oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-11 01:24:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace dba::select(limit => 1) by dba::selectOne

Browse source 
- Convert array declarations to new style
This commit is contained in:
Hypolite Petovan 2018-01-09 22:20:33 -05:00
parent a2d3cee006
commit da60893590
51 changed files with 206 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Cache.php
View file

@ -109,7 +109,7 @@ class Cache
// Frequently clear cache
self::clear();
$r = dba::select('cache', array('v'), array('k' => $key), array('limit' => 1));
$r = dba::selectOne('cache', ['v'], ['k' => $key]);
if (DBM::is_result($r)) {
$cached = $r['v'];

2
src/Core/Config.php
View file

@ -97,7 +97,7 @@ class Config
}
}
$ret = dba::select('config', array('v'), array('cat' => $family, 'k' => $key), array('limit' => 1));
$ret = dba::selectOne('config', ['v'], ['cat' => $family, 'k' => $key]);
if (DBM::is_result($ret)) {
// manage array value
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret['v']) ? unserialize($ret['v']) : $ret['v']);

2
src/Core/PConfig.php
View file

@ -90,7 +90,7 @@ class PConfig
}
}
$ret = dba::select('pconfig', array('v'), array('uid' => $uid, 'cat' => $family, 'k' => $key), array('limit' => 1));
$ret = dba::selectOne('pconfig', ['v'], ['uid' => $uid, 'cat' => $family, 'k' => $key]);
if (DBM::is_result($ret)) {
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret['v']) ? unserialize($ret['v']) : $ret['v']);
$a->config[$uid][$family][$key] = $val;

20
src/Core/Worker.php
View file

@ -165,7 +165,7 @@ class Worker
private static function highestPriority()
{
$condition = array("`executed` <= ? AND NOT `done`", NULL_DATE);
$s = dba::select('workerqueue', array('priority'), $condition, array('limit' => 1, 'order' => array('priority')));
$s = dba::selectOne('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
if (DBM::is_result($s)) {
return $s["priority"];
} else {
@ -772,9 +772,9 @@ class Worker
// Are there waiting processes with a higher priority than the currently highest?
$result = dba::select(
'workerqueue',
array('id'),
array("`executed` <= ? AND `priority` < ? AND NOT `done`", NULL_DATE, $highest_priority),
array('limit' => $limit, 'order' => array('priority', 'created'), 'only_query' => true)
['id'],
["`executed` <= ? AND `priority` < ? AND NOT `done`", NULL_DATE, $highest_priority],
['limit' => $limit, 'order' => ['priority', 'created']]
);
while ($id = dba::fetch($result)) {
@ -788,9 +788,9 @@ class Worker
// Give slower processes some processing time
$result = dba::select(
'workerqueue',
array('id'),
array("`executed` <= ? AND `priority` > ? AND NOT `done`", NULL_DATE, $highest_priority),
array('limit' => $limit, 'order' => array('priority', 'created'), 'only_query' => true)
['id'],
["`executed` <= ? AND `priority` > ? AND NOT `done`", NULL_DATE, $highest_priority],
['limit' => $limit, 'order' => ['priority', 'created']]
);
while ($id = dba::fetch($result)) {
@ -807,9 +807,9 @@ class Worker
if (!$found) {
$result = dba::select(
'workerqueue',
array('id'),
array("`executed` <= ? AND NOT `done`", NULL_DATE),
array('limit' => $limit, 'order' => array('priority', 'created'), 'only_query' => true)
['id'],
["`executed` <= ? AND NOT `done`", NULL_DATE],
['limit' => $limit, 'order' => ['priority', 'created']]
);
while ($id = dba::fetch($result)) {