silverstripe / cwp

tests/PageTypes/DatedUpdateHolderControllerTest.php

Indentation +23 added lines, -23 removed lines

@@ -9,36 +9,36 @@
 
 class DatedUpdateHolderControllerTest extends FunctionalTest
 {
-    protected static $fixture_file = 'EventHolderTest.yml';
+	protected static $fixture_file = 'EventHolderTest.yml';
 
-    protected static $use_draft_site = true;
+	protected static $use_draft_site = true;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        // Note: this test requires the starter theme to be installed
-        Config::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
-        Config::modify()->set(SSViewer::class, 'theme', 'starter');
-    }
+		// Note: this test requires the starter theme to be installed
+		Config::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
+		Config::modify()->set(SSViewer::class, 'theme', 'starter');
+	}
 
-    public function testSettingDateFiltersInReverseOrderShowsMessage()
-    {
-        /** @var EventHolder $holder */
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testSettingDateFiltersInReverseOrderShowsMessage()
+	{
+		/** @var EventHolder $holder */
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $result = $this->get($holder->Link() . '?from=2018-01-10&to=2018-01-01');
+		$result = $this->get($holder->Link() . '?from=2018-01-10&to=2018-01-01');
 
-        $this->assertContains('Filter has been applied with the dates reversed', $result->getBody());
-    }
+		$this->assertContains('Filter has been applied with the dates reversed', $result->getBody());
+	}
 
-    public function testSettingFromButNotToDateShowsMessage()
-    {
-        /** @var EventHolder $holder */
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testSettingFromButNotToDateShowsMessage()
+	{
+		/** @var EventHolder $holder */
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $result = $this->get($holder->Link() . '?from=2018-01-10');
+		$result = $this->get($holder->Link() . '?from=2018-01-10');
 
-        $this->assertContains('Filtered by a single date', $result->getBody());
-    }
+		$this->assertContains('Filtered by a single date', $result->getBody());
+	}
 }

src/PageTypes/DatedUpdateHolderController.php

Indentation +357 added lines, -357 removed lines

@@ -34,361 +34,361 @@
  */
 class DatedUpdateHolderController extends PageController
 {
-    private static $allowed_actions = [
-        'rss',
-        'atom',
-        'DateRangeForm',
-    ];
-
-    private static $casting = [
-        'MetaTitle' => 'Text',
-        'FilterDescription' => 'Text',
-    ];
-
-    /**
-     * The session key for storing temporary form messages
-     *
-     * @var string
-     */
-    const TEMP_FORM_MESSAGE = __CLASS__ . '.TempFormMessage';
-
-    /**
-     * Get the meta title for the current action
-     *
-     * @return string
-     */
-    public function getMetaTitle()
-    {
-        $title = $this->data()->getTitle();
-        $filter = $this->FilterDescription();
-        if ($filter) {
-            $title = "{$title} - {$filter}";
-        }
-
-        $this->extend('updateMetaTitle', $title);
-        return $title;
-    }
-
-    /**
-     * Returns a description of the current filter
-     *
-     * @return string
-     */
-    public function FilterDescription()
-    {
-        $params = $this->parseParams();
-
-        $filters = array();
-        if ($params['tag']) {
-            $term = TaxonomyTerm::get_by_id(TaxonomyTerm::class, $params['tag']);
-            if ($term) {
-                $filters[] = _t(
-                    'CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_WITHIN',
-                    'within'
-                ) . ' "' . $term->Name . '"';
-            }
-        }
-
-        if ($params['from'] || $params['to']) {
-            if ($params['from']) {
-                $from = strtotime($params['from']);
-                if ($params['to']) {
-                    $to = strtotime($params['to']);
-                    $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_BETWEEN', 'between') . ' '
-                        . date('j/m/Y', $from) . ' and ' . date('j/m/Y', $to);
-                } else {
-                    $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
-                        . ' ' . date('j/m/Y', $from);
-                }
-            } else {
-                $to = strtotime($params['to']);
-                $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
-                    . ' ' . date('j/m/Y', $to);
-            }
-        }
-
-        if ($params['year'] && $params['month']) {
-            $timestamp = mktime(1, 1, 1, $params['month'], 1, $params['year']);
-            $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_IN', 'in')
-                . ' ' . date('F', $timestamp) . ' ' . $params['year'];
-        }
-
-        if ($filters) {
-            return $this->getUpdateName() . ' ' . implode(' ', $filters);
-        }
-    }
-
-    public function getUpdateName()
-    {
-        return Config::inst()->get($this->data()->ClassName, 'update_name');
-    }
-
-    protected function init()
-    {
-        parent::init();
-        RSSFeed::linkToFeed($this->Link() . 'rss', $this->getSubscriptionTitle());
-    }
-
-    /**
-     * Parse URL parameters.
-     *
-     * @param bool $produceErrorMessages Set to false to omit session messages.
-     */
-    public function parseParams($produceErrorMessages = true)
-    {
-        $tag = $this->request->getVar('tag');
-        $from = $this->request->getVar('from');
-        $to = $this->request->getVar('to');
-        $year = $this->request->getVar('year');
-        $month = $this->request->getVar('month');
-
-        if ($tag == '') {
-            $tag = null;
-        }
-        if ($from == '') {
-            $from = null;
-        }
-        if ($to == '') {
-            $to = null;
-        }
-        if ($year == '') {
-            $year = null;
-        }
-        if ($month == '') {
-            $month = null;
-        }
-
-        if (isset($tag)) {
-            $tag = (int)$tag;
-        }
-        if (isset($from)) {
-            $from = urldecode($from);
-            $parser = DBDatetime::create();
-            $parser->setValue($from);
-            $from = $parser->Format('y-MM-dd');
-        }
-        if (isset($to)) {
-            $to = urldecode($to);
-            $parser = DBDatetime::create();
-            $parser->setValue($to);
-            $to = $parser->Format('y-MM-dd');
-        }
-        if (isset($year)) {
-            $year = (int)$year;
-        }
-        if (isset($month)) {
-            $month = (int)$month;
-        }
-
-        // If only "To" has been provided filter by single date. Normalise by swapping with "From".
-        if (isset($to) && !isset($from)) {
-            list($to, $from) = [$from, $to];
-        }
-
-        // Flip the dates if the order is wrong.
-        if (isset($to) && isset($from) && strtotime($from) > strtotime($to)) {
-            list($to, $from) = [$from, $to];
-
-            if ($produceErrorMessages) {
-                $this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
-                    __CLASS__ . '.FilterAppliedMessage',
-                    'Filter has been applied with the dates reversed.'
-                ));
-            }
-        }
-
-        // Notify the user that filtering by single date is taking place.
-        if (isset($from) && !isset($to)) {
-            if ($produceErrorMessages) {
-                $this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
-                    __CLASS__ . '.DateRangeFilterMessage',
-                    'Filtered by a single date.'
-                ));
-            }
-        }
-
-        return [
-            'tag' => $tag,
-            'from' => $from,
-            'to' => $to,
-            'year' => $year,
-            'month' => $month,
-        ];
-    }
-
-    /**
-     * Build the link - keep the date range, reset the rest.
-     */
-    public function AllTagsLink()
-    {
-        $link = HTTP::setGetVar('tag', null, null, '&');
-        $link = HTTP::setGetVar('month', null, $link, '&');
-        $link = HTTP::setGetVar('year', null, $link, '&');
-        $link = HTTP::setGetVar('start', null, $link, '&');
-
-        return $link;
-    }
-
-    /**
-     * List tags and attach links.
-     */
-    public function UpdateTagsWithLinks()
-    {
-        $tags = $this->UpdateTags();
-
-        $processed = ArrayList::create();
-
-        foreach ($tags as $tag) {
-            // Build the link - keep the tag, and date range, but reset month, year and pagination.
-            $link = HTTP::setGetVar('tag', $tag->ID, null, '&');
-            $link = HTTP::setGetVar('month', null, $link, '&');
-            $link = HTTP::setGetVar('year', null, $link, '&');
-            $link = HTTP::setGetVar('start', null, $link, '&');
-
-            $tag->Link = $link;
-            $processed->push($tag);
-        }
-
-        return $processed;
-    }
-
-    /**
-     * Get the TaxonomyTerm related to the current tag GET parameter.
-     */
-    public function CurrentTag()
-    {
-        $tagID = $this->request->getVar('tag');
-
-        if (isset($tagID)) {
-            return TaxonomyTerm::get_by_id(TaxonomyTerm::class, (int)$tagID);
-        }
-    }
-
-    /**
-     * Extract the available months based on the current query.
-     * Only tag is respected. Pagination and months are ignored.
-     */
-    public function AvailableMonths()
-    {
-        $params = $this->parseParams();
-
-        return DatedUpdateHolder::ExtractMonths(
-            $this->Updates($params['tag'], $params['from'], $params['to']),
-            Director::makeRelative($_SERVER['REQUEST_URI']),
-            $params['year'],
-            $params['month']
-        );
-    }
-
-    /**
-     * Get the updates 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']
-        );
-
-        // Apply pagination
-        $list = PaginatedList::create($items, $this->getRequest());
-        $list->setPageLength($pageSize);
-        return $list;
-    }
-
-    /**
-     * @return Form
-     */
-    public function DateRangeForm()
-    {
-        $dateFromTitle = DBField::create_field('HTMLText', sprintf(
-            '%s <span class="field-note">%s</span>',
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FROM_DATE', 'From date'),
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
-        ));
-        $dateToTitle = DBField::create_field('HTMLText', sprintf(
-            '%s <span class="field-note">%s</span>',
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.TO_DATE', 'To date'),
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
-        ));
-
-        $fields = FieldList::create(
-            DateField::create('from', $dateFromTitle),
-            DateField::create('to', $dateToTitle),
-            HiddenField::create('tag')
-        );
-
-        $actions = FieldList::create(
-            FormAction::create("doDateFilter")
-                ->setTitle(_t(__CLASS__ . '.Filter', 'Filter'))
-                ->addExtraClass('btn btn-primary primary'),
-            FormAction::create("doDateReset")
-                ->setTitle(_t(__CLASS__ . '.Clear', 'Clear'))
-                ->addExtraClass('btn')
-        );
-
-        $form = Form::create($this, 'DateRangeForm', $fields, $actions);
-        $form->loadDataFrom($this->request->getVars());
-        $form->setFormMethod('get');
-
-        // Add any locally stored form messages before returning
-        if ($formMessage = $this->getRequest()->getSession()->get(self::TEMP_FORM_MESSAGE)) {
-            $form->setMessage($formMessage, ValidationResult::TYPE_WARNING);
-            $this->getRequest()->getSession()->clear(self::TEMP_FORM_MESSAGE);
-        }
-
-        return $form;
-    }
-
-    public function doDateFilter()
-    {
-        $params = $this->parseParams();
-
-        // Build the link - keep the tag, but reset month, year and pagination.
-        $link = HTTP::setGetVar('from', $params['from'], $this->AbsoluteLink(), '&');
-        $link = HTTP::setGetVar('to', $params['to'], $link, '&');
-        if (isset($params['tag'])) {
-            $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
-        }
-
-        $this->redirect($link);
-    }
-
-    public function doDateReset()
-    {
-        $params = $this->parseParams(false);
-
-        // Reset the link - only include the tag.
-        $link = $this->AbsoluteLink();
-        if (isset($params['tag'])) {
-            $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
-        }
-
-        $this->redirect($link);
-    }
-
-    public function rss()
-    {
-        $rss = RSSFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('rss'),
-            $this->getSubscriptionTitle()
-        );
-        return $rss->outputToBrowser();
-    }
-
-    public function atom()
-    {
-        $atom = CwpAtomFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('atom'),
-            $this->getSubscriptionTitle()
-        );
-        return $atom->outputToBrowser();
-    }
+	private static $allowed_actions = [
+		'rss',
+		'atom',
+		'DateRangeForm',
+	];
+
+	private static $casting = [
+		'MetaTitle' => 'Text',
+		'FilterDescription' => 'Text',
+	];
+
+	/**
+	 * The session key for storing temporary form messages
+	 *
+	 * @var string
+	 */
+	const TEMP_FORM_MESSAGE = __CLASS__ . '.TempFormMessage';
+
+	/**
+	 * Get the meta title for the current action
+	 *
+	 * @return string
+	 */
+	public function getMetaTitle()
+	{
+		$title = $this->data()->getTitle();
+		$filter = $this->FilterDescription();
+		if ($filter) {
+			$title = "{$title} - {$filter}";
+		}
+
+		$this->extend('updateMetaTitle', $title);
+		return $title;
+	}
+
+	/**
+	 * Returns a description of the current filter
+	 *
+	 * @return string
+	 */
+	public function FilterDescription()
+	{
+		$params = $this->parseParams();
+
+		$filters = array();
+		if ($params['tag']) {
+			$term = TaxonomyTerm::get_by_id(TaxonomyTerm::class, $params['tag']);
+			if ($term) {
+				$filters[] = _t(
+					'CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_WITHIN',
+					'within'
+				) . ' "' . $term->Name . '"';
+			}
+		}
+
+		if ($params['from'] || $params['to']) {
+			if ($params['from']) {
+				$from = strtotime($params['from']);
+				if ($params['to']) {
+					$to = strtotime($params['to']);
+					$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_BETWEEN', 'between') . ' '
+						. date('j/m/Y', $from) . ' and ' . date('j/m/Y', $to);
+				} else {
+					$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
+						. ' ' . date('j/m/Y', $from);
+				}
+			} else {
+				$to = strtotime($params['to']);
+				$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
+					. ' ' . date('j/m/Y', $to);
+			}
+		}
+
+		if ($params['year'] && $params['month']) {
+			$timestamp = mktime(1, 1, 1, $params['month'], 1, $params['year']);
+			$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_IN', 'in')
+				. ' ' . date('F', $timestamp) . ' ' . $params['year'];
+		}
+
+		if ($filters) {
+			return $this->getUpdateName() . ' ' . implode(' ', $filters);
+		}
+	}
+
+	public function getUpdateName()
+	{
+		return Config::inst()->get($this->data()->ClassName, 'update_name');
+	}
+
+	protected function init()
+	{
+		parent::init();
+		RSSFeed::linkToFeed($this->Link() . 'rss', $this->getSubscriptionTitle());
+	}
+
+	/**
+	 * Parse URL parameters.
+	 *
+	 * @param bool $produceErrorMessages Set to false to omit session messages.
+	 */
+	public function parseParams($produceErrorMessages = true)
+	{
+		$tag = $this->request->getVar('tag');
+		$from = $this->request->getVar('from');
+		$to = $this->request->getVar('to');
+		$year = $this->request->getVar('year');
+		$month = $this->request->getVar('month');
+
+		if ($tag == '') {
+			$tag = null;
+		}
+		if ($from == '') {
+			$from = null;
+		}
+		if ($to == '') {
+			$to = null;
+		}
+		if ($year == '') {
+			$year = null;
+		}
+		if ($month == '') {
+			$month = null;
+		}
+
+		if (isset($tag)) {
+			$tag = (int)$tag;
+		}
+		if (isset($from)) {
+			$from = urldecode($from);
+			$parser = DBDatetime::create();
+			$parser->setValue($from);
+			$from = $parser->Format('y-MM-dd');
+		}
+		if (isset($to)) {
+			$to = urldecode($to);
+			$parser = DBDatetime::create();
+			$parser->setValue($to);
+			$to = $parser->Format('y-MM-dd');
+		}
+		if (isset($year)) {
+			$year = (int)$year;
+		}
+		if (isset($month)) {
+			$month = (int)$month;
+		}
+
+		// If only "To" has been provided filter by single date. Normalise by swapping with "From".
+		if (isset($to) && !isset($from)) {
+			list($to, $from) = [$from, $to];
+		}
+
+		// Flip the dates if the order is wrong.
+		if (isset($to) && isset($from) && strtotime($from) > strtotime($to)) {
+			list($to, $from) = [$from, $to];
+
+			if ($produceErrorMessages) {
+				$this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
+					__CLASS__ . '.FilterAppliedMessage',
+					'Filter has been applied with the dates reversed.'
+				));
+			}
+		}
+
+		// Notify the user that filtering by single date is taking place.
+		if (isset($from) && !isset($to)) {
+			if ($produceErrorMessages) {
+				$this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
+					__CLASS__ . '.DateRangeFilterMessage',
+					'Filtered by a single date.'
+				));
+			}
+		}
+
+		return [
+			'tag' => $tag,
+			'from' => $from,
+			'to' => $to,
+			'year' => $year,
+			'month' => $month,
+		];
+	}
+
+	/**
+	 * Build the link - keep the date range, reset the rest.
+	 */
+	public function AllTagsLink()
+	{
+		$link = HTTP::setGetVar('tag', null, null, '&');
+		$link = HTTP::setGetVar('month', null, $link, '&');
+		$link = HTTP::setGetVar('year', null, $link, '&');
+		$link = HTTP::setGetVar('start', null, $link, '&');
+
+		return $link;
+	}
+
+	/**
+	 * List tags and attach links.
+	 */
+	public function UpdateTagsWithLinks()
+	{
+		$tags = $this->UpdateTags();
+
+		$processed = ArrayList::create();
+
+		foreach ($tags as $tag) {
+			// Build the link - keep the tag, and date range, but reset month, year and pagination.
+			$link = HTTP::setGetVar('tag', $tag->ID, null, '&');
+			$link = HTTP::setGetVar('month', null, $link, '&');
+			$link = HTTP::setGetVar('year', null, $link, '&');
+			$link = HTTP::setGetVar('start', null, $link, '&');
+
+			$tag->Link = $link;
+			$processed->push($tag);
+		}
+
+		return $processed;
+	}
+
+	/**
+	 * Get the TaxonomyTerm related to the current tag GET parameter.
+	 */
+	public function CurrentTag()
+	{
+		$tagID = $this->request->getVar('tag');
+
+		if (isset($tagID)) {
+			return TaxonomyTerm::get_by_id(TaxonomyTerm::class, (int)$tagID);
+		}
+	}
+
+	/**
+	 * Extract the available months based on the current query.
+	 * Only tag is respected. Pagination and months are ignored.
+	 */
+	public function AvailableMonths()
+	{
+		$params = $this->parseParams();
+
+		return DatedUpdateHolder::ExtractMonths(
+			$this->Updates($params['tag'], $params['from'], $params['to']),
+			Director::makeRelative($_SERVER['REQUEST_URI']),
+			$params['year'],
+			$params['month']
+		);
+	}
+
+	/**
+	 * Get the updates 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']
+		);
+
+		// Apply pagination
+		$list = PaginatedList::create($items, $this->getRequest());
+		$list->setPageLength($pageSize);
+		return $list;
+	}
+
+	/**
+	 * @return Form
+	 */
+	public function DateRangeForm()
+	{
+		$dateFromTitle = DBField::create_field('HTMLText', sprintf(
+			'%s <span class="field-note">%s</span>',
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FROM_DATE', 'From date'),
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
+		));
+		$dateToTitle = DBField::create_field('HTMLText', sprintf(
+			'%s <span class="field-note">%s</span>',
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.TO_DATE', 'To date'),
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
+		));
+
+		$fields = FieldList::create(
+			DateField::create('from', $dateFromTitle),
+			DateField::create('to', $dateToTitle),
+			HiddenField::create('tag')
+		);
+
+		$actions = FieldList::create(
+			FormAction::create("doDateFilter")
+				->setTitle(_t(__CLASS__ . '.Filter', 'Filter'))
+				->addExtraClass('btn btn-primary primary'),
+			FormAction::create("doDateReset")
+				->setTitle(_t(__CLASS__ . '.Clear', 'Clear'))
+				->addExtraClass('btn')
+		);
+
+		$form = Form::create($this, 'DateRangeForm', $fields, $actions);
+		$form->loadDataFrom($this->request->getVars());
+		$form->setFormMethod('get');
+
+		// Add any locally stored form messages before returning
+		if ($formMessage = $this->getRequest()->getSession()->get(self::TEMP_FORM_MESSAGE)) {
+			$form->setMessage($formMessage, ValidationResult::TYPE_WARNING);
+			$this->getRequest()->getSession()->clear(self::TEMP_FORM_MESSAGE);
+		}
+
+		return $form;
+	}
+
+	public function doDateFilter()
+	{
+		$params = $this->parseParams();
+
+		// Build the link - keep the tag, but reset month, year and pagination.
+		$link = HTTP::setGetVar('from', $params['from'], $this->AbsoluteLink(), '&');
+		$link = HTTP::setGetVar('to', $params['to'], $link, '&');
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
+
+		$this->redirect($link);
+	}
+
+	public function doDateReset()
+	{
+		$params = $this->parseParams(false);
+
+		// Reset the link - only include the tag.
+		$link = $this->AbsoluteLink();
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
+
+		$this->redirect($link);
+	}
+
+	public function rss()
+	{
+		$rss = RSSFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('rss'),
+			$this->getSubscriptionTitle()
+		);
+		return $rss->outputToBrowser();
+	}
+
+	public function atom()
+	{
+		$atom = CwpAtomFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('atom'),
+			$this->getSubscriptionTitle()
+		);
+		return $atom->outputToBrowser();
+	}
 }

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()
+	{
+	}
 }

tests/Report/CwpStatsReportTest.php

Indentation +27 added lines, -27 removed lines

@@ -9,35 +9,35 @@
 
 class CwpStatsReportTest extends SapphireTest
 {
-    protected static $fixture_file = 'CwpStatsReportTest.yml';
+	protected static $fixture_file = 'CwpStatsReportTest.yml';
 
-    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();
+	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();
+		// 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();
+			$page5s->SubsiteID = $subsite->ID;
+			$page5s->write();
+		}
+		$page5s->publishRecursive();
 
-        $report = CwpStatsReport::create();
-        $records = $report->sourceRecords([])->toArray();
-        $i = 0;
-        $this->assertEquals($records[$i++]['Count'], 4, 'Four pages in total, across locales, subsites, live only.');
-        if (class_exists(Subsite::class)) {
-            $this->assertEquals($records[$i++]['Count'], 3, 'Three pages in the main site, if subsites installed.');
-            $this->assertEquals($records[$i++]['Count'], 1, 'One page in the subsite, if subsites installed');
-        }
-        $this->assertEquals($records[$i++]['Count'], 1, 'One file in total.');
-    }
+		$report = CwpStatsReport::create();
+		$records = $report->sourceRecords([])->toArray();
+		$i = 0;
+		$this->assertEquals($records[$i++]['Count'], 4, 'Four pages in total, across locales, subsites, live only.');
+		if (class_exists(Subsite::class)) {
+			$this->assertEquals($records[$i++]['Count'], 3, 'Three pages in the main site, if subsites installed.');
+			$this->assertEquals($records[$i++]['Count'], 1, 'One page in the subsite, if subsites installed');
+		}
+		$this->assertEquals($records[$i++]['Count'], 1, 'One file in total.');
+	}
 }

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

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->setRightTitle(
-            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->setRightTitle(
+			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->setRightTitle(
-            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->setRightTitle(
+			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->setRightTitle(
-            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->setRightTitle(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.TwitterFieldDesc',
+				'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
+			))
+		);
+	}
 }

src/PageTypes/BasePage.php

Indentation +143 added lines, -143 removed lines

@@ -27,147 +27,147 @@
 
 class BasePage extends SiteTree
 {
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
-
-    /**
-     * 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,
-        'RelatedPages' => BasePage::class,
-    ];
-
-    /**
-     * @var array
-     * @config
-     */
-    private static $many_many_extraFields = [
-        'RelatedPages' => [
-            'SortOrder' => DBInt::class,
-        ],
-    ];
-
-    private static $plural_name = 'Base Pages';
-
-    /**
-     * Get the footer holder.
-     */
-    public function getFooter()
-    {
-        return FooterHolder::get_one(FooterHolder::class);
-    }
-
-    public function RelatedPages()
-    {
-        return $this->getManyManyComponents('RelatedPages')->sort('SortOrder');
-    }
-
-    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 GridFieldSortableRows('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->RelatedPages(),
-                    $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'])) {
-                $components = GridFieldConfig_RelationEditor::create();
-                $components->removeComponentsByType(GridFieldAddNewButton::class);
-                $components->removeComponentsByType(GridFieldEditButton::class);
-
-                /** @var GridFieldAddExistingAutocompleter $autoCompleter */
-                $autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
-                $autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
-
-                /** @var GridFieldDataColumns $dataColumns */
-                $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-                $dataColumns->setDisplayFields([
-                    'Name' => _t(__CLASS__ . '.Term', 'Term'),
-                    'TaxonomyName' => _t(__CLASS__ . '.Taxonomy', 'Taxonomy')
-                ]);
-
-                $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;
-    }
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
+
+	/**
+	 * 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,
+		'RelatedPages' => BasePage::class,
+	];
+
+	/**
+	 * @var array
+	 * @config
+	 */
+	private static $many_many_extraFields = [
+		'RelatedPages' => [
+			'SortOrder' => DBInt::class,
+		],
+	];
+
+	private static $plural_name = 'Base Pages';
+
+	/**
+	 * Get the footer holder.
+	 */
+	public function getFooter()
+	{
+		return FooterHolder::get_one(FooterHolder::class);
+	}
+
+	public function RelatedPages()
+	{
+		return $this->getManyManyComponents('RelatedPages')->sort('SortOrder');
+	}
+
+	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 GridFieldSortableRows('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->RelatedPages(),
+					$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'])) {
+				$components = GridFieldConfig_RelationEditor::create();
+				$components->removeComponentsByType(GridFieldAddNewButton::class);
+				$components->removeComponentsByType(GridFieldEditButton::class);
+
+				/** @var GridFieldAddExistingAutocompleter $autoCompleter */
+				$autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
+				$autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
+
+				/** @var GridFieldDataColumns $dataColumns */
+				$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+				$dataColumns->setDisplayFields([
+					'Name' => _t(__CLASS__ . '.Term', 'Term'),
+					'TaxonomyName' => _t(__CLASS__ . '.Taxonomy', 'Taxonomy')
+				]);
+
+				$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/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);
+	}
 }