silverstripe / silverstripe-siteconfig

code/controller/SiteConfigLeftAndMain.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 	/**
 	 * Used for preview controls, mainly links which switch between different states of the page.
 	 *
-	 * @return ArrayData
+	 * @return SilverStripe\Model\FieldType\DBField
 	 */
     public function getSilverStripeNavigator()
     {

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		)->setHTMLID('Form_EditForm');
 		$form->setValidationResponseCallback(function() use ($negotiator, $form) {
 			$request = $this->getRequest();
-			if($request->isAjax() && $negotiator) {
+			if ($request->isAjax() && $negotiator) {
 				$form->setupFormErrors();
 				$result = $form->forTemplate();
 
@@ -128,7 +128,7 @@ 
 		
 		try {
 			$siteConfig->write();
-		} catch(ValidationException $ex) {
+		} catch (ValidationException $ex) {
 			$form->sessionMessage($ex->getResult()->message(), 'bad');
 			return $this->getResponseNegotiator()->respond($this->request);
 		}

tests/behat/features/bootstrap/SilverStripe/SiteConfig/Test/Behaviour/ThemeContext.php

Doc Comments +6 added lines

@@ -54,6 +54,9 @@ 
         $this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
     }
 
+    /**
+     * @param string $filename
+     */
     protected function requireFile($filename, $content)
     {
         // Already exists
@@ -71,6 +74,9 @@ 
         }
     }
 
+    /**
+     * @param string $dirname
+     */
     protected function requireDir($dirname)
     {
         // Directory doesn't exist, create it and mark it for deletion

Spacing +4 added lines, -4 removed lines

@@ -31,9 +31,9 @@ 
             throw new \InvalidArgumentException("Bad theme '$theme'");
         }
 
-        $this->requireDir(BASE_PATH . '/themes');
-        $this->requireDir(BASE_PATH . '/themes/' . $theme);
-        $this->requireDir(BASE_PATH . '/themes/' . $theme . '/templates');
+        $this->requireDir(BASE_PATH.'/themes');
+        $this->requireDir(BASE_PATH.'/themes/'.$theme);
+        $this->requireDir(BASE_PATH.'/themes/'.$theme.'/templates');
     }
 
     /**
@@ -51,7 +51,7 @@ 
         }
 
         $this->stepCreateTheme($theme);
-        $this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
+        $this->requireFile(BASE_PATH.'/themes/'.$theme.'/templates/'.$template, $content);
     }
 
     protected function requireFile($filename, $content)

tests/behat/features/bootstrap/Context/FeatureContext.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
         // Add extra contexts with more steps
         $this->useContext('ThemeContext', new \SilverStripe\Siteconfig\Test\Behaviour\ThemeContext($parameters));
-        if(!class_exists('SiteTree')) {
+        if (!class_exists('SiteTree')) {
             return;
         }
 
@@ -41,7 +41,7 @@ 
         $factory = $fixtureContext->getFixtureFactory();
         foreach (\ClassInfo::subclassesFor('SiteTree') as $id => $class) {
             $blueprint = \Injector::inst()->create('FixtureBlueprint', $class);
-            $blueprint->addCallback('afterCreate', function ($obj, $identifier, &$data, &$fixtures) {
+            $blueprint->addCallback('afterCreate', function($obj, $identifier, &$data, &$fixtures) {
                 $obj->publish('Stage', 'Live');
             });
             $factory->define($class, $blueprint);

code/model/SiteConfig.php

Spacing +3 added lines, -3 removed lines

@@ -141,9 +141,9 @@ 
             $fields->makeFieldReadonly($titleField);
         }
 
-        if (file_exists(BASE_PATH . '/install.php')) {
+        if (file_exists(BASE_PATH.'/install.php')) {
             $fields->addFieldToTab("Root.Main", new LiteralField("InstallWarningHeader",
-                "<p class=\"message warning\">" . _t("SiteTree.REMOVE_INSTALL_WARNING",
+                "<p class=\"message warning\">"._t("SiteTree.REMOVE_INSTALL_WARNING",
                 "Warning: You should remove install.php from this SilverStripe install for security reasons.")
                 . "</p>"), "Title");
         }
@@ -165,7 +165,7 @@ 
     public function getAvailableThemes($baseDir = null)
     {
         $themes = SSViewer::get_themes($baseDir);
-        $disabled = (array)$this->config()->disabled_themes;
+        $disabled = (array) $this->config()->disabled_themes;
     
         foreach ($disabled as $theme) {
             if (isset($themes[$theme])) {

tests/SiteConfigTest.php

Spacing +5 added lines, -5 removed lines

@@ -26,16 +26,16 @@
     {
         $config = $this->objFromFixture('SiteConfig', 'default');
         $ds = DIRECTORY_SEPARATOR;
-        $testThemeBaseDir = TEMP_FOLDER . $ds . 'test-themes';
+        $testThemeBaseDir = TEMP_FOLDER.$ds.'test-themes';
         
         if (file_exists($testThemeBaseDir)) {
             Filesystem::removeFolder($testThemeBaseDir);
         }
         mkdir($testThemeBaseDir);
-        mkdir($testThemeBaseDir . $ds . 'blackcandy');
-        mkdir($testThemeBaseDir . $ds . 'blackcandy_blog');
-        mkdir($testThemeBaseDir . $ds . 'darkshades');
-        mkdir($testThemeBaseDir . $ds . 'darkshades_blog');
+        mkdir($testThemeBaseDir.$ds.'blackcandy');
+        mkdir($testThemeBaseDir.$ds.'blackcandy_blog');
+        mkdir($testThemeBaseDir.$ds.'darkshades');
+        mkdir($testThemeBaseDir.$ds.'darkshades_blog');
         
         $themes = $config->getAvailableThemes($testThemeBaseDir);
         $this->assertContains('blackcandy', $themes, 'Test themes contain blackcandy theme');