From 7988114614132bcb64fdc2991c2d965fe1a771ac Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Mon, 2 Sep 2013 12:21:11 +0200 Subject: [PATCH] Fix #1430 : Use strict standards, declare the method static --- lib/classes/task/abstract.php | 10 ++++++++-- lib/classes/task/period/RecordMover.php | 4 ++-- lib/classes/task/period/apibridge.php | 4 ++-- lib/classes/task/period/archive.php | 4 ++-- lib/classes/task/period/cindexer.php | 4 ++-- lib/classes/task/period/emptyColl.php | 4 ++-- lib/classes/task/period/ftp.php | 4 ++-- lib/classes/task/period/ftpPull.php | 4 ++-- lib/classes/task/period/subdef.php | 4 ++-- lib/classes/task/period/test.php | 4 ++-- lib/classes/task/period/writemeta.php | 4 ++-- 11 files changed, 28 insertions(+), 22 deletions(-) diff --git a/lib/classes/task/abstract.php b/lib/classes/task/abstract.php index e5bd318e7a..8d5032f85c 100644 --- a/lib/classes/task/abstract.php +++ b/lib/classes/task/abstract.php @@ -393,9 +393,15 @@ abstract class task_abstract return $this->completed_percentage; } - abstract public function getName(); + public static function getName() + { + throw new \LogicException('This method must be implemented'); + } - abstract public function help(); + public static function help() + { + throw new \LogicException('This method must be implemented'); + } /** * diff --git a/lib/classes/task/period/RecordMover.php b/lib/classes/task/period/RecordMover.php index 798995d191..26670d2139 100644 --- a/lib/classes/task/period/RecordMover.php +++ b/lib/classes/task/period/RecordMover.php @@ -16,7 +16,7 @@ class task_period_RecordMover extends task_appboxAbstract * * @return string */ - public function getName() + public static function getName() { return _("Record Mover"); } @@ -25,7 +25,7 @@ class task_period_RecordMover extends task_appboxAbstract * * @return string */ - public function help() + public static function help() { return ''; } diff --git a/lib/classes/task/period/apibridge.php b/lib/classes/task/period/apibridge.php index f299b0728e..ae316277bd 100644 --- a/lib/classes/task/period/apibridge.php +++ b/lib/classes/task/period/apibridge.php @@ -16,7 +16,7 @@ class task_period_apibridge extends task_appboxAbstract * Return the name of the task * @return string */ - public function getName() + public static function getName() { return 'API bridge uploader'; } @@ -25,7 +25,7 @@ class task_period_apibridge extends task_appboxAbstract * Get help * @return string */ - public function help() + public static function help() { return ''; } diff --git a/lib/classes/task/period/archive.php b/lib/classes/task/period/archive.php index a10fa8621c..6cfaa97992 100644 --- a/lib/classes/task/period/archive.php +++ b/lib/classes/task/period/archive.php @@ -64,7 +64,7 @@ class task_period_archive extends task_abstract * * @return string */ - public function getName() + public static function getName() { return _('task::archive:Archivage'); } @@ -284,7 +284,7 @@ class task_period_archive extends task_abstract * * @return string */ - public function help() + public static function help() { return _("task::archive:Archiving files found into a 'hotfolder'"); } diff --git a/lib/classes/task/period/cindexer.php b/lib/classes/task/period/cindexer.php index 8954a68475..399000bd2c 100644 --- a/lib/classes/task/period/cindexer.php +++ b/lib/classes/task/period/cindexer.php @@ -99,7 +99,7 @@ class task_period_cindexer extends task_abstract * * @return string */ - public function getName() + public static function getName() { return(_("Indexation task")); } @@ -108,7 +108,7 @@ class task_period_cindexer extends task_abstract * * @return string */ - public function help() + public static function help() { return(_("This task is used to index records for Phrasea engine.")); } diff --git a/lib/classes/task/period/emptyColl.php b/lib/classes/task/period/emptyColl.php index c9e4701a20..f855ad9d79 100644 --- a/lib/classes/task/period/emptyColl.php +++ b/lib/classes/task/period/emptyColl.php @@ -17,7 +17,7 @@ class task_period_emptyColl extends task_appboxAbstract protected $suicidable = true; protected $total_records = 0; - public function getName() + public static function getName() { return(_("Vidage de collection")); } @@ -27,7 +27,7 @@ class task_period_emptyColl extends task_appboxAbstract return false; } - public function help() + public static function help() { return("Vide une collection"); } diff --git a/lib/classes/task/period/ftp.php b/lib/classes/task/period/ftp.php index 8db4bf150e..42a8716b41 100644 --- a/lib/classes/task/period/ftp.php +++ b/lib/classes/task/period/ftp.php @@ -22,7 +22,7 @@ class task_period_ftp extends task_appboxAbstract * * @return string */ - public function getName() + public static function getName() { return(_("task::ftp:FTP Push")); } @@ -31,7 +31,7 @@ class task_period_ftp extends task_appboxAbstract * * @return string */ - public function help() + public static function help() { return ''; } diff --git a/lib/classes/task/period/ftpPull.php b/lib/classes/task/period/ftpPull.php index c9211b79ce..5ebb5a4cf1 100644 --- a/lib/classes/task/period/ftpPull.php +++ b/lib/classes/task/period/ftpPull.php @@ -23,12 +23,12 @@ class task_period_ftpPull extends task_appboxAbstract protected $ftppath; protected $localpath; - public function getName() + public static function getName() { return(_("task::ftp:FTP Pull")); } - public function help() + public static function help() { return ''; } diff --git a/lib/classes/task/period/subdef.php b/lib/classes/task/period/subdef.php index e5f8fa3f89..3bb096403b 100644 --- a/lib/classes/task/period/subdef.php +++ b/lib/classes/task/period/subdef.php @@ -41,7 +41,7 @@ class task_period_subdef extends task_databoxAbstract * * @return */ - public function help() + public static function help() { return( _("task::subdef:creation des sous definitions des documents d'origine") @@ -53,7 +53,7 @@ class task_period_subdef extends task_databoxAbstract * * @return string */ - public function getName() + public static function getName() { return(_('task::subdef:creation des sous definitions')); } diff --git a/lib/classes/task/period/test.php b/lib/classes/task/period/test.php index 6960457afc..ff3ebfd944 100644 --- a/lib/classes/task/period/test.php +++ b/lib/classes/task/period/test.php @@ -12,12 +12,12 @@ class task_period_test extends task_appboxAbstract { - public function getName() + public static function getName() { return "Test"; } - public function help() + public static function help() { return "just saying what i'm doing"; } diff --git a/lib/classes/task/period/writemeta.php b/lib/classes/task/period/writemeta.php index 3a0149aaf6..0bf40e9a6d 100644 --- a/lib/classes/task/period/writemeta.php +++ b/lib/classes/task/period/writemeta.php @@ -19,7 +19,7 @@ class task_period_writemeta extends task_databoxAbstract protected $clear_doc; protected $metasubdefs = array(); - public function help() + public static function help() { return(_("task::writemeta:(re)ecriture des metadatas dans les documents (et subdefs concernees)")); } @@ -30,7 +30,7 @@ class task_period_writemeta extends task_databoxAbstract parent::loadSettings($sx_task_settings); } - public function getName() + public static function getName() { return(_('task::writemeta:ecriture des metadatas')); }