hiqdev / yii2-hiart

src/ActiveRecord.php

Doc Comments +3 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
      *
      * @throws InvalidConfigException
      *
-     * @return string|callable|array
+     * @return string
      *
      * @author SilverFire
      */
@@ -469,7 +469,7 @@ 
 
     /**
      * {@inheritdoc}
-     * @return ActiveQuery the relational query object.
+     * @return \yii\db\ActiveQuery the relational query object.
      */
     public function hasOne($class, $link)
     {
@@ -478,7 +478,7 @@ 
 
     /**
      * {@inheritdoc}
-     * @return ActiveQuery the relational query object.
+     * @return \yii\db\ActiveQuery the relational query object.
      */
     public function hasMany($class, $link)
     {

Spacing +3 added lines, -3 removed lines

@@ -201,7 +201,7 @@ 
     public static function index()
     {
         //        return Inflector::pluralize(Inflector::camel2id(StringHelper::basename(get_called_class()), '-'));
-        return mb_strtolower(StringHelper::basename(get_called_class()) . 's');
+        return mb_strtolower(StringHelper::basename(get_called_class()).'s');
     }
 
     public static function joinIndex()
@@ -352,7 +352,7 @@ 
      */
     public static function perform($action, $options = [], $bulk = false)
     {
-        $action = ($bulk === true ? static::index() : static::type()) . $action;
+        $action = ($bulk === true ? static::index() : static::type()).$action;
         $result = static::getDb()->createCommand()->perform($action, $options);
 
         return $result;
@@ -399,7 +399,7 @@ 
         if (is_array($result)) {
             return implode('', $result);
         } else {
-            return static::type() . ($bulk ? 's' : '') . $result;
+            return static::type().($bulk ? 's' : '').$result;
         }
     }
 

src/Command.php

Doc Comments +4 added lines, -1 removed lines

@@ -76,6 +76,9 @@ 
         }
     }
 
+    /**
+     * @param string $modelName
+     */
     public function get($modelName, $primaryKey, $options)
     {
         return $this->db->post($modelName . 'GetInfo', ArrayHelper::merge(['id' => $primaryKey], $options));
@@ -106,7 +109,7 @@ 
     }
 
     /**
-     * @param $action
+     * @param string $action
      * @param array $options
      *
      * @return mixed

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function search($options = [])
     {
-        $url     = $this->index . Inflector::id2camel(ArrayHelper::remove($options, 'scenario', 'search'));
+        $url     = $this->index.Inflector::id2camel(ArrayHelper::remove($options, 'scenario', 'search'));
         $query   = $this->queryParts;
         $options = array_merge($query, $options);
 
@@ -58,15 +58,15 @@ 
         $options = array_merge($data, $options);
 
         if ($id !== null) {
-            return $this->db->put($action . 'Update', array_merge($options, ['id' => $id]));
+            return $this->db->put($action.'Update', array_merge($options, ['id' => $id]));
         } else {
-            return $this->db->post($action . 'Create', $options);
+            return $this->db->post($action.'Create', $options);
         }
     }
 
     public function get($modelName, $primaryKey, $options)
     {
-        return $this->db->post($modelName . 'GetInfo', ArrayHelper::merge(['id' => $primaryKey], $options));
+        return $this->db->post($modelName.'GetInfo', ArrayHelper::merge(['id' => $primaryKey], $options));
     }
 
     public function mget($index, $type, $ids, $options = [])
@@ -83,14 +83,14 @@ 
 
     public function delete($index, $id, $options = [])
     {
-        return $this->db->delete($index . 'Delete', array_merge($options, ['id' => $id]));
+        return $this->db->delete($index.'Delete', array_merge($options, ['id' => $id]));
     }
 
     public function update($index, $id, $data, $options = [])
     {
         $options['id'] = $id;
 
-        return $this->db->put($index . 'Update', array_merge($data, $options));
+        return $this->db->put($index.'Update', array_merge($data, $options));
     }
 
     /**

src/Collection.php

Spacing +1 added lines, -1 removed lines

@@ -425,7 +425,7 @@
      */
     public function collectData($attributes = null, $options = [])
     {
-        $data       = [];
+        $data = [];
         foreach ($this->models as $model) {
             /* @var $model ActiveRecord */
             $key = $model->getPrimaryKey();

src/QueryBuilder.php

Doc Comments +10 added lines

@@ -27,6 +27,9 @@ 
 
     public $db;
 
+    /**
+     * @param Connection $connection
+     */
     public function __construct($connection, $config = [])
     {
         $this->db = $connection;
@@ -59,6 +62,9 @@ 
         ];
     }
 
+    /**
+     * @param integer $limit
+     */
     public function buildLimit($limit, &$parts)
     {
         if (!empty($limit)) {
@@ -69,6 +75,10 @@ 
         }
     }
 
+    /**
+     * @param integer $offset
+     * @param integer $limit
+     */
     public function buildPage($offset, $limit, &$parts)
     {
         if ($offset > 0) {

Spacing +6 added lines, -6 removed lines

@@ -79,7 +79,7 @@ 
     public function buildOrderBy($orderBy, &$parts)
     {
         if (!empty($orderBy)) {
-            $parts['orderby'] = key($orderBy) . $this->_sort[reset($orderBy)];
+            $parts['orderby'] = key($orderBy).$this->_sort[reset($orderBy)];
         }
     }
 
@@ -120,7 +120,7 @@ 
 
                 return $this->$method($operator, $condition);
             } else {
-                throw new InvalidParamException('Found unknown operator in query: ' . $operator);
+                throw new InvalidParamException('Found unknown operator in query: '.$operator);
             }
         } else {
             return $this->buildHashCondition($condition);
@@ -133,7 +133,7 @@ 
         foreach ($condition as $attribute => $value) {
             if (is_array($value)) { // IN condition
                 // $parts[] = [$attribute.'s' => join(',',$value)];
-                $parts[$attribute . 's'] = implode(',', $value);
+                $parts[$attribute.'s'] = implode(',', $value);
             } else {
                 $parts[$attribute] = $value;
             }
@@ -144,7 +144,7 @@ 
 
     private function buildLikeCondition($operator, $operands)
     {
-        return [$operands[0] . '_like' => $operands[1]];
+        return [$operands[0].'_like' => $operands[1]];
     }
 
     private function buildCompareCondition($operator, $operands)
@@ -153,7 +153,7 @@ 
             throw new InvalidParamException("Operator '$operator' requires three operands.");
         }
 
-        return [$operands[0] . '_' . $operator => $operands[1]];
+        return [$operands[0].'_'.$operator => $operands[1]];
     }
 
     private function buildAndCondition($operator, $operands)
@@ -199,7 +199,7 @@ 
             }
         }
 
-        return [$column . '_in' => $values];
+        return [$column.'_in' => $values];
     }
 
     private function buildEqCondition($operator, $operands)

tests/unit/ConnectionTest.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
             'config'  => [
                 'base_uri' => $this->site,
             ],
-            'errorChecker' => function ($res) {
+            'errorChecker' => function($res) {
                 return null;
             },
         ]);
@@ -61,15 +61,15 @@ 
     {
         $result = $this->object->get($this->url, [], $this->body, false);
         $this->assertSame($this->result, $result);
-        $this->assertSame('request',   $this->mock->name);
-        $this->assertSame('GET',       $this->mock->args[0]);
-        $this->assertSame($this->url,  $this->mock->args[1]);
+        $this->assertSame('request', $this->mock->name);
+        $this->assertSame('GET', $this->mock->args[0]);
+        $this->assertSame($this->url, $this->mock->args[1]);
         $this->assertSame($this->body, $this->mock->args[2]['form_params']);
     }
 
     public function testErrorChecker()
     {
-        $this->object->setErrorChecker(function ($res) { return $res; });
+        $this->object->setErrorChecker(function($res) { return $res; });
         $this->setExpectedException('hiqdev\hiart\ErrorResponseException', $this->result);
         $this->object->get($this->url, [], $this->body, false);
     }

src/Connection.php

Doc Comments +4 added lines, -4 removed lines

@@ -206,7 +206,6 @@ 
     /**
      * XXX DEPRECATED in favour of post().
      * @param $url
-     * @param array $query
      * @return mixed
      */
     public function perform($url, $body = [])
@@ -220,6 +219,7 @@ 
      * @param array  $query query options, (GET parameters)
      * @param string $body  request body, (POST parameters)
      * @param bool   $raw   if response body contains JSON and should be decoded
+     * @param string $method
      * @throws HiArtException
      * @throws \yii\base\InvalidConfigException
      * @return mixed response
@@ -233,9 +233,9 @@ 
 
     /**
      * Creates URL.
-     * @param mixed $path path
+     * @param string $path path
      * @param array $query query options
-     * @return array
+     * @return string
      */
     private function prepareUrl($path, array $query = [])
     {
@@ -322,7 +322,7 @@ 
 
     /**
      * Setter for errorChecker.
-     * @param Closure|array $value
+     * @param Closure $value
      * @return void
      */
     public function setErrorChecker($value)

Spacing +2 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
         $url = $path;
         $query = array_merge($this->getAuth(), $query);
         if (!empty($query)) {
-            $url .= (strpos($url, '?') === false ? '?' : '&') . http_build_query($query);
+            $url .= (strpos($url, '?') === false ? '?' : '&').http_build_query($query);
         }
 
         return $url;
@@ -283,7 +283,7 @@ 
     protected function handleRequest($method, $url, $body = null, $raw = false)
     {
         $method  = strtoupper($method);
-        $profile = $method . ' ' . $url . '#' . (is_array($body) ? http_build_query($body) : $body);
+        $profile = $method.' '.$url.'#'.(is_array($body) ? http_build_query($body) : $body);
         $options = [(is_array($body) ? 'form_params' : 'body') => $body];
         Yii::beginProfile($profile, __METHOD__);
         $response = $this->getHandler()->request($method, $url, $options);

src/DebugPanel.php

Spacing +8 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
         foreach ($timings as $timing) {
             $queryTime += $timing[3];
         }
-        $queryTime = number_format($queryTime * 1000) . ' ms';
+        $queryTime = number_format($queryTime * 1000).' ms';
         $url = $this->getUrl();
         $output = <<<HTML
 <div class="yii-debug-toolbar__block">
@@ -83,7 +83,7 @@ 
         try {
             $component = \Yii::$app->get('hiart');
             $apiUrl = (StringHelper::endsWith($component->config['api_url'],
-                '/')) ? $component->config['api_url'] : $component->config['api_url'] . '/';
+                '/')) ? $component->config['api_url'] : $component->config['api_url'].'/';
         } catch (\yii\base\InvalidConfigException $e) {
             // Pass
         }
@@ -102,7 +102,7 @@ 
             if (!empty($traces)) {
                 $traceString .= Html::ul($traces, [
                     'class' => 'trace',
-                    'item' => function ($trace) {
+                    'item' => function($trace) {
                         return "<li>{$trace['file']}({$trace['line']})</li>";
                     },
                 ]);
@@ -111,15 +111,15 @@ 
             $runLink = Html::a('run query', $ajaxUrl, [
                     'class' => 'hiart-link',
                     'data' => ['id' => $i],
-                ]) . '<br/>';
+                ]).'<br/>';
             $path = preg_replace('/^[A-Z]+\s+/', '', $url);
             if (strpos($path, '?') !== false) {
-                $newTabUrl = $apiUrl . rtrim($path, '&') . '&' . $body;
+                $newTabUrl = $apiUrl.rtrim($path, '&').'&'.$body;
             } else {
-                $newTabUrl = $apiUrl . $path . '?' . $body;
+                $newTabUrl = $apiUrl.$path.'?'.$body;
             }
-            $newTabLink = Html::a('to new tab', $newTabUrl, ['target' => '_blank']) . '<br/>';
-            $url_encoded = Html::encode((isset($apiUrl)) ? str_replace(' ', ' ' . $apiUrl, $url) : $url);
+            $newTabLink = Html::a('to new tab', $newTabUrl, ['target' => '_blank']).'<br/>';
+            $url_encoded = Html::encode((isset($apiUrl)) ? str_replace(' ', ' '.$apiUrl, $url) : $url);
             $body_encoded = Html::encode($body);
             $rows[] = <<<HTML
 <tr>

tests/_bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -11,5 +11,5 @@
 
 error_reporting(E_ALL & ~E_NOTICE);
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/yiisoft/yii2/Yii.php';