Merge branch '2.13.x' into 3.0.x

* 2.13.x: PHPStan 1.7.9 (doctrine#9812) Remove empty test file (doctrine#9805) Remove calls to deprecated MockBuilder::setMethods() (doctrine#9808) Deprecate passing null to Query::setFirstResult() Rename Abstract*Test to *TestCase (doctrine#9806) Add primary key on temp table (doctrine#9770) Fix wrong types (doctrine#9802) Widen return type Update baseline Fix Add type for AssociationMapping
derrabus · Jun 3, 2022 · b8299fe · b8299fe
2 parents ec03eb3 + ddede40
commit b8299fe
Show file tree

Hide file tree

Showing 59 changed files with 484 additions and 182 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -395,6 +395,10 @@ Use `toIterable()` instead.
 
 # Upgrade to 2.13
 
+## Deprecated passing `null` to `Doctrine\ORM\Query::setFirstResult()`
+
+`$query->setFirstResult(null);` is equivalent to `$query->setFirstResult(0)`.
+
 ## Deprecated calling setters without arguments
 
 The following methods will require an argument in 3.0. Pass `null` instead of

diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0",
         "phpbench/phpbench": "^1.0",
-        "phpstan/phpstan": "1.7.0",
+        "phpstan/phpstan": "1.7.9",
         "phpunit/phpunit": "^9.5",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.6.2",

diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
@@ -397,8 +397,7 @@ public function setParameter($key, $value, $type = null)
      *
      * @param mixed $value
      *
-     * @return mixed[]|string|int|float|bool|object|null
-     * @psalm-return array|scalar|object|null
+     * @return mixed
      *
      * @throws ORMInvalidArgumentException
      */

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -95,6 +95,41 @@
  *      declaredField?: string,
  *      options?: array<string, mixed>
  * }
+ * @psalm-type AssociationMapping = array{
+ *     cache?: array,
+ *     cascade?: array<string>,
+ *     declared?: class-string,
+ *     fetch?: mixed,
+ *     fieldName: string,
+ *     id?: bool,
+ *     inherited?: class-string,
+ *     indexBy?: string,
+ *     inversedBy?: string|null,
+ *     isCascadeRemove?: bool,
+ *     isCascadePersist?: bool,
+ *     isCascadeRefresh?: bool,
+ *     isCascadeMerge?: bool,
+ *     isCascadeDetach?: bool,
+ *     isOnDeleteCascade?: bool,
+ *     isOwningSide?: bool,
+ *     joinColumns?: array,
+ *     joinColumnFieldNames?: array,
+ *     joinTable?: array,
+ *     joinTableColumns?: list<mixed>,
+ *     mappedBy?: string|null,
+ *     orderBy?: array,
+ *     originalClass?: class-string,
+ *     originalField?: string,
+ *     orphanRemoval?: bool,
+ *     relationToSourceKeyColumns?: array,
+ *     relationToTargetKeyColumns?: array,
+ *     sourceEntity?: class-string,
+ *     sourceToTargetKeyColumns?: array,
+ *     targetEntity: class-string,
+ *     targetToSourceKeyColumns: array,
+ *     type: int,
+ *     unique?: bool,
+ * }
  */
 class ClassMetadataInfo implements ClassMetadata
 {
@@ -578,7 +613,7 @@ class ClassMetadataInfo implements ClassMetadata
      * )
      * </pre>
      *
-     * @psalm-var array<string, array<string, mixed>>
+     * @psalm-var array<string, AssociationMapping>
      */
     public $associationMappings = [];
 
@@ -1317,7 +1352,7 @@ public function getFieldMapping($fieldName)
      *                          the object model.
      *
      * @return mixed[] The mapping.
-     * @psalm-return array<string, mixed>
+     * @psalm-return AssociationMapping
      *
      * @throws MappingException
      */
@@ -1333,7 +1368,7 @@ public function getAssociationMapping($fieldName)
     /**
      * Gets all association mappings of the class.
      *
-     * @psalm-return array<string, array<string, mixed>>
+     * @psalm-return array<string, AssociationMapping>
      */
     public function getAssociationMappings()
     {
@@ -2565,7 +2600,7 @@ public function mapField(array $mapping)
      * Adds an association mapping without completing/validating it.
      * This is mainly used to add inherited association mappings to derived classes.
      *
-     * @psalm-param array<string, mixed> $mapping
+     * @psalm-param AssociationMapping $mapping
      *
      * @return void
      *

diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php
@@ -27,6 +27,7 @@
 use function count;
 use function get_debug_type;
 use function in_array;
+use function is_int;
 use function ksort;
 use function md5;
 use function reset;
@@ -479,7 +480,7 @@ public function useQueryCache($bool): self
     /**
      * Defines how long the query cache will be active before expire.
      *
-     * @param int $timeToLive How long the cache entry is valid.
+     * @param int|null $timeToLive How long the cache entry is valid.
      *
      * @return $this
      */
@@ -599,7 +600,19 @@ public function contains($dql): bool
      */
     public function setFirstResult($firstResult): self
     {
-        $this->firstResult = (int) $firstResult;
+        if (! is_int($firstResult)) {
+            Deprecation::trigger(
+                'doctrine/orm',
+                'https://github.com/doctrine/orm/pull/9809',
+                'Calling %s with %s is deprecated and will result in a TypeError in Doctrine 3.0. Pass an integer.',
+                __METHOD__,
+                get_debug_type($firstResult)
+            );
+
+            $firstResult = (int) $firstResult;
+        }
+
+        $this->firstResult = $firstResult;
         $this->_state      = self::STATE_DIRTY;
 
         return $this;

diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
@@ -99,7 +99,7 @@ public function __construct(AST\Node $AST, $sqlWalker)
         }
 
         $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ', PRIMARY KEY(' . implode(',', $idColumnNames) . '))';
         $this->_dropTempTableSql   = $platform->getDropTemporaryTableSQL($tempTable);
     }
 

diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
@@ -140,7 +140,7 @@ public function __construct(AST\Node $AST, $sqlWalker)
         }
 
         $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ', PRIMARY KEY(' . implode(',', $idColumnNames) . '))';
 
         $this->_dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -26,6 +26,7 @@
 use Doctrine\ORM\Internal\CommitOrderCalculator;
 use Doctrine\ORM\Internal\HydrationCompleteHandler;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\ORM\Persisters\Collection\CollectionPersister;
 use Doctrine\ORM\Persisters\Collection\ManyToManyPersister;
@@ -71,6 +72,8 @@
  * in the correct order.
  *
  * Internal note: This class contains highly performance-sensitive code.
+ *
+ * @psalm-import-type AssociationMapping from ClassMetadataInfo
  */
 class UnitOfWork implements PropertyChangedListener
 {