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()
     {

Indentation +16 added lines, -16 removed lines

@@ -42,8 +42,8 @@ 
 	 *
 	 * @return Form
 	 */
-    public function getEditForm($id = null, $fields = null)
-    {
+	public function getEditForm($id = null, $fields = null)
+	{
 		$siteConfig = SiteConfig::current_site_config();
 		$fields = $siteConfig->getCMSFields();
 
@@ -84,20 +84,20 @@ 
 		$form->addExtraClass('cms-content center cms-edit-form');
 		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 
-        if ($form->Fields()->hasTabset()) {
-            $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
-        }
+		if ($form->Fields()->hasTabset()) {
+			$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		}
 		$form->setHTMLID('Form_EditForm');
 		$form->loadDataFrom($siteConfig);
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
 
 		// Use <button> to allow full jQuery UI styling
 		$actions = $actions->dataFields();
-        if ($actions) {
-            foreach ($actions as $action) {
-                $action->setUseButtonTag(true);
-            }
-        }
+		if ($actions) {
+			foreach ($actions as $action) {
+				$action->setUseButtonTag(true);
+			}
+		}
 
 		$this->extend('updateEditForm', $form);
 
@@ -109,8 +109,8 @@ 
 	 *
 	 * @return ArrayData
 	 */
-    public function getSilverStripeNavigator()
-    {
+	public function getSilverStripeNavigator()
+	{
 		return $this->renderWith('CMSSettingsController_SilverStripeNavigator');
 	}
 
@@ -121,8 +121,8 @@ 
 	 * @param Form $form 
 	 * @return String
 	 */
-    public function save_siteconfig($data, $form)
-    {
+	public function save_siteconfig($data, $form)
+	{
 		$siteConfig = SiteConfig::current_site_config();
 		$form->saveInto($siteConfig);
 		
@@ -139,8 +139,8 @@ 
 	}
 	
 
-    public function Breadcrumbs($unlinked = false)
-    {
+	public function Breadcrumbs($unlinked = false)
+	{
 		$defaultTitle = self::menu_title_for_class(get_class($this));
 
 		return new ArrayList(array(

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/Context/FeatureContext.php

Unused Use Statements -3 removed lines

@@ -2,9 +2,6 @@
 
 namespace SilverStripe\Siteconfig\Test\Behaviour;
 
-use SilverStripe\BehatExtension\Context\SilverStripeContext;
-use SilverStripe\BehatExtension\Context\BasicContext;
-use SilverStripe\BehatExtension\Context\LoginContext;
 use SilverStripe\BehatExtension\Context\FixtureContext;
 use SilverStripe\Cms\Test\Behaviour;
 

Indentation +28 added lines, -28 removed lines

@@ -16,35 +16,35 @@
  */
 class FeatureContext extends \SilverStripe\Framework\Test\Behaviour\FeatureContext
 {
-    /**
-     * Initializes context.
-     * Every scenario gets it's own context object.
-     *
-     * @param   array   $parameters     context parameters (set them up through behat.yml)
-     */
-    public function __construct(array $parameters)
-    {
-        parent::__construct($parameters);
+	/**
+	 * Initializes context.
+	 * Every scenario gets it's own context object.
+	 *
+	 * @param   array   $parameters     context parameters (set them up through behat.yml)
+	 */
+	public function __construct(array $parameters)
+	{
+		parent::__construct($parameters);
 
-        // Override existing fixture context with more specific one
-        $fixtureContext = new \SilverStripe\Siteconfig\Test\Behaviour\FixtureContext($parameters);
-        $fixtureContext->setFixtureFactory($this->getFixtureFactory());
-        $this->useContext('FixtureContext', $fixtureContext);
+		// Override existing fixture context with more specific one
+		$fixtureContext = new \SilverStripe\Siteconfig\Test\Behaviour\FixtureContext($parameters);
+		$fixtureContext->setFixtureFactory($this->getFixtureFactory());
+		$this->useContext('FixtureContext', $fixtureContext);
 
-        // Add extra contexts with more steps
-        $this->useContext('ThemeContext', new \SilverStripe\Siteconfig\Test\Behaviour\ThemeContext($parameters));
-        if(!class_exists('SiteTree')) {
-            return;
-        }
+		// Add extra contexts with more steps
+		$this->useContext('ThemeContext', new \SilverStripe\Siteconfig\Test\Behaviour\ThemeContext($parameters));
+		if(!class_exists('SiteTree')) {
+			return;
+		}
 
-        // Use blueprints which auto-publish all subclasses of SiteTree
-        $factory = $fixtureContext->getFixtureFactory();
-        foreach (\ClassInfo::subclassesFor('SiteTree') as $id => $class) {
-            $blueprint = \Injector::inst()->create('FixtureBlueprint', $class);
-            $blueprint->addCallback('afterCreate', function ($obj, $identifier, &$data, &$fixtures) {
-                $obj->publish('Stage', 'Live');
-            });
-            $factory->define($class, $blueprint);
-        }
-    }
+		// Use blueprints which auto-publish all subclasses of SiteTree
+		$factory = $fixtureContext->getFixtureFactory();
+		foreach (\ClassInfo::subclassesFor('SiteTree') as $id => $class) {
+			$blueprint = \Injector::inst()->create('FixtureBlueprint', $class);
+			$blueprint->addCallback('afterCreate', function ($obj, $identifier, &$data, &$fixtures) {
+				$obj->publish('Stage', 'Live');
+			});
+			$factory->define($class, $blueprint);
+		}
+	}
 }

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);

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

Unused Use Statements -8 removed lines

@@ -2,15 +2,7 @@
 
 namespace SilverStripe\Siteconfig\Test\Behaviour;
 
-use Behat\Behat\Context\ClosuredContextInterface;
-use Behat\Behat\Context\TranslatedContextInterface;
 use Behat\Behat\Context\BehatContext;
-use Behat\Behat\Context\Step;
-use Behat\Behat\Event\StepEvent;
-use Behat\Behat\Exception\PendingException;
-use Behat\Mink\Driver\Selenium2Driver;
-use Behat\Gherkin\Node\PyStringNode;
-use Behat\Gherkin\Node\TableNode;
 
 /**
  * Context used to create fixtures in the SilverStripe ORM.

Indentation +86 added lines, -86 removed lines

@@ -17,100 +17,100 @@
  */
 class ThemeContext extends BehatContext
 {
-    protected $restoreFiles = array();
-    protected $restoreDirectories = array();
+	protected $restoreFiles = array();
+	protected $restoreDirectories = array();
 
-    /**
-     * Create a test theme
-     *
-     * @Given /^a theme "(?<theme>[^"]+)"/
-     */
-    public function stepCreateTheme($theme)
-    {
-        if (!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) {
-            throw new \InvalidArgumentException("Bad theme '$theme'");
-        }
+	/**
+	 * Create a test theme
+	 *
+	 * @Given /^a theme "(?<theme>[^"]+)"/
+	 */
+	public function stepCreateTheme($theme)
+	{
+		if (!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) {
+			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');
+	}
 
-    /**
-     * Create a template within a test theme
-     *
-     * @Given /^a template "(?<template>[^"]+)" in theme "(?<theme>[^"]+)" with content "(?<content>[^"]+)"/
-     */
-    public function stepCreateTemplate($template, $theme, $content)
-    {
-        if (!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) {
-            throw new \InvalidArgumentException("Bad theme '$theme'");
-        }
-        if (!preg_match('/^(Layout\/)?[0-9a-zA-Z_-]+\.ss$/', $template)) {
-            throw new \InvalidArgumentException("Bad template '$template'");
-        }
+	/**
+	 * Create a template within a test theme
+	 *
+	 * @Given /^a template "(?<template>[^"]+)" in theme "(?<theme>[^"]+)" with content "(?<content>[^"]+)"/
+	 */
+	public function stepCreateTemplate($template, $theme, $content)
+	{
+		if (!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) {
+			throw new \InvalidArgumentException("Bad theme '$theme'");
+		}
+		if (!preg_match('/^(Layout\/)?[0-9a-zA-Z_-]+\.ss$/', $template)) {
+			throw new \InvalidArgumentException("Bad template '$template'");
+		}
 
-        $this->stepCreateTheme($theme);
-        $this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
-    }
+		$this->stepCreateTheme($theme);
+		$this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
+	}
 
-    protected function requireFile($filename, $content)
-    {
-        // Already exists
-        if (file_exists($filename)) {
-            // If the content is different, remember old content for restoration
-            $origContent = file_get_contents($filename);
-            if ($origContent != $content) {
-                file_put_contents($filename, $content);
-                $this->restoreFiles[$filename] = $origContent;
-            }
-        // Doesn't exist, mark it for deletion after test
-        } else {
-            file_put_contents($filename, $content);
-            $this->restoreFiles[$filename] = null;
-        }
-    }
+	protected function requireFile($filename, $content)
+	{
+		// Already exists
+		if (file_exists($filename)) {
+			// If the content is different, remember old content for restoration
+			$origContent = file_get_contents($filename);
+			if ($origContent != $content) {
+				file_put_contents($filename, $content);
+				$this->restoreFiles[$filename] = $origContent;
+			}
+		// Doesn't exist, mark it for deletion after test
+		} else {
+			file_put_contents($filename, $content);
+			$this->restoreFiles[$filename] = null;
+		}
+	}
 
-    protected function requireDir($dirname)
-    {
-        // Directory doesn't exist, create it and mark it for deletion
-        if (!file_exists($dirname)) {
-            mkdir($dirname);
-            $this->restoreDirectories[] = $dirname;
-        }
-    }
+	protected function requireDir($dirname)
+	{
+		// Directory doesn't exist, create it and mark it for deletion
+		if (!file_exists($dirname)) {
+			mkdir($dirname);
+			$this->restoreDirectories[] = $dirname;
+		}
+	}
 
-    /**
-     * Clean up any theme manipulation
-     *
-     * @AfterScenario
-     */
-    public function cleanThemesAfterScenario()
-    {
-        // Restore any created/modified files.
-        //  - If modified, revert then to original contnet
-        //  - If created, delete them
-        if ($this->restoreFiles) {
-            foreach ($this->restoreFiles as $file => $origContent) {
-                if ($origContent === null) {
-                    unlink($file);
-                } else {
-                    file_put_contents($file, $origContent);
-                }
-            }
+	/**
+	 * Clean up any theme manipulation
+	 *
+	 * @AfterScenario
+	 */
+	public function cleanThemesAfterScenario()
+	{
+		// Restore any created/modified files.
+		//  - If modified, revert then to original contnet
+		//  - If created, delete them
+		if ($this->restoreFiles) {
+			foreach ($this->restoreFiles as $file => $origContent) {
+				if ($origContent === null) {
+					unlink($file);
+				} else {
+					file_put_contents($file, $origContent);
+				}
+			}
 
-            $this->restoreFiles = array();
-        }
+			$this->restoreFiles = array();
+		}
 
-        // Restore any created directories: that is, delete them
-        if ($this->restoreDirectories) {
-            // Flip the order so that nested direcotires are unlinked() first
-            $this->restoreDirectories = array_reverse($this->restoreDirectories);
-            foreach ($this->restoreDirectories as $dir) {
-                rmdir($dir);
-            }
+		// Restore any created directories: that is, delete them
+		if ($this->restoreDirectories) {
+			// Flip the order so that nested direcotires are unlinked() first
+			$this->restoreDirectories = array_reverse($this->restoreDirectories);
+			foreach ($this->restoreDirectories as $dir) {
+				rmdir($dir);
+			}
 
-            $this->restoreDirectories = array();
-        }
-    }
+			$this->restoreDirectories = array();
+		}
+	}
 }

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)

code/model/SiteConfig.php

Indentation +364 added lines, -364 removed lines

@@ -18,428 +18,428 @@
  */
 class SiteConfig extends DataObject implements PermissionProvider, TemplateGlobalProvider
 {
-    private static $db = array(
-        "Title" => "Varchar(255)",
-        "Tagline" => "Varchar(255)",
-        "Theme" => "Varchar(255)",
-        "CanViewType" => "Enum('Anyone, LoggedInUsers, OnlyTheseUsers', 'Anyone')",
-        "CanEditType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
-        "CanCreateTopLevelType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
-    );
+	private static $db = array(
+		"Title" => "Varchar(255)",
+		"Tagline" => "Varchar(255)",
+		"Theme" => "Varchar(255)",
+		"CanViewType" => "Enum('Anyone, LoggedInUsers, OnlyTheseUsers', 'Anyone')",
+		"CanEditType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
+		"CanCreateTopLevelType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
+	);
     
-    private static $many_many = array(
-        "ViewerGroups" => "Group",
-        "EditorGroups" => "Group",
-        "CreateTopLevelGroups" => "Group"
-    );
+	private static $many_many = array(
+		"ViewerGroups" => "Group",
+		"EditorGroups" => "Group",
+		"CreateTopLevelGroups" => "Group"
+	);
     
-    private static $defaults = array(
-        "CanViewType" => "Anyone",
-        "CanEditType" => "LoggedInUsers",
-        "CanCreateTopLevelType" => "LoggedInUsers",
-    );
+	private static $defaults = array(
+		"CanViewType" => "Anyone",
+		"CanEditType" => "LoggedInUsers",
+		"CanCreateTopLevelType" => "LoggedInUsers",
+	);
     
-    /**
-     * @config
-     *
-     * @var array
-     */
-    private static $disabled_themes = array();
+	/**
+	 * @config
+	 *
+	 * @var array
+	 */
+	private static $disabled_themes = array();
     
-    /**
-     * Default permission to check for 'LoggedInUsers' to create or edit pages
-     *
-     * @var array
-     * @config
-     */
-    private static $required_permission = array('CMS_ACCESS_CMSMain', 'CMS_ACCESS_LeftAndMain');
+	/**
+	 * Default permission to check for 'LoggedInUsers' to create or edit pages
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $required_permission = array('CMS_ACCESS_CMSMain', 'CMS_ACCESS_LeftAndMain');
     
 
-    public function populateDefaults()
-    {
-        $this->Title = _t('SiteConfig.SITENAMEDEFAULT', "Your Site Name");
-        $this->Tagline = _t('SiteConfig.TAGLINEDEFAULT', "your tagline here");
+	public function populateDefaults()
+	{
+		$this->Title = _t('SiteConfig.SITENAMEDEFAULT', "Your Site Name");
+		$this->Tagline = _t('SiteConfig.TAGLINEDEFAULT', "your tagline here");
         
-        // Allow these defaults to be overridden
-        parent::populateDefaults();
-    }
+		// Allow these defaults to be overridden
+		parent::populateDefaults();
+	}
 
-    /**
-     * Get the fields that are sent to the CMS. 
-     *
-     * In your extensions: updateCMSFields($fields).
-     *
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $groupsMap = array();
+	/**
+	 * Get the fields that are sent to the CMS. 
+	 *
+	 * In your extensions: updateCMSFields($fields).
+	 *
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$groupsMap = array();
 
-        foreach (Group::get() as $group) {
-            // Listboxfield values are escaped, use ASCII char instead of »
-            $groupsMap[$group->ID] = $group->getBreadcrumbs(' > ');
-        }
-        asort($groupsMap);
+		foreach (Group::get() as $group) {
+			// Listboxfield values are escaped, use ASCII char instead of »
+			$groupsMap[$group->ID] = $group->getBreadcrumbs(' > ');
+		}
+		asort($groupsMap);
 
-        $fields = new FieldList(
-            new TabSet("Root",
-                $tabMain = new Tab('Main',
-                    $titleField = new TextField("Title", _t('SiteConfig.SITETITLE', "Site title")),
-                    $taglineField = new TextField("Tagline", _t('SiteConfig.SITETAGLINE', "Site Tagline/Slogan")),
-                    $themeDropdownField = new DropdownField("Theme", _t('SiteConfig.THEME', 'Theme'), $this->getAvailableThemes())
-                ),
-                $tabAccess = new Tab('Access',
-                    $viewersOptionsField = new OptionsetField("CanViewType", _t('SiteConfig.VIEWHEADER', "Who can view pages on this site?")),
-                    $viewerGroupsField = ListboxField::create("ViewerGroups", _t('SiteTree.VIEWERGROUPS', "Viewer Groups"))
-                        ->setSource($groupsMap)
-                        ->setAttribute(
-                            'data-placeholder',
-                            _t('SiteTree.GroupPlaceholder', 'Click to select group')
-                        ),
-                    $editorsOptionsField = new OptionsetField("CanEditType", _t('SiteConfig.EDITHEADER', "Who can edit pages on this site?")),
-                    $editorGroupsField = ListboxField::create("EditorGroups", _t('SiteTree.EDITORGROUPS', "Editor Groups"))
-                        ->setSource($groupsMap)
-                        ->setAttribute(
-                            'data-placeholder',
-                            _t('SiteTree.GroupPlaceholder', 'Click to select group')
-                        ),
-                    $topLevelCreatorsOptionsField = new OptionsetField("CanCreateTopLevelType", _t('SiteConfig.TOPLEVELCREATE', "Who can create pages in the root of the site?")),
-                    $topLevelCreatorsGroupsField = ListboxField::create("CreateTopLevelGroups", _t('SiteTree.TOPLEVELCREATORGROUPS', "Top level creators"))
-                        ->setSource($groupsMap)
-                        ->setAttribute(
-                            'data-placeholder',
-                            _t('SiteTree.GroupPlaceholder', 'Click to select group')
-                        )
-                )
-            ),
-            new HiddenField('ID')
-        );
+		$fields = new FieldList(
+			new TabSet("Root",
+				$tabMain = new Tab('Main',
+					$titleField = new TextField("Title", _t('SiteConfig.SITETITLE', "Site title")),
+					$taglineField = new TextField("Tagline", _t('SiteConfig.SITETAGLINE', "Site Tagline/Slogan")),
+					$themeDropdownField = new DropdownField("Theme", _t('SiteConfig.THEME', 'Theme'), $this->getAvailableThemes())
+				),
+				$tabAccess = new Tab('Access',
+					$viewersOptionsField = new OptionsetField("CanViewType", _t('SiteConfig.VIEWHEADER', "Who can view pages on this site?")),
+					$viewerGroupsField = ListboxField::create("ViewerGroups", _t('SiteTree.VIEWERGROUPS', "Viewer Groups"))
+						->setSource($groupsMap)
+						->setAttribute(
+							'data-placeholder',
+							_t('SiteTree.GroupPlaceholder', 'Click to select group')
+						),
+					$editorsOptionsField = new OptionsetField("CanEditType", _t('SiteConfig.EDITHEADER', "Who can edit pages on this site?")),
+					$editorGroupsField = ListboxField::create("EditorGroups", _t('SiteTree.EDITORGROUPS', "Editor Groups"))
+						->setSource($groupsMap)
+						->setAttribute(
+							'data-placeholder',
+							_t('SiteTree.GroupPlaceholder', 'Click to select group')
+						),
+					$topLevelCreatorsOptionsField = new OptionsetField("CanCreateTopLevelType", _t('SiteConfig.TOPLEVELCREATE', "Who can create pages in the root of the site?")),
+					$topLevelCreatorsGroupsField = ListboxField::create("CreateTopLevelGroups", _t('SiteTree.TOPLEVELCREATORGROUPS', "Top level creators"))
+						->setSource($groupsMap)
+						->setAttribute(
+							'data-placeholder',
+							_t('SiteTree.GroupPlaceholder', 'Click to select group')
+						)
+				)
+			),
+			new HiddenField('ID')
+		);
 
-        $themeDropdownField->setEmptyString(_t('SiteConfig.DEFAULTTHEME', '(Use default theme)'));
+		$themeDropdownField->setEmptyString(_t('SiteConfig.DEFAULTTHEME', '(Use default theme)'));
 
-        $viewersOptionsSource = array();
-        $viewersOptionsSource["Anyone"] = _t('SiteTree.ACCESSANYONE', "Anyone");
-        $viewersOptionsSource["LoggedInUsers"] = _t('SiteTree.ACCESSLOGGEDIN', "Logged-in users");
-        $viewersOptionsSource["OnlyTheseUsers"] = _t('SiteTree.ACCESSONLYTHESE', "Only these people (choose from list)");
-        $viewersOptionsField->setSource($viewersOptionsSource);
+		$viewersOptionsSource = array();
+		$viewersOptionsSource["Anyone"] = _t('SiteTree.ACCESSANYONE', "Anyone");
+		$viewersOptionsSource["LoggedInUsers"] = _t('SiteTree.ACCESSLOGGEDIN', "Logged-in users");
+		$viewersOptionsSource["OnlyTheseUsers"] = _t('SiteTree.ACCESSONLYTHESE', "Only these people (choose from list)");
+		$viewersOptionsField->setSource($viewersOptionsSource);
         
-        $editorsOptionsSource = array();
-        $editorsOptionsSource["LoggedInUsers"] = _t('SiteTree.EDITANYONE', "Anyone who can log-in to the CMS");
-        $editorsOptionsSource["OnlyTheseUsers"] = _t('SiteTree.EDITONLYTHESE', "Only these people (choose from list)");
-        $editorsOptionsField->setSource($editorsOptionsSource);
+		$editorsOptionsSource = array();
+		$editorsOptionsSource["LoggedInUsers"] = _t('SiteTree.EDITANYONE', "Anyone who can log-in to the CMS");
+		$editorsOptionsSource["OnlyTheseUsers"] = _t('SiteTree.EDITONLYTHESE', "Only these people (choose from list)");
+		$editorsOptionsField->setSource($editorsOptionsSource);
         
-        $topLevelCreatorsOptionsField->setSource($editorsOptionsSource);
+		$topLevelCreatorsOptionsField->setSource($editorsOptionsSource);
         
-        if (!Permission::check('EDIT_SITECONFIG')) {
-            $fields->makeFieldReadonly($viewersOptionsField);
-            $fields->makeFieldReadonly($viewerGroupsField);
-            $fields->makeFieldReadonly($editorsOptionsField);
-            $fields->makeFieldReadonly($editorGroupsField);
-            $fields->makeFieldReadonly($topLevelCreatorsOptionsField);
-            $fields->makeFieldReadonly($topLevelCreatorsGroupsField);
-            $fields->makeFieldReadonly($taglineField);
-            $fields->makeFieldReadonly($titleField);
-        }
+		if (!Permission::check('EDIT_SITECONFIG')) {
+			$fields->makeFieldReadonly($viewersOptionsField);
+			$fields->makeFieldReadonly($viewerGroupsField);
+			$fields->makeFieldReadonly($editorsOptionsField);
+			$fields->makeFieldReadonly($editorGroupsField);
+			$fields->makeFieldReadonly($topLevelCreatorsOptionsField);
+			$fields->makeFieldReadonly($topLevelCreatorsGroupsField);
+			$fields->makeFieldReadonly($taglineField);
+			$fields->makeFieldReadonly($titleField);
+		}
 
-        if (file_exists(BASE_PATH . '/install.php')) {
-            $fields->addFieldToTab("Root.Main", new LiteralField("InstallWarningHeader",
-                "<p class=\"message warning\">" . _t("SiteTree.REMOVE_INSTALL_WARNING",
-                "Warning: You should remove install.php from this SilverStripe install for security reasons.")
-                . "</p>"), "Title");
-        }
+		if (file_exists(BASE_PATH . '/install.php')) {
+			$fields->addFieldToTab("Root.Main", new LiteralField("InstallWarningHeader",
+				"<p class=\"message warning\">" . _t("SiteTree.REMOVE_INSTALL_WARNING",
+				"Warning: You should remove install.php from this SilverStripe install for security reasons.")
+				. "</p>"), "Title");
+		}
         
-        $tabMain->setTitle(_t('SiteConfig.TABMAIN', "Main"));
-        $tabAccess->setTitle(_t('SiteConfig.TABACCESS', "Access"));
-        $this->extend('updateCMSFields', $fields);
+		$tabMain->setTitle(_t('SiteConfig.TABMAIN', "Main"));
+		$tabAccess->setTitle(_t('SiteConfig.TABACCESS', "Access"));
+		$this->extend('updateCMSFields', $fields);
         
-        return $fields;
-    }
+		return $fields;
+	}
 
-    /**
-     * Get all available themes that haven't been marked as disabled.
-     *
-     * @param string $baseDir Optional alternative theme base directory for testing
-     *
-     * @return array of theme directory names
-     */
-    public function getAvailableThemes($baseDir = null)
-    {
-        $themes = SSViewer::get_themes($baseDir);
-        $disabled = (array)$this->config()->disabled_themes;
+	/**
+	 * Get all available themes that haven't been marked as disabled.
+	 *
+	 * @param string $baseDir Optional alternative theme base directory for testing
+	 *
+	 * @return array of theme directory names
+	 */
+	public function getAvailableThemes($baseDir = null)
+	{
+		$themes = SSViewer::get_themes($baseDir);
+		$disabled = (array)$this->config()->disabled_themes;
     
-        foreach ($disabled as $theme) {
-            if (isset($themes[$theme])) {
-                unset($themes[$theme]);
-            }
-        }
+		foreach ($disabled as $theme) {
+			if (isset($themes[$theme])) {
+				unset($themes[$theme]);
+			}
+		}
     
-        return $themes;
-    }
+		return $themes;
+	}
     
-    /**
-     * Get the actions that are sent to the CMS. 
-     *
-     * In your extensions: updateEditFormActions($actions)
-     *
-     * @return FieldList
-     */
-    public function getCMSActions()
-    {
-        if (Permission::check('ADMIN') || Permission::check('EDIT_SITECONFIG')) {
-            $actions = new FieldList(
-                FormAction::create('save_siteconfig', _t('CMSMain.SAVE', 'Save'))
-                    ->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')
-            );
-        } else {
-            $actions = new FieldList();
-        }
+	/**
+	 * Get the actions that are sent to the CMS. 
+	 *
+	 * In your extensions: updateEditFormActions($actions)
+	 *
+	 * @return FieldList
+	 */
+	public function getCMSActions()
+	{
+		if (Permission::check('ADMIN') || Permission::check('EDIT_SITECONFIG')) {
+			$actions = new FieldList(
+				FormAction::create('save_siteconfig', _t('CMSMain.SAVE', 'Save'))
+					->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')
+			);
+		} else {
+			$actions = new FieldList();
+		}
         
-        $this->extend('updateCMSActions', $actions);
+		$this->extend('updateCMSActions', $actions);
         
-        return $actions;
-    }
+		return $actions;
+	}
 
-    /**
-     * @return string
-     */
-    public function CMSEditLink()
-    {
-        return singleton('CMSSettingsController')->Link();
-    }
+	/**
+	 * @return string
+	 */
+	public function CMSEditLink()
+	{
+		return singleton('CMSSettingsController')->Link();
+	}
     
-    /**
-     * Get the current sites SiteConfig, and creates a new one through 
-     * {@link make_site_config()} if none is found.
-     *
-     * @return SiteConfig
-     */
-    public static function current_site_config()
-    {
-        if ($siteConfig = DataObject::get_one('SiteConfig')) {
-            return $siteConfig;
-        }
+	/**
+	 * Get the current sites SiteConfig, and creates a new one through 
+	 * {@link make_site_config()} if none is found.
+	 *
+	 * @return SiteConfig
+	 */
+	public static function current_site_config()
+	{
+		if ($siteConfig = DataObject::get_one('SiteConfig')) {
+			return $siteConfig;
+		}
         
-        return self::make_site_config();
-    }
+		return self::make_site_config();
+	}
 
-    /**
-     * Setup a default SiteConfig record if none exists.
-     */
-    public function requireDefaultRecords()
-    {
-        parent::requireDefaultRecords();
+	/**
+	 * Setup a default SiteConfig record if none exists.
+	 */
+	public function requireDefaultRecords()
+	{
+		parent::requireDefaultRecords();
 
-        $config = DataObject::get_one('SiteConfig');
+		$config = DataObject::get_one('SiteConfig');
         
-        if (!$config) {
-            self::make_site_config();
+		if (!$config) {
+			self::make_site_config();
 
-            DB::alteration_message("Added default site config", "created");
-        }
-    }
+			DB::alteration_message("Added default site config", "created");
+		}
+	}
     
-    /**
-     * Create SiteConfig with defaults from language file.
-     * 
-     * @return SiteConfig
-     */
-    public static function make_site_config()
-    {
-        $config = SiteConfig::create();
-        $config->write();
+	/**
+	 * Create SiteConfig with defaults from language file.
+	 * 
+	 * @return SiteConfig
+	 */
+	public static function make_site_config()
+	{
+		$config = SiteConfig::create();
+		$config->write();
 
-        return $config;
-    }
+		return $config;
+	}
 
-    /**
-     * Can a user view this SiteConfig instance?
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canView($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUserID();
-        }
-        if ($member && is_numeric($member)) {
-            $member = DataObject::get_by_id('Member', $member);
-        }
+	/**
+	 * Can a user view this SiteConfig instance?
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canView($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUserID();
+		}
+		if ($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
 
-        $extended = $this->extendedCan('canView', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
+		$extended = $this->extendedCan('canView', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
 
-        // Assuming all that can edit this object can also view it
-        return $this->canEdit($member);
-    }
+		// Assuming all that can edit this object can also view it
+		return $this->canEdit($member);
+	}
 
-    /**
-     * Can a user view pages on this site? This method is only
-     * called if a page is set to Inherit, but there is nothing
-     * to inherit from.
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canViewPages($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUserID();
-        }
-        if ($member && is_numeric($member)) {
-            $member = DataObject::get_by_id('Member', $member);
-        }
+	/**
+	 * Can a user view pages on this site? This method is only
+	 * called if a page is set to Inherit, but there is nothing
+	 * to inherit from.
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canViewPages($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUserID();
+		}
+		if ($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
 
-        if ($member && Permission::checkMember($member, "ADMIN")) {
-            return true;
-        }
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
 
-        $extended = $this->extendedCan('canViewPages', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
+		$extended = $this->extendedCan('canViewPages', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
 
-        if (!$this->CanViewType || $this->CanViewType == 'Anyone') {
-            return true;
-        }
+		if (!$this->CanViewType || $this->CanViewType == 'Anyone') {
+			return true;
+		}
                 
-        // check for any logged-in users
-        if ($this->CanViewType === 'LoggedInUsers' && $member) {
-            return true;
-        }
+		// check for any logged-in users
+		if ($this->CanViewType === 'LoggedInUsers' && $member) {
+			return true;
+		}
 
-        // check for specific groups
-        if ($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) {
-            return true;
-        }
+		// check for specific groups
+		if ($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) {
+			return true;
+		}
         
-        return false;
-    }
+		return false;
+	}
     
-    /**
-     * Can a user edit pages on this site? This method is only
-     * called if a page is set to Inherit, but there is nothing
-     * to inherit from, or on new records without a parent.
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canEditPages($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUserID();
-        }
-        if ($member && is_numeric($member)) {
-            $member = DataObject::get_by_id('Member', $member);
-        }
+	/**
+	 * Can a user edit pages on this site? This method is only
+	 * called if a page is set to Inherit, but there is nothing
+	 * to inherit from, or on new records without a parent.
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canEditPages($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUserID();
+		}
+		if ($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
         
-        if ($member && Permission::checkMember($member, "ADMIN")) {
-            return true;
-        }
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
 
-        $extended = $this->extendedCan('canEditPages', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
+		$extended = $this->extendedCan('canEditPages', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
 
-        // check for any logged-in users with CMS access
-        if ($this->CanEditType === 'LoggedInUsers'
-            && Permission::checkMember($member, $this->config()->required_permission)
-        ) {
-            return true;
-        }
+		// check for any logged-in users with CMS access
+		if ($this->CanEditType === 'LoggedInUsers'
+			&& Permission::checkMember($member, $this->config()->required_permission)
+		) {
+			return true;
+		}
 
-            // check for specific groups
-        if ($this->CanEditType === 'OnlyTheseUsers' && $member && $member->inGroups($this->EditorGroups())) {
-            return true;
-        }
+			// check for specific groups
+		if ($this->CanEditType === 'OnlyTheseUsers' && $member && $member->inGroups($this->EditorGroups())) {
+			return true;
+		}
         
-        return false;
-    }
+		return false;
+	}
 
-    public function canEdit($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUserID();
-        }
-        if ($member && is_numeric($member)) {
-            $member = DataObject::get_by_id('Member', $member);
-        }
+	public function canEdit($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUserID();
+		}
+		if ($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
 
-        $extended = $this->extendedCan('canEdit', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
+		$extended = $this->extendedCan('canEdit', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
         
-        return Permission::checkMember($member, "EDIT_SITECONFIG");
-    }
+		return Permission::checkMember($member, "EDIT_SITECONFIG");
+	}
     
-    /**
-     * @return void
-     */
-    public function providePermissions()
-    {
-        return array(
-            'EDIT_SITECONFIG' => array(
-                'name' => _t('SiteConfig.EDIT_PERMISSION', 'Manage site configuration'),
-                'category' => _t('Permissions.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
-                'help' => _t('SiteConfig.EDIT_PERMISSION_HELP', 'Ability to edit global access settings/top-level page permissions.'),
-                'sort' => 400
-            )
-        );
-    }
+	/**
+	 * @return void
+	 */
+	public function providePermissions()
+	{
+		return array(
+			'EDIT_SITECONFIG' => array(
+				'name' => _t('SiteConfig.EDIT_PERMISSION', 'Manage site configuration'),
+				'category' => _t('Permissions.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
+				'help' => _t('SiteConfig.EDIT_PERMISSION_HELP', 'Ability to edit global access settings/top-level page permissions.'),
+				'sort' => 400
+			)
+		);
+	}
     
-    /**
-     * Can a user create pages in the root of this site?
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canCreateTopLevel($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUserID();
-        }
-        if ($member && is_numeric($member)) {
-            $member = DataObject::get_by_id('Member', $member);
-        }
+	/**
+	 * Can a user create pages in the root of this site?
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canCreateTopLevel($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUserID();
+		}
+		if ($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
         
-        if ($member && Permission::checkMember($member, "ADMIN")) {
-            return true;
-        }
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
 
-        $extended = $this->extendedCan('canCreateTopLevel', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
+		$extended = $this->extendedCan('canCreateTopLevel', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
         
-        // check for any logged-in users with CMS permission
-        if ($this->CanCreateTopLevelType === 'LoggedInUsers'
-            && Permission::checkMember($member, $this->config()->required_permission)
-        ) {
-            return true;
-        }
+		// check for any logged-in users with CMS permission
+		if ($this->CanCreateTopLevelType === 'LoggedInUsers'
+			&& Permission::checkMember($member, $this->config()->required_permission)
+		) {
+			return true;
+		}
         
-        // check for specific groups
-        if ($this->CanCreateTopLevelType === 'OnlyTheseUsers'
-            && $member
-            && $member->inGroups($this->CreateTopLevelGroups())
-        ) {
-            return true;
-        }
+		// check for specific groups
+		if ($this->CanCreateTopLevelType === 'OnlyTheseUsers'
+			&& $member
+			&& $member->inGroups($this->CreateTopLevelGroups())
+		) {
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Add $SiteConfig to all SSViewers
-     */
-    public static function get_template_global_variables()
-    {
-        return array(
-            'SiteConfig' => 'current_site_config',
-        );
-    }
+	/**
+	 * Add $SiteConfig to all SSViewers
+	 */
+	public static function get_template_global_variables()
+	{
+		return array(
+			'SiteConfig' => 'current_site_config',
+		);
+	}
 }

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

Indentation +70 added lines, -70 removed lines

@@ -6,92 +6,92 @@
  */
 class SiteConfigTest extends SapphireTest
 {
-    protected static $fixture_file = 'SiteConfigTest.yml';
+	protected static $fixture_file = 'SiteConfigTest.yml';
     
-    protected $illegalExtensions = array(
-        'SiteTree' => array('SiteTreeSubsites')
-    );
+	protected $illegalExtensions = array(
+		'SiteTree' => array('SiteTreeSubsites')
+	);
 
-    public function setUpOnce()
-    {
-        // Fix issue with tests failing without CMS module
-        if (!class_exists('SiteTree')) {
-            unset($this->illegalExtensions['SiteTree']);
-        }
+	public function setUpOnce()
+	{
+		// Fix issue with tests failing without CMS module
+		if (!class_exists('SiteTree')) {
+			unset($this->illegalExtensions['SiteTree']);
+		}
 
-        parent::setUpOnce(); // TODO: Change the autogenerated stub
-    }
+		parent::setUpOnce(); // TODO: Change the autogenerated stub
+	}
 
-    public function testAvailableThemes()
-    {
-        $config = $this->objFromFixture('SiteConfig', 'default');
-        $ds = DIRECTORY_SEPARATOR;
-        $testThemeBaseDir = TEMP_FOLDER . $ds . 'test-themes';
+	public function testAvailableThemes()
+	{
+		$config = $this->objFromFixture('SiteConfig', 'default');
+		$ds = DIRECTORY_SEPARATOR;
+		$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');
+		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');
         
-        $themes = $config->getAvailableThemes($testThemeBaseDir);
-        $this->assertContains('blackcandy', $themes, 'Test themes contain blackcandy theme');
-        $this->assertContains('darkshades', $themes, 'Test themes contain darkshades theme');
+		$themes = $config->getAvailableThemes($testThemeBaseDir);
+		$this->assertContains('blackcandy', $themes, 'Test themes contain blackcandy theme');
+		$this->assertContains('darkshades', $themes, 'Test themes contain darkshades theme');
         
-        SiteConfig::config()->disabled_themes = array('darkshades');
-        $themes = $config->getAvailableThemes($testThemeBaseDir);
-        $this->assertFalse(in_array('darkshades', $themes), 'Darkshades was disabled - it is no longer available');
+		SiteConfig::config()->disabled_themes = array('darkshades');
+		$themes = $config->getAvailableThemes($testThemeBaseDir);
+		$this->assertFalse(in_array('darkshades', $themes), 'Darkshades was disabled - it is no longer available');
         
-        Filesystem::removeFolder($testThemeBaseDir);
-    }
+		Filesystem::removeFolder($testThemeBaseDir);
+	}
 
-    public function testCanCreateRootPages()
-    {
-        $config = $this->objFromFixture('SiteConfig', 'default');
+	public function testCanCreateRootPages()
+	{
+		$config = $this->objFromFixture('SiteConfig', 'default');
 
-        // Log in without pages admin access
-        $this->logInWithPermission('CMS_ACCESS_AssetAdmin');
-        $this->assertFalse($config->canCreateTopLevel());
+		// Log in without pages admin access
+		$this->logInWithPermission('CMS_ACCESS_AssetAdmin');
+		$this->assertFalse($config->canCreateTopLevel());
 
-        // Login with necessary edit permission
-        $perms = SiteConfig::config()->required_permission;
-        $this->logInWithPermission(reset($perms));
-        $this->assertTrue($config->canCreateTopLevel());
-    }
+		// Login with necessary edit permission
+		$perms = SiteConfig::config()->required_permission;
+		$this->logInWithPermission(reset($perms));
+		$this->assertTrue($config->canCreateTopLevel());
+	}
 
-    public function testCanViewPages()
-    {
-        $config = $this->objFromFixture('SiteConfig', 'default');
-        $this->assertTrue($config->canViewPages());
-    }
+	public function testCanViewPages()
+	{
+		$config = $this->objFromFixture('SiteConfig', 'default');
+		$this->assertTrue($config->canViewPages());
+	}
 
-    public function testCanEdit()
-    {
-        $config = $this->objFromFixture('SiteConfig', 'default');
+	public function testCanEdit()
+	{
+		$config = $this->objFromFixture('SiteConfig', 'default');
         
-        // Unrelated permissions don't allow siteconfig
-        $this->logInWithPermission('CMS_ACCESS_AssetAdmin');
-        $this->assertFalse($config->canEdit());
+		// Unrelated permissions don't allow siteconfig
+		$this->logInWithPermission('CMS_ACCESS_AssetAdmin');
+		$this->assertFalse($config->canEdit());
 
-        // Only those with edit permission can do this
-        $this->logInWithPermission('EDIT_SITECONFIG');
-        $this->assertTrue($config->canEdit());
-    }
+		// Only those with edit permission can do this
+		$this->logInWithPermission('EDIT_SITECONFIG');
+		$this->assertTrue($config->canEdit());
+	}
 
-    public function testCanEditPages()
-    {
-        $config = $this->objFromFixture('SiteConfig', 'default');
+	public function testCanEditPages()
+	{
+		$config = $this->objFromFixture('SiteConfig', 'default');
         
-        // Log in without pages admin access
-        $this->logInWithPermission('CMS_ACCESS_AssetAdmin');
-        $this->assertFalse($config->canEditPages());
+		// Log in without pages admin access
+		$this->logInWithPermission('CMS_ACCESS_AssetAdmin');
+		$this->assertFalse($config->canEditPages());
 
-        // Login with necessary edit permission
-        $perms = SiteConfig::config()->required_permission;
-        $this->logInWithPermission(reset($perms));
-        $this->assertTrue($config->canEditPages());
-    }
+		// Login with necessary edit permission
+		$perms = SiteConfig::config()->required_permission;
+		$this->logInWithPermission(reset($perms));
+		$this->assertTrue($config->canEditPages());
+	}
 }

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');