Fix for Nextcloud9

3 files changed, 9 insertions, 18 deletions

diff --git a/apps/theming/lib/capabilities.php b/apps/theming/lib/capabilities.php
index 458da3be203..5c71d465fe0 100644
--- a/apps/theming/lib/capabilities.php
+++ b/apps/theming/lib/capabilities.php
@@ -24,7 +24,6 @@
 namespace OCA\Theming;
 
 use OCP\Capabilities\ICapability;
-use OCP\IURLGenerator;
 
 /**
  * Class Capabilities
@@ -33,13 +32,13 @@ use OCP\IURLGenerator;
  */
 class Capabilities implements ICapability {
 
-	/** @var ThemingDefaults */
+	/** @var Template */
 	protected $theming;
 
 	/**
-	 * @param ThemingDefaults $theming
+	 * @param Template $theming
 	 */
-	public function __construct(ThemingDefaults $theming) {
+	public function __construct(Template $theming) {
 		$this->theming = $theming;
 	}
 
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
index 7daccc7307c..deb1c4e28d4 100644
--- a/apps/theming/tests/CapabilitiesTest.php
+++ b/apps/theming/tests/CapabilitiesTest.php
@@ -22,8 +22,7 @@
 namespace OCA\Theming\Tests;
 
 use OCA\Theming\Capabilities;
-use OCA\Theming\ThemingDefaults;
-use OCP\IURLGenerator;
+use OCA\Theming\Template;
 use Test\TestCase;
 
 /**
@@ -33,7 +32,7 @@ use Test\TestCase;
  * @package OCA\Theming\Tests
  */
 class CapabilitiesTest extends TestCase  {
-	/** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var Template|\PHPUnit_Framework_MockObject_MockObject */
 	protected $theming;
 
 	/** @var Capabilities */
@@ -42,7 +41,7 @@ class CapabilitiesTest extends TestCase  {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->theming = $this->getMockBuilder('OCA\Theming\ThemingDefaults')
+		$this->theming = $this->getMockBuilder('OCA\Theming\Template')
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/theming/tests/ServicesTest.php b/apps/theming/tests/ServicesTest.php
index 0ea00fbf67a..28656d9d83c 100644
--- a/apps/theming/tests/ServicesTest.php
+++ b/apps/theming/tests/ServicesTest.php
@@ -50,18 +50,11 @@ class ServicesTest extends TestCase  {
 			// lib/
 			['OCA\Theming\Capabilities'],
 			['OCA\Theming\Capabilities', 'OCP\Capabilities\ICapability'],
-			['OCA\Theming\ThemingDefaults'],
-			['OCA\Theming\ThemingDefaults', 'OC_Defaults'],
-			['OCA\Theming\Util'],
+			['OCA\Theming\Template'],
+			['OCA\Theming\Template', 'OC_Defaults'],
 
-			// Controller
+			// controller/
 			['OCA\Theming\Controller\ThemingController'],
-
-			// Settings
-			['OCA\Theming\Settings\Admin'],
-			['OCA\Theming\Settings\Admin', 'OCP\Settings\ISettings'],
-			['OCA\Theming\Settings\Section'],
-			['OCA\Theming\Settings\Section', 'OCP\Settings\ISection'],
 		];
 	}