doctrine / orm

lib/Doctrine/ORM/Cache/DefaultQueryCache.php

Indentation +3 added lines, -3 removed lines

@@ -38,9 +38,9 @@
  */
 class DefaultQueryCache implements QueryCache
 {
-     /**
-     * @var \Doctrine\ORM\EntityManagerInterface
-     */
+        /**
+         * @var \Doctrine\ORM\EntityManagerInterface
+         */
     private $em;
 
     /**

Doc Comments -1 removed lines

@@ -336,7 +336,6 @@
 
     /**
      * @param \Doctrine\ORM\Cache\QueryCacheKey $key
-     * @param AssociationMetadata               $assoc
      * @param mixed                             $assocValue
      *
      * @return array|null

Unused Use Statements -3 removed lines

@@ -22,14 +22,11 @@
 
 namespace Doctrine\ORM\Cache;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Cache\Persister\CachedPersister;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\AssociationMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\PersistentCollection;
 use Doctrine\Common\Proxy\Proxy;
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Query;

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 
@@ -100,7 +100,7 @@ 
 
         $cm = $this->em->getClassMetadata($entityName);
 
-        $generateKeys = function (array $entry) use ($cm): EntityCacheKey {
+        $generateKeys = function(array $entry) use ($cm): EntityCacheKey {
             return new EntityCacheKey($cm->getRootClassName(), $entry['identifier']);
         };
 
@@ -171,7 +171,7 @@ 
                     continue;
                 }
 
-                $generateKeys = function ($id) use ($assocMetadata): EntityCacheKey {
+                $generateKeys = function($id) use ($assocMetadata): EntityCacheKey {
                     return new EntityCacheKey($assocMetadata->getRootClassName(), $id);
                 };
 
@@ -335,9 +335,9 @@ 
             $assocIdentifier = $this->uow->getEntityIdentifier($assocValue);
             $entityKey       = new EntityCacheKey($assocMetadata->getRootClassName(), $assocIdentifier);
 
-            if ((! $assocValue instanceof Proxy && ($key->cacheMode & Cache::MODE_REFRESH)) || ! $assocRegion->contains($entityKey)) {
+            if (( ! $assocValue instanceof Proxy && ($key->cacheMode & Cache::MODE_REFRESH)) || ! $assocRegion->contains($entityKey)) {
                 // Entity put fail
-                if (! $assocPersister->storeEntityCache($assocValue, $entityKey)) {
+                if ( ! $assocPersister->storeEntityCache($assocValue, $entityKey)) {
                     return null;
                 }
             }

lib/Doctrine/ORM/Cache/Logging/CacheLogger.php

Indentation +6 added lines, -6 removed lines

@@ -56,12 +56,12 @@
      */
     public function entityCacheMiss($regionName, EntityCacheKey $key);
 
-     /**
-     * Log an entity put into second level cache.
-     *
-     * @param string                                 $regionName The name of the cache region.
-     * @param \Doctrine\ORM\Cache\CollectionCacheKey $key        The cache key of the collection.
-     */
+        /**
+         * Log an entity put into second level cache.
+         *
+         * @param string                                 $regionName The name of the cache region.
+         * @param \Doctrine\ORM\Cache\CollectionCacheKey $key        The cache key of the collection.
+         */
     public function collectionCachePut($regionName, CollectionCacheKey $key);
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Logging;
 

lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php

Indentation +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
         $code = $this->generateEntityRepositoryClass($fullClassName);
 
         $path = $outputDirectory . DIRECTORY_SEPARATOR
-              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
+                . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
         $dir = dirname($path);
 
         if ( ! is_dir($dir)) {

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -98,7 +98,7 @@ 
     {
         $namespace = $this->getClassNamespace($fullClassName);
 
-        return $namespace ? 'namespace ' . $namespace . ';' : '';
+        return $namespace ? 'namespace '.$namespace.';' : '';
     }
 
     /**
@@ -113,7 +113,7 @@ 
         $repositoryName = $this->repositoryName ?: EntityRepository::class;
 
         if ($namespace && $repositoryName[0] !== '\\') {
-            $repositoryName = '\\' . $repositoryName;
+            $repositoryName = '\\'.$repositoryName;
         }
 
         return $repositoryName;
@@ -129,8 +129,8 @@ 
     {
         $code = $this->generateEntityRepositoryClass($fullClassName);
 
-        $path = $outputDirectory . DIRECTORY_SEPARATOR
-              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
+        $path = $outputDirectory.DIRECTORY_SEPARATOR
+              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName).'.php';
         $dir = dirname($path);
 
         if ( ! is_dir($dir)) {

lib/Doctrine/ORM/Tools/Console/Command/InfoCommand.php

Indentation +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
         $entityManager = $this->getHelper('em')->getEntityManager();
 
         $entityClassNames = $entityManager->getConfiguration()
-                                          ->getMetadataDriverImpl()
-                                          ->getAllClassNames();
+                                            ->getMetadataDriverImpl()
+                                            ->getAllClassNames();
 
         if (!$entityClassNames) {
             throw new \Exception(

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Console\Command;
 
@@ -46,7 +46,7 @@ 
                                           ->getMetadataDriverImpl()
                                           ->getAllClassNames();
 
-        if (!$entityClassNames) {
+        if ( ! $entityClassNames) {
             throw new \Exception(
                 'You do not have any mapped Doctrine ORM entities according to the current configuration. '.
                 'If you have entities or mapping files you should check your mapping configuration for errors.'

lib/Doctrine/ORM/EntityManagerInterface.php

Indentation +11 added lines, -11 removed lines

@@ -242,17 +242,17 @@
     public function getUnitOfWork();
 
     /**
-    * Gets a hydrator for the given hydration mode.
-    *
-    * This method caches the hydrator instances which is used for all queries that don't
-    * selectively iterate over the result.
-    *
-    * @deprecated
-    *
-    * @param int $hydrationMode
-    *
-    * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
-    */
+     * Gets a hydrator for the given hydration mode.
+     *
+     * This method caches the hydrator instances which is used for all queries that don't
+     * selectively iterate over the result.
+     *
+     * @deprecated
+     *
+     * @param int $hydrationMode
+     *
+     * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
+     */
     public function getHydrator($hydrationMode);
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 

lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     public function resolve($className)
     {
         if (isset($this->instances[$className = trim($className, '\\')])) {
-           return $this->instances[$className];
+            return $this->instances[$className];
         }
 
         return $this->instances[$className] = new $className();

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping;
 

lib/Doctrine/ORM/Configuration.php

Doc Comments +1 added lines, -1 removed lines

@@ -918,7 +918,7 @@
      * @since 2.5
      *
      * @param string $name  The name of the hint.
-     * @param mixed  $value The value of the hint.
+     * @param string  $value The value of the hint.
      */
     public function setDefaultQueryHint($name, $value)
     {

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -133,7 +133,7 @@ 
      */
     public function newDefaultAnnotationDriver($paths = [])
     {
-        AnnotationRegistry::registerFile(__DIR__ . '/Annotation/DoctrineAnnotations.php');
+        AnnotationRegistry::registerFile(__DIR__.'/Annotation/DoctrineAnnotations.php');
 
         $reader = new CachedReader(new AnnotationReader(), new ArrayCache());
 

lib/Doctrine/ORM/Query.php

Doc Comments +1 added lines, -1 removed lines

@@ -620,7 +620,7 @@
      * Executes the query and returns an IterableResult that can be used to incrementally
      * iterated over the result.
      *
-     * @param ArrayCollection|array|null $parameters    The query parameters.
+     * @param null|ArrayCollection $parameters    The query parameters.
      * @param integer                    $hydrationMode The hydration mode to use.
      *
      * @return \Doctrine\ORM\Internal\Hydration\IterableResult

Unused Use Statements -1 removed lines

@@ -26,7 +26,6 @@
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\ParserResult;
 use Doctrine\ORM\Query\QueryException;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query\ParameterTypeInferer;
 use Doctrine\Common\Collections\ArrayCollection;
 

Indentation +3 added lines, -3 removed lines

@@ -742,9 +742,9 @@
         );
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     protected function getHash()
     {
         return sha1(parent::getHash(). '-'. $this->firstResult . '-' . $this->maxResults);

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -26,7 +26,7 @@ 
     /**
      * A query object is in CLEAN state when it has NO unparsed/unprocessed DQL parts.
      */
-    const STATE_CLEAN  = 1;
+    const STATE_CLEAN = 1;
 
     /**
      * A query object is in state DIRTY when it has DQL parts that have not yet been
@@ -717,11 +717,11 @@ 
             ->getName();
 
         return md5(
-            $this->getDQL() . serialize($this->hints) .
-            '&platform=' . $platform .
-            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '') .
-            '&firstResult=' . $this->firstResult . '&maxResult=' . $this->maxResults .
-            '&hydrationMode=' . $this->hydrationMode . '&types=' . serialize($this->parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT'
+            $this->getDQL().serialize($this->hints).
+            '&platform='.$platform.
+            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '').
+            '&firstResult='.$this->firstResult.'&maxResult='.$this->maxResults.
+            '&hydrationMode='.$this->hydrationMode.'&types='.serialize($this->parsedTypes).'DOCTRINE_QUERY_CACHE_SALT'
         );
     }
 
@@ -730,7 +730,7 @@ 
      */
     protected function getHash()
     {
-        return sha1(parent::getHash(). '-'. $this->firstResult . '-' . $this->maxResults);
+        return sha1(parent::getHash().'-'.$this->firstResult.'-'.$this->maxResults);
     }
 
     /**

lib/Doctrine/ORM/Query/Expr.php

Doc Comments +31 added lines, -31 removed lines

@@ -75,7 +75,7 @@ 
     /**
      * Creates an ASCending order expression.
      *
-     * @param mixed $expr
+     * @param string $expr
      *
      * @return Expr\OrderBy
      */
@@ -87,7 +87,7 @@ 
     /**
      * Creates a DESCending order expression.
      *
-     * @param mixed $expr
+     * @param string $expr
      *
      * @return Expr\OrderBy
      */
@@ -125,8 +125,8 @@ 
      *     // u.id <> ?1
      *     $q->where($q->expr()->neq('u.id', '?1'));
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param string $x Left expression.
+     * @param string $y Right expression.
      *
      * @return Expr\Comparison
      */
@@ -214,7 +214,7 @@ 
     /**
      * Creates an instance of AVG() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in AVG() function.
+     * @param string $x Argument to be used in AVG() function.
      *
      * @return Expr\Func
      */
@@ -226,7 +226,7 @@ 
     /**
      * Creates an instance of MAX() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in MAX() function.
+     * @param string $x Argument to be used in MAX() function.
      *
      * @return Expr\Func
      */
@@ -238,7 +238,7 @@ 
     /**
      * Creates an instance of MIN() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in MIN() function.
+     * @param string $x Argument to be used in MIN() function.
      *
      * @return Expr\Func
      */
@@ -250,7 +250,7 @@ 
     /**
      * Creates an instance of COUNT() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in COUNT() function.
+     * @param string $x Argument to be used in COUNT() function.
      *
      * @return Expr\Func
      */
@@ -262,7 +262,7 @@ 
     /**
      * Creates an instance of COUNT(DISTINCT) function, with the given argument.
      *
-     * @param mixed $x Argument to be used in COUNT(DISTINCT) function.
+     * @param string $x Argument to be used in COUNT(DISTINCT) function.
      *
      * @return string
      */
@@ -274,7 +274,7 @@ 
     /**
      * Creates an instance of EXISTS() function, with the given DQL Subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in EXISTS() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in EXISTS() function.
      *
      * @return Expr\Func
      */
@@ -298,7 +298,7 @@ 
     /**
      * Creates a SOME() function expression with the given DQL subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in SOME() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in SOME() function.
      *
      * @return Expr\Func
      */
@@ -310,7 +310,7 @@ 
     /**
      * Creates an ANY() function expression with the given DQL subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in ANY() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in ANY() function.
      *
      * @return Expr\Func
      */
@@ -334,7 +334,7 @@ 
     /**
      * Creates an ABS() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in ABS() function.
+     * @param integer $x Argument to be used in ABS() function.
      *
      * @return Expr\Func
      */
@@ -353,8 +353,8 @@ 
      *     // u.salary * u.percentAnnualSalaryIncrease
      *     $q->expr()->prod('u.salary', 'u.percentAnnualSalaryIncrease')
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $x Left expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -372,7 +372,7 @@ 
      *     // u.monthlySubscriptionCount - 1
      *     $q->expr()->diff('u.monthlySubscriptionCount', '1')
      *
-     * @param mixed $x Left expression.
+     * @param integer $x Left expression.
      * @param mixed $y Right expression.
      *
      * @return Expr\Math
@@ -391,8 +391,8 @@ 
      *     // u.numChildren + 1
      *     $q->expr()->sum('u.numChildren', '1')
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $x Left expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -411,7 +411,7 @@ 
      *     $expr->quot('u.total', 'u.period')
      *
      * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -423,7 +423,7 @@ 
     /**
      * Creates a SQRT() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in SQRT() function.
+     * @param integer $x Argument to be used in SQRT() function.
      *
      * @return Expr\Func
      */
@@ -502,7 +502,7 @@ 
      * Creates a LIKE() comparison expression with the given arguments.
      *
      * @param string $x Field in string format to be inspected by LIKE() comparison.
-     * @param mixed  $y Argument to be used in LIKE() comparison.
+     * @param string  $y Argument to be used in LIKE() comparison.
      *
      * @return Expr\Comparison
      */
@@ -515,7 +515,7 @@ 
      * Creates a NOT LIKE() comparison expression with the given arguments.
      *
      * @param string $x Field in string format to be inspected by LIKE() comparison.
-     * @param mixed  $y Argument to be used in LIKE() comparison.
+     * @param string  $y Argument to be used in LIKE() comparison.
      *
      * @return Expr\Comparison
      */
@@ -527,8 +527,8 @@ 
     /**
      * Creates a CONCAT() function expression with the given arguments.
      *
-     * @param mixed $x First argument to be used in CONCAT() function.
-     * @param mixed $y,... Other arguments to be used in CONCAT() function.
+     * @param string $x First argument to be used in CONCAT() function.
+     * @param string $y
      *
      * @return Expr\Func
      */
@@ -540,7 +540,7 @@ 
     /**
      * Creates a SUBSTRING() function expression with the given arguments.
      *
-     * @param mixed    $x    Argument to be used as string to be cropped by SUBSTRING() function.
+     * @param string    $x    Argument to be used as string to be cropped by SUBSTRING() function.
      * @param int      $from Initial offset to start cropping string. May accept negative values.
      * @param int|null $len  Length of crop. May accept negative values.
      *
@@ -559,7 +559,7 @@ 
     /**
      * Creates a LOWER() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in LOWER() function.
+     * @param string $x Argument to be used in LOWER() function.
      *
      * @return Expr\Func A LOWER function expression.
      */
@@ -571,7 +571,7 @@ 
     /**
      * Creates an UPPER() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in UPPER() function.
+     * @param string $x Argument to be used in UPPER() function.
      *
      * @return Expr\Func An UPPER function expression.
      */
@@ -583,7 +583,7 @@ 
     /**
      * Creates a LENGTH() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used as argument of LENGTH() function.
+     * @param string $x Argument to be used as argument of LENGTH() function.
      *
      * @return Expr\Func A LENGTH function expression.
      */
@@ -625,11 +625,11 @@ 
     /**
      * Creates an instance of BETWEEN() function, with the given argument.
      *
-     * @param mixed   $val Valued to be inspected by range values.
+     * @param string   $val Valued to be inspected by range values.
      * @param integer $x   Starting range value to be used in BETWEEN() function.
      * @param integer $y   End point value to be used in BETWEEN() function.
      *
-     * @return Expr\Func A BETWEEN expression.
+     * @return string A BETWEEN expression.
      */
     public function between($val, $x, $y)
     {
@@ -639,7 +639,7 @@ 
     /**
      * Creates an instance of TRIM() function, with the given argument.
      *
-     * @param mixed $x Argument to be used as argument of TRIM() function.
+     * @param string $x Argument to be used as argument of TRIM() function.
      *
      * @return Expr\Func a TRIM expression.
      */

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -253,7 +253,7 @@ 
      */
     public function countDistinct($x)
     {
-        return 'COUNT(DISTINCT ' . implode(', ', func_get_args()) . ')';
+        return 'COUNT(DISTINCT '.implode(', ', func_get_args()).')';
     }
 
     /**
@@ -435,7 +435,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' IN', (array) $y);
+        return new Expr\Func($x.' IN', (array) $y);
     }
 
     /**
@@ -456,7 +456,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' NOT IN', (array) $y);
+        return new Expr\Func($x.' NOT IN', (array) $y);
     }
 
     /**
@@ -468,7 +468,7 @@ 
      */
     public function isNull($x)
     {
-        return $x . ' IS NULL';
+        return $x.' IS NULL';
     }
 
     /**
@@ -480,7 +480,7 @@ 
      */
     public function isNotNull($x)
     {
-        return $x . ' IS NOT NULL';
+        return $x.' IS NOT NULL';
     }
 
     /**
@@ -598,12 +598,12 @@ 
      */
     private function quoteLiteral($literal)
     {
-        if (is_numeric($literal) && !is_string($literal)) {
+        if (is_numeric($literal) && ! is_string($literal)) {
             return (string) $literal;
         } else if (is_bool($literal)) {
             return $literal ? "true" : "false";
         } else {
-            return "'" . str_replace("'", "''", $literal) . "'";
+            return "'".str_replace("'", "''", $literal)."'";
         }
     }
 
@@ -618,7 +618,7 @@ 
      */
     public function between($val, $x, $y)
     {
-        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
+        return $val.' BETWEEN '.$x.' AND '.$y;
     }
 
     /**