summaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
authorBjoern Schiessle <bjoern@schiessle.org>2016-08-12 15:30:35 +0200
committerBjoern Schiessle <bjoern@schiessle.org>2016-08-12 15:32:28 +0200
commit18fd8ff70cb00a886b86dd8e540f40be1ee4d735 (patch)
tree6812a2a93473a146f3631fff626c45df2447fd28 /apps/theming
parentac04ba6784ca2f0f19649bf726545525c493e493 (diff)
downloadnextcloud-server-18fd8ff70cb00a886b86dd8e540f40be1ee4d735.tar.gz
nextcloud-server-18fd8ff70cb00a886b86dd8e540f40be1ee4d735.zip
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy"
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/lib/Settings/Admin.php4
-rw-r--r--apps/theming/lib/ThemingDefaults.php (renamed from apps/theming/lib/Template.php)23
-rw-r--r--apps/theming/tests/ThemingDefaultsTest.php (renamed from apps/theming/tests/TemplateTest.php)5
3 files changed, 14 insertions, 18 deletions
diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php
index 07dfe75ec60..03356c11383 100644
--- a/apps/theming/lib/Settings/Admin.php
+++ b/apps/theming/lib/Settings/Admin.php
@@ -23,7 +23,7 @@
namespace OCA\Theming\Settings;
-use OCA\Theming\Template;
+use OCA\Theming\ThemingDefaults;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IL10N;
@@ -44,7 +44,7 @@ class Admin implements ISettings {
/** @var IURLGenerator */
private $urlGenerator;
- public function __construct(IConfig $config, IL10N $l, Template $themingDefaults, IURLGenerator $urlGenerator) {
+ public function __construct(IConfig $config, IL10N $l, ThemingDefaults $themingDefaults, IURLGenerator $urlGenerator) {
$this->config = $config;
$this->l = $l;
$this->themingDefaults = $themingDefaults;
diff --git a/apps/theming/lib/Template.php b/apps/theming/lib/ThemingDefaults.php
index 25730aad95b..a7af208b96d 100644
--- a/apps/theming/lib/Template.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -1,11 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
- * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
@@ -24,20 +19,19 @@
*
*/
+
namespace OCA\Theming;
+
+
+
use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
-/**
- * Class Template
- *
- * Handle all the values which can be modified by this app
- *
- * @package OCA\Theming
- */
-class Template extends \OC_Defaults {
+
+class ThemingDefaults extends \OC_Defaults {
+
/** @var IConfig */
private $config;
/** @var IL10N */
@@ -92,7 +86,7 @@ class Template extends \OC_Defaults {
public function getEntity() {
return $this->config->getAppValue('theming', 'name', $this->name);
}
-
+
public function getBaseUrl() {
return $this->config->getAppValue('theming', 'url', $this->url);
}
@@ -168,4 +162,5 @@ class Template extends \OC_Defaults {
return $returnValue;
}
+
}
diff --git a/apps/theming/tests/TemplateTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index c3c792657ec..34402825316 100644
--- a/apps/theming/tests/TemplateTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -24,12 +24,13 @@
namespace OCA\Theming\Tests;
use OCA\Theming\Template;
+use OCA\Theming\ThemingDefaults;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
use Test\TestCase;
-class TemplateTest extends TestCase {
+class ThemingDefaultsTest extends TestCase {
/** @var IConfig */
private $config;
/** @var IL10N */
@@ -64,7 +65,7 @@ class TemplateTest extends TestCase {
->expects($this->at(3))
->method('getMailHeaderColor')
->willReturn('#000');
- $this->template = new Template(
+ $this->template = new ThemingDefaults(
$this->config,
$this->l10n,
$this->urlGenerator,