silverstripe / cwp

src/PageTypes/SitemapPageController.php

Indentation +41 added lines, -41 removed lines

@@ -7,45 +7,45 @@
 
 class SitemapPageController extends PageController
 {
-    private static $allowed_actions = [
-        'showpage',
-    ];
-
-    private static $url_handlers = [
-        'page/$ID' => 'showpage',
-    ];
-
-    public function showpage($request)
-    {
-        $id = (int) $request->param('ID');
-        if (!$id) {
-            return false;
-        }
-        $page = SiteTree::get()->byId($id);
-
-        // does the page exist?
-        if (!($page && $page->exists())) {
-            return $this->httpError(404);
-        }
-
-        // can the page be viewed?
-        if (!$page->canView()) {
-            return $this->httpError(403);
-        }
-
-        $viewer = $this->customise([
-            'IsAjax' => $request->isAjax(),
-            'SelectedPage' => $page,
-            'Children' => $page->Children(),
-        ]);
-
-        if ($request->isAjax()) {
-            return $viewer->renderWith([
-                'type' => 'Includes',
-                'SitemapNodeChildren'
-            ]);
-        }
-
-        return $viewer;
-    }
+	private static $allowed_actions = [
+		'showpage',
+	];
+
+	private static $url_handlers = [
+		'page/$ID' => 'showpage',
+	];
+
+	public function showpage($request)
+	{
+		$id = (int) $request->param('ID');
+		if (!$id) {
+			return false;
+		}
+		$page = SiteTree::get()->byId($id);
+
+		// does the page exist?
+		if (!($page && $page->exists())) {
+			return $this->httpError(404);
+		}
+
+		// can the page be viewed?
+		if (!$page->canView()) {
+			return $this->httpError(403);
+		}
+
+		$viewer = $this->customise([
+			'IsAjax' => $request->isAjax(),
+			'SelectedPage' => $page,
+			'Children' => $page->Children(),
+		]);
+
+		if ($request->isAjax()) {
+			return $viewer->renderWith([
+				'type' => 'Includes',
+				'SitemapNodeChildren'
+			]);
+		}
+
+		return $viewer;
+	}
 }

src/Extensions/TaxonomyTermExtension.php

Indentation +11 added lines, -11 removed lines

@@ -10,17 +10,17 @@
 class TaxonomyTermExtension extends DataExtension
 {
 
-    private static $api_access = true;
+	private static $api_access = true;
 
-    private static $belongs_many_many = array(
-        'Pages' => BasePage::class
-    );
+	private static $belongs_many_many = array(
+		'Pages' => BasePage::class
+	);
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        $pagesGridField = $fields->dataFieldByName('Pages');
-        if ($pagesGridField) {
-            $pagesGridField->getConfig()->removeComponentsByType(GridFieldAddNewButton::class);
-        }
-    }
+	public function updateCMSFields(FieldList $fields)
+	{
+		$pagesGridField = $fields->dataFieldByName('Pages');
+		if ($pagesGridField) {
+			$pagesGridField->getConfig()->removeComponentsByType(GridFieldAddNewButton::class);
+		}
+	}
 }

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

src/Extensions/MaintenanceProxyExtension.php

Indentation +41 added lines, -41 removed lines

@@ -13,48 +13,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 (!Environment::getEnv('SS_OUTBOUND_PROXY') || !Environment::getEnv('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 (!Environment::getEnv('SS_OUTBOUND_PROXY') || !Environment::getEnv('SS_OUTBOUND_PROXY_PORT')) {
+			return '';
+		}
 
-        return sprintf(
-            'tcp://%s:%d',
-            Environment::getEnv('SS_OUTBOUND_PROXY'),
-            Environment::getEnv('SS_OUTBOUND_PROXY_PORT')
-        );
-    }
+		return sprintf(
+			'tcp://%s:%d',
+			Environment::getEnv('SS_OUTBOUND_PROXY'),
+			Environment::getEnv('SS_OUTBOUND_PROXY_PORT')
+		);
+	}
 }

tests/Report/CwpStatsReportTest.php

Indentation +38 added lines, -38 removed lines

@@ -11,42 +11,42 @@
 
 class CwpStatsReportTest extends SapphireTest
 {
-    protected static $fixture_file = 'CwpStatsReportTest.yml';
-
-    protected function setUp()
-    {
-        Config::modify()->set(SiteTree::class, 'create_default_pages', false);
-
-        parent::setUp();
-    }
-
-    public function testCount()
-    {
-        // Publish all pages apart from page3.
-        $this->objFromFixture(Page::class, 'page1')->publishRecursive();
-        $this->objFromFixture(Page::class, 'page2')->publishRecursive();
-        $this->objFromFixture(Page::class, 'page3')->publishRecursive();
-
-        // Add page5s to a subsite, if the module is installed.
-        $page5s = $this->objFromFixture(Page::class, 'page5s');
-        if (class_exists(Subsite::class)) {
-            $subsite = Subsite::create();
-            $subsite->Title = 'subsite';
-            $subsite->write();
-
-            $page5s->SubsiteID = $subsite->ID;
-            $page5s->write();
-        }
-        $page5s->publishRecursive();
-
-        $report = CwpStatsReport::create();
-        $records = $report->sourceRecords([])->toArray();
-        $i = 0;
-        $this->assertEquals(4, $records[$i++]['Count'], 'Four pages in total, across locales, subsites, live only.');
-        if (class_exists(Subsite::class)) {
-            $this->assertEquals(3, $records[$i++]['Count'], 'Three pages in the main site, if subsites installed.');
-            $this->assertEquals(1, $records[$i++]['Count'], 'One page in the subsite, if subsites installed');
-        }
-        $this->assertEquals(1, $records[$i++]['Count'], 'One file in total.');
-    }
+	protected static $fixture_file = 'CwpStatsReportTest.yml';
+
+	protected function setUp()
+	{
+		Config::modify()->set(SiteTree::class, 'create_default_pages', false);
+
+		parent::setUp();
+	}
+
+	public function testCount()
+	{
+		// Publish all pages apart from page3.
+		$this->objFromFixture(Page::class, 'page1')->publishRecursive();
+		$this->objFromFixture(Page::class, 'page2')->publishRecursive();
+		$this->objFromFixture(Page::class, 'page3')->publishRecursive();
+
+		// Add page5s to a subsite, if the module is installed.
+		$page5s = $this->objFromFixture(Page::class, 'page5s');
+		if (class_exists(Subsite::class)) {
+			$subsite = Subsite::create();
+			$subsite->Title = 'subsite';
+			$subsite->write();
+
+			$page5s->SubsiteID = $subsite->ID;
+			$page5s->write();
+		}
+		$page5s->publishRecursive();
+
+		$report = CwpStatsReport::create();
+		$records = $report->sourceRecords([])->toArray();
+		$i = 0;
+		$this->assertEquals(4, $records[$i++]['Count'], 'Four pages in total, across locales, subsites, live only.');
+		if (class_exists(Subsite::class)) {
+			$this->assertEquals(3, $records[$i++]['Count'], 'Three pages in the main site, if subsites installed.');
+			$this->assertEquals(1, $records[$i++]['Count'], 'One page in the subsite, if subsites installed');
+		}
+		$this->assertEquals(1, $records[$i++]['Count'], 'One file in total.');
+	}
 }

src/Extensions/CwpCommentingExtension.php

Indentation +14 added lines, -14 removed lines

@@ -14,20 +14,20 @@
  */
 class CwpCommentingExtension extends Extension
 {
-    public function alterCommentForm(Form $form)
-    {
-        $fields = $form->Fields();
+	public function alterCommentForm(Form $form)
+	{
+		$fields = $form->Fields();
 
-        if ($emailField = $fields->dataFieldByName('Email')) {
-            $emailField
-                ->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', 'Email'))
-                ->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
-        }
+		if ($emailField = $fields->dataFieldByName('Email')) {
+			$emailField
+				->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', 'Email'))
+				->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
+		}
 
-        if ($urlField = $fields->dataFieldByName('URL')) {
-            $urlField
-                ->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
-                ->setAttribute('placeholder', 'http://');
-        }
-    }
+		if ($urlField = $fields->dataFieldByName('URL')) {
+			$urlField
+				->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
+				->setAttribute('placeholder', 'http://');
+		}
+	}
 }

src/Model/RelatedPageLink.php

Indentation +23 added lines, -23 removed lines

@@ -8,30 +8,30 @@
 
 class RelatedPageLink extends DataObject
 {
-    private static $table_name = 'BasePage_RelatedPages';
+	private static $table_name = 'BasePage_RelatedPages';
 
-    private static $extensions = [
-        Versioned::class,
-    ];
+	private static $extensions = [
+		Versioned::class,
+	];
 
-    private static $db = [
-        'SortOrder' => 'Int',
-    ];
+	private static $db = [
+		'SortOrder' => 'Int',
+	];
 
-    /**
-     * For backwards compatibility these must match a traditional 'many_many' definition.
-     * This was BasePage.RelatedPages => BasePage
-     * ManyMany relations are normally joined by ${DefiningClass}ID && ${RelatedClass}ID
-     * excepting in the case where ${DefiningClass} === ${RelatedClass}
-     * Then the 'related class' column changes from ${RelatedClass}ID to "ChildID".
-     *
-     * {@see SilverStripe\ORM\DataObjectSchema->parseManyManyComponent()}
-     *
-     * @var array
-     * @config
-     */
-    private static $has_one = [
-        'BasePage' => BasePage::class,
-        'Child' => BasePage::class,
-    ];
+	/**
+	 * For backwards compatibility these must match a traditional 'many_many' definition.
+	 * This was BasePage.RelatedPages => BasePage
+	 * ManyMany relations are normally joined by ${DefiningClass}ID && ${RelatedClass}ID
+	 * excepting in the case where ${DefiningClass} === ${RelatedClass}
+	 * Then the 'related class' column changes from ${RelatedClass}ID to "ChildID".
+	 *
+	 * {@see SilverStripe\ORM\DataObjectSchema->parseManyManyComponent()}
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $has_one = [
+		'BasePage' => BasePage::class,
+		'Child' => BasePage::class,
+	];
 }

src/Extensions/CustomSiteConfig.php

Indentation +49 added lines, -49 removed lines

@@ -12,58 +12,58 @@
  */
 class CustomSiteConfig extends DataExtension
 {
-    private static $db = array(
-        'GACode' => 'Varchar(16)',
-        'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
-        'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
-    );
+	private static $db = array(
+		'GACode' => 'Varchar(16)',
+		'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
+		'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
+	);
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        $fields->addFieldToTab(
-            'Root.Main',
-            $gaCode = TextField::create(
-                'GACode',
-                _t(__CLASS__ . '.GaField', 'Google Analytics account')
-            )
-        );
+	public function updateCMSFields(FieldList $fields)
+	{
+		$fields->addFieldToTab(
+			'Root.Main',
+			$gaCode = TextField::create(
+				'GACode',
+				_t(__CLASS__ . '.GaField', 'Google Analytics account')
+			)
+		);
 
-        $gaCode->setDescription(
-            DBField::create_field('HTMLFragment', _t(
-                __CLASS__ . '.GaFieldDesc',
-                'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
-            ))
-        );
+		$gaCode->setDescription(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.GaFieldDesc',
+				'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
+			))
+		);
 
-        $fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
+		$fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $facebookURL = TextField::create(
-                'FacebookURL',
-                _t(__CLASS__ . '.FbField', 'Facebook UID or username')
-            )
-        );
-        $facebookURL->setDescription(
-            DBField::create_field('HTMLFragment', _t(
-                __CLASS__ . '.FbFieldDesc',
-                'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
-                . '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
-            ))
-        );
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$facebookURL = TextField::create(
+				'FacebookURL',
+				_t(__CLASS__ . '.FbField', 'Facebook UID or username')
+			)
+		);
+		$facebookURL->setDescription(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.FbFieldDesc',
+				'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
+				. '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
+			))
+		);
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $twitterUsername = TextField::create(
-                'TwitterUsername',
-                _t(__CLASS__ . '.TwitterField', 'Twitter username')
-            )
-        );
-        $twitterUsername->setDescription(
-            DBField::create_field('HTMLFragment', _t(
-                __CLASS__ . '.TwitterFieldDesc',
-                'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
-            ))
-        );
-    }
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$twitterUsername = TextField::create(
+				'TwitterUsername',
+				_t(__CLASS__ . '.TwitterField', 'Twitter username')
+			)
+		);
+		$twitterUsername->setDescription(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.TwitterFieldDesc',
+				'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
+			))
+		);
+	}
 }

src/PageTypes/NewsHolder.php

Indentation +46 added lines, -46 removed lines

@@ -7,50 +7,50 @@
 
 class NewsHolder extends DatedUpdateHolder
 {
-    private static $description = 'Container page for News Pages, provides news filtering and pagination';
-
-    private static $allowed_children = [
-        NewsPage::class,
-    ];
-
-    private static $default_child = NewsPage::class;
-
-    private static $update_name = 'News';
-
-    private static $update_class = NewsPage::class;
-
-    private static $icon_class = 'font-icon-news';
-
-    private static $singular_name = 'News Holder';
-
-    private static $plural_name = 'News Holders';
-
-    private static $table_name = 'NewsHolder';
-
-    /**
-     * Find all site's news items, based on some filters.
-     * Omitting parameters will prevent relevant filters from being applied. The filters are ANDed together.
-     *
-     * @param string $className The name of the class to fetch.
-     * @param int $parentID The ID of the holder to extract the news items from.
-     * @param int $tagID The ID of the tag to filter the news items by.
-     * @param string $dateFrom The beginning of a date filter range.
-     * @param string $dateTo The end of the date filter range. If empty, only one day will be searched for.
-     * @param int $year Numeric value of the year to show.
-     * @param int $monthNumber Numeric value of the month to show.
-     *
-     * @returns DataList|PaginatedList
-     */
-    public static function AllUpdates(
-        $className = NewsPage::class,
-        $parentID = null,
-        $tagID = null,
-        $dateFrom = null,
-        $dateTo = null,
-        $year = null,
-        $monthNumber = null
-    ) {
-        return parent::AllUpdates($className, $parentID, $tagID, $dateFrom, $dateTo, $year, $monthNumber)
-            ->Sort('Date', 'DESC');
-    }
+	private static $description = 'Container page for News Pages, provides news filtering and pagination';
+
+	private static $allowed_children = [
+		NewsPage::class,
+	];
+
+	private static $default_child = NewsPage::class;
+
+	private static $update_name = 'News';
+
+	private static $update_class = NewsPage::class;
+
+	private static $icon_class = 'font-icon-news';
+
+	private static $singular_name = 'News Holder';
+
+	private static $plural_name = 'News Holders';
+
+	private static $table_name = 'NewsHolder';
+
+	/**
+	 * Find all site's news items, based on some filters.
+	 * Omitting parameters will prevent relevant filters from being applied. The filters are ANDed together.
+	 *
+	 * @param string $className The name of the class to fetch.
+	 * @param int $parentID The ID of the holder to extract the news items from.
+	 * @param int $tagID The ID of the tag to filter the news items by.
+	 * @param string $dateFrom The beginning of a date filter range.
+	 * @param string $dateTo The end of the date filter range. If empty, only one day will be searched for.
+	 * @param int $year Numeric value of the year to show.
+	 * @param int $monthNumber Numeric value of the month to show.
+	 *
+	 * @returns DataList|PaginatedList
+	 */
+	public static function AllUpdates(
+		$className = NewsPage::class,
+		$parentID = null,
+		$tagID = null,
+		$dateFrom = null,
+		$dateTo = null,
+		$year = null,
+		$monthNumber = null
+	) {
+		return parent::AllUpdates($className, $parentID, $tagID, $dateFrom, $dateTo, $year, $monthNumber)
+			->Sort('Date', 'DESC');
+	}
 }