silverstripe / cwp

src/Extensions/MaintenanceProxyExtension.php

Indentation +41 added lines, -41 removed lines

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

src/Extensions/CwpCommentingExtension.php

Indentation +14 added lines, -14 removed lines

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

src/Model/RelatedPageLink.php

Indentation +23 added lines, -23 removed lines

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

src/Extensions/CustomSiteConfig.php

Indentation +49 added lines, -49 removed lines

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

src/PageTypes/NewsHolder.php

Indentation +46 added lines, -46 removed lines

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

src/PageTypes/SitemapPage.php

Indentation +5 added lines, -5 removed lines

@@ -6,13 +6,13 @@
 
 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';
 
-    private static $icon_class = 'font-icon-sitemap';
+	private static $icon_class = 'font-icon-sitemap';
 }

src/PageTypes/EventHolder.php

Indentation +53 added lines, -53 removed lines

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

src/Model/Quicklink.php

Indentation +117 added lines, -117 removed lines

@@ -15,121 +15,121 @@
  */
 class Quicklink extends DataObject
 {
-    private static $db = [
-        'Name' => 'Varchar(255)',
-        'ExternalLink' => 'Varchar(255)',
-        'SortOrder' => 'Int',
-    ];
-
-    private static $has_one = [
-        'Parent' => BaseHomePage::class,
-        'InternalLink' => SiteTree::class,
-    ];
-
-    private static $summary_fields = [
-        'Name' => 'Name',
-        'InternalLink.Title' => 'Internal Link',
-        'ExternalLink' => 'External Link',
-    ];
-
-    private static $table_name = 'Quicklink';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Name'] = _t(__CLASS__ . '.NameLabel', 'Name');
-        $labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
-        $labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
-        $labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
-        $labels['InternalLinkID'] = _t(__CLASS__ . '.InternalLinkLabel', 'Internal Link');
-
-        return $labels;
-    }
-
-    public function getLink()
-    {
-        if ($this->ExternalLink) {
-            $url = parse_url($this->ExternalLink);
-
-            // if no scheme set in the link, default to http
-            if (!isset($url['scheme'])) {
-                return 'http://' . $this->ExternalLink;
-            }
-
-            return $this->ExternalLink;
-        }
-
-        if ($this->InternalLinkID) {
-            return $this->InternalLink()->Link();
-        }
-    }
-
-    public function canCreate($member = null, $context = [])
-    {
-        // Creating quick links should not be the same permission level as creating parent pages for them, they're
-        // essentially content in the context of the page, so use the edit permission instead.
-        return $this->canEdit($member);
-    }
-
-    public function canEdit($member = null)
-    {
-        return $this->Parent()->canEdit($member);
-    }
-
-    public function canDelete($member = null)
-    {
-        return $this->Parent()->canDelete($member);
-    }
-
-    public function canView($member = null)
-    {
-        return $this->Parent()->canView($member);
-    }
-
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        $fields->removeByName('ParentID');
-
-        $externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
-
-        $fields->removeByName('ExternalLink');
-        $fields->removeByName('InternalLinkID');
-        $fields->removeByName('SortOrder');
-        $externalLinkField->addExtraClass('noBorder');
-
-        $fields->addFieldToTab('Root.Main', CompositeField::create(
-            array(
-                TreeDropdownField::create(
-                    'InternalLinkID',
-                    $this->fieldLabel('InternalLinkID'),
-                    SiteTree::class
-                ),
-                $externalLinkField,
-                $wrap = CompositeField::create(
-                    $extraLabel = LiteralField::create(
-                        'NoteOverride',
-                        sprintf('<div class="message good notice">%s</div>', _t(
-                            __CLASS__ . '.Note',
-                            'Note: If you specify an External Link, the Internal Link will be ignored.'
-                        ))
-                    )
-                )
-            )
-        ));
-        $fields->insertBefore(
-            'Name',
-            LiteralField::create(
-                'Note',
-                sprintf('<p>%s</p>', _t(
-                    __CLASS__ . '.Note2',
-                    'Use this to specify a link to a page either on this site '
-                        . '(Internal Link) or another site (External Link).'
-                ))
-            )
-        );
-
-        return $fields;
-    }
+	private static $db = [
+		'Name' => 'Varchar(255)',
+		'ExternalLink' => 'Varchar(255)',
+		'SortOrder' => 'Int',
+	];
+
+	private static $has_one = [
+		'Parent' => BaseHomePage::class,
+		'InternalLink' => SiteTree::class,
+	];
+
+	private static $summary_fields = [
+		'Name' => 'Name',
+		'InternalLink.Title' => 'Internal Link',
+		'ExternalLink' => 'External Link',
+	];
+
+	private static $table_name = 'Quicklink';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Name'] = _t(__CLASS__ . '.NameLabel', 'Name');
+		$labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
+		$labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
+		$labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
+		$labels['InternalLinkID'] = _t(__CLASS__ . '.InternalLinkLabel', 'Internal Link');
+
+		return $labels;
+	}
+
+	public function getLink()
+	{
+		if ($this->ExternalLink) {
+			$url = parse_url($this->ExternalLink);
+
+			// if no scheme set in the link, default to http
+			if (!isset($url['scheme'])) {
+				return 'http://' . $this->ExternalLink;
+			}
+
+			return $this->ExternalLink;
+		}
+
+		if ($this->InternalLinkID) {
+			return $this->InternalLink()->Link();
+		}
+	}
+
+	public function canCreate($member = null, $context = [])
+	{
+		// Creating quick links should not be the same permission level as creating parent pages for them, they're
+		// essentially content in the context of the page, so use the edit permission instead.
+		return $this->canEdit($member);
+	}
+
+	public function canEdit($member = null)
+	{
+		return $this->Parent()->canEdit($member);
+	}
+
+	public function canDelete($member = null)
+	{
+		return $this->Parent()->canDelete($member);
+	}
+
+	public function canView($member = null)
+	{
+		return $this->Parent()->canView($member);
+	}
+
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		$fields->removeByName('ParentID');
+
+		$externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
+
+		$fields->removeByName('ExternalLink');
+		$fields->removeByName('InternalLinkID');
+		$fields->removeByName('SortOrder');
+		$externalLinkField->addExtraClass('noBorder');
+
+		$fields->addFieldToTab('Root.Main', CompositeField::create(
+			array(
+				TreeDropdownField::create(
+					'InternalLinkID',
+					$this->fieldLabel('InternalLinkID'),
+					SiteTree::class
+				),
+				$externalLinkField,
+				$wrap = CompositeField::create(
+					$extraLabel = LiteralField::create(
+						'NoteOverride',
+						sprintf('<div class="message good notice">%s</div>', _t(
+							__CLASS__ . '.Note',
+							'Note: If you specify an External Link, the Internal Link will be ignored.'
+						))
+					)
+				)
+			)
+		));
+		$fields->insertBefore(
+			'Name',
+			LiteralField::create(
+				'Note',
+				sprintf('<p>%s</p>', _t(
+					__CLASS__ . '.Note2',
+					'Use this to specify a link to a page either on this site '
+						. '(Internal Link) or another site (External Link).'
+				))
+			)
+		);
+
+		return $fields;
+	}
 }

tests/PageTypes/NewsPageTest.php

Indentation +14 added lines, -14 removed lines

@@ -9,21 +9,21 @@
 
 class NewsPageTest extends SapphireTest
 {
-    protected $usesDatabase = true;
+	protected $usesDatabase = true;
 
-    public function testGetNewsPageAuthor()
-    {
-        $holder = new NewsHolder();
-        $holder->Title = 'Holder';
-        $holder->write();
+	public function testGetNewsPageAuthor()
+	{
+		$holder = new NewsHolder();
+		$holder->Title = 'Holder';
+		$holder->write();
 
-        $page = new NewsPage();
-        $page->Author = 'Leslie Lawless';
-        $page->ParentID = $holder->ID;
-        $page->write();
+		$page = new NewsPage();
+		$page->Author = 'Leslie Lawless';
+		$page->ParentID = $holder->ID;
+		$page->write();
 
-        $field = $page->getNewsPageAuthor();
-        $this->assertInstanceOf(DBField::class, $field);
-        $this->assertSame('Leslie Lawless', $field->getValue());
-    }
+		$field = $page->getNewsPageAuthor();
+		$this->assertInstanceOf(DBField::class, $field);
+		$this->assertSame('Leslie Lawless', $field->getValue());
+	}
 }