@@ -11,5 +11,5 @@ |
||
11 | 11 | |
12 | 12 | error_reporting(E_ALL & ~E_NOTICE); |
13 | 13 | |
14 | -require_once __DIR__ . '/../vendor/autoload.php'; |
|
15 | -require_once __DIR__ . '/../vendor/yiisoft/yii2/Yii.php'; |
|
14 | +require_once __DIR__.'/../vendor/autoload.php'; |
|
15 | +require_once __DIR__.'/../vendor/yiisoft/yii2/Yii.php'; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | 'config' => [ |
47 | 47 | 'base_uri' => $this->site, |
48 | 48 | ], |
49 | - 'errorChecker' => function ($res) { |
|
49 | + 'errorChecker' => function($res) { |
|
50 | 50 | return null; |
51 | 51 | }, |
52 | 52 | ]); |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | { |
61 | 61 | $result = $this->object->get($this->url, [], false); |
62 | 62 | $this->assertSame($this->result, $result); |
63 | - $this->assertSame('request', $this->mock->name); |
|
64 | - $this->assertSame('GET', $this->mock->args[0]); |
|
65 | - $this->assertSame($this->url, $this->mock->args[1]); |
|
63 | + $this->assertSame('request', $this->mock->name); |
|
64 | + $this->assertSame('GET', $this->mock->args[0]); |
|
65 | + $this->assertSame($this->url, $this->mock->args[1]); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public function testErrorChecker() |
69 | 69 | { |
70 | - $this->object->setErrorChecker(function ($res) { |
|
70 | + $this->object->setErrorChecker(function($res) { |
|
71 | 71 | return $res; |
72 | 72 | }); |
73 | 73 | $this->setExpectedException('hiqdev\hiart\ErrorResponseException', $this->result); |
@@ -192,7 +192,7 @@ |
||
192 | 192 | public static function index() |
193 | 193 | { |
194 | 194 | // return Inflector::pluralize(Inflector::camel2id(StringHelper::basename(get_called_class()), '-')); |
195 | - return mb_strtolower(StringHelper::basename(get_called_class()) . 's'); |
|
195 | + return mb_strtolower(StringHelper::basename(get_called_class()).'s'); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | public static function joinIndex() |
@@ -20,7 +20,7 @@ |
||
20 | 20 | public function checkResponse(ResponseInterface $response) |
21 | 21 | { |
22 | 22 | $code = $response->getStatusCode(); |
23 | - if ($code>=200 && $code<300) { |
|
23 | + if ($code >= 200 && $code < 300) { |
|
24 | 24 | return; |
25 | 25 | } |
26 | 26 |
@@ -8,4 +8,4 @@ |
||
8 | 8 | * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/) |
9 | 9 | */ |
10 | 10 | |
11 | -return require __DIR__ . '/common.php'; |
|
11 | +return require __DIR__.'/common.php'; |
@@ -8,4 +8,4 @@ |
||
8 | 8 | * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/) |
9 | 9 | */ |
10 | 10 | |
11 | -return require __DIR__ . '/common.php'; |
|
11 | +return require __DIR__.'/common.php'; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | ]), |
30 | 30 | 'container' => [ |
31 | 31 | 'singletons' => [ |
32 | - \hiqdev\hiart\ConnectionInterface::class => function () { |
|
32 | + \hiqdev\hiart\ConnectionInterface::class => function() { |
|
33 | 33 | return Yii::$app->get(Yii::$app->params['hiart.dbname']); |
34 | 34 | }, |
35 | 35 | ], |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | |
155 | 155 | return $this->$method($operator, $condition); |
156 | 156 | } else { |
157 | - throw new InvalidParamException('Found unknown operator in query: ' . $operator); |
|
157 | + throw new InvalidParamException('Found unknown operator in query: '.$operator); |
|
158 | 158 | } |
159 | 159 | } else { |
160 | 160 | return $this->buildHashCondition($condition); |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | foreach ($condition as $attribute => $value) { |
168 | 168 | if (is_array($value)) { // IN condition |
169 | 169 | // $parts[] = [$attribute.'s' => join(',',$value)]; |
170 | - $parts[$attribute . 's'] = implode(',', $value); |
|
170 | + $parts[$attribute.'s'] = implode(',', $value); |
|
171 | 171 | } else { |
172 | 172 | $parts[$attribute] = $value; |
173 | 173 | } |
@@ -178,12 +178,12 @@ discard block |
||
178 | 178 | |
179 | 179 | protected function buildLikeCondition($operator, $operands) |
180 | 180 | { |
181 | - return [$operands[0] . '_like' => $operands[1]]; |
|
181 | + return [$operands[0].'_like' => $operands[1]]; |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | protected function buildIlikeCondition($operator, $operands) |
185 | 185 | { |
186 | - return [$operands[0] . '_ilike' => $operands[1]]; |
|
186 | + return [$operands[0].'_ilike' => $operands[1]]; |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | protected function buildCompareCondition($operator, $operands) |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | throw new InvalidParamException("Operator '$operator' requires three operands."); |
193 | 193 | } |
194 | 194 | |
195 | - return [$operands[0] . '_' . $operator => $operands[1]]; |
|
195 | + return [$operands[0].'_'.$operator => $operands[1]]; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | protected function buildAndCondition($operator, $operands) |
@@ -239,9 +239,9 @@ discard block |
||
239 | 239 | } |
240 | 240 | |
241 | 241 | if ($not) { |
242 | - $key = $column . '_ni'; // not in |
|
242 | + $key = $column.'_ni'; // not in |
|
243 | 243 | } else { |
244 | - $key = $column . '_in'; |
|
244 | + $key = $column.'_in'; |
|
245 | 245 | } |
246 | 246 | return [$key => $values]; |
247 | 247 | } |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | { |
263 | 263 | $key = array_shift($operands); |
264 | 264 | |
265 | - return [$key . '_' . $operator => reset($operands)]; |
|
265 | + return [$key.'_'.$operator => reset($operands)]; |
|
266 | 266 | } |
267 | 267 | |
268 | 268 | protected function buildCompositeInCondition($operator, $columns, $values) |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | |
80 | 80 | public function createFullUri() |
81 | 81 | { |
82 | - return ($this->isFullUri($this->uri) ? '' : $this->getDb()->getBaseUri()) . $this->uri; |
|
82 | + return ($this->isFullUri($this->uri) ? '' : $this->getDb()->getBaseUri()).$this->uri; |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | public function isFullUri($uri) |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $params = http_build_query($params, '', '&'); |
163 | 163 | } |
164 | 164 | if (!empty($params)) { |
165 | - $this->uri .= '?' . $params; |
|
165 | + $this->uri .= '?'.$params; |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 |