projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5
[civicrm-core.git]
/
CRM
/
Queue
/
Queue
/
Sql.php
diff --git
a/CRM/Queue/Queue/Sql.php
b/CRM/Queue/Queue/Sql.php
index c5b5558b7626341cce69934d34981a27e746348f..9a7b638e91952ac6aca1d5402b815cab7e9c635c 100644
(file)
--- a/
CRM/Queue/Queue/Sql.php
+++ b/
CRM/Queue/Queue/Sql.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-84,7
+84,7
@@
class CRM_Queue_Queue_Sql extends CRM_Queue_Queue {
* Add a new item to the queue
*
* @param $data serializable PHP object or array
* Add a new item to the queue
*
* @param $data serializable PHP object or array
- * @param $options queue-dependent options; for example, if this is a
+ * @param
array|\queue
$options queue-dependent options; for example, if this is a
* priority-queue, then $options might specify the item's priority
*
* @return bool, TRUE on success
* priority-queue, then $options might specify the item's priority
*
* @return bool, TRUE on success
@@
-116,7
+116,7
@@
class CRM_Queue_Queue_Sql extends CRM_Queue_Queue {
/**
* Get the next item
*
/**
* Get the next item
*
- * @param $lease_time seconds
+ * @param
int|\seconds
$lease_time seconds
*
* @return object with key 'data' that matches the inputted data
*/
*
* @return object with key 'data' that matches the inputted data
*/
@@
-165,7
+165,7
@@
class CRM_Queue_Queue_Sql extends CRM_Queue_Queue {
/**
* Get the next item, even if there's an active lease
*
/**
* Get the next item, even if there's an active lease
*
- * @param $lease_time seconds
+ * @param
int|\seconds
$lease_time seconds
*
* @return object with key 'data' that matches the inputted data
*/
*
* @return object with key 'data' that matches the inputted data
*/