From 650dc5b39632ebce52c80963ee1443dc554a27d9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 6 Sep 2016 11:14:27 +0200
Subject: php 5.4 and 5.5 compatibility

---
 apps/theming/appinfo/app.php            |  2 +-
 apps/theming/tests/CapabilitiesTest.php | 13 ++-----------
 apps/theming/tests/ServicesTest.php     | 32 +++++++++++---------------------
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/apps/theming/appinfo/app.php b/apps/theming/appinfo/app.php
index 45067d5889c..1a49438d59e 100644
--- a/apps/theming/appinfo/app.php
+++ b/apps/theming/appinfo/app.php
@@ -39,4 +39,4 @@ $linkToCSS = \OC::$server->getURLGenerator()->linkToRoute(
 );
 
 $app = new \OCP\AppFramework\App('theming');
-$app->getContainer()->registerCapability(\OCA\Theming\Capabilities::class);
+$app->getContainer()->registerCapability('OCA\Theming\Capabilities');
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
index 218fca505ed..d63092d4ae7 100644
--- a/apps/theming/tests/CapabilitiesTest.php
+++ b/apps/theming/tests/CapabilitiesTest.php
@@ -22,17 +22,8 @@
 namespace OCA\Theming\Tests;
 
 use OCA\Theming\Capabilities;
-use OCA\Theming\Controller\ThemingController;
-use OCA\Theming\Settings\Admin;
-use OCA\Theming\Settings\Section;
 use OCA\Theming\ThemingDefaults;
-use OCA\Theming\Util;
-use OCP\AppFramework\App;
-use OCP\Capabilities\ICapability;
-use OCP\IL10N;
 use OCP\IURLGenerator;
-use OCP\Settings\ISection;
-use OCP\Settings\ISettings;
 use Test\TestCase;
 
 /**
@@ -54,10 +45,10 @@ class CapabilitiesTest extends TestCase  {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->theming = $this->getMockBuilder(ThemingDefaults::class)
+		$this->theming = $this->getMockBuilder('OCA\Theming\ThemingDefaults')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->url = $this->getMockBuilder(IURLGenerator::class)
+		$this->url = $this->getMockBuilder('OCP\IURLGenerator')
 			->getMock();
 
 		$this->capabilities = new Capabilities($this->theming, $this->url);
diff --git a/apps/theming/tests/ServicesTest.php b/apps/theming/tests/ServicesTest.php
index 1e98e67841c..0ea00fbf67a 100644
--- a/apps/theming/tests/ServicesTest.php
+++ b/apps/theming/tests/ServicesTest.php
@@ -21,17 +21,7 @@
 
 namespace OCA\Theming\Tests;
 
-use OCA\Theming\Capabilities;
-use OCA\Theming\Controller\ThemingController;
-use OCA\Theming\Settings\Admin;
-use OCA\Theming\Settings\Section;
-use OCA\Theming\ThemingDefaults;
-use OCA\Theming\Util;
 use OCP\AppFramework\App;
-use OCP\Capabilities\ICapability;
-use OCP\IL10N;
-use OCP\Settings\ISection;
-use OCP\Settings\ISettings;
 use Test\TestCase;
 
 /**
@@ -55,23 +45,23 @@ class ServicesTest extends TestCase  {
 
 	public function queryData() {
 		return [
-			[IL10N::class],
+			['OCP\IL10N'],
 
 			// lib/
-			[Capabilities::class],
-			[Capabilities::class, ICapability::class],
-			[ThemingDefaults::class],
-			[ThemingDefaults::class, \OC_Defaults::class],
-			[Util::class],
+			['OCA\Theming\Capabilities'],
+			['OCA\Theming\Capabilities', 'OCP\Capabilities\ICapability'],
+			['OCA\Theming\ThemingDefaults'],
+			['OCA\Theming\ThemingDefaults', 'OC_Defaults'],
+			['OCA\Theming\Util'],
 
 			// Controller
-			[ThemingController::class, ThemingController::class],
+			['OCA\Theming\Controller\ThemingController'],
 
 			// Settings
-			[Admin::class],
-			[Admin::class, ISettings::class],
-			[Section::class],
-			[Section::class, ISection::class],
+			['OCA\Theming\Settings\Admin'],
+			['OCA\Theming\Settings\Admin', 'OCP\Settings\ISettings'],
+			['OCA\Theming\Settings\Section'],
+			['OCA\Theming\Settings\Section', 'OCP\Settings\ISection'],
 		];
 	}
 
-- 
cgit v1.2.3