hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of task manager in strict standards context

Browse Source
This commit is contained in:
Romain Neutron
2013-08-30 13:40:05 +02:00
parent 302c8aa14e
commit 2f25438588
13 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/task/abstract.php
View File

@@ -393,7 +393,10 @@ abstract class task_abstract
return $this->completed_percentage; return $this->completed_percentage;
} }
abstract public function getName(); public static function getName()
{
throw new \LogicException('This method must be implemented');
}
abstract public function help(); abstract public function help();

4
lib/classes/task/appboxAbstract.php
View File

@@ -19,9 +19,9 @@ abstract class task_appboxAbstract extends task_abstract
abstract protected function retrieveContent(appbox $appbox); abstract protected function retrieveContent(appbox $appbox);
abstract protected function processOneContent(appbox $appbox, Array $row); abstract protected function processOneContent(appbox $appbox, $row);
abstract protected function postProcessOneContent(appbox $appbox, Array $row); abstract protected function postProcessOneContent(appbox $appbox, $row);
protected function run2() protected function run2()
{ {

4
lib/classes/task/databoxAbstract.php
View File

@@ -20,11 +20,11 @@ abstract class task_databoxAbstract extends task_abstract
abstract protected function retrieveSbasContent(databox $databox); abstract protected function retrieveSbasContent(databox $databox);
abstract protected function processOneContent(databox $databox, Array $row); abstract protected function processOneContent(databox $databox, $row);
abstract protected function flushRecordsSbas(); abstract protected function flushRecordsSbas();
abstract protected function postProcessOneContent(databox $databox, Array $row); abstract protected function postProcessOneContent(databox $databox, $row);
protected function run2() protected function run2()
{ {

6
lib/classes/task/period/RecordMover.php
View File

@@ -16,7 +16,7 @@ class task_period_RecordMover extends task_appboxAbstract
* *
* @return string * @return string
*/ */
public function getName() public static function getName()
{ {
return _("Record Mover"); return _("Record Mover");
} }
@@ -402,7 +402,7 @@ class task_period_RecordMover extends task_appboxAbstract
* @param array $row * @param array $row
* @return \task_period_RecordMover * @return \task_period_RecordMover
*/ */
protected function processOneContent(appbox $appbox, Array $row) protected function processOneContent(appbox $appbox, $row)
{ {
$logsql = (int) ($this->sxTaskSettings->logsql) > 0; $logsql = (int) ($this->sxTaskSettings->logsql) > 0;
$databox = $this->dependencyContainer['phraseanet.appbox']->get_databox($row['sbas_id']); $databox = $this->dependencyContainer['phraseanet.appbox']->get_databox($row['sbas_id']);
@@ -466,7 +466,7 @@ class task_period_RecordMover extends task_appboxAbstract
* @param array $row * @param array $row
* @return \task_period_RecordMover * @return \task_period_RecordMover
*/ */
protected function postProcessOneContent(appbox $appbox, Array $row) protected function postProcessOneContent(appbox $appbox, $row)
{ {
return $this; return $this;
} }

6
lib/classes/task/period/apibridge.php
View File

@@ -16,7 +16,7 @@ class task_period_apibridge extends task_appboxAbstract
* Return the name of the task * Return the name of the task
* @return string * @return string
*/ */
public function getName() public static function getName()
{ {
return 'API bridge uploader'; return 'API bridge uploader';
} }
@@ -64,7 +64,7 @@ class task_period_apibridge extends task_appboxAbstract
* @param array $row * @param array $row
* @return task_period_apibridge * @return task_period_apibridge
*/ */
protected function processOneContent(appbox $appbox, Array $row) protected function processOneContent(appbox $appbox, $row)
{ {
try { try {
$account = Bridge_Account::load_account($this->dependencyContainer, $row['account_id']); $account = Bridge_Account::load_account($this->dependencyContainer, $row['account_id']);
@@ -99,7 +99,7 @@ class task_period_apibridge extends task_appboxAbstract
* @param array $row * @param array $row
* @return task_period_apibridge * @return task_period_apibridge
*/ */
protected function postProcessOneContent(appbox $appbox, Array $row) protected function postProcessOneContent(appbox $appbox, $row)
{ {
return $this; return $this;
} }

2
lib/classes/task/period/archive.php
View File

@@ -64,7 +64,7 @@ class task_period_archive extends task_abstract
* *
* @return string * @return string
*/ */
public function getName() public static function getName()
{ {
return _('task::archive:Archivage'); return _('task::archive:Archivage');
} }

2
lib/classes/task/period/cindexer.php
View File

@@ -99,7 +99,7 @@ class task_period_cindexer extends task_abstract
* *
* @return string * @return string
*/ */
public function getName() public static function getName()
{ {
return(_("Indexation task")); return(_("Indexation task"));
} }

6
lib/classes/task/period/emptyColl.php
View File

@@ -17,7 +17,7 @@ class task_period_emptyColl extends task_appboxAbstract
protected $suicidable = true; protected $suicidable = true;
protected $total_records = 0; protected $total_records = 0;
public function getName() public static function getName()
{ {
return(_("Vidage de collection")); return(_("Vidage de collection"));
} }
@@ -68,12 +68,12 @@ class task_period_emptyColl extends task_appboxAbstract
return array(); return array();
} }
protected function processOneContent(appbox $appbox, Array $row) protected function processOneContent(appbox $appbox, $row)
{ {
return $this; return $this;
} }
protected function postProcessOneContent(appbox $appbox, Array $row) protected function postProcessOneContent(appbox $appbox, $row)
{ {
return $this; return $this;
} }

6
lib/classes/task/period/ftp.php
View File

@@ -22,7 +22,7 @@ class task_period_ftp extends task_appboxAbstract
* *
* @return string * @return string
*/ */
public function getName() public static function getName()
{ {
return(_("task::ftp:FTP Push")); return(_("task::ftp:FTP Push"));
} }
@@ -317,7 +317,7 @@ class task_period_ftp extends task_appboxAbstract
return $ftp_exports; return $ftp_exports;
} }
protected function processOneContent(appbox $appbox, Array $ftp_export) protected function processOneContent(appbox $appbox, $ftp_export)
{ {
$conn = $appbox->get_connection(); $conn = $appbox->get_connection();
@@ -548,7 +548,7 @@ class task_period_ftp extends task_appboxAbstract
$this->finalize($appbox, $id); $this->finalize($appbox, $id);
} }
protected function postProcessOneContent(appbox $appbox, Array $row) protected function postProcessOneContent(appbox $appbox, $row)
{ {
return $this; return $this;
} }

6
lib/classes/task/period/ftpPull.php
View File

@@ -23,7 +23,7 @@ class task_period_ftpPull extends task_appboxAbstract
protected $ftppath; protected $ftppath;
protected $localpath; protected $localpath;
public function getName() public static function getName()
{ {
return(_("task::ftp:FTP Pull")); return(_("task::ftp:FTP Pull"));
} }
@@ -441,12 +441,12 @@ class task_period_ftpPull extends task_appboxAbstract
} }
} }
protected function processOneContent(appbox $appbox, Array $row) protected function processOneContent(appbox $appbox, $row)
{ {
} }
protected function postProcessOneContent(appbox $appbox, Array $row) protected function postProcessOneContent(appbox $appbox, $row)
{ {
} }

6
lib/classes/task/period/subdef.php
View File

@@ -53,7 +53,7 @@ class task_period_subdef extends task_databoxAbstract
* *
* @return string * @return string
*/ */
public function getName() public static function getName()
{ {
return(_('task::subdef:creation des sous definitions')); return(_('task::subdef:creation des sous definitions'));
} }
@@ -278,7 +278,7 @@ class task_period_subdef extends task_databoxAbstract
return $rs; return $rs;
} }
public function processOneContent(databox $databox, Array $row) public function processOneContent(databox $databox, $row)
{ {
$record_id = $row['record_id']; $record_id = $row['record_id'];
$this->log(sprintf( $this->log(sprintf(
@@ -310,7 +310,7 @@ class task_period_subdef extends task_databoxAbstract
return $this; return $this;
} }
protected function postProcessOneContent(databox $databox, Array $row) protected function postProcessOneContent(databox $databox, $row)
{ {
$connbas = $databox->get_connection(); $connbas = $databox->get_connection();
$sql = 'UPDATE record $sql = 'UPDATE record

6
lib/classes/task/period/test.php
View File

@@ -12,7 +12,7 @@
class task_period_test extends task_appboxAbstract class task_period_test extends task_appboxAbstract
{ {
public function getName() public static function getName()
{ {
return "Test"; return "Test";
} }
@@ -29,14 +29,14 @@ class task_period_test extends task_appboxAbstract
return array(array('hello'), array('world')); return array(array('hello'), array('world'));
} }
protected function processOneContent(appbox $appbox, Array $row) protected function processOneContent(appbox $appbox, $row)
{ {
$this->log(sprintf("test class, process content : `%s`", implode(' ', $row))); $this->log(sprintf("test class, process content : `%s`", implode(' ', $row)));
return $this; return $this;
} }
protected function postProcessOneContent(appbox $appbox, Array $row) protected function postProcessOneContent(appbox $appbox, $row)
{ {
$this->log(sprintf("test class, post process content, they were %s", count($row))); $this->log(sprintf("test class, post process content, they were %s", count($row)));

6
lib/classes/task/period/writemeta.php
View File

@@ -30,7 +30,7 @@ class task_period_writemeta extends task_databoxAbstract
parent::loadSettings($sx_task_settings); parent::loadSettings($sx_task_settings);
} }
public function getName() public static function getName()
{ {
return(_('task::writemeta:ecriture des metadatas')); return(_('task::writemeta:ecriture des metadatas'));
} }
@@ -233,7 +233,7 @@ class task_period_writemeta extends task_databoxAbstract
return $rs; return $rs;
} }
protected function processOneContent(databox $databox, Array $row) protected function processOneContent(databox $databox, $row)
{ {
$record_id = $row['record_id']; $record_id = $row['record_id'];
$jeton = $row['jeton']; $jeton = $row['jeton'];
@@ -324,7 +324,7 @@ class task_period_writemeta extends task_databoxAbstract
return $this; return $this;
} }
protected function postProcessOneContent(databox $databox, Array $row) protected function postProcessOneContent(databox $databox, $row)
{ {
$connbas = $databox->get_connection(); $connbas = $databox->get_connection();