From a88e8be403dd4c1701a840db7f56d16d2e277631 Mon Sep 17 00:00:00 2001 From: Dylan Wagstaff Date: Thu, 23 Nov 2017 13:19:00 +1300 Subject: [PATCH] FIX Linting errors for code cleanliness --- .upgrade.yml | 2 +- _config/routes.yml | 2 +- src/Controllers/CMSExternalLinks.php | 2 +- src/Jobs/CheckExternalLinksJob.php | 72 ++++++++++++++-------------- tests/ExternalLinksTest.php | 2 + tests/ExternalLinksTestPage.php | 2 + 6 files changed, 42 insertions(+), 40 deletions(-) diff --git a/.upgrade.yml b/.upgrade.yml index ce4f759..5bad3f1 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -1,5 +1,5 @@ mappings: - CMSExternalLinks_Controller: SilverStripe\ExternalLinks\Controllers\CMSExternalLinks_Controller + CMSExternalLinks_Controller: SilverStripe\ExternalLinks\Controllers\CMSExternalLinksController CheckExternalLinksJob: SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob BrokenExternalLink: SilverStripe\ExternalLinks\Model\BrokenExternalLink BrokenExternalPageTrack: SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack diff --git a/_config/routes.yml b/_config/routes.yml index 2284d3a..7320d40 100644 --- a/_config/routes.yml +++ b/_config/routes.yml @@ -4,4 +4,4 @@ After: framework/routes --- Director: rules: - 'admin/externallinks//$Action': 'CMSExternalLinks_Controller' + 'admin/externallinks//$Action': 'CMSExternalLinksController' diff --git a/src/Controllers/CMSExternalLinks.php b/src/Controllers/CMSExternalLinks.php index a725ae9..595e4db 100644 --- a/src/Controllers/CMSExternalLinks.php +++ b/src/Controllers/CMSExternalLinks.php @@ -8,7 +8,7 @@ use SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob; use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask; use SilverStripe\Control\Controller; -class CMSExternalLinks_Controller extends Controller +class CMSExternalLinksController extends Controller { private static $allowed_actions = array('getJobStatus', 'start'); diff --git a/src/Jobs/CheckExternalLinksJob.php b/src/Jobs/CheckExternalLinksJob.php index 662d81d..aac7589 100644 --- a/src/Jobs/CheckExternalLinksJob.php +++ b/src/Jobs/CheckExternalLinksJob.php @@ -2,46 +2,44 @@ namespace SilverStripe\ExternalLinks\Jobs; -use AbstractQueuedJob; -use QueuedJob; - -use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask; - -if (!class_exists('AbstractQueuedJob')) { - return; -} - -/** - * A Job for running a external link check for published pages - * - */ -class CheckExternalLinksJob extends AbstractQueuedJob implements QueuedJob -{ - - public function getTitle() - { - return _t('CheckExternalLiksJob.TITLE', 'Checking for external broken links'); - } - - public function getJobType() - { - return QueuedJob::QUEUED; - } - - public function getSignature() - { - return md5(get_class($this)); - } +if (class_exists('Symbiote\QueuedJobs\Services\AbstractQueuedJob')) { + use Symbiote\QueuedJobs\Services\AbstractQueuedJob; + use Symbiote\QueuedJobs\Services\QueuedJob; + use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask; /** - * Check an individual page + * A Job for running a external link check for published pages + * */ - public function process() + class CheckExternalLinksJob extends AbstractQueuedJob implements QueuedJob { - $task = CheckExternalLinksTask::create(); - $track = $task->runLinksCheck(1); - $this->currentStep = $track->CompletedPages; - $this->totalSteps = $track->TotalPages; - $this->isComplete = $track->Status === 'Completed'; + + public function getTitle() + { + return _t('CheckExternalLiksJob.TITLE', 'Checking for external broken links'); + } + + public function getJobType() + { + return QueuedJob::QUEUED; + } + + public function getSignature() + { + return md5(get_class($this)); + } + + /** + * Check an individual page + */ + public function process() + { + $task = CheckExternalLinksTask::create(); + $track = $task->runLinksCheck(1); + $this->currentStep = $track->CompletedPages; + $this->totalSteps = $track->TotalPages; + $this->isComplete = $track->Status === 'Completed'; + } } + } diff --git a/tests/ExternalLinksTest.php b/tests/ExternalLinksTest.php index 8b68df1..3394aed 100644 --- a/tests/ExternalLinksTest.php +++ b/tests/ExternalLinksTest.php @@ -1,5 +1,7 @@