Avoid overriding user settings

maiconpinto · Apr 19, 2018 · bf27e4e · bf27e4e
1 parent 8bc4d78
commit bf27e4e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 10 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -3,12 +3,34 @@
 use Cake\Core\Exception\MissingPluginException;
 use Cake\Core\Plugin;
 
-Configure::write('Theme.title', 'AdminLTE');
-Configure::write('Theme.logo.mini', '<b>A</b>LT');
-Configure::write('Theme.logo.large', '<b>Admin</b>LTE');
-Configure::write('Theme.login.show_remember', true);
-Configure::write('Theme.login.show_register', true);
-Configure::write('Theme.login.show_social', true);
-Configure::write('Theme.login.show_social', true);
-Configure::write('Theme.folder', ROOT);
-Configure::write('Theme.skin', 'blue');
+if (!Configure::check('Theme.title')) {
+    Configure::write('Theme.title', 'AdminLTE');
+}
+
+if (!Configure::check('Theme.logo.mini')) {
+    Configure::write('Theme.logo.mini', '<b>A</b>LT');
+}
+
+if (!Configure::check('Theme.logo.large')) {
+    Configure::write('Theme.logo.large', '<b>Admin</b>LTE');
+}
+
+if (!Configure::check('Theme.login.show_remember')) {
+    Configure::write('Theme.login.show_remember', true);
+}
+
+if (!Configure::check('Theme.login.show_register')) {
+    Configure::write('Theme.login.show_register', true);
+}
+
+if (!Configure::check('Theme.login.show_social')) {
+    Configure::write('Theme.login.show_social', true);
+}
+
+if (!Configure::check('Theme.folder')) {
+    Configure::write('Theme.folder', ROOT);
+}
+
+if (!Configure::check('Theme.skin')) {
+    Configure::write('Theme.skin', 'blue');
+}
diff --git a/tests/TestCase/ConfiguresTest.php b/tests/TestCase/ConfiguresTest.php
@@ -31,5 +31,26 @@ public function testDefaultConfigures()
         include dirname(dirname(dirname(__FILE__))) . '/config/bootstrap.php';
         $this->assertEquals($expected, Configure::read('Theme'));
     }
-}
 
+    public function testNotOverridingUserConfigures()
+    {
+        $expected = [
+            'title' => 'my site name',
+            'logo' => [
+                'mini' => 'ALT',
+                'large' => 'AdminLTE'
+            ],
+            'login' => [
+                'show_remember' => false,
+                'show_register' => false,
+                'show_social' => false
+            ],
+            'folder' => ROOT . DS . 'sub',
+            'skin' => 'red'
+        ];
+
+        Configure::write('Theme', $expected);
+        include dirname(dirname(dirname(__FILE__))) . '/config/bootstrap.php';
+        $this->assertEquals($expected, Configure::read('Theme'));
+    }
+}