diff options
| -rw-r--r-- | apps/theming/lib/Controller/IconController.php | 8 | ||||
| -rw-r--r-- | apps/theming/tests/Controller/IconControllerTest.php | 12 | ||||
| -rw-r--r-- | lib/public/Defaults.php | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php index ddd1240fab8..7c4e209d0df 100644 --- a/apps/theming/lib/Controller/IconController.php +++ b/apps/theming/lib/Controller/IconController.php @@ -24,19 +24,19 @@ namespace OCA\Theming\Controller; use OCA\Theming\IconBuilder; use OCA\Theming\ImageManager; +use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Utility\ITimeFactory; -use OCP\Defaults; use OCP\Files\NotFoundException; use OCP\IRequest; use OCA\Theming\Util; use OCP\IConfig; class IconController extends Controller { - /** @var Defaults */ + /** @var ThemingDefaults */ private $themingDefaults; /** @var Util */ private $util; @@ -54,7 +54,7 @@ class IconController extends Controller { * * @param string $appName * @param IRequest $request - * @param Defaults $themingDefaults + * @param ThemingDefaults $themingDefaults * @param Util $util * @param ITimeFactory $timeFactory * @param IConfig $config @@ -64,7 +64,7 @@ class IconController extends Controller { public function __construct( $appName, IRequest $request, - Defaults $themingDefaults, + ThemingDefaults $themingDefaults, Util $util, ITimeFactory $timeFactory, IConfig $config, diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index ce053ff0eab..add11df3e6d 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -24,11 +24,11 @@ namespace OCA\Theming\Tests\Controller; use OC\Files\SimpleFS\SimpleFile; +use OCA\Theming\IconBuilder; use OCA\Theming\ImageManager; +use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Http; use OCP\AppFramework\Http\NotFoundResponse; -use OCP\Defaults; -use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IRequest; @@ -41,7 +41,7 @@ use OCP\AppFramework\Http\FileDisplayResponse; class IconControllerTest extends TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ private $request; - /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ private $themingDefaults; /** @var Util */ private $util; @@ -51,14 +51,14 @@ class IconControllerTest extends TestCase { private $iconController; /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IconBuilder|\PHPUnit_Framework_MockObject_MockObject */ private $iconBuilder; /** @var ImageManager */ private $imageManager; public function setUp() { $this->request = $this->getMockBuilder('OCP\IRequest')->getMock(); - $this->themingDefaults = $this->getMockBuilder('OCP\Defaults') + $this->themingDefaults = $this->getMockBuilder('OCA\Theming\ThemingDefaults') ->disableOriginalConstructor()->getMock(); $this->util = $this->getMockBuilder('\OCA\Theming\Util')->disableOriginalConstructor() ->setMethods(['getAppImage', 'getAppIcon', 'elementColor'])->getMock(); @@ -109,7 +109,7 @@ class IconControllerTest extends TestCase { $expires->add(new \DateInterval('PT24H')); $expected->addHeader('Expires', $expires->format(\DateTime::RFC2822)); $expected->addHeader('Pragma', 'cache'); - @$this->assertEquals($expected, $this->iconController->getThemedIcon('core', 'filetypes/folder.svg')); + $this->assertEquals($expected, $this->iconController->getThemedIcon('core', 'filetypes/folder.svg')); } public function testGetFaviconDefault() { diff --git a/lib/public/Defaults.php b/lib/public/Defaults.php index 591da18c7ee..dbde78bce68 100644 --- a/lib/public/Defaults.php +++ b/lib/public/Defaults.php @@ -51,7 +51,7 @@ class Defaults { * actual defaults * @since 6.0.0 */ - function __construct(\OC_Defaults $defaults = null) { + public function __construct(\OC_Defaults $defaults = null) { if ($defaults === null) { $defaults = \OC::$server->getThemingDefaults(); } |