tflori / orm

src/Relation/Owner.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
     /** {@inheritdoc} */
     public function fetch(Entity $self, EntityManager $entityManager)
     {
-        $key = array_map([$self, '__get' ], array_keys($this->reference));
+        $key = array_map([$self, '__get'], array_keys($this->reference));
 
         if (in_array(null, $key)) {
             return null;
@@ -82,6 +82,6 @@ 
             $expression[] = $alias . '.' . $myVar . ' = ' . $this->name . '.' . $hisVar;
         }
 
-        call_user_func([ $fetcher, $join ], $this->class, implode(' AND ', $expression), $this->name, [], true);
+        call_user_func([$fetcher, $join], $this->class, implode(' AND ', $expression), $this->name, [], true);
     }
 }

src/EntityFetcher.php

Spacing +7 added lines, -7 removed lines

@@ -61,8 +61,8 @@ 
 
         $this->tableName = $entityManager->escapeIdentifier($class::getTableName());
         $this->alias     = 't0';
-        $this->columns   = [ 't0.*' ];
-        $this->modifier  = [ 'DISTINCT' ];
+        $this->columns   = ['t0.*'];
+        $this->modifier  = ['DISTINCT'];
 
         $this->classMapping['byClass'][$class] = 't0';
         $this->classMapping['byAlias']['t0']   = $class;
@@ -183,7 +183,7 @@ 
             $alias = $this->alias;
         }
 
-        call_user_func([ $class, 'getRelation' ], $relation)->addJoin($this, $join, $alias);
+        call_user_func([$class, 'getRelation'], $relation)->addJoin($this, $join, $alias);
         return $this;
     }
 
@@ -230,7 +230,7 @@ 
             return null;
         }
 
-        $class         = $this->class;
+        $class = $this->class;
         $newEntity = new $class($data, $this->entityManager, true);
         $entity    = $this->entityManager->map($newEntity);
 
@@ -275,11 +275,11 @@ 
     public function count()
     {
         // set the columns and reset after get query
-        $this->columns  = [ 'COUNT(DISTINCT t0.*)' ];
+        $this->columns  = ['COUNT(DISTINCT t0.*)'];
         $this->modifier = [];
         $query          = $this->getQuery();
-        $this->columns  = [ 't0.*' ];
-        $this->modifier = [ 'DISTINCT' ];
+        $this->columns  = ['t0.*'];
+        $this->modifier = ['DISTINCT'];
 
         return (int) $this->entityManager->getConnection()->query($query)->fetchColumn();
     }

src/EntityManager.php

Spacing +2 added lines, -3 removed lines

@@ -384,8 +384,7 @@ 
         }
 
         return $useAutoIncrement && $entity::isAutoIncremented() ?
-            $this->getDbal()->insertAndSyncWithAutoInc($entity) :
-            $this->getDbal()->insertAndSync($entity);
+            $this->getDbal()->insertAndSyncWithAutoInc($entity) : $this->getDbal()->insertAndSync($entity);
     }
 
     /**
@@ -501,7 +500,7 @@ 
             return new EntityFetcher($this, $class);
         }
 
-        $primaryKey = $this::buildPrimaryKey($class, (array)$primaryKey);
+        $primaryKey = $this::buildPrimaryKey($class, (array) $primaryKey);
         $checksum = $this::buildChecksum($primaryKey);
 
         if (isset($this->map[$class][$checksum])) {

src/Testing/EntityManagerMock.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             return new EntityFetcherMock($this, $class);
         }
 
-        $primaryKey = $this->buildPrimaryKey($class, (array)$primaryKey);
+        $primaryKey = $this->buildPrimaryKey($class, (array) $primaryKey);
         $checksum = $this->buildChecksum($primaryKey);
 
         if (isset($this->map[$class][$checksum])) {

Doc Comments +2 added lines, -1 removed lines

@@ -56,8 +56,9 @@
      *
      * As the results are mocked to come from the database they will also get a primary key if they don't have already.
      *
-     * @param $class
+     * @param string $class
      * @param Entity ...$entities
+     * @param Entity[] $entities
      * @return Result|m\MockInterface
      * @codeCoverageIgnore proxy method
      */

src/Testing/MocksEntityManager.php

Spacing +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
         $em = $this->ormGetEntityManagerInstance($class);
 
         /** @var m\MockInterface|EntityFetcher $fetcher */
-        $fetcher = m::mock(EntityFetcher::class, [ $em, $class ])->makePartial();
+        $fetcher = m::mock(EntityFetcher::class, [$em, $class])->makePartial();
         $expectation = $em->shouldReceive('fetch')->with($class)->andReturn($fetcher);
 
         $fetcher->shouldReceive('count')->with()->andReturn(count($entities))->byDefault();

Doc Comments +4 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * Get the EntityManagerMock for $class
      *
-     * @param $class
+     * @param string $class
      * @return EntityManagerMock|m\MockInterface|EntityManager
      * @codeCoverageIgnore proxy method
      */
@@ -130,6 +130,7 @@ 
      *
      * @param string $class The class of an Entity
      * @param Entity ...$entities The entities that will be returned
+     * @param Entity[] $entities
      * @return EntityFetcherMock\Result|m\MockInterface
      * @codeCoverageIgnore trivial code
      */
@@ -260,7 +261,7 @@ 
      *
      * Entity has to be a mock use `emCreateMockedEntity()` to create it.
      *
-     * @param Entity|m\MockInterface $entity
+     * @param m\MockInterface $entity
      * @param array  $changingData Emulate changing data during update statement (triggers etc)
      * @param array  $updatedData  Emulate data changes in database
      */
@@ -275,7 +276,7 @@ 
      *
      * Entity has to be a mock use `emCreateMockedEntity()` to create it.
      *
-     * @param Entity|m\MockInterface $entity
+     * @param m\MockInterface $entity
      * @param array $changingData Emulate changing data during update statement (triggers etc)
      * @param array $updatedData Emulate data changes in database
      * @return m\Expectation

src/Dbal/Column.php

Spacing +4 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
     protected static function getRegisteredType(array $columnDefinition)
     {
         foreach (self::$registeredTypes as $class) {
-            if (call_user_func([ $class, 'fits' ], $columnDefinition)) {
+            if (call_user_func([$class, 'fits'], $columnDefinition)) {
                 return $class;
             }
         }
@@ -114,8 +114,7 @@ 
     public function __get($name)
     {
         $method = [$this, 'get' . ucfirst($name)];
-        return is_callable($method) ? call_user_func($method) :
-            (isset($this->columnDefinition[$name]) ? $this->columnDefinition[$name] : null);
+        return is_callable($method) ? call_user_func($method) : (isset($this->columnDefinition[$name]) ? $this->columnDefinition[$name] : null);
     }
 
     /**
@@ -183,11 +182,11 @@ 
                 $class = $this->columnDefinition['type'];
             }
 
-            if ($class === null || !is_callable([ $class, 'factory' ])) {
+            if ($class === null || !is_callable([$class, 'factory'])) {
                 $class = Type\Text::class;
             }
 
-            $this->type = call_user_func([ $class, 'factory' ], $this->dbal, $this->columnDefinition);
+            $this->type = call_user_func([$class, 'factory'], $this->dbal, $this->columnDefinition);
         }
 
         return $this->type;

src/Dbal/Escaping.php

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * Escape a date time object for query
      *
      * @param DateTime $value
-     * @return mixed
+     * @return string
      */
     protected function escapeDateTime(DateTime $value)
     {

src/Testing/EntityFetcherMock/ResultRepository.php

Doc Comments +2 added lines

@@ -39,6 +39,7 @@ 
      * RANDOM_KEY_MIN and RANDOM_KEY_MAX (at the time writing this it is 1000000000 and 1000999999).
      *
      * @param Entity ...$entities
+     * @param Entity[] $entities
      * @return Entity[]
      */
     public static function completePrimaryKeys(Entity ...$entities)
@@ -97,6 +98,7 @@ 
      *
      * @param $class
      * @param Entity ...$entities
+     * @param Entity[] $entities
      * @return Result|m\MockInterface
      */
     public function addResult($class, Entity ...$entities)