dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Change the syntax and non-one count fake values for {{PLURAL: in newmessages*"
[lhc/web/wiklou.git]
/
includes
/
job
/
Job.php
diff --git
a/includes/job/Job.php
b/includes/job/Job.php
index
64925f7
..
ab7df5d
100644
(file)
--- a/
includes/job/Job.php
+++ b/
includes/job/Job.php
@@
-68,7
+68,7
@@
abstract class Job {
*/
public static function factory( $command, Title $title, $params = false, $id = 0 ) {
global $wgJobClasses;
*/
public static function factory( $command, Title $title, $params = false, $id = 0 ) {
global $wgJobClasses;
- if( isset( $wgJobClasses[$command] ) ) {
+ if
( isset( $wgJobClasses[$command] ) ) {
$class = $wgJobClasses[$command];
return new $class( $title, $params, $id );
}
$class = $wgJobClasses[$command];
return new $class( $title, $params, $id );
}
@@
-84,7
+84,7
@@
abstract class Job {
*
* @param array $jobs of Job objects
* @return bool
*
* @param array $jobs of Job objects
* @return bool
- * @deprecated 1.21
+ * @deprecated
since
1.21
*/
public static function batchInsert( $jobs ) {
return JobQueueGroup::singleton()->push( $jobs );
*/
public static function batchInsert( $jobs ) {
return JobQueueGroup::singleton()->push( $jobs );
@@
-99,7
+99,7
@@
abstract class Job {
*
* @param array $jobs of Job objects
* @return bool
*
* @param array $jobs of Job objects
* @return bool
- * @deprecated 1.21
+ * @deprecated
since
1.21
*/
public static function safeBatchInsert( $jobs ) {
return JobQueueGroup::singleton()->push( $jobs, JobQueue::QOS_ATOMIC );
*/
public static function safeBatchInsert( $jobs ) {
return JobQueueGroup::singleton()->push( $jobs, JobQueue::QOS_ATOMIC );
@@
-112,7
+112,7
@@
abstract class Job {
*
* @param $type string
* @return Job|bool Returns false if there are no jobs
*
* @param $type string
* @return Job|bool Returns false if there are no jobs
- * @deprecated 1.21
+ * @deprecated
since
1.21
*/
public static function pop_type( $type ) {
return JobQueueGroup::singleton()->get( $type )->pop();
*/
public static function pop_type( $type ) {
return JobQueueGroup::singleton()->get( $type )->pop();
@@
-123,7
+123,7
@@
abstract class Job {
* This is subject to $wgJobTypesExcludedFromDefaultQueue.
*
* @return Job or false if there's no jobs
* This is subject to $wgJobTypesExcludedFromDefaultQueue.
*
* @return Job or false if there's no jobs
- * @deprecated 1.21
+ * @deprecated
since
1.21
*/
public static function pop() {
return JobQueueGroup::singleton()->pop();
*/
public static function pop() {
return JobQueueGroup::singleton()->pop();
@@
-150,6
+150,7
@@
abstract class Job {
/**
* @return integer May be 0 for jobs stored outside the DB
/**
* @return integer May be 0 for jobs stored outside the DB
+ * @deprecated since 1.22
*/
public function getId() {
return $this->id;
*/
public function getId() {
return $this->id;
@@
-212,10
+213,10
@@
abstract class Job {
*/
public function getDeduplicationInfo() {
$info = array(
*/
public function getDeduplicationInfo() {
$info = array(
- 'type'
=> $this->getType(),
+ 'type' => $this->getType(),
'namespace' => $this->getTitle()->getNamespace(),
'namespace' => $this->getTitle()->getNamespace(),
- 'title'
=> $this->getTitle()->getDBkey(),
- 'params'
=> $this->getParams()
+ 'title' => $this->getTitle()->getDBkey(),
+ 'params' => $this->getParams()
);
if ( is_array( $info['params'] ) ) {
// Identical jobs with different "root" jobs should count as duplicates
);
if ( is_array( $info['params'] ) ) {
// Identical jobs with different "root" jobs should count as duplicates
@@
-269,7
+270,7
@@
abstract class Job {
/**
* Insert a single job into the queue.
* @return bool true on success
/**
* Insert a single job into the queue.
* @return bool true on success
- * @deprecated 1.21
+ * @deprecated
since
1.21
*/
public function insert() {
return JobQueueGroup::singleton()->push( $this );
*/
public function insert() {
return JobQueueGroup::singleton()->push( $this );