@@ -109,6 +109,10 @@ |
||
| 109 | 109 | return $this->createRequest($query); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | + /** |
|
| 113 | + * @param string $action |
|
| 114 | + * @param string $table |
|
| 115 | + */ |
|
| 112 | 116 | public function perform($action, $table, $body, $options = []) |
| 113 | 117 | { |
| 114 | 118 | $query = $this->createQuery($action, $table, $options)->body($body); |
@@ -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) |
@@ -68,6 +68,9 @@ discard block |
||
| 68 | 68 | return $this->uri; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | + /** |
|
| 72 | + * @return string |
|
| 73 | + */ |
|
| 71 | 74 | public function getFullUri() |
| 72 | 75 | { |
| 73 | 76 | if ($this->fullUri === null) { |
@@ -82,6 +85,9 @@ discard block |
||
| 82 | 85 | return ($this->isFullUri($this->uri) ? '' : $this->getDb()->getBaseUri()) . $this->uri; |
| 83 | 86 | } |
| 84 | 87 | |
| 88 | + /** |
|
| 89 | + * @param string $uri |
|
| 90 | + */ |
|
| 85 | 91 | public function isFullUri($uri) |
| 86 | 92 | { |
| 87 | 93 | return preg_match('/^https?:\\/\\//i', $uri); |
@@ -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 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * By default, the "hiart" application component is used as the database connection. |
| 27 | 27 | * You may override this method if you want to use a different database connection. |
| 28 | 28 | * |
| 29 | - * @return Connection the database connection used by this AR class |
|
| 29 | + * @return ConnectionInterface the database connection used by this AR class |
|
| 30 | 30 | */ |
| 31 | 31 | public static function getDb() |
| 32 | 32 | { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * |
| 129 | 129 | * @throws InvalidConfigException |
| 130 | 130 | * |
| 131 | - * @return string|callable|array |
|
| 131 | + * @return string |
|
| 132 | 132 | * |
| 133 | 133 | * @author SilverFire |
| 134 | 134 | */ |
@@ -316,6 +316,9 @@ discard block |
||
| 316 | 316 | return $result === false ? false : true; |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | + /** |
|
| 320 | + * @param string $defaultScenario |
|
| 321 | + */ |
|
| 319 | 322 | public function performScenario($defaultScenario, $data, array $options = []) |
| 320 | 323 | { |
| 321 | 324 | $action = $this->getScenarioAction($defaultScenario); |
@@ -323,6 +326,9 @@ discard block |
||
| 323 | 326 | return static::perform($action, $data, $options); |
| 324 | 327 | } |
| 325 | 328 | |
| 329 | + /** |
|
| 330 | + * @param string $action |
|
| 331 | + */ |
|
| 326 | 332 | public static function perform($action, $data, array $options = []) |
| 327 | 333 | { |
| 328 | 334 | return static::getDb()->createCommand()->perform($action, static::from(), $data, $options); |
@@ -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() |
@@ -130,6 +130,9 @@ |
||
| 130 | 130 | return $this->_viewPath; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | + /** |
|
| 134 | + * @param string $file |
|
| 135 | + */ |
|
| 133 | 136 | public function render($file, $data) |
| 134 | 137 | { |
| 135 | 138 | return Yii::$app->view->render($file, $data, $this); |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | |
| 13 | 13 | use hiqdev\hiart\Command; |
| 14 | 14 | use Yii; |
| 15 | -use yii\base\InvalidConfigException; |
|
| 16 | 15 | use yii\base\ViewContextInterface; |
| 17 | 16 | use yii\log\Logger; |
| 18 | 17 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | return $this->render('summary', [ |
| 52 | 52 | 'url' => $this->getUrl(), |
| 53 | 53 | 'count' => count($timings), |
| 54 | - 'total' => number_format($total * 1000) . ' ms', |
|
| 54 | + 'total' => number_format($total * 1000).' ms', |
|
| 55 | 55 | ]); |
| 56 | 56 | } |
| 57 | 57 | |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | public function getViewPath() |
| 126 | 126 | { |
| 127 | 127 | if ($this->_viewPath === null) { |
| 128 | - $this->_viewPath = dirname(__DIR__) . '/views/debug'; |
|
| 128 | + $this->_viewPath = dirname(__DIR__).'/views/debug'; |
|
| 129 | 129 | } |
| 130 | 130 | return $this->_viewPath; |
| 131 | 131 | } |
@@ -133,6 +133,10 @@ |
||
| 133 | 133 | return $this; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | + /** |
|
| 137 | + * @param string $name |
|
| 138 | + * @param boolean $value |
|
| 139 | + */ |
|
| 136 | 140 | public function addOption($name, $value) |
| 137 | 141 | { |
| 138 | 142 | if (!isset($this->options[$name])) { |
@@ -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 | ], |