silverstripe / cwp

src/PageTypes/FooterHolder.php

Indentation +42 added lines, -42 removed lines

@@ -14,54 +14,54 @@
 class FooterHolder extends RedirectorPage
 {
 
-    private static $description = 'Holder page that displays all child pages as links in the footer';
+	private static $description = 'Holder page that displays all child pages as links in the footer';
 
-    private static $singular_name = 'Footer Holder';
+	private static $singular_name = 'Footer Holder';
 
-    private static $plural_name = 'Footer Holders';
+	private static $plural_name = 'Footer Holders';
 
-    private static $defaults = [
-        'ShowInMenus' => 0,
-        'ShowInSearch' => 0,
-    ];
+	private static $defaults = [
+		'ShowInMenus' => 0,
+		'ShowInSearch' => 0,
+	];
 
-    private static $table_name = 'FooterHolder';
+	private static $table_name = 'FooterHolder';
 
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('RedirectorDescHeader');
-            $fields->removeByName('RedirectionType');
-            $fields->removeByName('LinkToID');
-            $fields->removeByName('ExternalURL');
-        });
-        return parent::getCMSFields();
-    }
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('RedirectorDescHeader');
+			$fields->removeByName('RedirectionType');
+			$fields->removeByName('LinkToID');
+			$fields->removeByName('ExternalURL');
+		});
+		return parent::getCMSFields();
+	}
 
-    /**
-     * Return the link to the first child page.
-     */
-    public function redirectionLink()
-    {
-        $childPage = $this->Children()->first();
+	/**
+	 * Return the link to the first child page.
+	 */
+	public function redirectionLink()
+	{
+		$childPage = $this->Children()->first();
 
-        if ($childPage) {
-            // If we're linking to another redirectorpage then just return the URLSegment, to prevent a cycle of
-            // redirector pages from causing an infinite loop.  Instead, they will cause a 30x redirection loop in
-            // the browser, but this can be handled sufficiently gracefully by the browser.
-            if ($childPage instanceof RedirectorPage) {
-                return $childPage->regularLink();
-            }
-            // For all other pages, just return the link of the page.
-            return $childPage->Link();
-        }
-    }
+		if ($childPage) {
+			// If we're linking to another redirectorpage then just return the URLSegment, to prevent a cycle of
+			// redirector pages from causing an infinite loop.  Instead, they will cause a 30x redirection loop in
+			// the browser, but this can be handled sufficiently gracefully by the browser.
+			if ($childPage instanceof RedirectorPage) {
+				return $childPage->regularLink();
+			}
+			// For all other pages, just return the link of the page.
+			return $childPage->Link();
+		}
+	}
 
-    public function syncLinkTracking()
-    {
-        // If we don't have anything to link to, then we have a broken link.
-        if (!$this->Children()) {
-            $this->HasBrokenLink = true;
-        }
-    }
+	public function syncLinkTracking()
+	{
+		// If we don't have anything to link to, then we have a broken link.
+		if (!$this->Children()) {
+			$this->HasBrokenLink = true;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->removeByName('RedirectorDescHeader');
             $fields->removeByName('RedirectionType');
             $fields->removeByName('LinkToID');

src/PageTypes/SitemapPage.php

Indentation +4 added lines, -4 removed lines

@@ -6,11 +6,11 @@
 
 class SitemapPage extends Page
 {
-    private static $description = 'Lists all pages on the site';
+	private static $description = 'Lists all pages on the site';
 
-    private static $singular_name = 'Sitemap Page';
+	private static $singular_name = 'Sitemap Page';
 
-    private static $plural_name = 'Sitemap Pages';
+	private static $plural_name = 'Sitemap Pages';
 
-    private static $table_name = 'SitemapPage';
+	private static $table_name = 'SitemapPage';
 }

src/PageTypes/BaseHomePage.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             // Main Content tab
             $fields->addFieldToTab(
                 'Root.Main',

Indentation +133 added lines, -133 removed lines

@@ -26,137 +26,137 @@
  */
 class BaseHomePage extends Page
 {
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
-
-    private static $hide_ancestor = BaseHomePage::class;
-
-    private static $singular_name = 'Home Page';
-
-    private static $plural_name = 'Home Pages';
-
-    private static $table_name = 'BaseHomePage';
-
-    private static $db = [
-        'FeatureOneTitle' => 'Varchar(255)',
-        'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureOneContent' => 'HTMLText',
-        'FeatureOneButtonText' => 'Varchar(255)',
-        'FeatureTwoTitle' => 'Varchar(255)',
-        'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureTwoContent' => 'HTMLText',
-        'FeatureTwoButtonText' => 'Varchar(255)'
-    ];
-
-    private static $has_one = [
-        'LearnMorePage' => SiteTree::class,
-        'FeatureOneLink' => SiteTree::class,
-        'FeatureTwoLink' => SiteTree::class,
-    ];
-
-    private static $has_many = [
-        'Quicklinks' => Quicklink::class . '.Parent',
-    ];
-
-    public function Quicklinks()
-    {
-        return $this->getComponents('Quicklinks')->sort('SortOrder');
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            // Main Content tab
-            $fields->addFieldToTab(
-                'Root.Main',
-                TreeDropdownField::create(
-                    'LearnMorePageID',
-                    _t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
-                    SiteTree::class
-                ),
-                'Metadata'
-            );
-
-            $gridField = GridField::create(
-                'Quicklinks',
-                'Quicklinks',
-                $this->Quicklinks(),
-                GridFieldConfig_RelationEditor::create()
-            );
-            $gridConfig = $gridField->getConfig();
-            $gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
-                _t(__CLASS__ . '.AddNewButton', 'Add new')
-            );
-
-            $injector = Injector::inst();
-
-            $gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
-            $gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
-            $gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
-            $gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
-            $gridField->setModelClass(Quicklink::class);
-
-            $fields->addFieldToTab('Root.Quicklinks', $gridField);
-
-            $fields->removeByName('Import');
-
-            $fields->addFieldToTab(
-                'Root.Features',
-                ToggleCompositeField::create(
-                    'FeatureOne',
-                    _t(__CLASS__ . '.FeatureOne', 'Feature One'),
-                    array(
-                        TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
-                        $dropdownField = DropdownField::create(
-                            'FeatureOneCategory',
-                            _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                            singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
-                        ),
-                        HTMLEditorField::create(
-                            'FeatureOneContent',
-                            _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                        ),
-                        TextField::create(
-                            'FeatureOneButtonText',
-                            _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                        ),
-                        TreeDropdownField::create(
-                            'FeatureOneLinkID',
-                            _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                            SiteTree::class
-                        )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                    )
-                )->setHeadingLevel(3)
-            );
-            $dropdownField->setEmptyString('none');
-
-            $fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
-                'FeatureTwo',
-                _t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
-                array(
-                    TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
-                    $dropdownField = DropdownField::create(
-                        'FeatureTwoCategory',
-                        _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                        singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
-                    ),
-                    HTMLEditorField::create(
-                        'FeatureTwoContent',
-                        _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                    ),
-                    TextField::create(
-                        'FeatureTwoButtonText',
-                        _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                    ),
-                    TreeDropdownField::create(
-                        'FeatureTwoLinkID',
-                        _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                        SiteTree::class
-                    )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                )
-            )->setHeadingLevel(3));
-            $dropdownField->setEmptyString('none');
-        });
-
-        return parent::getCMSFields();
-    }
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
+
+	private static $hide_ancestor = BaseHomePage::class;
+
+	private static $singular_name = 'Home Page';
+
+	private static $plural_name = 'Home Pages';
+
+	private static $table_name = 'BaseHomePage';
+
+	private static $db = [
+		'FeatureOneTitle' => 'Varchar(255)',
+		'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureOneContent' => 'HTMLText',
+		'FeatureOneButtonText' => 'Varchar(255)',
+		'FeatureTwoTitle' => 'Varchar(255)',
+		'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureTwoContent' => 'HTMLText',
+		'FeatureTwoButtonText' => 'Varchar(255)'
+	];
+
+	private static $has_one = [
+		'LearnMorePage' => SiteTree::class,
+		'FeatureOneLink' => SiteTree::class,
+		'FeatureTwoLink' => SiteTree::class,
+	];
+
+	private static $has_many = [
+		'Quicklinks' => Quicklink::class . '.Parent',
+	];
+
+	public function Quicklinks()
+	{
+		return $this->getComponents('Quicklinks')->sort('SortOrder');
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			// Main Content tab
+			$fields->addFieldToTab(
+				'Root.Main',
+				TreeDropdownField::create(
+					'LearnMorePageID',
+					_t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
+					SiteTree::class
+				),
+				'Metadata'
+			);
+
+			$gridField = GridField::create(
+				'Quicklinks',
+				'Quicklinks',
+				$this->Quicklinks(),
+				GridFieldConfig_RelationEditor::create()
+			);
+			$gridConfig = $gridField->getConfig();
+			$gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
+				_t(__CLASS__ . '.AddNewButton', 'Add new')
+			);
+
+			$injector = Injector::inst();
+
+			$gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
+			$gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
+			$gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
+			$gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
+			$gridField->setModelClass(Quicklink::class);
+
+			$fields->addFieldToTab('Root.Quicklinks', $gridField);
+
+			$fields->removeByName('Import');
+
+			$fields->addFieldToTab(
+				'Root.Features',
+				ToggleCompositeField::create(
+					'FeatureOne',
+					_t(__CLASS__ . '.FeatureOne', 'Feature One'),
+					array(
+						TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
+						$dropdownField = DropdownField::create(
+							'FeatureOneCategory',
+							_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+							singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
+						),
+						HTMLEditorField::create(
+							'FeatureOneContent',
+							_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+						),
+						TextField::create(
+							'FeatureOneButtonText',
+							_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+						),
+						TreeDropdownField::create(
+							'FeatureOneLinkID',
+							_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+							SiteTree::class
+						)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+					)
+				)->setHeadingLevel(3)
+			);
+			$dropdownField->setEmptyString('none');
+
+			$fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
+				'FeatureTwo',
+				_t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
+				array(
+					TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
+					$dropdownField = DropdownField::create(
+						'FeatureTwoCategory',
+						_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+						singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
+					),
+					HTMLEditorField::create(
+						'FeatureTwoContent',
+						_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+					),
+					TextField::create(
+						'FeatureTwoButtonText',
+						_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+					),
+					TreeDropdownField::create(
+						'FeatureTwoLinkID',
+						_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+						SiteTree::class
+					)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+				)
+			)->setHeadingLevel(3));
+			$dropdownField->setEmptyString('none');
+		});
+
+		return parent::getCMSFields();
+	}
 }

src/PageTypes/DatedUpdatePage.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->addFieldToTab(
                 'Root.Main',
                 $dateTimeField = DatetimeField::create('Date', $this->fieldLabel('Date')),

Indentation +55 added lines, -55 removed lines

@@ -10,70 +10,70 @@
 
 class DatedUpdatePage extends Page
 {
-    /**
-     * Meant as an abstract base class.
-     *
-     * {@inheritDoc}
-     */
-    private static $hide_ancestor = DatedUpdatePage::class;
+	/**
+	 * Meant as an abstract base class.
+	 *
+	 * {@inheritDoc}
+	 */
+	private static $hide_ancestor = DatedUpdatePage::class;
 
-    private static $singular_name = 'Dated Update Page';
+	private static $singular_name = 'Dated Update Page';
 
-    private static $plural_name = 'Dated Update Pages';
+	private static $plural_name = 'Dated Update Pages';
 
-    private static $table_name = 'DatedUpdatePage';
+	private static $table_name = 'DatedUpdatePage';
 
-    private static $defaults = [
-        'ShowInMenus' => false,
-    ];
+	private static $defaults = [
+		'ShowInMenus' => false,
+	];
 
-    private static $db = [
-        'Abstract' => 'Text',
-        'Date' => 'Datetime',
-    ];
+	private static $db = [
+		'Abstract' => 'Text',
+		'Date' => 'Datetime',
+	];
 
-    /**
-     * Add the default for the Date being the current day.
-     */
-    public function populateDefaults()
-    {
-        parent::populateDefaults();
+	/**
+	 * Add the default for the Date being the current day.
+	 */
+	public function populateDefaults()
+	{
+		parent::populateDefaults();
 
-        if (!isset($this->Date) || $this->Date === null) {
-            $this->Date = DBDatetime::now()->Format('y-MM-dd 09:00:00');
-        }
-    }
+		if (!isset($this->Date) || $this->Date === null) {
+			$this->Date = DBDatetime::now()->Format('y-MM-dd 09:00:00');
+		}
+	}
 
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Date'] = _t(__CLASS__ . '.DateLabel', 'Date');
-        $labels['Abstract'] = _t(__CLASS__ . '.AbstractTextFieldLabel', 'Abstract');
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Date'] = _t(__CLASS__ . '.DateLabel', 'Date');
+		$labels['Abstract'] = _t(__CLASS__ . '.AbstractTextFieldLabel', 'Abstract');
 
-        return $labels;
-    }
+		return $labels;
+	}
 
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldToTab(
-                'Root.Main',
-                $dateTimeField = DatetimeField::create('Date', $this->fieldLabel('Date')),
-                'Content'
-            );
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldToTab(
+				'Root.Main',
+				$dateTimeField = DatetimeField::create('Date', $this->fieldLabel('Date')),
+				'Content'
+			);
 
-            $fields->addfieldToTab(
-                'Root.Main',
-                $abstractField = TextareaField::create('Abstract', $this->fieldLabel('Abstract')),
-                'Content'
-            );
-            $abstractField->setAttribute('maxlength', '160');
-            $abstractField->setRightTitle(_t(
-                __CLASS__ . '.AbstractDesc',
-                'The abstract is used as a summary on the listing pages. It is limited to 160 characters.'
-            ));
-            $abstractField->setRows(6);
-        });
-        return parent::getCMSFields();
-    }
+			$fields->addfieldToTab(
+				'Root.Main',
+				$abstractField = TextareaField::create('Abstract', $this->fieldLabel('Abstract')),
+				'Content'
+			);
+			$abstractField->setAttribute('maxlength', '160');
+			$abstractField->setRightTitle(_t(
+				__CLASS__ . '.AbstractDesc',
+				'The abstract is used as a summary on the listing pages. It is limited to 160 characters.'
+			));
+			$abstractField->setRows(6);
+		});
+		return parent::getCMSFields();
+	}
 }

src/PageTypes/BaseHomePageController.php

Indentation +15 added lines, -15 removed lines

@@ -6,20 +6,20 @@
 
 class BaseHomePageController extends PageController
 {
-    public function getNewsPage()
-    {
-        return NewsHolder::get_one(NewsHolder::class);
-    }
+	public function getNewsPage()
+	{
+		return NewsHolder::get_one(NewsHolder::class);
+	}
 
-    /**
-     * @param int $amount The amount of items to provide.
-     */
-    public function getNewsItems($amount = 2)
-    {
-        $newsHolder = $this->getNewsPage();
-        if ($newsHolder) {
-            $controller = NewsHolderController::create($newsHolder);
-            return $controller->Updates()->limit($amount);
-        }
-    }
+	/**
+	 * @param int $amount The amount of items to provide.
+	 */
+	public function getNewsItems($amount = 2)
+	{
+		$newsHolder = $this->getNewsPage();
+		if ($newsHolder) {
+			$controller = NewsHolderController::create($newsHolder);
+			return $controller->Updates()->limit($amount);
+		}
+	}
 }

src/PageTypes/DatedUpdateHolder.php

Indentation +243 added lines, -243 removed lines

@@ -17,247 +17,247 @@
 
 class DatedUpdateHolder extends Page
 {
-    /**
-     * Meant as an abstract base class.
-     *
-     * {@inheritDoc}
-     */
-    private static $hide_ancestor = DatedUpdateHolder::class;
-
-    private static $update_name = 'Updates';
-
-    private static $update_class = DatedUpdatePage::class;
-
-    private static $singular_name = 'Dated Update Holder';
-
-    private static $plural_name = 'Dated Update Holders';
-
-    private static $table_name = 'DatedUpdateHolder';
-
-    /**
-     * Find all distinct tags (TaxonomyTerms) associated with the DatedUpdatePages under this holder.
-     */
-    public function UpdateTags()
-    {
-        $siteTree = DataObject::getSchema()->tableName(SiteTree::class);
-        $taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
-
-        $tags = TaxonomyTerm::get()
-            ->innerJoin('BasePage_Terms', sprintf('"%s"."ID"="BasePage_Terms"."TaxonomyTermID"', $taxonomy))
-            ->innerJoin(
-                $siteTree,
-                sprintf(
-                    '"%s"."ID" = "BasePage_Terms"."BasePageID" AND "%s"."ParentID" = \'%d\'',
-                    $siteTree,
-                    $siteTree,
-                    $this->ID
-                )
-            )
-            ->sort('Name');
-
-        return $tags;
-    }
-
-    /**
-     * Wrapper to find all updates belonging to this holder, based on some filters.
-     */
-    public function Updates($tagID = null, $dateFrom = null, $dateTo = null, $year = null, $monthNumber = null)
-    {
-        $className = Config::inst()->get($this->ClassName, 'update_class');
-        return static::AllUpdates($className, $this->ID, $tagID, $dateFrom, $dateTo, $year, $monthNumber);
-    }
-
-    /**
-     * Find all site's updates, 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|null $parentID The ID of the holder to extract the updates from.
-     * @param int|null $tagID The ID of the tag to filter the updates by.
-     * @param string|null $dateFrom The beginning of a date filter range.
-     * @param string|null $dateTo The end of the date filter range. If empty, only one day will be searched for.
-     * @param int|null $year Numeric value of the year to show.
-     * @param int|null $monthNumber Numeric value of the month to show.
-     *
-     * @returns DataList | PaginatedList
-     */
-    public static function AllUpdates(
-        $className = DatedUpdatePage::class,
-        $parentID = null,
-        $tagID = null,
-        $dateFrom = null,
-        $dateTo = null,
-        $year = null,
-        $monthNumber = null
-    ) {
-
-        $items = $className::get();
-        $dbTableName = DataObject::getSchema()->tableForField($className, 'Date');
-        if (!$dbTableName) {
-            $dbTableName = DatedUpdatePage::class;
-        }
-
-        // Filter by parent holder.
-        if (isset($parentID)) {
-            $items = $items->filter(['ParentID'=>$parentID]);
-        }
-
-        // Filter down to a single tag.
-        if (isset($tagID)) {
-            $taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
-            $tableName = DataObject::getSchema()->tableName($className);
-
-            $items = $items->innerJoin(
-                'BasePage_Terms',
-                sprintf('"%s"."ID" = "BasePage_Terms"."BasePageID"', $tableName)
-            )->innerJoin(
-                $taxonomy,
-                sprintf(
-                    '"BasePage_Terms"."TaxonomyTermID" = "%s"."ID" AND "TaxonomyTerm"."ID" = \'%d\'',
-                    $taxonomy,
-                    $tagID
-                )
-            );
-        }
-
-        // Filter by date
-        if (isset($dateFrom)) {
-            if (!isset($dateTo)) {
-                $dateTo = $dateFrom;
-            }
-
-            $items = $items->where([
-                sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql("$dateFrom 00:00:00")),
-                sprintf('"%s"."Date" <= \'%s\'', $dbTableName, Convert::raw2sql("$dateTo 23:59:59"))
-            ]);
-        }
-
-        // Filter down to single month.
-        if (isset($year) && isset($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"));
-
-            $items = $items->where(array(
-                sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql($beginDate)),
-                sprintf('"%s"."Date" < \'%s\'', $dbTableName, Convert::raw2sql($endDate))
-            ));
-        }
-
-        // Unpaginated DataList.
-        return $items;
-    }
-
-    /**
-     * Produce an ArrayList of available months out of the updates contained in the DataList.
-     *
-     * Here is an example of the returned structure:
-     * ArrayList:
-     *   ArrayData:
-     *     YearName => 2013
-     *     Months => ArrayList:
-     *       MonthName => Jan
-     *       MonthNumber => 1
-     *       MonthLink => (page URL)year=2012&month=1
-     *       Active => true
-     *   ArrayData:
-     *     YearName => 2012
-     *     Months => ArrayList:
-     *     ...
-     *
-     * @param DataList $updates DataList DataList to extract months from.
-     * @param string $link Link used as abase to construct the MonthLink.
-     * @param int $currentYear Currently selected year, for computing the link active state.
-     * @param int $currentMonthNumber Currently selected month, for computing the link active state.
-     *
-     * @returns ArrayList
-     */
-    public static function ExtractMonths(
-        DataList $updates,
-        $link = null,
-        $currentYear = null,
-        $currentMonthNumber = null
-    ) {
-        // Set the link to current URL in the same way the HTTP::setGetVar does it.
-        if (!isset($link)) {
-            $link = Director::makeRelative($_SERVER['REQUEST_URI']);
-        }
-
-        $dates = $updates->dataQuery()
-            ->groupby('YEAR("Date")')
-            ->groupby('MONTH("Date")')
-            ->query()
-            ->setSelect([
-                'Year' => 'YEAR("Date")',
-                'Month' => 'MONTH("Date")',
-            ])
-            ->addWhere('"Date" IS NOT NULL')
-            ->setOrderBy([
-                'YEAR("Date")' => 'DESC',
-                'MONTH("Date")' => 'DESC',
-            ])
-            ->execute();
-
-        $years = [];
-        foreach ($dates as $date) {
-            $monthNumber = $date['Month'];
-            $year = $date['Year'];
-            $dateObj = new DateTime(implode('-', [$year, $monthNumber, 1]));
-            $monthName = $dateObj->Format('M');
-
-            // Set up the relevant year array, if not yet available.
-            if (!isset($years[$year])) {
-                $years[$year] = ['YearName'=>$year, 'Months' => []];
-            }
-
-            // 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);
-            }
-
-            // Build the link - keep the tag and date filter, but reset the pagination.
-            if ($active) {
-                // Allow clicking to deselect the month.
-                $link = HTTP::setGetVar('month', null, $link, '&');
-                $link = HTTP::setGetVar('year', null, $link, '&');
-            } else {
-                $link = HTTP::setGetVar('month', $monthNumber, $link, '&');
-                $link = HTTP::setGetVar('year', $year, $link, '&');
-            }
-            $link = HTTP::setGetVar('start', null, $link, '&');
-
-            $years[$year]['Months'][$monthNumber] = array(
-                'MonthName'=>$monthName,
-                'MonthNumber'=>$monthNumber,
-                'MonthLink'=>$link,
-                'Active'=>$active
-            );
-        }
-
-        // ArrayList will not recursively walk through the supplied array, so manually build nested ArrayLists.
-        foreach ($years as &$year) {
-            $year['Months'] = new ArrayList($year['Months']);
-        }
-
-        // Reverse the list so the most recent years appear first.
-        return new ArrayList($years);
-    }
-
-    public function getDefaultRSSLink()
-    {
-        return $this->Link('rss');
-    }
-
-    public function getDefaultAtomLink()
-    {
-        return $this->Link('atom');
-    }
-
-    public function getSubscriptionTitle()
-    {
-        return $this->Title;
-    }
+	/**
+	 * Meant as an abstract base class.
+	 *
+	 * {@inheritDoc}
+	 */
+	private static $hide_ancestor = DatedUpdateHolder::class;
+
+	private static $update_name = 'Updates';
+
+	private static $update_class = DatedUpdatePage::class;
+
+	private static $singular_name = 'Dated Update Holder';
+
+	private static $plural_name = 'Dated Update Holders';
+
+	private static $table_name = 'DatedUpdateHolder';
+
+	/**
+	 * Find all distinct tags (TaxonomyTerms) associated with the DatedUpdatePages under this holder.
+	 */
+	public function UpdateTags()
+	{
+		$siteTree = DataObject::getSchema()->tableName(SiteTree::class);
+		$taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
+
+		$tags = TaxonomyTerm::get()
+			->innerJoin('BasePage_Terms', sprintf('"%s"."ID"="BasePage_Terms"."TaxonomyTermID"', $taxonomy))
+			->innerJoin(
+				$siteTree,
+				sprintf(
+					'"%s"."ID" = "BasePage_Terms"."BasePageID" AND "%s"."ParentID" = \'%d\'',
+					$siteTree,
+					$siteTree,
+					$this->ID
+				)
+			)
+			->sort('Name');
+
+		return $tags;
+	}
+
+	/**
+	 * Wrapper to find all updates belonging to this holder, based on some filters.
+	 */
+	public function Updates($tagID = null, $dateFrom = null, $dateTo = null, $year = null, $monthNumber = null)
+	{
+		$className = Config::inst()->get($this->ClassName, 'update_class');
+		return static::AllUpdates($className, $this->ID, $tagID, $dateFrom, $dateTo, $year, $monthNumber);
+	}
+
+	/**
+	 * Find all site's updates, 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|null $parentID The ID of the holder to extract the updates from.
+	 * @param int|null $tagID The ID of the tag to filter the updates by.
+	 * @param string|null $dateFrom The beginning of a date filter range.
+	 * @param string|null $dateTo The end of the date filter range. If empty, only one day will be searched for.
+	 * @param int|null $year Numeric value of the year to show.
+	 * @param int|null $monthNumber Numeric value of the month to show.
+	 *
+	 * @returns DataList | PaginatedList
+	 */
+	public static function AllUpdates(
+		$className = DatedUpdatePage::class,
+		$parentID = null,
+		$tagID = null,
+		$dateFrom = null,
+		$dateTo = null,
+		$year = null,
+		$monthNumber = null
+	) {
+
+		$items = $className::get();
+		$dbTableName = DataObject::getSchema()->tableForField($className, 'Date');
+		if (!$dbTableName) {
+			$dbTableName = DatedUpdatePage::class;
+		}
+
+		// Filter by parent holder.
+		if (isset($parentID)) {
+			$items = $items->filter(['ParentID'=>$parentID]);
+		}
+
+		// Filter down to a single tag.
+		if (isset($tagID)) {
+			$taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
+			$tableName = DataObject::getSchema()->tableName($className);
+
+			$items = $items->innerJoin(
+				'BasePage_Terms',
+				sprintf('"%s"."ID" = "BasePage_Terms"."BasePageID"', $tableName)
+			)->innerJoin(
+				$taxonomy,
+				sprintf(
+					'"BasePage_Terms"."TaxonomyTermID" = "%s"."ID" AND "TaxonomyTerm"."ID" = \'%d\'',
+					$taxonomy,
+					$tagID
+				)
+			);
+		}
+
+		// Filter by date
+		if (isset($dateFrom)) {
+			if (!isset($dateTo)) {
+				$dateTo = $dateFrom;
+			}
+
+			$items = $items->where([
+				sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql("$dateFrom 00:00:00")),
+				sprintf('"%s"."Date" <= \'%s\'', $dbTableName, Convert::raw2sql("$dateTo 23:59:59"))
+			]);
+		}
+
+		// Filter down to single month.
+		if (isset($year) && isset($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"));
+
+			$items = $items->where(array(
+				sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql($beginDate)),
+				sprintf('"%s"."Date" < \'%s\'', $dbTableName, Convert::raw2sql($endDate))
+			));
+		}
+
+		// Unpaginated DataList.
+		return $items;
+	}
+
+	/**
+	 * Produce an ArrayList of available months out of the updates contained in the DataList.
+	 *
+	 * Here is an example of the returned structure:
+	 * ArrayList:
+	 *   ArrayData:
+	 *     YearName => 2013
+	 *     Months => ArrayList:
+	 *       MonthName => Jan
+	 *       MonthNumber => 1
+	 *       MonthLink => (page URL)year=2012&month=1
+	 *       Active => true
+	 *   ArrayData:
+	 *     YearName => 2012
+	 *     Months => ArrayList:
+	 *     ...
+	 *
+	 * @param DataList $updates DataList DataList to extract months from.
+	 * @param string $link Link used as abase to construct the MonthLink.
+	 * @param int $currentYear Currently selected year, for computing the link active state.
+	 * @param int $currentMonthNumber Currently selected month, for computing the link active state.
+	 *
+	 * @returns ArrayList
+	 */
+	public static function ExtractMonths(
+		DataList $updates,
+		$link = null,
+		$currentYear = null,
+		$currentMonthNumber = null
+	) {
+		// Set the link to current URL in the same way the HTTP::setGetVar does it.
+		if (!isset($link)) {
+			$link = Director::makeRelative($_SERVER['REQUEST_URI']);
+		}
+
+		$dates = $updates->dataQuery()
+			->groupby('YEAR("Date")')
+			->groupby('MONTH("Date")')
+			->query()
+			->setSelect([
+				'Year' => 'YEAR("Date")',
+				'Month' => 'MONTH("Date")',
+			])
+			->addWhere('"Date" IS NOT NULL')
+			->setOrderBy([
+				'YEAR("Date")' => 'DESC',
+				'MONTH("Date")' => 'DESC',
+			])
+			->execute();
+
+		$years = [];
+		foreach ($dates as $date) {
+			$monthNumber = $date['Month'];
+			$year = $date['Year'];
+			$dateObj = new DateTime(implode('-', [$year, $monthNumber, 1]));
+			$monthName = $dateObj->Format('M');
+
+			// Set up the relevant year array, if not yet available.
+			if (!isset($years[$year])) {
+				$years[$year] = ['YearName'=>$year, 'Months' => []];
+			}
+
+			// 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);
+			}
+
+			// Build the link - keep the tag and date filter, but reset the pagination.
+			if ($active) {
+				// Allow clicking to deselect the month.
+				$link = HTTP::setGetVar('month', null, $link, '&');
+				$link = HTTP::setGetVar('year', null, $link, '&');
+			} else {
+				$link = HTTP::setGetVar('month', $monthNumber, $link, '&');
+				$link = HTTP::setGetVar('year', $year, $link, '&');
+			}
+			$link = HTTP::setGetVar('start', null, $link, '&');
+
+			$years[$year]['Months'][$monthNumber] = array(
+				'MonthName'=>$monthName,
+				'MonthNumber'=>$monthNumber,
+				'MonthLink'=>$link,
+				'Active'=>$active
+			);
+		}
+
+		// ArrayList will not recursively walk through the supplied array, so manually build nested ArrayLists.
+		foreach ($years as &$year) {
+			$year['Months'] = new ArrayList($year['Months']);
+		}
+
+		// Reverse the list so the most recent years appear first.
+		return new ArrayList($years);
+	}
+
+	public function getDefaultRSSLink()
+	{
+		return $this->Link('rss');
+	}
+
+	public function getDefaultAtomLink()
+	{
+		return $this->Link('atom');
+	}
+
+	public function getSubscriptionTitle()
+	{
+		return $this->Title;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -134,8 +134,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"));
@@ -215,7 +215,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.

src/Extensions/CwpWorkflowDefinitionExtension.php

Indentation +29 added lines, -29 removed lines

@@ -12,37 +12,37 @@
  */
 class CwpWorkflowDefinitionExtension extends DataExtension
 {
-    /**
-     * Create the default 'Two-step Workflow' when this extension is loaded
-     *
-     * @config
-     * @var boolean
-     */
-    private static $create_default_workflow = true;
+	/**
+	 * Create the default 'Two-step Workflow' when this extension is loaded
+	 *
+	 * @config
+	 * @var boolean
+	 */
+	private static $create_default_workflow = true;
 
-    public function requireDefaultRecords()
-    {
-        if (Config::inst()->get(CwpWorkflowDefinitionExtension::class, '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;
-            }
+	public function requireDefaultRecords()
+	{
+		if (Config::inst()->get(CwpWorkflowDefinitionExtension::class, '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;
+			}
 
-            //generate from the template, which happens after we write the definition
-            $definition = WorkflowDefinition::create();
-            $definition->Template = "Review and Approve";
-            $definition->write();
+			//generate from the template, which happens after we write the definition
+			$definition = WorkflowDefinition::create();
+			$definition->Template = "Review and Approve";
+			$definition->write();
 
-            //change the title, description, and reminder days
-            $definition->update(array(
-                'Title' => "Two-step Workflow",
-                'Description' => "Content Authors can write content and Content Publishers can approve/reject.",
-                'RemindDays' => 3,
-            ));
-            $definition->write();
+			//change the title, description, and reminder days
+			$definition->update(array(
+				'Title' => "Two-step Workflow",
+				'Description' => "Content Authors can write content and Content Publishers can approve/reject.",
+				'RemindDays' => 3,
+			));
+			$definition->write();
 
-            DB::alteration_message("Added default workflow definition to WorkflowDefinition table", "created");
-        }
-    }
+			DB::alteration_message("Added default workflow definition to WorkflowDefinition table", "created");
+		}
+	}
 }

tests/PageTypes/EventHolderTest.php

Indentation +68 added lines, -68 removed lines

@@ -8,94 +8,94 @@
 
 class EventHolderTest extends SapphireTest
 {
-    protected static $fixture_file = 'EventHolderTest.yml';
+	protected static $fixture_file = 'EventHolderTest.yml';
 
-    public function testEventTags()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventTags()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $tags = $holder->UpdateTags();
-        $this->assertNotNull($tags->find('Name', 'Future'), 'Finds present terms.');
-        $this->assertNull($tags->find('Name', 'Event types', 'Does not find top level taxonomy.'));
-        $this->assertNull($tags->find('Name', 'Carrot'), 'Does not find terms that are not applied.');
-    }
+		$tags = $holder->UpdateTags();
+		$this->assertNotNull($tags->find('Name', 'Future'), 'Finds present terms.');
+		$this->assertNull($tags->find('Name', 'Event types', 'Does not find top level taxonomy.'));
+		$this->assertNull($tags->find('Name', 'Carrot'), 'Does not find terms that are not applied.');
+	}
 
-    public function testEventWithParentFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder2');
+	public function testEventWithParentFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder2');
 
-        $items = $holder->Updates();
+		$items = $holder->Updates();
 
-        $this->assertNotNull($items->find('URLSegment', 'other-holder'), 'Event from the holder is shown.');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Events from other holders are not shown.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'other-holder'), 'Event from the holder is shown.');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Events from other holders are not shown.');
+	}
 
-    public function testEventsWithTagFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithTagFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        //Get the "Future" tag.
-        $tag = $this->objFromFixture(TaxonomyTerm::class, 'TaxonomyTerm1');
+		//Get the "Future" tag.
+		$tag = $this->objFromFixture(TaxonomyTerm::class, 'TaxonomyTerm1');
 
-        $items = $holder->Updates($tag->ID);
+		$items = $holder->Updates($tag->ID);
 
-        $this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the tagged page.');
-        $this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find pages that are not tagged.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the tagged page.');
+		$this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find pages that are not tagged.');
+	}
 
-    public function testEventsWithMonthFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithMonthFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $items = $holder->Updates(null, null, null, 2013, 7);
+		$items = $holder->Updates(null, null, null, 2013, 7);
 
-        $this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the event in 2013-07.');
-        $this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find events at other dates.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the event in 2013-07.');
+		$this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find events at other dates.');
+	}
 
-    public function testEventsWithDateRangeFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithDateRangeFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $items = $holder->Updates(null, '2013-01-19', null);
-        $this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds the event at the date');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find the event at another date');
+		$items = $holder->Updates(null, '2013-01-19', null);
+		$this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds the event at the date');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find the event at another date');
 
-        $items = $holder->Updates(null, '2013-01-01', '2013-01-19');
-        $this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds events in the date range');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find event out of range');
-    }
+		$items = $holder->Updates(null, '2013-01-01', '2013-01-19');
+		$this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds events in the date range');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find event out of range');
+	}
 
-    public function testExtractMonths()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testExtractMonths()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $months = EventHolder::ExtractMonths(
-            $holder->Updates(),
-            'http://mybase.org/?tag=12&start=10&from=2010-10-10&to=2010-10-11', // Used for link generation
-            2013, // Currently selected
-            1 // Currently selected
-        );
+		$months = EventHolder::ExtractMonths(
+			$holder->Updates(),
+			'http://mybase.org/?tag=12&start=10&from=2010-10-10&to=2010-10-11', // Used for link generation
+			2013, // Currently selected
+			1 // Currently selected
+		);
 
-        // Check which years are generated.
-        $this->assertNotNull($months->find('YearName', 2013), 'Generates existing year');
-        $this->assertNull($months->find('YearName', 1990), 'Does not generate non-present year');
+		// Check which years are generated.
+		$this->assertNotNull($months->find('YearName', 2013), 'Generates existing year');
+		$this->assertNull($months->find('YearName', 1990), 'Does not generate non-present year');
 
-        $year = $months->find('YearName', 2013);
+		$year = $months->find('YearName', 2013);
 
-        // Check which months come up in 2013
-        $this->assertNotNull($year['Months']->find('MonthNumber', 7), 'Generates existing month');
-        $this->assertNull($year['Months']->find('MonthNumber', 12), 'Does not generate non-present month');
+		// Check which months come up in 2013
+		$this->assertNotNull($year['Months']->find('MonthNumber', 7), 'Generates existing month');
+		$this->assertNull($year['Months']->find('MonthNumber', 12), 'Does not generate non-present month');
 
-        $month = $year['Months']->find('MonthNumber', 7);
-        $this->assertEquals(
-            $month['MonthLink'],
-            'http://mybase.org/?tag=12&from=2010-10-10&to=2010-10-11&month=7&year=2013',
-            'Selection link is built properly - start is removed, and tag, from and to retained.'
-        );
+		$month = $year['Months']->find('MonthNumber', 7);
+		$this->assertEquals(
+			$month['MonthLink'],
+			'http://mybase.org/?tag=12&from=2010-10-10&to=2010-10-11&month=7&year=2013',
+			'Selection link is built properly - start is removed, and tag, from and to retained.'
+		);
 
-        // Check if these months are marked properly.
-        $month = $year['Months']->find('MonthNumber', 1);
-        $this->assertEquals($month['Active'], true, 'Correctly marks active link');
-    }
+		// Check if these months are marked properly.
+		$month = $year['Months']->find('MonthNumber', 1);
+		$this->assertEquals($month['Active'], true, 'Correctly marks active link');
+	}
 }

src/PageTypes/NewsHolderController.php

Indentation +24 added lines, -24 removed lines

@@ -7,30 +7,30 @@
 
 class NewsHolderController extends DatedUpdateHolderController
 {
-    private static $allowed_actions = [
-        'rss',
-        'atom',
-    ];
+	private static $allowed_actions = [
+		'rss',
+		'atom',
+	];
 
-    public function rss()
-    {
-        $rss = RSSFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('rss'),
-            $this->getSubscriptionTitle()
-        );
-        $rss->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_rss');
-        return $rss->outputToBrowser();
-    }
+	public function rss()
+	{
+		$rss = RSSFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('rss'),
+			$this->getSubscriptionTitle()
+		);
+		$rss->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_rss');
+		return $rss->outputToBrowser();
+	}
 
-    public function atom()
-    {
-        $atom = CwpAtomFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('atom'),
-            $this->getSubscriptionTitle()
-        );
-        $atom->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_atom');
-        return $atom->outputToBrowser();
-    }
+	public function atom()
+	{
+		$atom = CwpAtomFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('atom'),
+			$this->getSubscriptionTitle()
+		);
+		$atom->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_atom');
+		return $atom->outputToBrowser();
+	}
 }