silverstripe / cwp

src/PageTypes/EventPage.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->removeByName('Date');
 
             $dateTimeFields = array();

Indentation +77 added lines, -77 removed lines

@@ -12,81 +12,81 @@
 
 class EventPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an event occurring on a specific date.';
-
-    private static $default_parent = EventHolder::class;
-
-    private static $can_be_root = false;
-
-    private static $icon_class = 'font-icon-p-event';
-
-    private static $singular_name = 'Event Page';
-
-    private static $plural_name = 'Event Pages';
-
-    private static $db = [
-        'StartTime' => 'Time',
-        'EndTime' => 'Time',
-        'Location' => 'Text',
-    ];
-
-    private static $table_name = 'EventPage';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
-        $labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
-        $labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
-
-        return $labels;
-    }
-
-    /**
-     * Add the default for the Date being the current day.
-     */
-    public function populateDefaults()
-    {
-        if (!isset($this->Date) || $this->Date === null) {
-            $this->Date = DBDatetime::now()->Format('y-MM-dd');
-        }
-
-        if (!isset($this->StartTime) || $this->StartTime === null) {
-            $this->StartTime = '09:00:00';
-        }
-
-        if (!isset($this->EndTime) || $this->EndTime === null) {
-            $this->EndTime = '17:00:00';
-        }
-
-        parent::populateDefaults();
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('Date');
-
-            $dateTimeFields = array();
-
-            $dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
-            $dateTimeFields[] = $startTimeField = TimeField::create(
-                'StartTime',
-                $this->fieldLabel('StartTime')
-            );
-            $dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
-
-            $fields->addFieldsToTab('Root.Main', [
-                $dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
-                $locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
-            ], 'Abstract');
-            $locationField->setRows(4);
-        });
-        return parent::getCMSFields();
-    }
-
-    public function NiceLocation()
-    {
-        return nl2br(Convert::raw2xml($this->Location), true);
-    }
+	private static $description = 'Describes an event occurring on a specific date.';
+
+	private static $default_parent = EventHolder::class;
+
+	private static $can_be_root = false;
+
+	private static $icon_class = 'font-icon-p-event';
+
+	private static $singular_name = 'Event Page';
+
+	private static $plural_name = 'Event Pages';
+
+	private static $db = [
+		'StartTime' => 'Time',
+		'EndTime' => 'Time',
+		'Location' => 'Text',
+	];
+
+	private static $table_name = 'EventPage';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
+		$labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
+		$labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
+
+		return $labels;
+	}
+
+	/**
+	 * Add the default for the Date being the current day.
+	 */
+	public function populateDefaults()
+	{
+		if (!isset($this->Date) || $this->Date === null) {
+			$this->Date = DBDatetime::now()->Format('y-MM-dd');
+		}
+
+		if (!isset($this->StartTime) || $this->StartTime === null) {
+			$this->StartTime = '09:00:00';
+		}
+
+		if (!isset($this->EndTime) || $this->EndTime === null) {
+			$this->EndTime = '17:00:00';
+		}
+
+		parent::populateDefaults();
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('Date');
+
+			$dateTimeFields = array();
+
+			$dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
+			$dateTimeFields[] = $startTimeField = TimeField::create(
+				'StartTime',
+				$this->fieldLabel('StartTime')
+			);
+			$dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
+
+			$fields->addFieldsToTab('Root.Main', [
+				$dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
+				$locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
+			], 'Abstract');
+			$locationField->setRows(4);
+		});
+		return parent::getCMSFields();
+	}
+
+	public function NiceLocation()
+	{
+		return nl2br(Convert::raw2xml($this->Location), true);
+	}
 }

src/PageTypes/NewsPage.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->addFieldToTab(
                 'Root.Main',
                 TextField::create('Author', $this->fieldLabel('Author')),

Indentation +67 added lines, -67 removed lines

@@ -10,71 +10,71 @@
 
 class NewsPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an item of news';
-
-    private static $default_parent = 'NewsHolderPage';
-
-    private static $can_be_root = false;
-
-    private static $icon_class = 'font-icon-p-news-item';
-
-    private static $singular_name = 'News Page';
-
-    private static $plural_name = 'News Pages';
-
-    private static $db = [
-        'Author' => 'Varchar(255)',
-    ];
-
-    private static $has_one = [
-        'FeaturedImage' => Image::class,
-    ];
-
-    private static $owns = [
-        'FeaturedImage',
-    ];
-
-    private static $table_name = 'NewsPage';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Author'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.AuthorFieldLabel', 'Author');
-        $labels['FeaturedImageID'] = _t(
-            'CWP\\CWP\\PageTypes\\DateUpdatePage.FeaturedImageFieldLabel',
-            'Featured Image'
-        );
-
-        return $labels;
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldToTab(
-                'Root.Main',
-                TextField::create('Author', $this->fieldLabel('Author')),
-                'Abstract'
-            );
-
-            $fields->addFieldToTab(
-                'Root.Main',
-                UploadField::create('FeaturedImage', $this->fieldLabel('FeaturedImageID')),
-                'Abstract'
-            );
-        });
-        return parent::getCMSFields();
-    }
-
-    /**
-     * Returns the Author DB field for this page type.
-     *
-     * Used to avoid conflicts with `Versioned::Author()`
-     *
-     * @return DBField
-     */
-    public function getNewsPageAuthor()
-    {
-        return $this->dbObject('Author');
-    }
+	private static $description = 'Describes an item of news';
+
+	private static $default_parent = 'NewsHolderPage';
+
+	private static $can_be_root = false;
+
+	private static $icon_class = 'font-icon-p-news-item';
+
+	private static $singular_name = 'News Page';
+
+	private static $plural_name = 'News Pages';
+
+	private static $db = [
+		'Author' => 'Varchar(255)',
+	];
+
+	private static $has_one = [
+		'FeaturedImage' => Image::class,
+	];
+
+	private static $owns = [
+		'FeaturedImage',
+	];
+
+	private static $table_name = 'NewsPage';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Author'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.AuthorFieldLabel', 'Author');
+		$labels['FeaturedImageID'] = _t(
+			'CWP\\CWP\\PageTypes\\DateUpdatePage.FeaturedImageFieldLabel',
+			'Featured Image'
+		);
+
+		return $labels;
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldToTab(
+				'Root.Main',
+				TextField::create('Author', $this->fieldLabel('Author')),
+				'Abstract'
+			);
+
+			$fields->addFieldToTab(
+				'Root.Main',
+				UploadField::create('FeaturedImage', $this->fieldLabel('FeaturedImageID')),
+				'Abstract'
+			);
+		});
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * Returns the Author DB field for this page type.
+	 *
+	 * Used to avoid conflicts with `Versioned::Author()`
+	 *
+	 * @return DBField
+	 */
+	public function getNewsPageAuthor()
+	{
+		return $this->dbObject('Author');
+	}
 }

src/PageTypes/EventHolderController.php

Indentation +41 added lines, -41 removed lines

@@ -19,53 +19,53 @@
  */
 class EventHolderController extends DatedUpdateHolderController
 {
-    public function getUpdateName()
-    {
-        $params = $this->parseParams();
-        if ($params['upcomingOnly']) {
-            return _t(__CLASS__ . '.Upcoming', 'Upcoming events');
-        }
+	public function getUpdateName()
+	{
+		$params = $this->parseParams();
+		if ($params['upcomingOnly']) {
+			return _t(__CLASS__ . '.Upcoming', 'Upcoming events');
+		}
 
-        return _t(__CLASS__ . '.Events', 'Events');
-    }
+		return _t(__CLASS__ . '.Events', 'Events');
+	}
 
-    /**
-     * Parse URL parameters.
-     *
-     * @param boolean $produceErrorMessages Set to false to omit session messages.
-     */
-    public function parseParams($produceErrorMessages = true)
-    {
-        $params = parent::parseParams($produceErrorMessages);
+	/**
+	 * Parse URL parameters.
+	 *
+	 * @param boolean $produceErrorMessages Set to false to omit session messages.
+	 */
+	public function parseParams($produceErrorMessages = true)
+	{
+		$params = parent::parseParams($produceErrorMessages);
 
-        // We need to set whether or not we're supposed to be displaying only upcoming events or all events.
-        $params['upcomingOnly'] = !($params['from'] || $params['to'] || $params['year'] || $params['month']);
+		// We need to set whether or not we're supposed to be displaying only upcoming events or all events.
+		$params['upcomingOnly'] = !($params['from'] || $params['to'] || $params['year'] || $params['month']);
 
-        return $params;
-    }
+		return $params;
+	}
 
-    /**
-     * Get the events based on the current query.
-     */
-    public function FilteredUpdates($pageSize = 20)
-    {
-        $params = $this->parseParams();
+	/**
+	 * Get the events based on the current query.
+	 */
+	public function FilteredUpdates($pageSize = 20)
+	{
+		$params = $this->parseParams();
 
-        $items = $this->Updates(
-            $params['tag'],
-            $params['from'],
-            $params['to'],
-            $params['year'],
-            $params['month']
-        );
+		$items = $this->Updates(
+			$params['tag'],
+			$params['from'],
+			$params['to'],
+			$params['year'],
+			$params['month']
+		);
 
-        if ($params['upcomingOnly']) {
-            $items = $items->filter(['Date:LessThan:Not' => DBDatetime::now()->Format('y-MM-dd')]);
-        }
+		if ($params['upcomingOnly']) {
+			$items = $items->filter(['Date:LessThan:Not' => DBDatetime::now()->Format('y-MM-dd')]);
+		}
 
-        // Apply pagination
-        $list = PaginatedList::create($items, $this->getRequest());
-        $list->setPageLength($pageSize);
-        return $list;
-    }
+		// Apply pagination
+		$list = PaginatedList::create($items, $this->getRequest());
+		$list->setPageLength($pageSize);
+		return $list;
+	}
 }

src/PageTypes/BasePage.php

Spacing +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             // Related Pages
             $components = GridFieldConfig_RelationEditor::create();
             $components->removeComponentsByType(GridFieldAddNewButton::class);

Indentation +141 added lines, -141 removed lines

@@ -31,145 +31,145 @@
 
 class BasePage extends SiteTree
 {
-    /**
-     * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
-     *
-     * {@inheritDoc}
-     */
-    private static $hide_ancestor = BasePage::class;
-
-    private static $api_access = [
-        'view' => [
-            'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
-            'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
-        ],
-        'edit' => [
-            'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
-            'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
-        ],
-    ];
-
-    private static $table_name = 'BasePage';
-
-    /**
-     * @config
-     * @var string
-     */
-    private static $related_pages_title = 'Related pages';
-
-    private static $many_many = [
-        'Terms' => TaxonomyTerm::class,
-        'RelatedPagesThrough' => [
-            'through' => RelatedPageLink::class,
-            'from' => 'BasePage',
-            'to' => 'Child',
-        ]
-    ];
-
-    private static $owns = [
-        'RelatedPagesThrough',
-    ];
-
-    private static $belongs_many_many = [
-        'SimilarPages' => BasePage::class
-    ];
-
-    /**
-     * @var array
-     * @config
-     */
-    private static $many_many_extraFields = [
-        'RelatedPages' => [
-            'SortOrder' => 'Int',
-        ],
-    ];
-
-    private static $plural_name = 'Base Pages';
-
-    /**
-     * Get the footer holder.
-     */
-    public function getFooter()
-    {
-        return FooterHolder::get_one(FooterHolder::class);
-    }
-
-    /**
-     * @deprecated 2.2.0:3.0.0 Please use RelatedPagesThrough() instead
-     */
-    public function RelatedPages()
-    {
-        return $this->getManyManyComponents('RelatedPagesThrough');
-    }
-
-    public function RelatedPagesTitle()
-    {
-        return $this->config()->get('related_pages_title');
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            // Related Pages
-            $components = GridFieldConfig_RelationEditor::create();
-            $components->removeComponentsByType(GridFieldAddNewButton::class);
-            $components->removeComponentsByType(GridFieldEditButton::class);
-            $components->removeComponentsByType(GridFieldFilterHeader::class);
-            $components->addComponent(new GridFieldOrderableRows('SortOrder'));
-
-            /** @var GridFieldDataColumns $dataColumns */
-            $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-            $dataColumns->setDisplayFields([
-                'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
-                'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
-            ]);
-
-            $fields->findOrMakeTab(
-                'Root.RelatedPages',
-                _t(__CLASS__ . '.RelatedPages', 'Related pages')
-            );
-            $fields->addFieldToTab(
-                'Root.RelatedPages',
-                GridField::create(
-                    'RelatedPages',
-                    _t(__CLASS__ . '.RelatedPages', 'Related pages'),
-                    $this->RelatedPagesThrough(),
-                    $components
-                )
-            );
-
-            // Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
-            $hasMany = $this->hasMany();
-            $manyMany = $this->manyMany();
-            if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
-                $fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
-                $fields->addFieldToTab(
-                    'Root.Tags',
-                    TreeMultiselectField::create(
-                        'Terms',
-                        _t(__CLASS__ . '.Terms', 'Terms'),
-                        TaxonomyTerm::class
-                    )->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
-                );
-            }
-        });
-        return parent::getCMSFields();
-    }
-
-    /**
-     * Returns the native language name for the selected locale/language, empty string if Fluent is not available
-     *
-     * @return string
-     */
-    public function getSelectedLanguage()
-    {
-        if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
-            return '';
-        }
-
-        /** @var ArrayData $information */
-        $information = $this->LocaleInformation(FluentState::singleton()->getLocale());
-
-        return $information->LanguageNative;
-    }
+	/**
+	 * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
+	 *
+	 * {@inheritDoc}
+	 */
+	private static $hide_ancestor = BasePage::class;
+
+	private static $api_access = [
+		'view' => [
+			'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
+			'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
+		],
+		'edit' => [
+			'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
+			'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
+		],
+	];
+
+	private static $table_name = 'BasePage';
+
+	/**
+	 * @config
+	 * @var string
+	 */
+	private static $related_pages_title = 'Related pages';
+
+	private static $many_many = [
+		'Terms' => TaxonomyTerm::class,
+		'RelatedPagesThrough' => [
+			'through' => RelatedPageLink::class,
+			'from' => 'BasePage',
+			'to' => 'Child',
+		]
+	];
+
+	private static $owns = [
+		'RelatedPagesThrough',
+	];
+
+	private static $belongs_many_many = [
+		'SimilarPages' => BasePage::class
+	];
+
+	/**
+	 * @var array
+	 * @config
+	 */
+	private static $many_many_extraFields = [
+		'RelatedPages' => [
+			'SortOrder' => 'Int',
+		],
+	];
+
+	private static $plural_name = 'Base Pages';
+
+	/**
+	 * Get the footer holder.
+	 */
+	public function getFooter()
+	{
+		return FooterHolder::get_one(FooterHolder::class);
+	}
+
+	/**
+	 * @deprecated 2.2.0:3.0.0 Please use RelatedPagesThrough() instead
+	 */
+	public function RelatedPages()
+	{
+		return $this->getManyManyComponents('RelatedPagesThrough');
+	}
+
+	public function RelatedPagesTitle()
+	{
+		return $this->config()->get('related_pages_title');
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			// Related Pages
+			$components = GridFieldConfig_RelationEditor::create();
+			$components->removeComponentsByType(GridFieldAddNewButton::class);
+			$components->removeComponentsByType(GridFieldEditButton::class);
+			$components->removeComponentsByType(GridFieldFilterHeader::class);
+			$components->addComponent(new GridFieldOrderableRows('SortOrder'));
+
+			/** @var GridFieldDataColumns $dataColumns */
+			$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+			$dataColumns->setDisplayFields([
+				'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
+				'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
+			]);
+
+			$fields->findOrMakeTab(
+				'Root.RelatedPages',
+				_t(__CLASS__ . '.RelatedPages', 'Related pages')
+			);
+			$fields->addFieldToTab(
+				'Root.RelatedPages',
+				GridField::create(
+					'RelatedPages',
+					_t(__CLASS__ . '.RelatedPages', 'Related pages'),
+					$this->RelatedPagesThrough(),
+					$components
+				)
+			);
+
+			// Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
+			$hasMany = $this->hasMany();
+			$manyMany = $this->manyMany();
+			if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
+				$fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
+				$fields->addFieldToTab(
+					'Root.Tags',
+					TreeMultiselectField::create(
+						'Terms',
+						_t(__CLASS__ . '.Terms', 'Terms'),
+						TaxonomyTerm::class
+					)->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
+				);
+			}
+		});
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * Returns the native language name for the selected locale/language, empty string if Fluent is not available
+	 *
+	 * @return string
+	 */
+	public function getSelectedLanguage()
+	{
+		if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
+			return '';
+		}
+
+		/** @var ArrayData $information */
+		$information = $this->LocaleInformation(FluentState::singleton()->getLocale());
+
+		return $information->LanguageNative;
+	}
 }

tests/PageTypes/SitemapPageTest.php

Indentation +19 added lines, -19 removed lines

@@ -9,27 +9,27 @@
 
 class SitemapPageTest extends FunctionalTest
 {
-    protected static $fixture_file = 'SitemapPageTest.yml';
+	protected static $fixture_file = 'SitemapPageTest.yml';
 
-    protected static $use_draft_site = true;
+	protected static $use_draft_site = true;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        Config::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
-        Config::modify()->set(SSViewer::class, 'theme', 'starter');
-    }
+		Config::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
+		Config::modify()->set(SSViewer::class, 'theme', 'starter');
+	}
 
-    /**
-     * Note: this test depends on the "starter" theme being installed and configured as default
-     */
-    public function testSitemapShowsNavigationTitleNotNormalTitle()
-    {
-        $response = $this->get('sitemap');
-        $parser = new CSSContentParser($response->getBody());
-        $elements = $parser->getBySelector('.sitemap li.first .sitemap-link');
-        $this->assertNotEmpty($elements);
-        $this->assertEquals('Top page nav 1', (string) $elements[0]);
-    }
+	/**
+	 * Note: this test depends on the "starter" theme being installed and configured as default
+	 */
+	public function testSitemapShowsNavigationTitleNotNormalTitle()
+	{
+		$response = $this->get('sitemap');
+		$parser = new CSSContentParser($response->getBody());
+		$elements = $parser->getBySelector('.sitemap li.first .sitemap-link');
+		$this->assertNotEmpty($elements);
+		$this->assertEquals('Top page nav 1', (string) $elements[0]);
+	}
 }

src/PageTypes/BasePageController.php

Indentation +10 added lines, -10 removed lines

@@ -7,15 +7,15 @@
 
 class BasePageController extends ContentController
 {
-    /**
-     * Provide current year.
-     */
-    public function CurrentDatetime()
-    {
-        return DBDatetime::now();
-    }
+	/**
+	 * Provide current year.
+	 */
+	public function CurrentDatetime()
+	{
+		return DBDatetime::now();
+	}
 
-    public function getRSSLink()
-    {
-    }
+	public function getRSSLink()
+	{
+	}
 }

src/Report/CwpStatsReport.php

Indentation +104 added lines, -104 removed lines

@@ -20,108 +20,108 @@
  */
 class CwpStatsReport extends Report
 {
-    public function title()
-    {
-        return _t(__CLASS__ . '.Title', 'Summary statistics');
-    }
-
-    public function description()
-    {
-        return _t(
-            __CLASS__ . '.Description',
-            'This report provides various statistics for this site. The "total live page count" is the number that ' .
-                'can be compared against the instance size specifications.'
-        );
-    }
-
-    public function columns()
-    {
-        return [
-            'Name' => _t(__CLASS__ . '.Name', 'Name'),
-            'Count' => _t(__CLASS__ . '.Count', 'Count'),
-        ];
-    }
-
-    /**
-     * Manually create source records for the report. Agreggates cannot be provided as a column of a DataQuery result.
-     *
-     * {@inheritDoc}
-     */
-    public function sourceRecords($params = [], $sort = null, $limit = null)
-    {
-        $records = [];
-
-        // Get the query to apply across all variants: looks at all subsites, translations, live stage only.
-        $crossVariant = (function ($dataQuery) {
-            $params = [
-                'Subsite.filter' => false,
-                'Versioned.mode' => 'stage',
-                'Versioned.stage' => Versioned::LIVE,
-            ];
-
-            return $dataQuery->setDataQueryParam($params);
-        });
-
-        // Total.
-        $records[] = [
-            'Name' => _t(
-                __CLASS__ . '.TotalPageCount',
-                'Total live page count, across all translations and subsites'
-            ),
-            'Count' => $crossVariant(SiteTree::get())->count(),
-        ];
-
-        if (class_exists(Subsite::class)) {
-            // Main site.
-            $records[] = [
-                'Name' => _t(__CLASS__ . '.PagesForMainSite', '- in the main site'),
-                'Count' => $crossVariant(SiteTree::get())
-                    ->filter(['SubsiteID' => 0])
-                    ->count(),
-            ];
-
-            // Per subsite.
-            $subsites = Subsite::get();
-            foreach ($subsites as $subsite) {
-                $records[] = [
-                    'Name' => _t(
-                        __CLASS__ . '.PagesForSubsite',
-                        "- in the subsite '{SubsiteTitle}'",
-                        ['SubsiteTitle' => $subsite->Title]
-                    ),
-                    'Count' => $crossVariant(SiteTree::get())
-                        ->filter(['SubsiteID' => $subsite->ID])
-                        ->count(),
-                ];
-            }
-        }
-
-        // Files.
-        $records[] = [
-            'Name' => _t(__CLASS__ . '.FileCount', 'File count'),
-            'Count' => File::get()
-                ->setDataQueryParam('Subsite.filter', false)
-                ->filter(['ClassName:not' => Folder::class])
-                ->count(),
-        ];
-
-        return ArrayList::create($records);
-    }
-
-    /**
-     * @return GridField
-     */
-    public function getReportField()
-    {
-        /** @var GridField $gridField */
-        $gridField = parent::getReportField();
-
-        /** @var GridFieldConfig $gridConfig */
-        $gridConfig = $gridField->getConfig();
-        $gridConfig->removeComponentsByType(GridFieldPrintButton::class);
-        $gridConfig->removeComponentsByType(GridFieldExportButton::class);
-        $gridConfig->removeComponentsByType(GridFieldSortableHeader::class);
-
-        return $gridField;
-    }
+	public function title()
+	{
+		return _t(__CLASS__ . '.Title', 'Summary statistics');
+	}
+
+	public function description()
+	{
+		return _t(
+			__CLASS__ . '.Description',
+			'This report provides various statistics for this site. The "total live page count" is the number that ' .
+				'can be compared against the instance size specifications.'
+		);
+	}
+
+	public function columns()
+	{
+		return [
+			'Name' => _t(__CLASS__ . '.Name', 'Name'),
+			'Count' => _t(__CLASS__ . '.Count', 'Count'),
+		];
+	}
+
+	/**
+	 * Manually create source records for the report. Agreggates cannot be provided as a column of a DataQuery result.
+	 *
+	 * {@inheritDoc}
+	 */
+	public function sourceRecords($params = [], $sort = null, $limit = null)
+	{
+		$records = [];
+
+		// Get the query to apply across all variants: looks at all subsites, translations, live stage only.
+		$crossVariant = (function ($dataQuery) {
+			$params = [
+				'Subsite.filter' => false,
+				'Versioned.mode' => 'stage',
+				'Versioned.stage' => Versioned::LIVE,
+			];
+
+			return $dataQuery->setDataQueryParam($params);
+		});
+
+		// Total.
+		$records[] = [
+			'Name' => _t(
+				__CLASS__ . '.TotalPageCount',
+				'Total live page count, across all translations and subsites'
+			),
+			'Count' => $crossVariant(SiteTree::get())->count(),
+		];
+
+		if (class_exists(Subsite::class)) {
+			// Main site.
+			$records[] = [
+				'Name' => _t(__CLASS__ . '.PagesForMainSite', '- in the main site'),
+				'Count' => $crossVariant(SiteTree::get())
+					->filter(['SubsiteID' => 0])
+					->count(),
+			];
+
+			// Per subsite.
+			$subsites = Subsite::get();
+			foreach ($subsites as $subsite) {
+				$records[] = [
+					'Name' => _t(
+						__CLASS__ . '.PagesForSubsite',
+						"- in the subsite '{SubsiteTitle}'",
+						['SubsiteTitle' => $subsite->Title]
+					),
+					'Count' => $crossVariant(SiteTree::get())
+						->filter(['SubsiteID' => $subsite->ID])
+						->count(),
+				];
+			}
+		}
+
+		// Files.
+		$records[] = [
+			'Name' => _t(__CLASS__ . '.FileCount', 'File count'),
+			'Count' => File::get()
+				->setDataQueryParam('Subsite.filter', false)
+				->filter(['ClassName:not' => Folder::class])
+				->count(),
+		];
+
+		return ArrayList::create($records);
+	}
+
+	/**
+	 * @return GridField
+	 */
+	public function getReportField()
+	{
+		/** @var GridField $gridField */
+		$gridField = parent::getReportField();
+
+		/** @var GridFieldConfig $gridConfig */
+		$gridConfig = $gridField->getConfig();
+		$gridConfig->removeComponentsByType(GridFieldPrintButton::class);
+		$gridConfig->removeComponentsByType(GridFieldExportButton::class);
+		$gridConfig->removeComponentsByType(GridFieldSortableHeader::class);
+
+		return $gridField;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         $records = [];
 
         // Get the query to apply across all variants: looks at all subsites, translations, live stage only.
-        $crossVariant = (function ($dataQuery) {
+        $crossVariant = (function($dataQuery) {
             $params = [
                 'Subsite.filter' => false,
                 'Versioned.mode' => 'stage',

tests/Extensions/WorkflowDefinitionExtensionTest.php

Indentation +34 added lines, -34 removed lines

@@ -15,38 +15,38 @@
 class WorkflowDefinitionExtensionTest extends FunctionalTest
 {
 
-    /**
-     * @var Boolean If set to TRUE, this will force a test database to be generated
-     * in {@link setUp()}. Note that this flag is overruled by the presence of a
-     * {@link $fixture_file}, which always forces a database build.
-     */
-    protected $usesDatabase = true;
-
-    /**
-     * Tests the config option that controls the creation of a default workflow definition
-     *
-     * @return void
-     */
-    public function testCreateDefaultWorkflowTest()
-    {
-        if (!class_exists(WorkflowDefinition::class)) {
-            $this->markTestSkipped('This test requires the advancedworkflow module to be installed');
-        }
-
-        DB::quiet();
-
-        // test disabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNull($definition);
-
-        // test enabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNotNull($definition);
-    }
+	/**
+	 * @var Boolean If set to TRUE, this will force a test database to be generated
+	 * in {@link setUp()}. Note that this flag is overruled by the presence of a
+	 * {@link $fixture_file}, which always forces a database build.
+	 */
+	protected $usesDatabase = true;
+
+	/**
+	 * Tests the config option that controls the creation of a default workflow definition
+	 *
+	 * @return void
+	 */
+	public function testCreateDefaultWorkflowTest()
+	{
+		if (!class_exists(WorkflowDefinition::class)) {
+			$this->markTestSkipped('This test requires the advancedworkflow module to be installed');
+		}
+
+		DB::quiet();
+
+		// test disabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNull($definition);
+
+		// test enabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNotNull($definition);
+	}
 }

tests/Tasks/PopulateThemeSampleDataTaskTest.php

Indentation +46 added lines, -46 removed lines

@@ -10,50 +10,50 @@
 
 class PopulateThemeSampleDataTaskTest extends SapphireTest
 {
-    protected $usesDatabase = true;
-
-    /**
-     * Ensure that the "contact" user form is only created once
-     */
-    public function testOnlyCreateContactFormOnce()
-    {
-        if (!class_exists(UserDefinedForm::class)) {
-            $this->markTestSkipped('This test requires the userforms module to be installed');
-        }
-
-        $createdMessage = 'Created "contact" UserDefinedForm';
-
-        $task = new PopulateThemeSampleDataTask;
-
-        // Run the task
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
-
-        // Run a second time
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
-
-        // Change the page name
-        $form = UserDefinedForm::get()->filter('URLSegment', 'contact')->first();
-        $form->URLSegment = 'testing';
-        $form->write();
-
-        // Ensure the old version is still detected in draft, so not recreated
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
-
-        // Delete the page, then ensure it's recreated again (DataObject::delete will remove staged versions)
-        $form->delete();
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
-    }
-
-    /**
-     * Run a BuildTask while buffering its output, and return the result
-     *
-     * @param  BuildTask $task
-     * @return string
-     */
-    protected function bufferedTask(BuildTask $task)
-    {
-        ob_start();
-        $task->run(new HTTPRequest('GET', '/'));
-        return ob_get_clean();
-    }
+	protected $usesDatabase = true;
+
+	/**
+	 * Ensure that the "contact" user form is only created once
+	 */
+	public function testOnlyCreateContactFormOnce()
+	{
+		if (!class_exists(UserDefinedForm::class)) {
+			$this->markTestSkipped('This test requires the userforms module to be installed');
+		}
+
+		$createdMessage = 'Created "contact" UserDefinedForm';
+
+		$task = new PopulateThemeSampleDataTask;
+
+		// Run the task
+		$this->assertContains($createdMessage, $this->bufferedTask($task));
+
+		// Run a second time
+		$this->assertNotContains($createdMessage, $this->bufferedTask($task));
+
+		// Change the page name
+		$form = UserDefinedForm::get()->filter('URLSegment', 'contact')->first();
+		$form->URLSegment = 'testing';
+		$form->write();
+
+		// Ensure the old version is still detected in draft, so not recreated
+		$this->assertNotContains($createdMessage, $this->bufferedTask($task));
+
+		// Delete the page, then ensure it's recreated again (DataObject::delete will remove staged versions)
+		$form->delete();
+		$this->assertContains($createdMessage, $this->bufferedTask($task));
+	}
+
+	/**
+	 * Run a BuildTask while buffering its output, and return the result
+	 *
+	 * @param  BuildTask $task
+	 * @return string
+	 */
+	protected function bufferedTask(BuildTask $task)
+	{
+		ob_start();
+		$task->run(new HTTPRequest('GET', '/'));
+		return ob_get_clean();
+	}
 }