doctrine / orm

lib/Doctrine/ORM/NativeQuery.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     /**
      * Gets the SQL query.
      *
-     * @return mixed The built SQL query or an array of all SQL queries.
+     * @return string The built SQL query or an array of all SQL queries.
      *
      * @override
      */

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/Query/QueryExpressionVisitor.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 namespace Doctrine\ORM\Query;
 
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\Common\Collections\Expr\ExpressionVisitor;
 use Doctrine\Common\Collections\Expr\Comparison;
 use Doctrine\Common\Collections\Expr\CompositeExpression;

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -99,7 +99,7 @@ 
             $expressionList[] = $this->dispatch($child);
         }
 
-        switch($expr->getType()) {
+        switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
                 return new Expr\Andx($expressionList);
 
@@ -107,7 +107,7 @@ 
                 return new Expr\Orx($expressionList);
 
             default:
-                throw new \RuntimeException("Unknown composite " . $expr->getType());
+                throw new \RuntimeException("Unknown composite ".$expr->getType());
         }
     }
 
@@ -121,10 +121,10 @@ 
             throw new QueryException('No aliases are set before invoking walkComparison().');
         }
 
-        $field = $this->queryAliases[0] . '.' . $comparison->getField();
+        $field = $this->queryAliases[0].'.'.$comparison->getField();
 
-        foreach($this->queryAliases as $alias) {
-            if(strpos($comparison->getField() . '.', $alias . '.') === 0) {
+        foreach ($this->queryAliases as $alias) {
+            if (strpos($comparison->getField().'.', $alias.'.') === 0) {
                 $field = $comparison->getField();
                 break;
             }
@@ -135,13 +135,13 @@ 
 
         foreach ($this->parameters as $parameter) {
             if ($parameter->getName() === $parameterName) {
-                $parameterName .= '_' . $parameterCount;
+                $parameterName .= '_'.$parameterCount;
                 break;
             }
         }
 
         $parameter = new Parameter($parameterName, $this->walkValue($comparison->getValue()));
-        $placeholder = ':' . $parameterName;
+        $placeholder = ':'.$parameterName;
 
         switch ($comparison->getOperator()) {
             case Comparison::IN:
@@ -168,17 +168,17 @@ 
 
                 return $this->expr->neq($field, $placeholder);
             case Comparison::CONTAINS:
-                $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType());
+                $parameter->setValue('%'.$parameter->getValue().'%', $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
             case Comparison::STARTS_WITH:
-                $parameter->setValue($parameter->getValue() . '%', $parameter->getType());
+                $parameter->setValue($parameter->getValue().'%', $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
             case Comparison::ENDS_WITH:
-                $parameter->setValue('%' . $parameter->getValue(), $parameter->getType());
+                $parameter->setValue('%'.$parameter->getValue(), $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
@@ -194,7 +194,7 @@ 
                     );
                 }
 
-                throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
+                throw new \RuntimeException("Unknown comparison operator: ".$comparison->getOperator());
         }
     }
 

lib/Doctrine/ORM/QueryBuilder.php

Unused Use Statements -1 removed lines

@@ -21,7 +21,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
-
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\QueryExpressionVisitor;
 

Doc Comments +5 added lines, -7 removed lines

@@ -609,7 +609,7 @@ 
     /**
      * Gets a (previously set) query parameter of the query being constructed.
      *
-     * @param mixed $key The key (index or name) of the bound parameter.
+     * @param string $key The key (index or name) of the bound parameter.
      *
      * @return Query\Parameter|null The value of the bound parameter.
      */
@@ -1097,7 +1097,6 @@ 
      *         ->andWhere('u.is_active = 1');
      * </code>
      *
-     * @param mixed $where The query restrictions.
      *
      * @return self
      *
@@ -1130,7 +1129,6 @@ 
      *         ->orWhere('u.id = 2');
      * </code>
      *
-     * @param mixed $where The WHERE statement.
      *
      * @return self
      *
@@ -1195,7 +1193,7 @@ 
      * Specifies a restriction over the groups of the query.
      * Replaces any previous having restrictions, if any.
      *
-     * @param mixed $having The restriction over the groups.
+     * @param string $having The restriction over the groups.
      *
      * @return self
      */
@@ -1212,7 +1210,7 @@ 
      * Adds a restriction over the groups of the query, forming a logical
      * conjunction with any existing having restrictions.
      *
-     * @param mixed $having The restriction to append.
+     * @param string $having The restriction to append.
      *
      * @return self
      */
@@ -1235,7 +1233,7 @@ 
      * Adds a restriction over the groups of the query, forming a logical
      * disjunction with any existing having restrictions.
      *
-     * @param mixed $having The restriction to add.
+     * @param string $having The restriction to add.
      *
      * @return self
      */
@@ -1454,7 +1452,7 @@ 
     /**
      * Resets DQL parts.
      *
-     * @param array|null $parts
+     * @param string[] $parts
      *
      * @return self
      */

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -518,7 +518,7 @@ 
     public function setParameter($key, $value, $type = null)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 /* @var Query\Parameter $parameter */
                 // Must not be identical because of string to integer conversion
@@ -526,7 +526,7 @@ 
             }
         );
 
-        if (! $filteredParameters->isEmpty()) {
+        if ( ! $filteredParameters->isEmpty()) {
             /* @var Query\Parameter $parameter */
             $parameter = $filteredParameters->first();
             $parameter->setValue($value, $type);
@@ -599,7 +599,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 /* @var Query\Parameter $parameter */
                 // Must not be identical because of string to integer conversion
@@ -682,7 +682,7 @@ 
         }
 
         $isMultiple = is_array($this->dqlParts[$dqlPartName])
-            && !($dqlPartName == 'join' && !$append);
+            && ! ($dqlPartName == 'join' && ! $append);
 
         // Allow adding any part retrieved from self::getDQLParts().
         if (is_array($dqlPart) && $dqlPartName != 'join') {
@@ -899,7 +899,7 @@ 
     {
         $rootAliases = $this->getRootAliases();
 
-        if (!in_array($alias, $rootAliases)) {
+        if ( ! in_array($alias, $rootAliases)) {
             throw new Query\QueryException(
                 sprintf('Specified root alias %s must be set before invoking indexBy().', $alias)
             );
@@ -1301,15 +1301,15 @@ 
             foreach ($criteria->getOrderings() as $sort => $order) {
 
                 $hasValidAlias = false;
-                foreach($allAliases as $alias) {
-                    if(strpos($sort . '.', $alias . '.') === 0) {
+                foreach ($allAliases as $alias) {
+                    if (strpos($sort.'.', $alias.'.') === 0) {
                         $hasValidAlias = true;
                         break;
                     }
                 }
 
-                if(!$hasValidAlias) {
-                    $sort = $allAliases[0] . '.' . $sort;
+                if ( ! $hasValidAlias) {
+                    $sort = $allAliases[0].'.'.$sort;
                 }
 
                 $this->addOrderBy($sort, $order);
@@ -1382,7 +1382,7 @@ 
     private function getDQLForSelect()
     {
         $dql = 'SELECT'
-             . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
+             . ($this->dqlParts['distinct'] === true ? ' DISTINCT' : '')
              . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
@@ -1398,7 +1398,7 @@ 
 
                 if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) {
                     foreach ($joinParts[$from->getAlias()] as $join) {
-                        $fromClause .= ' ' . ((string) $join);
+                        $fromClause .= ' '.((string) $join);
                     }
                 }
 

Indentation +26 added lines, -26 removed lines

@@ -103,11 +103,11 @@ 
      */
     private $joinRootAliases = [];
 
-     /**
-     * Whether to use second level cache, if available.
-     *
-     * @var boolean
-     */
+        /**
+         * Whether to use second level cache, if available.
+         *
+         * @var boolean
+         */
     protected $cacheable = false;
 
     /**
@@ -198,10 +198,10 @@ 
     }
 
     /**
-    * Obtain the name of the second level query cache region in which query results will be stored
-    *
-    * @return string|null The cache region name; NULL indicates the default region.
-    */
+     * Obtain the name of the second level query cache region in which query results will be stored
+     *
+     * @return string|null The cache region name; NULL indicates the default region.
+     */
     public function getCacheRegion()
     {
         return $this->cacheRegion;
@@ -1356,10 +1356,10 @@ 
      */
     private function getDQLForDelete()
     {
-         return 'DELETE'
-              . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
-              . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+            return 'DELETE'
+                . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     /**
@@ -1367,11 +1367,11 @@ 
      */
     private function getDQLForUpdate()
     {
-         return 'UPDATE'
-              . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
-              . $this->getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
-              . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+            return 'UPDATE'
+                . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     /**
@@ -1380,8 +1380,8 @@ 
     private function getDQLForSelect()
     {
         $dql = 'SELECT'
-             . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
-             . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
+                . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
+                . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
         $joinParts   = $this->getDQLPart('join');
@@ -1405,10 +1405,10 @@ 
         }
 
         $dql .= implode(', ', $fromClauses)
-              . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
-              . $this->getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
-              . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
+                . $this->getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
 
         return $dql;
     }
@@ -1428,8 +1428,8 @@ 
         }
 
         return ($options['pre'] ?? '')
-             . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
-             . ($options['post'] ?? '');
+                . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
+                . ($options['post'] ?? '');
     }
 
     /**

tools/sandbox/index.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 use Entities\Address;
 use Entities\User;
 
-$em = require_once __DIR__ . '/bootstrap.php';
+$em = require_once __DIR__.'/bootstrap.php';
 
 ## PUT YOUR TEST CODE BELOW
 
 $user = new User;
 $address = new Address;
 
-echo 'Hello World!' . PHP_EOL;
+echo 'Hello World!'.PHP_EOL;

lib/Doctrine/ORM/Query/AST/Node.php

Indentation +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
             foreach ($props as $name => $prop) {
                 $ident += 4;
                 $str .= str_repeat(' ', $ident) . '"' . $name . '": '
-                      . $this->dump($prop) . ',' . PHP_EOL;
+                        . $this->dump($prop) . ',' . PHP_EOL;
                 $ident -= 4;
             }
 
@@ -86,7 +86,7 @@ 
 
             foreach ($obj as $k => $v) {
                 $str .= PHP_EOL . str_repeat(' ', $ident) . '"'
-                      . $k . '" => ' . $this->dump($v) . ',';
+                        . $k . '" => ' . $this->dump($v) . ',';
                 $some = true;
             }
 

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query\AST;
 
@@ -53,32 +53,32 @@ 
         $str = '';
 
         if ($obj instanceof Node) {
-            $str .= get_class($obj) . '(' . PHP_EOL;
+            $str .= get_class($obj).'('.PHP_EOL;
             $props = get_object_vars($obj);
 
             foreach ($props as $name => $prop) {
                 $ident += 4;
-                $str .= str_repeat(' ', $ident) . '"' . $name . '": '
-                      . $this->dump($prop) . ',' . PHP_EOL;
+                $str .= str_repeat(' ', $ident).'"'.$name.'": '
+                      . $this->dump($prop).','.PHP_EOL;
                 $ident -= 4;
             }
 
-            $str .= str_repeat(' ', $ident) . ')';
+            $str .= str_repeat(' ', $ident).')';
         } else if (is_array($obj)) {
             $ident += 4;
             $str .= 'array(';
             $some = false;
 
             foreach ($obj as $k => $v) {
-                $str .= PHP_EOL . str_repeat(' ', $ident) . '"'
-                      . $k . '" => ' . $this->dump($v) . ',';
+                $str .= PHP_EOL.str_repeat(' ', $ident).'"'
+                      . $k.'" => '.$this->dump($v).',';
                 $some = true;
             }
 
             $ident -= 4;
-            $str .= ($some ? PHP_EOL . str_repeat(' ', $ident) : '') . ')';
+            $str .= ($some ? PHP_EOL . str_repeat(' ', $ident) : '').')';
         } else if (is_object($obj)) {
-            $str .= 'instanceof(' . get_class($obj) . ')';
+            $str .= 'instanceof('.get_class($obj).')';
         } else {
             $str .= var_export($obj, true);
         }

lib/Doctrine/ORM/Query/Expr/Join.php

Indentation +3 added lines, -3 removed lines

@@ -138,8 +138,8 @@
     public function __toString()
     {
         return strtoupper($this->joinType) . ' JOIN ' . $this->join
-             . ($this->alias ? ' ' . $this->alias : '')
-             . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '')
-             . ($this->condition ? ' ' . strtoupper($this->conditionType) . ' ' . $this->condition : '');
+                . ($this->alias ? ' ' . $this->alias : '')
+                . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '')
+                . ($this->condition ? ' ' . strtoupper($this->conditionType) . ' ' . $this->condition : '');
     }
 }

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query\Expr;
 
@@ -122,9 +122,9 @@ 
      */
     public function __toString()
     {
-        return strtoupper($this->joinType) . ' JOIN ' . $this->join
-             . ($this->alias ? ' ' . $this->alias : '')
-             . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '')
-             . ($this->condition ? ' ' . strtoupper($this->conditionType) . ' ' . $this->condition : '');
+        return strtoupper($this->joinType).' JOIN '.$this->join
+             . ($this->alias ? ' '.$this->alias : '')
+             . ($this->indexBy ? ' INDEX BY '.$this->indexBy : '')
+             . ($this->condition ? ' '.strtoupper($this->conditionType).' '.$this->condition : '');
     }
 }

lib/Doctrine/ORM/Query/ResultSetMapping.php

Braces +3 added lines, -1 removed lines

@@ -227,7 +227,9 @@
         $found = false;
 
         foreach (array_merge($this->metaMappings, $this->fieldMappings) as $columnName => $columnFieldName) {
-            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) continue;
+            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) {
+                continue;
+            }
 
             $this->addIndexByColumn($alias, $columnName);
             $found = true;

Spacing +1 added lines, -1 removed lines

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

lib/Doctrine/ORM/AbstractQuery.php

Indentation +4 added lines, -4 removed lines

@@ -212,10 +212,10 @@
     }
 
     /**
-    * Obtain the name of the second level query cache region in which query results will be stored
-    *
-    * @return string|null The cache region name; NULL indicates the default region.
-    */
+     * Obtain the name of the second level query cache region in which query results will be stored
+     *
+     * @return string|null The cache region name; NULL indicates the default region.
+     */
     public function getCacheRegion()
     {
         return $this->cacheRegion;

Doc Comments +1 added lines, -1 removed lines

@@ -1044,7 +1044,7 @@
      * Will return the configured id if it exists otherwise a hash will be
      * automatically generated for you.
      *
-     * @return array ($key, $hash)
+     * @return string[] ($key, $hash)
      */
     protected function getHydrationCacheId()
     {

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -306,7 +306,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -355,14 +355,14 @@ 
     public function setParameter($key, $value, $type = null)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
             }
         );
 
-        if (! $filteredParameters->isEmpty()) {
+        if ( ! $filteredParameters->isEmpty()) {
             $parameter = $filteredParameters->first();
             $parameter->setValue($value, $type);
 
@@ -451,7 +451,7 @@ 
      */
     private function translateNamespaces(Query\ResultSetMapping $rsm)
     {
-        $translate = function ($alias) {
+        $translate = function($alias) {
             return $this->em->getClassMetadata($alias)->getClassName();
         };
 
@@ -513,7 +513,7 @@ 
      */
     public function setResultCacheProfile(QueryCacheProfile $profile = null)
     {
-        if (! $profile->getResultCacheDriver()) {
+        if ( ! $profile->getResultCacheDriver()) {
             $resultCacheDriver = $this->em->getConfiguration()->getResultCacheImpl();
             $profile = $profile->setResultCacheDriver($resultCacheDriver);
         }
@@ -981,7 +981,7 @@ 
             $this->getTimestampKey()
         );
 
-        $result     = $queryCache->get($queryKey, $rsm, $this->hints);
+        $result = $queryCache->get($queryKey, $rsm, $this->hints);
 
         if ($result !== null) {
             if ($this->cacheLogger) {
@@ -1115,6 +1115,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

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

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 
@@ -96,7 +96,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']);
         };
 
@@ -167,7 +167,7 @@ 
                     continue;
                 }
 
-                $generateKeys = function ($id) use ($assocMetadata): EntityCacheKey {
+                $generateKeys = function($id) use ($assocMetadata): EntityCacheKey {
                     return new EntityCacheKey($assocMetadata->getRootClassName(), $id);
                 };
 
@@ -348,9 +348,9 @@ 
             $assocIdentifier = $unitOfWork->getEntityIdentifier($assocValue);
             $entityKey       = new EntityCacheKey($assocMetadata->getRootClassName(), $assocIdentifier);
 
-            if ((! $assocValue instanceof GhostObjectInterface && ($key->cacheMode & Cache::MODE_REFRESH)) || ! $assocRegion->contains($entityKey)) {
+            if (( ! $assocValue instanceof GhostObjectInterface && ($key->cacheMode & Cache::MODE_REFRESH)) || ! $assocRegion->contains($entityKey)) {
                 // Entity put fail
-                if (! $assocPersister->storeEntityCache($assocValue, $entityKey)) {
+                if ( ! $assocPersister->storeEntityCache($assocValue, $entityKey)) {
                     return null;
                 }
             }

Unused Use Statements -4 removed lines

@@ -5,17 +5,13 @@
 
 namespace Doctrine\ORM\Cache;
 
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Proxy\Proxy;
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Cache\FeatureNotImplemented;
 use Doctrine\ORM\Cache\NonCacheableEntity;
 use Doctrine\ORM\Cache\Persister\CachedPersister;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
-use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\ResultSetMapping;
 use ProxyManager\Proxy\GhostObjectInterface;