@@ -70,14 +70,14 @@ discard block |
||
| 70 | 70 | $query = $this->newQuery(); |
| 71 | 71 | |
| 72 | 72 | // Setup select statements |
| 73 | - if (! empty($queryObject->getSelects())) { |
|
| 73 | + if (!empty($queryObject->getSelects())) { |
|
| 74 | 74 | $query->cols($queryObject->getSelects()); |
| 75 | 75 | } else { |
| 76 | 76 | $query->cols(['*']); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | // Workarounds :-/ |
| 80 | - if (! empty($queryObject->getFlags())) { |
|
| 80 | + if (!empty($queryObject->getFlags())) { |
|
| 81 | 81 | if ($queryObject->getFlags() === 'outfitIDs') { |
| 82 | 82 | // Prevent the VS, NC and TR "no outfit" workaround |
| 83 | 83 | $queryObject->addWhere([ |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // Setup where statements |
| 92 | - if (! empty($queryObject->getWheres())) { |
|
| 92 | + if (!empty($queryObject->getWheres())) { |
|
| 93 | 93 | foreach ($queryObject->getWheres() as $where) { |
| 94 | 94 | $col = $where['col']; |
| 95 | 95 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | // Generate a UUID so that any columns that are used multiple |
| 104 | 104 | // times always have unique values. Tiny overhead for the benefit |
| 105 | 105 | $uuid = $this->getUuidDriver()->uuid4()->toString(); |
| 106 | - $bind = str_replace('-', '', $col.$uuid); |
|
| 106 | + $bind = str_replace('-', '', $col . $uuid); |
|
| 107 | 107 | |
| 108 | 108 | $op = (isset($where['op']) ? $where['op'] : '='); |
| 109 | 109 | |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | // Setup where statements |
| 116 | - if (! empty($queryObject->getWhereIns())) { |
|
| 116 | + if (!empty($queryObject->getWhereIns())) { |
|
| 117 | 117 | foreach ($queryObject->getWhereIns() as $whereIn) { |
| 118 | 118 | $col = $whereIn['col']; |
| 119 | 119 | |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | // Set up order statement |
| 132 | - if (! empty($queryObject->getOrderBy())) { |
|
| 132 | + if (!empty($queryObject->getOrderBy())) { |
|
| 133 | 133 | $orderBy = $queryObject->getOrderBy(); |
| 134 | 134 | if ($orderBy === 'primary') { |
| 135 | 135 | $orderBy = $this->getPrimaryKey(); |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | ]); |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - if (! empty($queryObject->getLimit())) { |
|
| 146 | + if (!empty($queryObject->getLimit())) { |
|
| 147 | 147 | // Only set a limit if it's required |
| 148 | 148 | if ($queryObject->getLimit() !== 'unlimited') { |
| 149 | 149 | $query->limit($queryObject->getLimit()); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | public function register() |
| 21 | 21 | { |
| 22 | - $this->getContainer()->add('Ramsey\Uuid\Uuid', function () { |
|
| 22 | + $this->getContainer()->add('Ramsey\Uuid\Uuid', function() { |
|
| 23 | 23 | $uuid = Uuid::Uuid4(); |
| 24 | 24 | return $uuid; |
| 25 | 25 | }); |
@@ -105,7 +105,6 @@ discard block |
||
| 105 | 105 | /** |
| 106 | 106 | * De-encode the POST from application/json vars for use |
| 107 | 107 | * |
| 108 | - * @param array $post |
|
| 109 | 108 | * |
| 110 | 109 | * @return array |
| 111 | 110 | */ |
@@ -132,10 +131,10 @@ discard block |
||
| 132 | 131 | * Takes common requests and appends them to the query object. Any other |
| 133 | 132 | * special requirements will be handled after |
| 134 | 133 | * |
| 135 | - * @param Ps2alerts\Api\QueryObjects\QueryObject $queryObject |
|
| 134 | + * @param QueryObject $queryObject |
|
| 136 | 135 | * @param array $post |
| 137 | 136 | * |
| 138 | - * @return Ps2alerts\Api\QueryObjects\QueryObject |
|
| 137 | + * @return QueryObject |
|
| 139 | 138 | */ |
| 140 | 139 | public function setupQueryObject(QueryObject $queryObject, array $post) |
| 141 | 140 | { |
@@ -75,27 +75,27 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | public function appendRedisKey($post, $redisKey) |
| 77 | 77 | { |
| 78 | - if (! empty($post['selects'])) { |
|
| 78 | + if (!empty($post['selects'])) { |
|
| 79 | 79 | $whereMD5 = md5(json_encode($post['selects'])); |
| 80 | 80 | $redisKey .= "/select:{$whereMD5}"; |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - if (! empty($post['wheres'])) { |
|
| 83 | + if (!empty($post['wheres'])) { |
|
| 84 | 84 | $whereMD5 = md5(json_encode($post['wheres'])); |
| 85 | 85 | $redisKey .= "/where:{$whereMD5}"; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - if (! empty($post['whereIns'])) { |
|
| 88 | + if (!empty($post['whereIns'])) { |
|
| 89 | 89 | $whereInMD5 = md5(json_encode($post['whereIns'])); |
| 90 | 90 | $redisKey .= "/whereIn:{$whereInMD5}"; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - if (! empty($post['orderBy'])) { |
|
| 93 | + if (!empty($post['orderBy'])) { |
|
| 94 | 94 | $orderMD5 = md5(json_encode($post['orderBy'])); |
| 95 | 95 | $redisKey .= "/order:{$orderMD5}"; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - if (empty($post['limit']) || ! isset($post['limit'])) { |
|
| 98 | + if (empty($post['limit']) || !isset($post['limit'])) { |
|
| 99 | 99 | $redisKey .= "/limit:{$post['limit']}"; |
| 100 | 100 | } |
| 101 | 101 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | // Cheat, dirty hack to get everything out as an array |
| 118 | 118 | $post = json_decode(json_encode($post), true); |
| 119 | 119 | |
| 120 | - if (empty($post['limit']) || ! isset($post['limit'])) { |
|
| 120 | + if (empty($post['limit']) || !isset($post['limit'])) { |
|
| 121 | 121 | $post['limit'] = 10; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | public function setupQueryObject(QueryObject $queryObject, array $post) |
| 141 | 141 | { |
| 142 | - if (! empty($post['wheres'])) { |
|
| 142 | + if (!empty($post['wheres'])) { |
|
| 143 | 143 | foreach ($post['wheres'] as $key => $value) { |
| 144 | 144 | if ($key !== 'lessthan' && $key !== 'morethan') { |
| 145 | 145 | $queryObject->addWhere([ |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - if (! empty($post['wheres']['lessthan'])) { |
|
| 152 | + if (!empty($post['wheres']['lessthan'])) { |
|
| 153 | 153 | foreach ($post['wheres']['lessthan'] as $key => $value) { |
| 154 | 154 | $queryObject->addWhere([ |
| 155 | 155 | 'col' => $key, |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | } |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - if (! empty($post['wheres']['morethan'])) { |
|
| 162 | + if (!empty($post['wheres']['morethan'])) { |
|
| 163 | 163 | foreach ($post['wheres']['morethan'] as $key => $value) { |
| 164 | 164 | $queryObject->addWhere([ |
| 165 | 165 | 'col' => $key, |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - if (! empty($post['whereIns'])) { |
|
| 173 | + if (!empty($post['whereIns'])) { |
|
| 174 | 174 | foreach ($post['whereIns'] as $key => $value) { |
| 175 | 175 | // Escape strings manually, incase of player IDs etc |
| 176 | 176 | foreach ($value as $i => $val) { |
@@ -186,16 +186,16 @@ discard block |
||
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - if (! empty($post['orderBy'])) { |
|
| 189 | + if (!empty($post['orderBy'])) { |
|
| 190 | 190 | $queryObject->setOrderBy(array_keys($post['orderBy'])[0]); |
| 191 | 191 | $queryObject->setOrderByDirection(array_values($post['orderBy'])[0]); |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - if (! empty($post['limit'])) { |
|
| 194 | + if (!empty($post['limit'])) { |
|
| 195 | 195 | $queryObject->setLimit($post['limit']); |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | - if (! empty($this->getFlags())) { |
|
| 198 | + if (!empty($this->getFlags())) { |
|
| 199 | 199 | // If there are some funky things we have to do, set them. |
| 200 | 200 | $queryObject->setFlags($this->getFlags()); |
| 201 | 201 | } |