silverstripe / cwp

code/pagetypes/BasePage.php

Indentation +16 added lines, -16 removed lines

@@ -250,22 +250,22 @@
 	}
 
 	/**
-     * Returns the native language name for the selected locale/language, empty string if Translatable is not available
-     *
-     * @return string
-     */
-    public function getSelectedLanguage()
-    {
-        if (!class_exists('Translatable')) {
-            return '';
-        }
-
-        $language = explode('_', Translatable::get_current_locale());
-        $languageCode = array_shift($language);
-        $nativeName = i18n::get_language_name($languageCode, true);
-
-        return $nativeName;
-    }
+	 * Returns the native language name for the selected locale/language, empty string if Translatable is not available
+	 *
+	 * @return string
+	 */
+	public function getSelectedLanguage()
+	{
+		if (!class_exists('Translatable')) {
+			return '';
+		}
+
+		$language = explode('_', Translatable::get_current_locale());
+		$languageCode = array_shift($language);
+		$nativeName = i18n::get_language_name($languageCode, true);
+
+		return $nativeName;
+	}
 }
 
 class BasePage_Controller extends ContentController {

Braces +23 added lines, -8 removed lines

@@ -66,7 +66,9 @@ 
 		$baseName = sprintf('%s-%s', $this->URLSegment, $this->ID);
 
 		$folderPath = Config::inst()->get('BasePage', 'generated_pdf_path');
-		if($folderPath[0] != '/') $folderPath = BASE_PATH . '/' . $folderPath;
+		if($folderPath[0] != '/') {
+			$folderPath = BASE_PATH . '/' . $folderPath;
+		}
 
 		return sprintf('%s/%s.pdf', $folderPath, $baseName);
 	}
@@ -75,7 +77,9 @@ 
 	 * Build pdf link for template.
 	 */
 	public function PdfLink() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
+			return false;
+		}
 
 		$path = $this->getPdfFilename();
 
@@ -112,7 +116,9 @@ 
 	 * @return boolean
 	 */
 	public function doUnpublish() {
-		if(!parent::doUnpublish()) return false;
+		if(!parent::doUnpublish()) {
+			return false;
+		}
 
 		$filepath = $this->getPdfFilename();
 		if(file_exists($filepath)) {
@@ -245,8 +251,11 @@ 
 			)));
 		}
 
-		if ($translations->count()>1) return $translations;
-		else return null;
+		if ($translations->count()>1) {
+			return $translations;
+		} else {
+			return null;
+		}
 	}
 
 	/**
@@ -308,7 +317,9 @@ 
 	 * Serve the page rendered as PDF.
 	 */
 	public function downloadpdf() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
+			return false;
+		}
 
 		// We only allow producing live pdf. There is no way to secure the draft files.
 		Versioned::reading_stage('Live');
@@ -356,7 +367,9 @@ 
 	 * Render the page as PDF using wkhtmltopdf.
 	 */
 	public function generatePDF() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
+			return false;
+		}
 
 		$binaryPath = Config::inst()->get('BasePage', 'wkhtmltopdf_binary');
 		if(!$binaryPath || !is_executable($binaryPath)) {
@@ -381,7 +394,9 @@ 
 		$footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
 
 		// make sure the work directory exists
-		if(!file_exists(dirname($pdfFile))) Filesystem::makeFolder(dirname($pdfFile));
+		if(!file_exists(dirname($pdfFile))) {
+			Filesystem::makeFolder(dirname($pdfFile));
+		}
 
 		//decide the domain to use in generation
 		$pdf_base_url = $this->getPDFBaseURL();

code/pagetypes/DatedUpdateHolder.php

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

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

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/search/CwpSearchEngine.php

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.

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]
+		);
+	}
 }

code/extensions/MaintenanceProxyExtension.php

Indentation +41 added lines, -41 removed lines

@@ -11,48 +11,48 @@
  */
 class MaintenanceProxyExtension extends Extension
 {
-    /**
-     * Configures required environment settings for Composer's use, applies to
-     * {@link \BringYourOwnIdeas\Maintenance\Util\ComposerLoader} and is applied before ComposerLoaderExtension in
-     * bringyourownideas/silverstripe-composer-update-checker to ensure the proxy information is set before Composer
-     * is created
-     */
-    public function onAfterBuild()
-    {
-        // Provide access for Composer's StreamContextFactory, since it creates its own stream context
-        if ($proxy = $this->getCwpProxy()) {
-            $_SERVER['CGI_HTTP_PROXY'] = $proxy;
-        }
-    }
+	/**
+	 * Configures required environment settings for Composer's use, applies to
+	 * {@link \BringYourOwnIdeas\Maintenance\Util\ComposerLoader} and is applied before ComposerLoaderExtension in
+	 * bringyourownideas/silverstripe-composer-update-checker to ensure the proxy information is set before Composer
+	 * is created
+	 */
+	public function onAfterBuild()
+	{
+		// Provide access for Composer's StreamContextFactory, since it creates its own stream context
+		if ($proxy = $this->getCwpProxy()) {
+			$_SERVER['CGI_HTTP_PROXY'] = $proxy;
+		}
+	}
 
-    /**
-     * Provide proxy options for {@link \BringYourOwnIdeas\Maintenance\Util\ApiLoader} instances to use in
-     * their Guzzle clients
-     *
-     * @param array $options
-     */
-    public function updateClientOptions(&$options)
-    {
-        if ($proxy = $this->getCwpProxy()) {
-            $options['proxy'] = $proxy;
-        }
-    }
+	/**
+	 * Provide proxy options for {@link \BringYourOwnIdeas\Maintenance\Util\ApiLoader} instances to use in
+	 * their Guzzle clients
+	 *
+	 * @param array $options
+	 */
+	public function updateClientOptions(&$options)
+	{
+		if ($proxy = $this->getCwpProxy()) {
+			$options['proxy'] = $proxy;
+		}
+	}
 
-    /**
-     * Returns a formatted CWP proxy string, e.g. `tcp://proxy.cwp.govt.nz:1234`
-     *
-     * @return string
-     */
-    protected function getCwpProxy()
-    {
-        if (!defined('SS_OUTBOUND_PROXY') || !defined('SS_OUTBOUND_PROXY_PORT')) {
-            return '';
-        }
+	/**
+	 * Returns a formatted CWP proxy string, e.g. `tcp://proxy.cwp.govt.nz:1234`
+	 *
+	 * @return string
+	 */
+	protected function getCwpProxy()
+	{
+		if (!defined('SS_OUTBOUND_PROXY') || !defined('SS_OUTBOUND_PROXY_PORT')) {
+			return '';
+		}
 
-        return sprintf(
-            'tcp://%s:%d',
-            SS_OUTBOUND_PROXY,
-            SS_OUTBOUND_PROXY_PORT
-        );
-    }
+		return sprintf(
+			'tcp://%s:%d',
+			SS_OUTBOUND_PROXY,
+			SS_OUTBOUND_PROXY_PORT
+		);
+	}
 }