mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2025-03-03 03:39:21 -05:00
Apply StyleCI changes
This commit is contained in:
parent
5b54f2cdb0
commit
b90967a14b
@ -183,7 +183,6 @@ class Controller
|
|||||||
$this->_setDefaultTemplate();
|
$this->_setDefaultTemplate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set default language
|
* Set default language
|
||||||
*
|
*
|
||||||
@ -202,7 +201,6 @@ class Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set default template
|
* Set default template
|
||||||
*
|
*
|
||||||
@ -213,7 +211,7 @@ class Controller
|
|||||||
$this->_conf = new Configuration;
|
$this->_conf = new Configuration;
|
||||||
|
|
||||||
$templates = $this->_conf->getSection('available_templates');
|
$templates = $this->_conf->getSection('available_templates');
|
||||||
$template = $this->_conf->getKey('template');
|
$template = $this->_conf->getKey('template');
|
||||||
TemplateSwitcher::setAvailableTemplates($templates);
|
TemplateSwitcher::setAvailableTemplates($templates);
|
||||||
TemplateSwitcher::setTemplateFallback($template);
|
TemplateSwitcher::setTemplateFallback($template);
|
||||||
|
|
||||||
|
@ -11,14 +11,13 @@
|
|||||||
|
|
||||||
namespace PrivateBin;
|
namespace PrivateBin;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TemplateSwitcher
|
* TemplateSwitcher
|
||||||
*
|
*
|
||||||
* Provides tool to change application template
|
* Provides tool to change application template
|
||||||
*/
|
*/
|
||||||
class TemplateSwitcher {
|
class TemplateSwitcher
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* template fallback
|
* template fallback
|
||||||
*
|
*
|
||||||
@ -28,7 +27,6 @@ class TemplateSwitcher {
|
|||||||
*/
|
*/
|
||||||
protected static $_templateFallback;
|
protected static $_templateFallback;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* available templates
|
* available templates
|
||||||
*
|
*
|
||||||
@ -38,7 +36,6 @@ class TemplateSwitcher {
|
|||||||
*/
|
*/
|
||||||
protected static $_availableTemplates = array();
|
protected static $_availableTemplates = array();
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set available templates
|
* set available templates
|
||||||
*
|
*
|
||||||
@ -111,8 +108,8 @@ class TemplateSwitcher {
|
|||||||
*/
|
*/
|
||||||
private static function getSelectedByUserTemplate(): ?string
|
private static function getSelectedByUserTemplate(): ?string
|
||||||
{
|
{
|
||||||
$selectedTemplate = null;
|
$selectedTemplate = null;
|
||||||
$templateCookieValue = $_COOKIE['template'] ?? "";
|
$templateCookieValue = $_COOKIE['template'] ?? '';
|
||||||
|
|
||||||
if (self::isTemplateAvailable($templateCookieValue)) {
|
if (self::isTemplateAvailable($templateCookieValue)) {
|
||||||
$selectedTemplate = $templateCookieValue;
|
$selectedTemplate = $templateCookieValue;
|
||||||
|
@ -4,68 +4,62 @@ use PHPUnit\Framework\TestCase;
|
|||||||
use PrivateBin\Configuration;
|
use PrivateBin\Configuration;
|
||||||
use PrivateBin\TemplateSwitcher;
|
use PrivateBin\TemplateSwitcher;
|
||||||
|
|
||||||
|
|
||||||
class TemplateSwitcherTest extends TestCase
|
class TemplateSwitcherTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
||||||
public function testSetTemplateFallback()
|
public function testSetTemplateFallback()
|
||||||
{
|
{
|
||||||
$conf = new Configuration;
|
$conf = new Configuration;
|
||||||
|
|
||||||
$existingTemplateFallback = "bootstrap-dark";
|
$existingTemplateFallback = 'bootstrap-dark';
|
||||||
$wrongTemplateFallback = "bootstrap-wrong";
|
$wrongTemplateFallback = 'bootstrap-wrong';
|
||||||
|
|
||||||
TemplateSwitcher::setAvailableTemplates($conf->getSection('available_templates'));
|
TemplateSwitcher::setAvailableTemplates($conf->getSection('available_templates'));
|
||||||
TemplateSwitcher::setTemplateFallback($existingTemplateFallback);
|
TemplateSwitcher::setTemplateFallback($existingTemplateFallback);
|
||||||
$this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), "Correct template fallback");
|
$this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), 'Correct template fallback');
|
||||||
|
|
||||||
TemplateSwitcher::setTemplateFallback($wrongTemplateFallback);
|
TemplateSwitcher::setTemplateFallback($wrongTemplateFallback);
|
||||||
$this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), "Wrong template fallback");
|
$this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), 'Wrong template fallback');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function testSetAvailableTemplates()
|
public function testSetAvailableTemplates()
|
||||||
{
|
{
|
||||||
$conf = new Configuration;
|
$conf = new Configuration;
|
||||||
$availableTemplates = $conf->getSection('available_templates');
|
$availableTemplates = $conf->getSection('available_templates');
|
||||||
|
|
||||||
TemplateSwitcher::setAvailableTemplates($availableTemplates);
|
TemplateSwitcher::setAvailableTemplates($availableTemplates);
|
||||||
$this->assertEquals($availableTemplates, TemplateSwitcher::getAvailableTemplates(), "Set available templates");
|
$this->assertEquals($availableTemplates, TemplateSwitcher::getAvailableTemplates(), 'Set available templates');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function testGetTemplate()
|
public function testGetTemplate()
|
||||||
{
|
{
|
||||||
$defaultTemplateFallback = "bootstrap";
|
$defaultTemplateFallback = 'bootstrap';
|
||||||
$customTemplate = "bootstrap-dark";
|
$customTemplate = 'bootstrap-dark';
|
||||||
$customWrongTemplate = "bootstrap-wrong";
|
$customWrongTemplate = 'bootstrap-wrong';
|
||||||
|
|
||||||
TemplateSwitcher::setTemplateFallback($defaultTemplateFallback);
|
TemplateSwitcher::setTemplateFallback($defaultTemplateFallback);
|
||||||
|
|
||||||
$_COOKIE['template'] = $customWrongTemplate;
|
$_COOKIE['template'] = $customWrongTemplate;
|
||||||
$this->assertEquals($defaultTemplateFallback, TemplateSwitcher::getTemplate(), "Custom wrong template");
|
$this->assertEquals($defaultTemplateFallback, TemplateSwitcher::getTemplate(), 'Custom wrong template');
|
||||||
|
|
||||||
$_COOKIE['template'] = $customTemplate;
|
$_COOKIE['template'] = $customTemplate;
|
||||||
$this->assertEquals($customTemplate, TemplateSwitcher::getTemplate(), "Custom template");
|
$this->assertEquals($customTemplate, TemplateSwitcher::getTemplate(), 'Custom template');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function testGetAvailableTemplates()
|
public function testGetAvailableTemplates()
|
||||||
{
|
{
|
||||||
$this->assertNotEmpty(TemplateSwitcher::getAvailableTemplates(), "Get available templates");
|
$this->assertNotEmpty(TemplateSwitcher::getAvailableTemplates(), 'Get available templates');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function testIsTemplateAvailable()
|
public function testIsTemplateAvailable()
|
||||||
{
|
{
|
||||||
$conf = new Configuration;
|
$conf = new Configuration;
|
||||||
|
|
||||||
$existingTemplate = "bootstrap";
|
$existingTemplate = 'bootstrap';
|
||||||
$nonExistentTemplate = "bootstrap-wrong";
|
$nonExistentTemplate = 'bootstrap-wrong';
|
||||||
|
|
||||||
TemplateSwitcher::setAvailableTemplates($conf->getSection('available_templates'));
|
TemplateSwitcher::setAvailableTemplates($conf->getSection('available_templates'));
|
||||||
|
|
||||||
$this->assertTrue(TemplateSwitcher::isTemplateAvailable($existingTemplate), "Existing template");
|
$this->assertTrue(TemplateSwitcher::isTemplateAvailable($existingTemplate), 'Existing template');
|
||||||
$this->assertFalse(TemplateSwitcher::isTemplateAvailable($nonExistentTemplate), "Non-existent template");
|
$this->assertFalse(TemplateSwitcher::isTemplateAvailable($nonExistentTemplate), 'Non-existent template');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user