Merge pull request #3 from maxmirazh33/scrutinizer-patch-3

Scrutinizer Auto-Fixes
analogueorm · Jan 8, 2016 · 0d3c2e6 · 0d3c2e6
2 parents 83915a3 + 8b5a205
commit 0d3c2e6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/src/Plugins/SoftDeletes/SoftDeletingScope.php b/src/Plugins/SoftDeletes/SoftDeletingScope.php
@@ -41,7 +41,7 @@ public function remove(Query $query)
 
         $query = $query->getQuery();
 
-        foreach ((array)$query->wheres as $key => $where) {
+        foreach ((array) $query->wheres as $key => $where) {
             // If the where clause is a soft delete date constraint, we will remove it from
             // the query and reset the keys on the wheres. This allows this developer to
             // include deleted model in a relationship result set that is lazy loaded.

diff --git a/src/Relationships/BelongsTo.php b/src/Relationships/BelongsTo.php
@@ -70,15 +70,15 @@ public function attachTo($related)
      */
     public function detachFrom($related)
     {
-        return $this->dissociate($related);//todo
+        return $this->dissociate($related); //todo
     }
 
     /**
      * Get the results of the relationship.
      *
      * @param  $relation
      *
-     * @return mixed
+     * @return \Analogue\ORM\Entity
      */
     public function getResults($relation)
     {

diff --git a/src/Relationships/HasManyThrough.php b/src/Relationships/HasManyThrough.php
@@ -150,7 +150,7 @@ public function addEagerConstraints(array $entities)
      *
      * @param  \Analogue\ORM\Entity[] $entities
      * @param  string                 $relation
-     * @return array
+     * @return \Analogue\ORM\Entity[]
      */
     public function initRelation(array $entities, $relation)
     {
@@ -167,7 +167,7 @@ public function initRelation(array $entities, $relation)
      * @param  \Analogue\ORM\Entity[] $entities
      * @param  EntityCollection       $results
      * @param  string                 $relation
-     * @return array
+     * @return \Analogue\ORM\Entity[]
      */
     public function match(array $entities, EntityCollection $results, $relation)
     {
@@ -221,7 +221,7 @@ protected function buildDictionary(EntityCollection $results)
      * Get the results of the relationship.
      *
      * @param  $relation
-     * @return mixed
+     * @return EntityCollection
      */
     public function getResults($relation)
     {
@@ -277,7 +277,7 @@ protected function getSelectColumns(array $columns = ['*'])
      *
      * @param  int   $perPage
      * @param  array $columns
-     * @return \Illuminate\Pagination\Paginator
+     * @return \Illuminate\Pagination\LengthAwarePaginator
      */
     public function paginate($perPage = null, $columns = ['*'])
     {

diff --git a/src/Relationships/MorphTo.php b/src/Relationships/MorphTo.php
@@ -102,7 +102,7 @@ public function match(array $entities, EntityCollection $results, $relation)
     /**
      * Get the results of the relationship.
      *
-     * @return mixed
+     * @return EntityCollection
      */
     public function getEager()
     {
@@ -152,7 +152,7 @@ protected function getResultsByType($type)
      * Gather all of the foreign keys for a given type.
      *
      * @param  string $type
-     * @return array
+     * @return BaseCollection
      */
     protected function gatherKeysByType($type)
     {

diff --git a/src/Relationships/Relationship.php b/src/Relationships/Relationship.php
@@ -279,7 +279,7 @@ public function getQuery()
     /**
      * Get the base query builder
      *
-     * @return \Illuminate\Database\Query\Builder
+     * @return \Analogue\ORM\Drivers\QueryAdapter
      */
     public function getBaseQuery()
     {

diff --git a/src/System/Aggregate.php b/src/System/Aggregate.php
@@ -197,7 +197,7 @@ protected function parseSingleRelationship($relation)
      * Check if value isn't parent or root in the aggregate
      *
      * @param  mixed
-     * @return true|void
+     * @return boolean|null
      */
     protected function isParentOrRoot($value)
     {
@@ -295,6 +295,7 @@ protected function createSubAggregates($entities, $relation)
      * Create a related subAggregate
      *
      * @param  mixed $entity
+     * @param string $relation
      * @return self
      */
     protected function createSubAggregate($entity, $relation)

diff --git a/src/System/Mapper.php b/src/System/Mapper.php
@@ -141,7 +141,7 @@ protected function storeEntity($entity)
      */
     protected function aggregate($entity)
     {
-         return new Aggregate($entity);
+            return new Aggregate($entity);
     }
 
     /**

diff --git a/src/System/Proxies/Proxy.php b/src/System/Proxies/Proxy.php
@@ -65,7 +65,7 @@ public function isLoaded()
     /**
      * Return the Query Builder on the relation
      *
-     * @param  mixed  $entity
+     * @param  \Analogue\ORM\System\InternallyMappable  $entity
      * @param  string $relation
      * @return \Analogue\ORM\System\Query
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,7 +141,7 @@ protected function storeEntity($entity) @@
          */
         protected function aggregate($entity)
         {
-             return new Aggregate($entity);
+                return new Aggregate($entity);
         }
         /**
@@ Expand Down @@