Run the upgrader & linting tools

An initial (untested) run at a proper upgrade. Progress commit.

src/Controllers/CMSExternalLinks.php

@@ -2,14 +2,14 @@
 
 namespace SilverStripe\ExternalLinks\Controllers;
 
-use Controller;
+use SilverStripe\Control\HTTP;
-use HTTP;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
-use BrokenExternalPageTrackStatus;
+use SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob;
-use CheckExternalLinksJob;
+use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask;
-use CheckExternalLinksTask;
+use SilverStripe\Control\Controller;
 
-
+class CMSExternalLinks_Controller extends Controller
-class CMSExternalLinks_Controller extends Controller {
+{
 
     private static $allowed_actions = array('getJobStatus', 'start');
 
@@ -18,7 +18,8 @@ class CMSExternalLinks_Controller extends Controller {
 	 *
 	 * @return string JSON string detailing status of the job
 	 */
-	public function getJobStatus() {
+    public function getJobStatus()
+    {
         // Set headers
         HTTP::set_cache_age(0);
         HTTP::add_cache_headers($this->response);
@@ -29,22 +30,27 @@ class CMSExternalLinks_Controller extends Controller {
 
         // Format status
         $track = BrokenExternalPageTrackStatus::get_latest();
-		if($track) return json_encode(array(
+        if ($track) {
+            return json_encode(array(
             'TrackID' => $track->ID,
             'Status' => $track->Status,
             'Completed' => $track->getCompletedPages(),
             'Total' => $track->getTotalPages()
             ));
         }
+    }
 
 
     /*
 	 * Starts a broken external link check
 	 */
-	public function start() {
+    public function start()
+    {
         // return if the a job is already running
         $status = BrokenExternalPageTrackStatus::get_latest();
-		if ($status && $status->Status == 'Running') return;
+        if ($status && $status->Status == 'Running') {
+            return;
+        }
 
         // Create a new job
         if (class_exists('QueuedJobService')) {

src/Jobs/CheckExternalLinksJob.php

@@ -4,38 +4,44 @@ namespace SilverStripe\ExternalLinks\Jobs;
 
 use AbstractQueuedJob;
 use QueuedJob;
-use CheckExternalLinksTask;
 
+use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask;
 
-if(!class_exists('AbstractQueuedJob')) return;
+if (!class_exists('AbstractQueuedJob')) {
+    return;
+}
 
 /**
  * A Job for running a external link check for published pages
  *
  */
-class CheckExternalLinksJob extends AbstractQueuedJob implements QueuedJob {
+class CheckExternalLinksJob extends AbstractQueuedJob implements QueuedJob
+{
 
-	public function getTitle() {
+    public function getTitle()
+    {
         return _t('CheckExternalLiksJob.TITLE', 'Checking for external broken links');
     }
 
-	public function getJobType() {
+    public function getJobType()
+    {
         return QueuedJob::QUEUED;
     }
 
-	public function getSignature() {
+    public function getSignature()
+    {
         return md5(get_class($this));
     }
 
     /**
      * Check an individual page
      */
-	public function process() {
+    public function process()
+    {
         $task = CheckExternalLinksTask::create();
         $track = $task->runLinksCheck(1);
         $this->currentStep = $track->CompletedPages;
         $this->totalSteps = $track->TotalPages;
         $this->isComplete = $track->Status === 'Completed';
     }
-
 }

src/Model/BrokenExternalLink.php

@@ -2,11 +2,13 @@
 
 namespace SilverStripe\ExternalLinks\Model;
 
-use DataObject;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack;
-use Member;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
-use Permission;
+use SilverStripe\Security\Member;
-use Config;
+use SilverStripe\Security\Permission;
-
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Control\HTTPResponse;
+use SilverStripe\ORM\DataObject;
 
 /**
  * Represents a single link checked for a single run that is broken
@@ -14,7 +16,8 @@ use Config;
  * @method BrokenExternalPageTrack Track()
  * @method BrokenExternalPageTrackStatus Status()
  */
-class BrokenExternalLink extends DataObject {
+class BrokenExternalLink extends DataObject
+{
 
     private static $db = array(
         'Link' => 'Varchar(2083)', // 2083 is the maximum length of a URL in Internet Explorer.
@@ -22,8 +25,8 @@ class BrokenExternalLink extends DataObject {
     );
 
     private static $has_one = array(
-		'Track' => 'BrokenExternalPageTrack',
+        'Track' => BrokenExternalPageTrack::class,
-		'Status' => 'BrokenExternalPageTrackStatus'
+        'Status' => BrokenExternalPageTrackStatus::class
     );
 
     private static $summary_fields = array(
@@ -40,15 +43,18 @@ class BrokenExternalLink extends DataObject {
     /**
      * @return SiteTree
      */
-	public function Page() {
+    public function Page()
+    {
         return $this->Track()->Page();
     }
 
-	public function canEdit($member = false) {
+    public function canEdit($member = false)
+    {
         return false;
     }
 
-	public function canView($member = false) {
+    public function canView($member = false)
+    {
         $member = $member ? $member : Member::currentUser();
         $codes = array('content-authors', 'administrators');
         return Permission::checkMember($member, $codes);
@@ -59,13 +65,13 @@ class BrokenExternalLink extends DataObject {
      *
      * @return string
      */
-	public function getHTTPCodeDescription() {
+    public function getHTTPCodeDescription()
+    {
         $code = $this->HTTPCode;
-		if(empty($code)) {
+        if (empty($code)) {
             // Assume that $code = 0 means there was no response
             $description = _t('BrokenExternalLink.NOTAVAILABLE', 'Server Not Available');
-		} elseif(
+        } elseif (($descriptions = Config::inst()->get(HTTPResponse::class, 'status_codes'))
-			($descriptions = Config::inst()->get('SS_HTTPResponse', 'status_codes'))
             && isset($descriptions[$code])
         ) {
             $description = $descriptions[$code];
@@ -75,5 +81,3 @@ class BrokenExternalLink extends DataObject {
         return sprintf("%d (%s)", $code, $description);
     }
 }
-
-

src/Model/BrokenExternalPageTrack.php

@@ -2,33 +2,37 @@
 
 namespace SilverStripe\ExternalLinks\Model;
 
-use DataObject;
+use SilverStripe\CMS\Model\SiteTree;
-use Versioned;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
-
+use SilverStripe\ExternalLinks\Model\BrokenExternalLink;
+use SilverStripe\Versioned\Versioned;
+use SilverStripe\ORM\DataObject;
 
 /**
  * Represents a track for a single page
  */
-class BrokenExternalPageTrack extends DataObject {
+class BrokenExternalPageTrack extends DataObject
+{
 
     private static $db = array(
         'Processed' => 'Boolean'
     );
 
     private static $has_one = array(
-		'Page' => 'SiteTree',
+        'Page' => SiteTree::class,
-		'Status' => 'BrokenExternalPageTrackStatus'
+        'Status' => BrokenExternalPageTrackStatus::class
     );
 
     private static $has_many = array(
-		'BrokenLinks' => 'BrokenExternalLink'
+        'BrokenLinks' => BrokenExternalLink::class
     );
 
     /**
      * @return SiteTree
      */
-	public function Page() {
+    public function Page()
-		return Versioned::get_by_stage('SiteTree', 'Stage')
+    {
+        return Versioned::get_by_stage(SiteTree::class, 'Stage')
             ->byID($this->PageID);
     }
 }

src/Model/BrokenExternalPageTrackStatus.php

@@ -2,9 +2,11 @@
 
 namespace SilverStripe\ExternalLinks\Model;
 
-use DataObject;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack;
-use Versioned;
+use SilverStripe\ExternalLinks\Model\BrokenExternalLink;
-
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Versioned\Versioned;
+use SilverStripe\ORM\DataObject;
 
 /**
  * Represents the status of a track run
@@ -14,7 +16,8 @@ use Versioned;
  * @property int $TotalPages Get total pages count
  * @property int $CompletedPages Get completed pages count
  */
-class BrokenExternalPageTrackStatus extends DataObject {
+class BrokenExternalPageTrackStatus extends DataObject
+{
 
     private static $db = array(
         'Status' => 'Enum("Completed, Running", "Running")',
@@ -22,8 +25,8 @@ class BrokenExternalPageTrackStatus extends DataObject {
     );
 
     private static $has_many = array(
-		'TrackedPages' => 'BrokenExternalPageTrack',
+        'TrackedPages' => BrokenExternalPageTrack::class,
-		'BrokenLinks' => 'BrokenExternalLink'
+        'BrokenLinks' => BrokenExternalLink::class
     );
 
     /**
@@ -31,7 +34,8 @@ class BrokenExternalPageTrackStatus extends DataObject {
      *
      * @return self
      */
-	public static function get_latest() {
+    public static function get_latest()
+    {
         return self::get()
             ->sort('ID', 'DESC')
             ->first();
@@ -42,20 +46,24 @@ class BrokenExternalPageTrackStatus extends DataObject {
      *
      * @return DataList
      */
-	public function getIncompletePageList() {
+    public function getIncompletePageList()
+    {
         $pageIDs = $this
             ->getIncompleteTracks()
             ->column('PageID');
-		if($pageIDs) return Versioned::get_by_stage('SiteTree', 'Stage')
+        if ($pageIDs) {
+            return Versioned::get_by_stage(SiteTree::class, 'Stage')
             ->byIDs($pageIDs);
         }
+    }
 
     /**
      * Get the list of incomplete BrokenExternalPageTrack
      *
      * @return DataList
      */
-	public function getIncompleteTracks() {
+    public function getIncompleteTracks()
+    {
         return $this
             ->TrackedPages()
             ->filter('Processed', 0);
@@ -64,14 +72,16 @@ class BrokenExternalPageTrackStatus extends DataObject {
     /**
      * Get total pages count
      */
-	public function getTotalPages() {
+    public function getTotalPages()
+    {
         return $this->TrackedPages()->count();
     }
 
     /**
      * Get completed pages count
      */
-	public function getCompletedPages() {
+    public function getCompletedPages()
+    {
         return $this
             ->TrackedPages()
             ->filter('Processed', 1)
@@ -83,7 +93,8 @@ class BrokenExternalPageTrackStatus extends DataObject {
      *
      * @return self
      */
-	public static function get_or_create() {
+    public static function get_or_create()
+    {
         // Check the current status
         $status = self::get_latest();
         if ($status && $status->Status == 'Running') {
@@ -99,13 +110,14 @@ class BrokenExternalPageTrackStatus extends DataObject {
 	 *
 	 * @return self
 	 */
-	public static function create_status() {
+    public static function create_status()
+    {
         // If the script is to be started create a new status
         $status = self::create();
         $status->updateJobInfo('Creating new tracking object');
 
         // Setup all pages to test
-		$pageIDs = Versioned::get_by_stage('SiteTree', 'Stage')
+        $pageIDs = Versioned::get_by_stage(SiteTree::class, 'Stage')
             ->column('ID');
         foreach ($pageIDs as $pageID) {
             $trackPage = BrokenExternalPageTrack::create();
@@ -117,7 +129,8 @@ class BrokenExternalPageTrackStatus extends DataObject {
         return $status;
     }
 
-	public function updateJobInfo($message) {
+    public function updateJobInfo($message)
+    {
         $this->JobInfo = $message;
         $this->write();
     }
@@ -125,7 +138,8 @@ class BrokenExternalPageTrackStatus extends DataObject {
     /**
      * Self check status
      */
-	public function updateStatus() {
+    public function updateStatus()
+    {
         if ($this->CompletedPages == $this->TotalPages) {
             $this->Status = 'Completed';
             $this->updateJobInfo('Setting to completed');

src/Reports/BrokenExternalLinksReport.php

@@ -2,13 +2,12 @@
 
 namespace SilverStripe\ExternalLinks\Reports;
 
-use SS_Report;
+use SilverStripe\Core\Convert;
-use Convert;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
-use BrokenExternalPageTrackStatus;
+use SilverStripe\ORM\ArrayList;
-use ArrayList;
+use SilverStripe\View\Requirements;
-use Requirements;
+use SilverStripe\Forms\LiteralField;
-use LiteralField;
+use SilverStripe\Reports\Report;
-
 
 /**
  * Content side-report listing pages with external broken links
@@ -16,23 +15,26 @@ use LiteralField;
  * @subpackage content
  */
 
-class BrokenExternalLinksReport extends SS_Report {
+class BrokenExternalLinksReport extends Report
+{
 
     /**
      * Returns the report title
      *
      * @return string
      */
-	public function title() {
+    public function title()
+    {
         return _t('ExternalBrokenLinksReport.EXTERNALBROKENLINKS', "External broken links report");
     }
 
-	public function columns() {
+    public function columns()
+    {
         return array(
             "Created" => "Checked",
             'Link' => array(
                 'title' => 'External Link',
-				'formatting' => function($value, $item) {
+                'formatting' => function ($value, $item) {
                     return sprintf(
                         '<a target="_blank" href="%s">%s</a>',
                         Convert::raw2att($item->Link),
@@ -43,7 +45,7 @@ class BrokenExternalLinksReport extends SS_Report {
             'HTTPCodeDescription' => 'HTTP Error Code',
             "Title" => array(
                 "title" => 'Page link is on',
-				'formatting' => function($value, $item) {
+                'formatting' => function ($value, $item) {
                     $page = $item->Page();
                     return sprintf(
                         '<a href="%s">%s</a>',
@@ -60,17 +62,22 @@ class BrokenExternalLinksReport extends SS_Report {
      * in {@link GridFieldExportButton} generateExportFileData method.
      * @return array
      */
-	public function getColumns() {
+    public function getColumns()
+    {
         return $this->columns();
     }
 
-	public function sourceRecords() {
+    public function sourceRecords()
+    {
         $track = BrokenExternalPageTrackStatus::get_latest();
-		if ($track) return $track->BrokenLinks();
+        if ($track) {
+            return $track->BrokenLinks();
+        }
         return new ArrayList();
     }
 
-	public function getCMSFields() {
+    public function getCMSFields()
+    {
         Requirements::javascript('externallinks/javascript/BrokenExternalLinksReport.js');
         $fields = parent::getCMSFields();
 

src/Tasks/CheckExternalLinksTask.php

@@ -2,18 +2,23 @@
 
 namespace SilverStripe\ExternalLinks\Tasks;
 
-use BuildTask;
-use Debug;
-use BrokenExternalPageTrack;
 use DOMNode;
-use BrokenExternalLink;
-use Config;
-use BrokenExternalPageTrackStatus;
-use Injector;
-use DB;
 
 
-class CheckExternalLinksTask extends BuildTask {
+
+
+
+use SilverStripe\Dev\Debug;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack;
+use SilverStripe\ExternalLinks\Model\BrokenExternalLink;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
+use SilverStripe\Core\Injector\Injector;
+use SilverStripe\ORM\DB;
+use SilverStripe\Dev\BuildTask;
+
+class CheckExternalLinksTask extends BuildTask
+{
 
     private static $dependencies = array(
         'LinkChecker' => '%$LinkChecker'
@@ -40,11 +45,15 @@ class CheckExternalLinksTask extends BuildTask {
      *
      * @param string $message
      */
-	protected function log($message) {
+    protected function log($message)
-		if(!$this->silent) Debug::message($message);
+    {
+        if (!$this->silent) {
+            Debug::message($message);
+        }
     }
 
-	public function run($request) {
+    public function run($request)
+    {
         $this->runLinksCheck();
     }
     /**
@@ -52,21 +61,24 @@ class CheckExternalLinksTask extends BuildTask {
      *
      * @param bool $silent
      */
-	public function setSilent($silent) {
+    public function setSilent($silent)
+    {
         $this->silent = $silent;
     }
 
     /**
      * @param LinkChecker $linkChecker
      */
-	public function setLinkChecker(LinkChecker $linkChecker) {
+    public function setLinkChecker(LinkChecker $linkChecker)
+    {
         $this->linkChecker = $linkChecker;
     }
 
     /**
      * @return LinkChecker
      */
-	public function getLinkChecker() {
+    public function getLinkChecker()
+    {
         return $this->linkChecker;
     }
 
@@ -76,17 +88,20 @@ class CheckExternalLinksTask extends BuildTask {
      * @param BrokenExternalPageTrack $pageTrack
      * @param DOMNode $link
      */
-	protected function checkPageLink(BrokenExternalPageTrack $pageTrack, DOMNode $link) {
+    protected function checkPageLink(BrokenExternalPageTrack $pageTrack, DOMNode $link)
+    {
         $class = $link->getAttribute('class');
         $href = $link->getAttribute('href');
         $markedBroken = preg_match('/\b(ss-broken)\b/', $class);
 
         // Check link
         $httpCode = $this->linkChecker->checkLink($href);
-		if($httpCode === null) return; // Null link means uncheckable, such as an internal link
+        if ($httpCode === null) {
+            return; // Null link means uncheckable, such as an internal link
+        }
 
         // If this code is broken then mark as such
-		if($foundBroken = $this->isCodeBroken($httpCode)) {
+        if ($foundBroken = $this->isCodeBroken($httpCode)) {
             // Create broken record
             $brokenLink = new BrokenExternalLink();
             $brokenLink->Link = $href;
@@ -97,8 +112,10 @@ class CheckExternalLinksTask extends BuildTask {
         }
 
         // Check if we need to update CSS class, otherwise return
-		if($markedBroken == $foundBroken) return;
+        if ($markedBroken == $foundBroken) {
-		if($foundBroken) {
+            return;
+        }
+        if ($foundBroken) {
             $class .= ' ss-broken';
         } else {
             $class = preg_replace('/\s*\b(ss-broken)\b\s*/', ' ', $class);
@@ -112,13 +129,18 @@ class CheckExternalLinksTask extends BuildTask {
      * @param int $httpCode
      * @return bool True if this is a broken code
      */
-	protected function isCodeBroken($httpCode) {
+    protected function isCodeBroken($httpCode)
+    {
         // Null represents no request attempted
-		if($httpCode === null) return false;
+        if ($httpCode === null) {
+            return false;
+        }
 
         // do we have any whitelisted codes
         $ignoreCodes = Config::inst()->get('CheckExternalLinks', 'IgnoreCodes');
-		if(is_array($ignoreCodes) && in_array($httpCode, $ignoreCodes)) return false;
+        if (is_array($ignoreCodes) && in_array($httpCode, $ignoreCodes)) {
+            return false;
+        }
 
         // Check if code is outside valid range
         return $httpCode < 200 || $httpCode > 302;
@@ -130,13 +152,16 @@ class CheckExternalLinksTask extends BuildTask {
      * @param int $limit Limit to number of pages to run, or null to run all
      * @return BrokenExternalPageTrackStatus
      */
-	public function runLinksCheck($limit = null) {
+    public function runLinksCheck($limit = null)
+    {
         // Check the current status
         $status = BrokenExternalPageTrackStatus::get_or_create();
 
         // Calculate pages to run
         $pageTracks = $status->getIncompleteTracks();
-		if($limit) $pageTracks = $pageTracks->limit($limit);
+        if ($limit) {
+            $pageTracks = $pageTracks->limit($limit);
+        }
 
         // Check each page
         foreach ($pageTracks as $pageTrack) {
@@ -148,11 +173,13 @@ class CheckExternalLinksTask extends BuildTask {
             $page = $pageTrack->Page();
             $this->log("Checking {$page->Title}");
             $htmlValue = Injector::inst()->create('HTMLValue', $page->Content);
-			if (!$htmlValue->isValid()) continue;
+            if (!$htmlValue->isValid()) {
+                continue;
+            }
 
             // Check each link
             $links = $htmlValue->getElementsByTagName('a');
-			foreach($links as $link) {
+            foreach ($links as $link) {
                 $this->checkPageLink($pageTrack, $link);
             }
 
@@ -164,7 +191,7 @@ class CheckExternalLinksTask extends BuildTask {
             // Once all links have been created for this page update HasBrokenLinks
             $count = $pageTrack->BrokenLinks()->count();
             $this->log("Found {$count} broken links");
-			if($count) {
+            if ($count) {
                 // Bypass the ORM as syncLinkTracking does not allow you to update HasBrokenLink to true
                 DB::query(sprintf(
                     'UPDATE "SiteTree" SET "HasBrokenLink" = 1 WHERE "ID" = \'%d\'',
@@ -178,7 +205,8 @@ class CheckExternalLinksTask extends BuildTask {
         return $status;
     }
 
-	private function updateCompletedPages($trackID = 0) {
+    private function updateCompletedPages($trackID = 0)
+    {
         $noPages = BrokenExternalPageTrack::get()
             ->filter(array(
                 'TrackID' => $trackID,
@@ -191,9 +219,10 @@ class CheckExternalLinksTask extends BuildTask {
         return $noPages;
     }
 
-	private function updateJobInfo($message) {
+    private function updateJobInfo($message)
+    {
         $track = BrokenExternalPageTrackStatus::get_latest();
-		if($track) {
+        if ($track) {
             $track->JobInfo = $message;
             $track->write();
         }

src/Tasks/CurlLinkChecker.php

@@ -4,18 +4,19 @@ namespace SilverStripe\ExternalLinks\Tasks;
 
 use SS_Cache;
 
-
 /**
  * Check links using curl
  */
-class CurlLinkChecker implements LinkChecker {
+class CurlLinkChecker implements LinkChecker
+{
 
     /**
      * Return cache
      *
      * @return Zend_Cache_Frontend
      */
-	protected function getCache() {
+    protected function getCache()
+    {
         return SS_Cache::factory(
             __CLASS__,
             'Output',
@@ -29,18 +30,23 @@ class CurlLinkChecker implements LinkChecker {
      * @param string $href URL to check
      * @return int HTTP status code, or null if not checkable (not a link)
      */
-	public function checkLink($href) {
+    public function checkLink($href)
+    {
         // Skip non-external links
-		if(!preg_match('/^https?[^:]*:\/\//', $href)) return null;
+        if (!preg_match('/^https?[^:]*:\/\//', $href)) {
+            return null;
+        }
 
         // Check if we have a cached result
         $cacheKey = md5($href);
         $result = $this->getCache()->load($cacheKey);
-		if($result !== false) return $result;
+        if ($result !== false) {
+            return $result;
+        }
 
         // No cached result so just request
         $handle = curl_init($href);
-		curl_setopt($handle, CURLOPT_RETURNTRANSFER, TRUE);
+        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
         curl_setopt($handle, CURLOPT_TIMEOUT, 10);
         curl_exec($handle);

src/Tasks/LinkChecker.php

@@ -2,13 +2,11 @@
 
 namespace SilverStripe\ExternalLinks\Tasks;
 
-
-
-
 /**
  * Provides an interface for checking that a link is valid
  */
-interface LinkChecker {
+interface LinkChecker
+{
     
     /**
      * Determine the http status code for a given link

tests/ExternalLinksTest.php

@@ -1,6 +1,16 @@
 <?php
 
-class ExternalLinksTest extends SapphireTest {
+use SilverStripe\ExternalLinks\Tasks\LinkChecker;
+use SilverStripe\Core\Injector\Injector;
+use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask;
+use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
+use SilverStripe\i18n\i18n;
+use SilverStripe\Reports\Report;
+use SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport;
+use SilverStripe\Dev\SapphireTest;
+
+class ExternalLinksTest extends SapphireTest
+{
 
     protected static $fixture_file = 'ExternalLinksTest.yml';
 
@@ -12,7 +22,8 @@ class ExternalLinksTest extends SapphireTest {
         'SiteTree' => array('Translatable')
     );
 
-	public function setUpOnce() {
+    public function setUpOnce()
+    {
         if (class_exists('Phockito')) {
             Phockito::include_hamcrest(false);
         }
@@ -20,7 +31,8 @@ class ExternalLinksTest extends SapphireTest {
         parent::setUpOnce();
     }
 
-	public function setUp() {
+    public function setUp()
+    {
         parent::setUp();
 
         // Check dependencies
@@ -30,7 +42,7 @@ class ExternalLinksTest extends SapphireTest {
         }
 
         // Mock link checker
-		$checker = Phockito::mock('LinkChecker');
+        $checker = Phockito::mock(LinkChecker::class);
         Phockito::when($checker)
             ->checkLink('http://www.working.com')
             ->return(200);
@@ -71,10 +83,11 @@ class ExternalLinksTest extends SapphireTest {
             ->checkLink(Hamcrest_Matchers::anything()) // anything else is 404
             ->return(404);
 
-		Injector::inst()->registerService($checker, 'LinkChecker');
+        Injector::inst()->registerService($checker, LinkChecker::class);
     }
 
-	public function testLinks() {
+    public function testLinks()
+    {
         // Run link checker
         $task = CheckExternalLinksTask::create();
         $task->setSilent(true); // Be quiet during the test!
@@ -87,7 +100,7 @@ class ExternalLinksTest extends SapphireTest {
         $this->assertEquals(5, $status->CompletedPages);
 
         // Check all pages have had the correct HTML adjusted
-		for($i = 1; $i <= 5; $i++) {
+        for ($i = 1; $i <= 5; $i++) {
             $page = $this->objFromFixture('ExternalLinksTestPage', 'page'.$i);
             $this->assertNotEmpty($page->Content);
             $this->assertEquals(
@@ -136,13 +149,17 @@ class ExternalLinksTest extends SapphireTest {
     /**
      * Test that broken links appears in the reports list
      */
-	public function testReportExists() {
+    public function testReportExists()
-		$reports = SS_Report::get_reports();
+    {
+        $reports = Report::get_reports();
         $reportNames = array();
-		foreach($reports as $report) {
+        foreach ($reports as $report) {
             $reportNames[] = $report->class;
         }
-		$this->assertContains('BrokenExternalLinksReport',$reportNames,
+        $this->assertContains(
-			'BrokenExternalLinksReport is in reports list');
+            BrokenExternalLinksReport::class,
+            $reportNames,
+            'BrokenExternalLinksReport is in reports list'
+        );
     }
 }

tests/ExternalLinksTestPage.php

@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Dev\TestOnly;
+
 class ExternalLinksTestPage extends Page implements TestOnly
 {
     private static $db = array(