jarektkaczyk / eloquence

src/Builder.php

Doc Comments +1 added lines, -1 removed lines

@@ -473,7 +473,7 @@
     /**
      * Prefix selected columns with table name in order to avoid collisions.
      *
-     * @return void
+     * @return Builder|null
      */
     public function prefixColumnsForJoin()
     {

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace Sofa\Eloquence;
 
-use Closure;
-use InvalidArgumentException;
 use Sofa\Eloquence\Searchable\Column;
 use Illuminate\Database\Query\Expression;
 use Sofa\Hookable\Builder as HookableBuilder;

Indentation +2 added lines, -2 removed lines

@@ -108,8 +108,8 @@
                         : (float) $threshold ;
 
         $subquery->select($this->model->getTable().'.*')
-                 ->from($this->model->getTable())
-                 ->groupBy($this->model->getQualifiedKeyName());
+                    ->from($this->model->getTable())
+                    ->groupBy($this->model->getQualifiedKeyName());
 
         $this->addSearchClauses($subquery, $columns, $words, $threshold);
 

Spacing +10 added lines, -10 removed lines

@@ -105,9 +105,9 @@ 
 
         $threshold = (is_null($threshold))
                         ? array_sum($columns->getWeights()) / 4
-                        : (float) $threshold ;
+                        : (float) $threshold;
 
-        $subquery->select($this->model->getTable().'.*')
+        $subquery->select($this->model->getTable() . '.*')
                  ->from($this->model->getTable())
                  ->groupBy($this->model->getQualifiedKeyName());
 
@@ -134,7 +134,7 @@ 
         $whereBindings = $this->searchSelect($subquery, $columns, $words, $threshold);
 
         // For morphOne/morphMany support we need to port the bindings from JoinClauses.
-        $joinBindings = array_flatten(array_pluck((array)$subquery->getQuery()->joins, 'bindings'));
+        $joinBindings = array_flatten(array_pluck((array) $subquery->getQuery()->joins, 'bindings'));
 
         $this->addBinding($joinBindings, 'select');
 
@@ -238,7 +238,7 @@ 
             if (in_array($type, $typesToMove) && $this->model->hasColumn($where['column'])) {
                 unset($this->query->wheres[$key]);
 
-                $where['column'] = $this->model->getTable().'.'.$where['column'];
+                $where['column'] = $this->model->getTable() . '.' . $where['column'];
 
                 $subquery->getQuery()->wheres[] = $where;
 
@@ -269,7 +269,7 @@ 
     protected function countBindings(array $where, $type)
     {
         if ($this->isHasWhere($where, $type)) {
-            return substr_count($where['column'].$where['value'], '?');
+            return substr_count($where['column'] . $where['value'], '?');
 
         } elseif ($type === 'basic') {
             return (int) !$where['value'] instanceof Expression;
@@ -322,7 +322,7 @@ 
 
         $operator = $this->getLikeOperator();
 
-        $bindings['select'] = $bindings['where'] = array_map(function ($word) {
+        $bindings['select'] = $bindings['where'] = array_map(function($word) {
             return $this->caseBinding($word);
         }, $words);
 
@@ -334,7 +334,7 @@ 
             foreach ($words as $key => $word) {
                 if ($this->isLeftMatching($word)) {
                     $leftMatching[] = sprintf('%s %s ?', $column->getWrapped(), $operator);
-                    $bindings['select'][] = $bindings['where'][$key] = $this->caseBinding($word).'%';
+                    $bindings['select'][] = $bindings['where'][$key] = $this->caseBinding($word) . '%';
                 }
             }
 
@@ -349,7 +349,7 @@ 
             foreach ($words as $key => $word) {
                 if ($this->isWildcard($word)) {
                     $wildcards[] = sprintf('%s %s ?', $column->getWrapped(), $operator);
-                    $bindings['select'][] = $bindings['where'][$key] = '%'.$this->caseBinding($word).'%';
+                    $bindings['select'][] = $bindings['where'][$key] = '%' . $this->caseBinding($word) . '%';
                 }
             }
 
@@ -478,12 +478,12 @@ 
     public function prefixColumnsForJoin()
     {
         if (!$columns = $this->query->columns) {
-            return $this->select($this->model->getTable().'.*');
+            return $this->select($this->model->getTable() . '.*');
         }
 
         foreach ($columns as $key => $column) {
             if ($this->model->hasColumn($column)) {
-                $columns[$key] = $this->model->getTable().'.'.$column;
+                $columns[$key] = $this->model->getTable() . '.' . $column;
             }
         }
 

src/Eloquence.php

Doc Comments +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
      * Determine whether where should be treated as whereNull.
      *
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return boolean
      */
     protected function isWhereNull($method, ArgumentBag $args)
@@ -74,7 +74,7 @@ 
     /**
      * Determine whether where is a whereNull by the arguments passed to where method.
      *
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return boolean
      */
     protected function isWhereNullByArgs(ArgumentBag $args)

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
     {
         static::loadColumnListing();
 
-        return in_array((string)$key, static::$columnListing);
+        return in_array((string) $key, static::$columnListing);
     }
 
     /**

src/Mappable.php

Doc Comments +11 added lines, -11 removed lines

@@ -60,7 +60,7 @@ 
      *
      * @param  \Sofa\Eloquence\Builder $query
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return mixed
      */
     protected function mappedQuery(Builder $query, $method, ArgumentBag $args)
@@ -80,7 +80,7 @@ 
      * Adjust mapped columns for select statement.
      *
      * @param  \Sofa\Eloquence\Builder $query
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return void
      */
     protected function mappedSelect(Builder $query, ArgumentBag $args)
@@ -122,7 +122,7 @@ 
      *
      * @param  \Sofa\Eloquence\Builder $query
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @param  string $mapping
      * @return mixed
      */
@@ -142,7 +142,7 @@ 
      *
      * @param  \Sofa\Eloquence\Builder $query
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @param  string $target
      * @param  string $column
      * @return mixed
@@ -164,7 +164,7 @@ 
      * Order query by mapped attribute.
      *
      * @param  \Sofa\Eloquence\Builder $query
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @param  string $table
      * @param  string $column
      * @param  string $target
@@ -181,7 +181,7 @@ 
      * Get an array with the values of given mapped attribute.
      *
      * @param  \Sofa\Eloquence\Builder $query
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @param  string $table
      * @param  string $column
      * @return array
@@ -328,7 +328,7 @@ 
      *
      * @param  \Sofa\Eloquence\Builder $query
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @param  string $target
      * @param  string $column
      * @return \Sofa\Eloquence\Builder
@@ -350,7 +350,7 @@ 
      * Get the relation constraint closure.
      *
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return \Closure
      */
     protected function getMappedWhereConstraint($method, ArgumentBag $args)
@@ -363,7 +363,7 @@ 
     /**
      * Get boolean called on the original method and set it to default.
      *
-     * @param  \Sofa\EloquenceArgumentBag $args
+     * @param  ArgumentBag $args
      * @return string
      */
     protected function getMappedBoolean(ArgumentBag $args)
@@ -379,7 +379,7 @@ 
      * Determine the operator for count relation query and set 'not' appropriately.
      *
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return string
      */
     protected function getMappedOperator($method, ArgumentBag $args)
@@ -484,7 +484,7 @@ 
      *
      * @param  \Illuminate\Database\Eloquent\Model $target
      * @param  array  $segments
-     * @return mixed
+     * @return EloquentModel
      */
     protected function getTarget($target, array $segments)
     {

Spacing +4 added lines, -4 removed lines

@@ -209,7 +209,7 @@ 
     protected function mappedSelectListsKey(Builder $query, $key)
     {
         if ($this->hasColumn($key)) {
-            return $query->addSelect($this->getTable().'.'.$key);
+            return $query->addSelect($this->getTable() . '.' . $key);
         }
 
         return $query->addSelect($key);
@@ -255,7 +255,7 @@ 
         if (!$this->alreadyJoined($query, $table)) {
             list($fk, $pk) = $this->getJoinKeys($relation);
 
-            $query->leftJoin($table, function ($join) use ($fk, $pk, $relation, $parent, $related) {
+            $query->leftJoin($table, function($join) use ($fk, $pk, $relation, $parent, $related) {
                 $join->on($fk, '=', $pk);
 
                 if ($relation instanceof MorphOne || $relation instanceof MorphTo) {
@@ -355,7 +355,7 @@ 
      */
     protected function getMappedWhereConstraint($method, ArgumentBag $args)
     {
-        return function ($query) use ($method, $args) {
+        return function($query) use ($method, $args) {
             call_user_func_array([$query, $method], $args->all());
         };
     }
@@ -431,7 +431,7 @@ 
             $this->parseMappings();
         }
 
-        return array_key_exists((string)$key, static::$mappedAttributes);
+        return array_key_exists((string) $key, static::$mappedAttributes);
     }
 
     /**

src/Metable.php

Doc Comments +9 added lines, -9 removed lines

@@ -64,7 +64,7 @@ 
      *
      * @param  \Sofa\Eloquence\Builder $query
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return mixed
      */
     protected function metaQuery(Builder $query, $method, ArgumentBag $args)
@@ -80,7 +80,7 @@ 
      * Adjust meta columns for select statement.
      *
      * @param  \Sofa\Eloquence\Builder $query
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return void
      */
     protected function metaSelect(Builder $query, ArgumentBag $args)
@@ -113,7 +113,7 @@ 
      *
      * @param  \Sofa\Eloquence\Builder $query
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return mixed
      */
     protected function metaJoinQuery(Builder $query, $method, ArgumentBag $args)
@@ -148,7 +148,7 @@ 
      * Get an array with the values of given meta attribute.
      *
      * @param  \Sofa\Eloquence\Builder $query
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @param  string $alias
      * @return array
      */
@@ -238,7 +238,7 @@ 
      *
      * @param  \Sofa\Eloquence\Builder $query
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return \Sofa\Eloquence\Builder
      */
     protected function metaHasQuery(Builder $query, $method, ArgumentBag $args)
@@ -259,7 +259,7 @@ 
     /**
      * Get boolean called on the original method and set it to default.
      *
-     * @param  \Sofa\EloquenceArgumentBag $args
+     * @param  ArgumentBag $args
      * @return string
      */
     protected function getMetaBoolean(ArgumentBag $args)
@@ -275,7 +275,7 @@ 
      * Determine the operator for count relation query.
      *
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return string
      */
     protected function getMetaOperator($method, ArgumentBag $args)
@@ -291,7 +291,7 @@ 
      * Integers and floats must be passed in raw form in order to avoid string
      * comparison, due to the fact that all meta values are stored as strings.
      *
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return void
      */
     protected function unbindNumerics(ArgumentBag $args)
@@ -313,7 +313,7 @@ 
      * Get the relation constraint closure.
      *
      * @param  string $method
-     * @param  \Sofa\Eloquence\ArgumentBag $args
+     * @param  ArgumentBag $args
      * @return \Closure
      */
     protected function getMetaWhereConstraint($method, ArgumentBag $args)

Spacing +5 added lines, -5 removed lines

@@ -177,7 +177,7 @@ 
         if (strpos($key, '.') !== false) {
             return $query->addSelect($key);
         } elseif ($this->hasColumn($key)) {
-            return $query->addSelect($this->getTable().'.'.$key);
+            return $query->addSelect($this->getTable() . '.' . $key);
         }
 
         $alias = $this->joinMeta($query, $key);
@@ -214,7 +214,7 @@ 
 
         $table = (new Attribute)->getTable();
 
-        $query->leftJoin("{$table} as {$alias}", function ($join) use ($alias, $column) {
+        $query->leftJoin("{$table} as {$alias}", function($join) use ($alias, $column) {
             $join->on("{$alias}.metable_id", '=', $this->getQualifiedKeyName())
                 ->where("{$alias}.metable_type", '=', $this->getMorphClass())
                 ->where("{$alias}.meta_key", '=', $column);
@@ -230,7 +230,7 @@ 
      */
     protected function generateMetaAlias()
     {
-        return md5(microtime(true)).'_meta_alias';
+        return md5(microtime(true)) . '_meta_alias';
     }
 
     /**
@@ -326,7 +326,7 @@ 
             return $this->getMetaBetweenConstraint($column, $args->get('values'));
         }
 
-        return function ($query) use ($column, $method, $args) {
+        return function($query) use ($column, $method, $args) {
             $query->where('meta_key', $column);
 
             if ($args->get('value') || $args->get('values')) {
@@ -347,7 +347,7 @@ 
         $min = $values[0];
         $max = $values[1];
 
-        return function ($query) use ($column, $min, $max) {
+        return function($query) use ($column, $min, $max) {
             $query->where('meta_key', $column)
                 ->where('meta_value', '>=', $min)
                 ->where('meta_value', '<=', $max);

src/Mutator/Mutator.php

Doc Comments -1 removed lines

@@ -16,7 +16,6 @@
      * Mutate value using provided methods.
      *
      * @param  mixed $value
-     * @param  string|array $mutators
      * @return mixed
      *
      * @throws \LogicException

src/Validable.php

Doc Comments +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
     /**
      * Get all validation rules for update for given id.
      *
-     * @param  \Illuminate\Database\Eloquent\Model|string $id
+     * @param  Validable $id
      * @return array
      */
     public static function getUpdateRulesForId($id)

src/Metable/CreateMetaAttributesTable.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function up()
     {
-        \Schema::create($this->table, function (Blueprint $table) {
+        \Schema::create($this->table, function(Blueprint $table) {
             $table->increments('meta_id');
             $table->string('meta_key');
             $table->longText('meta_value');

src/Metable/Hooks.php

Spacing +10 added lines, -10 removed lines

@@ -17,7 +17,7 @@ 
      */
     public function getAttribute()
     {
-        return function ($next, $value, $args) {
+        return function($next, $value, $args) {
             $key = $args->get('key');
 
             if (is_null($value)) {
@@ -35,7 +35,7 @@ 
      */
     public function setAttribute()
     {
-        return function ($next, $value, $args) {
+        return function($next, $value, $args) {
             $key = $args->get('key');
 
             if (!$this->hasColumn($key) && $this->allowsMeta($key) && !$this->hasSetMutator($key)) {
@@ -53,7 +53,7 @@ 
      */
     public function toArray()
     {
-        return function ($next, $attributes) {
+        return function($next, $attributes) {
             unset($attributes['meta_attributes'], $attributes['metaAttributes']);
 
             $attributes = array_merge($attributes, $this->getMetaAttributesArray());
@@ -69,7 +69,7 @@ 
      */
     public function replicate()
     {
-        return function ($next, $copy, $args) {
+        return function($next, $copy, $args) {
             $metaAttributes = $args->get('original')
                                     ->getMetaAttributes()
                                     ->replicate($args->get('except'));
@@ -87,7 +87,7 @@ 
      */
     public function save()
     {
-        return function ($next, $value, $args) {
+        return function($next, $value, $args) {
             $this->saveMeta();
 
             return $next($value, $args);
@@ -101,7 +101,7 @@ 
      */
     public function __issetHook()
     {
-        return function ($next, $isset, $args) {
+        return function($next, $isset, $args) {
             $key = $args->get('key');
 
             if (!$isset) {
@@ -119,7 +119,7 @@ 
      */
     public function __unsetHook()
     {
-        return function ($next, $value, $args) {
+        return function($next, $value, $args) {
             $key = $args->get('key');
 
             if ($this->hasMeta($key)) {
@@ -137,7 +137,7 @@ 
      */
     public function queryHook()
     {
-        return function ($next, $query, $bag) {
+        return function($next, $query, $bag) {
             $method = $bag->get('method');
             $args   = $bag->get('args');
             $column = $args->get('column');
@@ -156,8 +156,8 @@ 
 
     public function __call($method, $params)
     {
-        if (strpos($method, '__') === 0 && method_exists($this, $method.'Hook')) {
-            return call_user_func_array([$this, $method.'Hook'], $params);
+        if (strpos($method, '__') === 0 && method_exists($this, $method . 'Hook')) {
+            return call_user_func_array([$this, $method . 'Hook'], $params);
         }
 
         throw new BadMethodCallException("Method [{$method}] doesn't exist on this object.");

src/Mutable/Hooks.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function getAttribute()
     {
-        return function ($next, $value, $args) {
+        return function($next, $value, $args) {
             $key = $args->get('key');
 
             if ($this->hasGetterMutator($key)) {
@@ -33,7 +33,7 @@ 
      */
     public function setAttribute()
     {
-        return function ($next, $value, $args) {
+        return function($next, $value, $args) {
             $key = $args->get('key');
 
             if ($this->hasSetterMutator($key)) {
@@ -51,7 +51,7 @@ 
      */
     public function toArray()
     {
-        return function ($next, $attributes) {
+        return function($next, $attributes) {
             $attributes = $this->mutableAttributesToArray($attributes);
 
             return $next($attributes);