From b90967a14b629c677cd8e740c3ecd682ab5e87c2 Mon Sep 17 00:00:00 2001 From: Ribas160 Date: Fri, 14 Feb 2025 15:33:34 +0200 Subject: [PATCH] Apply StyleCI changes --- lib/Controller.php | 4 +--- lib/TemplateSwitcher.php | 11 ++++------- tst/TemplateSwitcherTest.php | 38 +++++++++++++++--------------------- 3 files changed, 21 insertions(+), 32 deletions(-) diff --git a/lib/Controller.php b/lib/Controller.php index f90e3ca5..a1857f04 100644 --- a/lib/Controller.php +++ b/lib/Controller.php @@ -183,7 +183,6 @@ class Controller $this->_setDefaultTemplate(); } - /** * Set default language * @@ -202,7 +201,6 @@ class Controller } } - /** * Set default template * @@ -213,7 +211,7 @@ class Controller $this->_conf = new Configuration; $templates = $this->_conf->getSection('available_templates'); - $template = $this->_conf->getKey('template'); + $template = $this->_conf->getKey('template'); TemplateSwitcher::setAvailableTemplates($templates); TemplateSwitcher::setTemplateFallback($template); diff --git a/lib/TemplateSwitcher.php b/lib/TemplateSwitcher.php index 135889d7..8ecdad17 100644 --- a/lib/TemplateSwitcher.php +++ b/lib/TemplateSwitcher.php @@ -11,14 +11,13 @@ namespace PrivateBin; - /** * TemplateSwitcher * * Provides tool to change application template */ -class TemplateSwitcher { - +class TemplateSwitcher +{ /** * template fallback * @@ -28,7 +27,6 @@ class TemplateSwitcher { */ protected static $_templateFallback; - /** * available templates * @@ -38,7 +36,6 @@ class TemplateSwitcher { */ protected static $_availableTemplates = array(); - /** * set available templates * @@ -111,8 +108,8 @@ class TemplateSwitcher { */ private static function getSelectedByUserTemplate(): ?string { - $selectedTemplate = null; - $templateCookieValue = $_COOKIE['template'] ?? ""; + $selectedTemplate = null; + $templateCookieValue = $_COOKIE['template'] ?? ''; if (self::isTemplateAvailable($templateCookieValue)) { $selectedTemplate = $templateCookieValue; diff --git a/tst/TemplateSwitcherTest.php b/tst/TemplateSwitcherTest.php index 9d1fe00d..d854b36c 100644 --- a/tst/TemplateSwitcherTest.php +++ b/tst/TemplateSwitcherTest.php @@ -4,68 +4,62 @@ use PHPUnit\Framework\TestCase; use PrivateBin\Configuration; use PrivateBin\TemplateSwitcher; - class TemplateSwitcherTest extends TestCase { - public function testSetTemplateFallback() { $conf = new Configuration; - $existingTemplateFallback = "bootstrap-dark"; - $wrongTemplateFallback = "bootstrap-wrong"; + $existingTemplateFallback = 'bootstrap-dark'; + $wrongTemplateFallback = 'bootstrap-wrong'; TemplateSwitcher::setAvailableTemplates($conf->getSection('available_templates')); TemplateSwitcher::setTemplateFallback($existingTemplateFallback); - $this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), "Correct template fallback"); + $this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), 'Correct template fallback'); TemplateSwitcher::setTemplateFallback($wrongTemplateFallback); - $this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), "Wrong template fallback"); + $this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), 'Wrong template fallback'); } - public function testSetAvailableTemplates() { - $conf = new Configuration; + $conf = new Configuration; $availableTemplates = $conf->getSection('available_templates'); TemplateSwitcher::setAvailableTemplates($availableTemplates); - $this->assertEquals($availableTemplates, TemplateSwitcher::getAvailableTemplates(), "Set available templates"); + $this->assertEquals($availableTemplates, TemplateSwitcher::getAvailableTemplates(), 'Set available templates'); } - public function testGetTemplate() { - $defaultTemplateFallback = "bootstrap"; - $customTemplate = "bootstrap-dark"; - $customWrongTemplate = "bootstrap-wrong"; + $defaultTemplateFallback = 'bootstrap'; + $customTemplate = 'bootstrap-dark'; + $customWrongTemplate = 'bootstrap-wrong'; TemplateSwitcher::setTemplateFallback($defaultTemplateFallback); $_COOKIE['template'] = $customWrongTemplate; - $this->assertEquals($defaultTemplateFallback, TemplateSwitcher::getTemplate(), "Custom wrong template"); + $this->assertEquals($defaultTemplateFallback, TemplateSwitcher::getTemplate(), 'Custom wrong template'); $_COOKIE['template'] = $customTemplate; - $this->assertEquals($customTemplate, TemplateSwitcher::getTemplate(), "Custom template"); + $this->assertEquals($customTemplate, TemplateSwitcher::getTemplate(), 'Custom template'); } - public function testGetAvailableTemplates() { - $this->assertNotEmpty(TemplateSwitcher::getAvailableTemplates(), "Get available templates"); + $this->assertNotEmpty(TemplateSwitcher::getAvailableTemplates(), 'Get available templates'); } - public function testIsTemplateAvailable() { $conf = new Configuration; - $existingTemplate = "bootstrap"; - $nonExistentTemplate = "bootstrap-wrong"; + $existingTemplate = 'bootstrap'; + $nonExistentTemplate = 'bootstrap-wrong'; TemplateSwitcher::setAvailableTemplates($conf->getSection('available_templates')); - $this->assertTrue(TemplateSwitcher::isTemplateAvailable($existingTemplate), "Existing template"); - $this->assertFalse(TemplateSwitcher::isTemplateAvailable($nonExistentTemplate), "Non-existent template"); + $this->assertTrue(TemplateSwitcher::isTemplateAvailable($existingTemplate), 'Existing template'); + $this->assertFalse(TemplateSwitcher::isTemplateAvailable($nonExistentTemplate), 'Non-existent template'); } }