886bda5f81
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
86 lines
2.3 KiB
PHP
86 lines
2.3 KiB
PHP
<?php
|
|
|
|
/**
|
|
* ownCloud - App Framework
|
|
*
|
|
* @author Bernhard Posselt
|
|
* @author Morris Jobke
|
|
* @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
|
|
* @copyright 2013 Morris Jobke <morris.jobke@gmail.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* License as published by the Free Software Foundation; either
|
|
* version 3 of the License, or any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
|
|
namespace OC\AppFramework\DependencyInjection;
|
|
|
|
use \OC\AppFramework\Http\Request;
|
|
|
|
|
|
class DIContainerTest extends \Test\TestCase {
|
|
|
|
private $container;
|
|
private $api;
|
|
|
|
protected function setUp(){
|
|
parent::setUp();
|
|
$this->container = new DIContainer('name');
|
|
$this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi'));
|
|
}
|
|
|
|
public function testProvidesAPI(){
|
|
$this->assertTrue(isset($this->container['API']));
|
|
}
|
|
|
|
|
|
public function testProvidesRequest(){
|
|
$this->assertTrue(isset($this->container['Request']));
|
|
}
|
|
|
|
|
|
public function testProvidesSecurityMiddleware(){
|
|
$this->assertTrue(isset($this->container['SecurityMiddleware']));
|
|
}
|
|
|
|
|
|
public function testProvidesMiddlewareDispatcher(){
|
|
$this->assertTrue(isset($this->container['MiddlewareDispatcher']));
|
|
}
|
|
|
|
|
|
public function testProvidesAppName(){
|
|
$this->assertTrue(isset($this->container['AppName']));
|
|
}
|
|
|
|
|
|
public function testAppNameIsSetCorrectly(){
|
|
$this->assertEquals('name', $this->container['AppName']);
|
|
}
|
|
|
|
|
|
public function testMiddlewareDispatcherIncludesSecurityMiddleware(){
|
|
$this->container['Request'] = new Request(
|
|
['method' => 'GET'],
|
|
$this->getMock('\OCP\Security\ISecureRandom'),
|
|
$this->getMock('\OCP\IConfig')
|
|
);
|
|
$security = $this->container['SecurityMiddleware'];
|
|
$dispatcher = $this->container['MiddlewareDispatcher'];
|
|
|
|
$this->assertContains($security, $dispatcher->getMiddlewares());
|
|
}
|
|
|
|
|
|
}
|