silverstripe / cwp

code/pagetypes/DatedUpdateHolder.php

Spacing +16 added lines, -16 removed lines

@@ -90,8 +90,8 @@ 
 
 		// Filter down to single month.
 		if (isset($year) && isset($monthNumber)) {
-			$year = (int)$year;
-			$monthNumber = (int)$monthNumber;
+			$year = (int) $year;
+			$monthNumber = (int) $monthNumber;
 
 			$beginDate = sprintf("%04d-%02d-01 00:00:00", $year, $monthNumber);
 			$endDate = date('Y-m-d H:i:s', strtotime("{$beginDate} +1 month"));
@@ -163,7 +163,7 @@ 
 			// Check if the currently processed month is the one that is selected via GET params.
 			$active = false;
 			if (isset($year) && isset($monthNumber)) {
-				$active = (((int)$currentYear)==$year && ((int)$currentMonthNumber)==$monthNumber);
+				$active = (((int) $currentYear) == $year && ((int) $currentMonthNumber) == $monthNumber);
 			}
 
 			// Build the link - keep the tag and date filter, but reset the pagination.
@@ -242,7 +242,7 @@ 
 	public function getMetaTitle() {
 		$title = $this->data()->getTitle();
 		$filter = $this->FilterDescription();
-		if($filter) {
+		if ($filter) {
 			$title = "{$title} - {$filter}";
 		}
 
@@ -313,13 +313,13 @@ 
 		$year = $this->request->getVar('year');
 		$month = $this->request->getVar('month');
 
-		if ($tag=='') $tag = null;
-		if ($from=='') $from = null;
-		if ($to=='') $to = null;
-		if ($year=='') $year = null;
-		if ($month=='') $month = null;
+		if ($tag == '') $tag = null;
+		if ($from == '') $from = null;
+		if ($to == '') $to = null;
+		if ($year == '') $year = null;
+		if ($month == '') $month = null;
 
-		if (isset($tag)) $tag = (int)$tag;
+		if (isset($tag)) $tag = (int) $tag;
 		if (isset($from)) {
 			$from = urldecode($from);
 			$parser = new SS_Datetime;
@@ -332,8 +332,8 @@ 
 			$parser->setValue($to);
 			$to = $parser->Format('Y-m-d');
 		}
-		if (isset($year)) $year = (int)$year;
-		if (isset($month)) $month = (int)$month;
+		if (isset($year)) $year = (int) $year;
+		if (isset($month)) $month = (int) $month;
 
 		// If only "To" has been provided filter by single date. Normalise by swapping with "From".
 		if (isset($to) && !isset($from)) {
@@ -341,13 +341,13 @@ 
 		}
 
 		// Flip the dates if the order is wrong.
-		if (isset($to) && isset($from) && strtotime($from)>strtotime($to)) {
+		if (isset($to) && isset($from) && strtotime($from) > strtotime($to)) {
 			list($to, $from) = array($from, $to);
 
 			if ($produceErrorMessages) {
 				Session::setFormMessage(
 					'Form_DateRangeForm',
-					_t('DateUpdateHolder.FilterAppliedMessage','Filter has been applied with the dates reversed.'),
+					_t('DateUpdateHolder.FilterAppliedMessage', 'Filter has been applied with the dates reversed.'),
 					'warning'
 				);
 			}
@@ -358,7 +358,7 @@ 
 			if ($produceErrorMessages) {
 				Session::setFormMessage(
 					'Form_DateRangeForm',
-					_t('DateUpdateHolder.DateRangeFilterMessage','Filtered by a single date.'),
+					_t('DateUpdateHolder.DateRangeFilterMessage', 'Filtered by a single date.'),
 					'warning'
 				);
 			}
@@ -414,7 +414,7 @@ 
 		$tagID = $this->request->getVar('tag');
 
 		if (isset($tagID)) {
-			return TaxonomyTerm::get_by_id('TaxonomyTerm', (int)$tagID);
+			return TaxonomyTerm::get_by_id('TaxonomyTerm', (int) $tagID);
 		}
 	}
 

Braces +30 added lines, -10 removed lines

@@ -313,13 +313,25 @@ 
 		$year = $this->request->getVar('year');
 		$month = $this->request->getVar('month');
 
-		if ($tag=='') $tag = null;
-		if ($from=='') $from = null;
-		if ($to=='') $to = null;
-		if ($year=='') $year = null;
-		if ($month=='') $month = null;
+		if ($tag=='') {
+			$tag = null;
+		}
+		if ($from=='') {
+			$from = null;
+		}
+		if ($to=='') {
+			$to = null;
+		}
+		if ($year=='') {
+			$year = null;
+		}
+		if ($month=='') {
+			$month = null;
+		}
 
-		if (isset($tag)) $tag = (int)$tag;
+		if (isset($tag)) {
+			$tag = (int)$tag;
+		}
 		if (isset($from)) {
 			$from = urldecode($from);
 			$parser = new SS_Datetime;
@@ -332,8 +344,12 @@ 
 			$parser->setValue($to);
 			$to = $parser->Format('Y-m-d');
 		}
-		if (isset($year)) $year = (int)$year;
-		if (isset($month)) $month = (int)$month;
+		if (isset($year)) {
+			$year = (int)$year;
+		}
+		if (isset($month)) {
+			$month = (int)$month;
+		}
 
 		// If only "To" has been provided filter by single date. Normalise by swapping with "From".
 		if (isset($to) && !isset($from)) {
@@ -499,7 +515,9 @@ 
 		// Build the link - keep the tag, but reset month, year and pagination.
 		$link = HTTP::setGetVar('from', $params['from'], $this->AbsoluteLink(), '&');
 		$link = HTTP::setGetVar('to', $params['to'], $link, '&');
-		if (isset($params['tag'])) $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
 
 		$this->redirect($link);
 	}
@@ -509,7 +527,9 @@ 
 
 		// Reset the link - only include the tag.
 		$link = $this->AbsoluteLink();
-		if (isset($params['tag'])) $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
 
 		$this->redirect($link);
 	}

code/extensions/CwpWorkflowDefinitionExtension.php

Spacing +2 added lines, -2 removed lines

@@ -14,10 +14,10 @@
 	private static $create_default_workflow = true;
 
 	public function requireDefaultRecords() {
-		if(Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) {
+		if (Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) {
 			// Only proceed if a definition using this template has not been created yet
 			$definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
-			if($definition && $definition->exists()) return;
+			if ($definition && $definition->exists()) return;
 
 			//generate from the template, which happens after we write the definition
 			$definition = WorkflowDefinition::create();

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 		if(Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) {
 			// Only proceed if a definition using this template has not been created yet
 			$definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
-			if($definition && $definition->exists()) return;
+			if($definition && $definition->exists()) {
+				return;
+			}
 
 			//generate from the template, which happens after we write the definition
 			$definition = WorkflowDefinition::create();

code/extensions/SynonymValidator.php

Spacing +11 added lines, -11 removed lines

@@ -25,8 +25,8 @@ 
 	 * @return mixed
 	 */
 	public function php($data) {
-		foreach($this->fieldNames as $fieldName) {
-			if(empty($data[$fieldName])) {
+		foreach ($this->fieldNames as $fieldName) {
+			if (empty($data[$fieldName])) {
 				return;
 			}
 
@@ -41,7 +41,7 @@ 
 	 * @param mixed $value
 	 */
 	protected function validateField($fieldName, $value) {
-		if(!$this->validateValue($value)) {
+		if (!$this->validateValue($value)) {
 			$this->validationError(
 				$fieldName,
 				_t(
@@ -66,15 +66,15 @@ 
 		);
 
 		// strip comments (lines beginning with "#")
-		$lines = array_filter($lines, function ($line) {
+		$lines = array_filter($lines, function($line) {
 			$line = trim($line);
 
 			return !empty($line) && $line[0] !== '#';
 		});
 
 		// validate each line
-		foreach($lines as $line) {
-			if(!$this->validateLine($line)) {
+		foreach ($lines as $line) {
+			if (!$this->validateLine($line)) {
 				return false;
 			}
 		}
@@ -95,8 +95,8 @@ 
 		$parts = explode(',', $line);
 		$parts = array_filter($parts);
 
-		foreach($parts as $part) {
-			if(!$this->validatePart($part)) {
+		foreach ($parts as $part) {
+			if (!$this->validatePart($part)) {
 				return false;
 			}
 		}
@@ -112,11 +112,11 @@ 
 	 * @return bool
 	 */
 	protected function validatePart($part) {
-		if(strpos($part, '=>') !== false) {
+		if (strpos($part, '=>') !== false) {
 			$subs = explode('=>', $part);
 			$subs = array_filter($subs);
 
-			foreach($subs as $sub) {
+			foreach ($subs as $sub) {
 				if (!$this->validateNoSpaces($sub)) {
 					return false;
 				}
@@ -138,7 +138,7 @@ 
 		$value = trim($value);
 
 		// does the value contain 1 or more whitespace characters?
-		if(preg_match('/\s+/', $value)) {
+		if (preg_match('/\s+/', $value)) {
 			return false;
 		}
 

code/extensions/SynonymsSiteConfig.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 	
 	public function updateCMSFields(FieldList $fields) {
 		// Don't show this field if you're not an admin
-		if(!Permission::check('ADMIN')) {
+		if (!Permission::check('ADMIN')) {
 			return;
 		}
 		
@@ -22,7 +22,7 @@ 
 			TextareaField::create('SearchSynonyms', _t('CwpConfig.SearchSynonyms', 'Search Synonyms'))
 				->setDescription(_t(
 					'CwpConfig.SearchSynonyms_Description',
-					'Enter as many comma separated synonyms as you wish, where '.
+					'Enter as many comma separated synonyms as you wish, where ' .
 					'each line represents a group of synonyms.<br /> ' .
 					'You will need to run <a rel="external" target="_blank" href="dev/tasks/Solr_Configure">Solr_Configure</a> if you make any changes'
 				))

code/search/CwpSearchResult.php

Spacing +7 added lines, -7 removed lines

@@ -54,11 +54,11 @@ 
 	 */
 	public function __construct($terms = '', ArrayData $results = null) {
 		$this->query = $terms;
-		if($results) {
+		if ($results) {
 			// Clean up the results.
 			$matches = $results->Matches;
-			foreach($matches as $result) {
-				if(!$result->canView()) {
+			foreach ($matches as $result) {
+				if (!$result->canView()) {
 					$matches->remove($result);
 				}
 			}
@@ -177,12 +177,12 @@ 
 	 * @return string|null
 	 */
 	protected function getLink($terms, $format = null) {
-		if(!$terms) {
+		if (!$terms) {
 			return null;
 		}
-		$link = 'search/SearchForm?Search='.rawurlencode($terms);
-		if($format) {
-			$link .= '&format='.rawurlencode($format);
+		$link = 'search/SearchForm?Search=' . rawurlencode($terms);
+		if ($format) {
+			$link .= '&format=' . rawurlencode($format);
 		}
 		return $link;
 	}

code/search/CwpSearchPage.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 	private static $hide_ancestor = 'CwpSearchPage';
 	
 	public function canViewStage($stage = 'Live', $member = null) {
-		if(Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) {
+		if (Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) {
 			return true;
 		}
 		
@@ -37,7 +37,7 @@ 
 	}
 	
 	public function __construct($dataRecord = null) {
-		if(!$dataRecord) {
+		if (!$dataRecord) {
 			$dataRecord = $this->generateSearchRecord();
 		}
 		parent::__construct($dataRecord);

code/search/CwpSearchEngine.php

Spacing +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	protected function getSearchOptions($spellcheck) {
 		$options = $this->config()->search_options;
-		if($spellcheck) {
+		if ($spellcheck) {
 			$options = array_merge($options, $this->config()->spellcheck_options);
 		}
 		return $options;
@@ -103,7 +103,7 @@ 
 	 * @return CwpSearchResult|null
 	 */
 	public function search($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $followSuggestions = false) {
-		if(empty($keywords)) {
+		if (empty($keywords)) {
 			return null;
 		}
 
@@ -112,7 +112,7 @@ 
 			$result = $this->getResult($keywords, $classes, $searchIndex, $limit, $start, true);
 			
 			// Return results if we don't need to refine this any further
-			if(!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
+			if (!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
 				return $result;
 			}
 			
@@ -122,13 +122,13 @@ 
 			$newResult->setOriginal($keywords);
 
 			// Compare new results to the original query
-			if($newResult->hasResults()) {
+			if ($newResult->hasResults()) {
 				return $newResult;
 			} else {
 				return $result;
 			}
 
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			SS_Log::log($e, SS_Log::WARN);
 		}
 		

Indentation +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@
 		$query->exclude('SiteTree_ShowInSearch', 0);
 
 		// Add File_ShowInSearch if the File class is in the query
-        $classes = array_column($classes, 'class');
-        if (in_array('File', $classes)) {
-            $query->exclude('File_ShowInSearch', 0);
-        }
+		$classes = array_column($classes, 'class');
+		if (in_array('File', $classes)) {
+			$query->exclude('File_ShowInSearch', 0);
+		}
 
 		// Artificially lower the amount of results to prevent too high resource usage.
 		// on subsequent canView check loop.

tests/BasePageTest.php

Indentation +66 added lines, -66 removed lines

@@ -1,80 +1,80 @@
 <?php
 class BasePageTest extends SapphireTest
 {
-    public static $fixture_file = 'BasePageTest.yml';
+	public static $fixture_file = 'BasePageTest.yml';
 
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        Config::nest();
-        Config::inst()->update('BasePage', 'pdf_export', true);
-        Config::inst()->update('BasePage', 'generated_pdf_path', 'assets/_generated_pdfs');
-    }
+		Config::nest();
+		Config::inst()->update('BasePage', 'pdf_export', true);
+		Config::inst()->update('BasePage', 'generated_pdf_path', 'assets/_generated_pdfs');
+	}
 
-    public function testPdfFilename()
-    {
-        $page = $this->objFromFixture('BasePage', 'test-page-one');
-        $this->assertContains(
-            'assets/_generated_pdfs/test-page-one-1.pdf',
-            $page->getPdfFilename(),
-            'Generated filename for PDF'
-        );
-    }
+	public function testPdfFilename()
+	{
+		$page = $this->objFromFixture('BasePage', 'test-page-one');
+		$this->assertContains(
+			'assets/_generated_pdfs/test-page-one-1.pdf',
+			$page->getPdfFilename(),
+			'Generated filename for PDF'
+		);
+	}
 
-    public function testPdfLink()
-    {
-        $page = $this->objFromFixture('BasePage', 'test-page-one');
-        $this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF');
-    }
+	public function testPdfLink()
+	{
+		$page = $this->objFromFixture('BasePage', 'test-page-one');
+		$this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF');
+	}
 
-    public function testHomePagePdfLink()
-    {
-        $page = $this->objFromFixture('BasePage', 'home-page');
-        $this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF');
-    }
+	public function testHomePagePdfLink()
+	{
+		$page = $this->objFromFixture('BasePage', 'home-page');
+		$this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF');
+	}
 
-    public function testPdfLinkDisabled()
-    {
-        Config::inst()->update('BasePage', 'pdf_export', false);
-        $page = $this->objFromFixture('BasePage', 'test-page-one');
-        $this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled');
-    }
+	public function testPdfLinkDisabled()
+	{
+		Config::inst()->update('BasePage', 'pdf_export', false);
+		$page = $this->objFromFixture('BasePage', 'test-page-one');
+		$this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled');
+	}
 
-    /**
-     * Test that the native language name can be returned for the current locale
-     *
-     * @see i18n
-     * @param string $locale
-     * @param string $expected
-     * @dataProvider localeProvider
-     */
-    public function testGetSelectedLanguage($locale, $expected)
-    {
-        if (!class_exists('Translatable')) {
-            $this->markTestSkipped('Language tests require Translatable module.');
-        }
+	/**
+	 * Test that the native language name can be returned for the current locale
+	 *
+	 * @see i18n
+	 * @param string $locale
+	 * @param string $expected
+	 * @dataProvider localeProvider
+	 */
+	public function testGetSelectedLanguage($locale, $expected)
+	{
+		if (!class_exists('Translatable')) {
+			$this->markTestSkipped('Language tests require Translatable module.');
+		}
 
-        Translatable::set_current_locale($locale);
-        $page = $this->objFromFixture('BasePage', 'test-page-one');
-        $this->assertSame($expected, $page->getSelectedLanguage());
-    }
+		Translatable::set_current_locale($locale);
+		$page = $this->objFromFixture('BasePage', 'test-page-one');
+		$this->assertSame($expected, $page->getSelectedLanguage());
+	}
 
-    /**
-     * @return array[]
-     */
-    public function localeProvider()
-    {
-        return array(
-            array('en_NZ', 'English'),
-            array('af_ZA', 'Afrikaans'),
-            array('es_ES', 'espa&ntilde;ol')
-        );
-    }
+	/**
+	 * @return array[]
+	 */
+	public function localeProvider()
+	{
+		return array(
+			array('en_NZ', 'English'),
+			array('af_ZA', 'Afrikaans'),
+			array('es_ES', 'espa&ntilde;ol')
+		);
+	}
 
-    public function tearDown()
-    {
-        Config::unnest();
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		Config::unnest();
+		parent::tearDown();
+	}
 }

code/extensions/CwpSiteSummaryExtension.php

Indentation +35 added lines, -35 removed lines

@@ -5,41 +5,41 @@
  */
 class CwpSiteSummaryExtension extends Extension
 {
-    /**
-     * Updates the modules used for the version label by:
-     *  - Removing SS Framework
-     *  - Adding CWP
-     *  - Relabelling SS CMS
-     *
-     * @param array $modules
-     */
-    public function updateVersionModules(&$modules)
-    {
-        unset($modules['silverstripe/framework']);
-        $modules = ['cwp/cwp' => 'CWP'] + $modules;
-        $modules['silverstripe/cms'] = 'SilverStripe CMS';
-    }
+	/**
+	 * Updates the modules used for the version label by:
+	 *  - Removing SS Framework
+	 *  - Adding CWP
+	 *  - Relabelling SS CMS
+	 *
+	 * @param array $modules
+	 */
+	public function updateVersionModules(&$modules)
+	{
+		unset($modules['silverstripe/framework']);
+		$modules = ['cwp/cwp' => 'CWP'] + $modules;
+		$modules['silverstripe/cms'] = 'SilverStripe CMS';
+	}
 
-    /**
-     * Updates the dropdown filter used to filter supported packages by renaming the labels (replaces the existing
-     * filter options)
-     *
-     * @param GridFieldDropdownFilter $dropdownFilter
-     */
-    public function updateDropdownFilterOptions($dropdownFilter)
-    {
-        $dropdownFilter->removeFilterOption('supported');
-        $dropdownFilter->removeFilterOption('unsupported');
+	/**
+	 * Updates the dropdown filter used to filter supported packages by renaming the labels (replaces the existing
+	 * filter options)
+	 *
+	 * @param GridFieldDropdownFilter $dropdownFilter
+	 */
+	public function updateDropdownFilterOptions($dropdownFilter)
+	{
+		$dropdownFilter->removeFilterOption('supported');
+		$dropdownFilter->removeFilterOption('unsupported');
 
-        $dropdownFilter->addFilterOption(
-            'supported',
-            _t(__CLASS__ . '.FilterSupported', 'CWP recipe modules'),
-            ['Supported' => true]
-        );
-        $dropdownFilter->addFilterOption(
-            'unsupported',
-            _t(__CLASS__ . '.FilterUnsupported', 'Non CWP modules'),
-            ['Supported' => false]
-        );
-    }
+		$dropdownFilter->addFilterOption(
+			'supported',
+			_t(__CLASS__ . '.FilterSupported', 'CWP recipe modules'),
+			['Supported' => true]
+		);
+		$dropdownFilter->addFilterOption(
+			'unsupported',
+			_t(__CLASS__ . '.FilterUnsupported', 'Non CWP modules'),
+			['Supported' => false]
+		);
+	}
 }