Merge branch '3.0.x' into 3.1.x

* 3.0.x: Remove broken assertion from DateAddFunction and DateSubFunction (doctrine#11243) Remove unused trait [Documentation] Adding link to Postgres upgrade article (doctrine#11257) fix: support array-type arg in QB variadic calls (doctrine#11242)
derrabus · Feb 21, 2024 · fcf1116 · fcf1116
2 parents 78dc63d + bc5efd4
commit fcf1116
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 51 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -32,7 +32,7 @@ jobs:
         include:
         - dbal-version: default
           config: phpstan.neon
-        - dbal-version: 3.7
+        - dbal-version: 3.8.2
           config: phpstan-dbal3.neon
 
     steps:
@@ -65,7 +65,7 @@ jobs:
       matrix:
         dbal-version:
         - default
-        - 3.7
+        - 3.8.2
 
     steps:
       - name: "Checkout code"

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -25,9 +25,9 @@ so `$targetEntity` is a first argument now. This change affects only non-named a
 
 When using the `AUTO` strategy to let Doctrine determine the identity generation mechanism for
 an entity, and when using `doctrine/dbal` 4, PostgreSQL now uses `IDENTITY`
-instead of `SEQUENCE`. When upgrading from ORM 2.x and preference is on keeping
-the `SEQUENCE` based identity generation, then configure the ORM this way:
-
+instead of `SEQUENCE` or `SERIAL`.
+* If you want to upgrade your existing tables to identity columns, you will need to follow [migration to identity columns on PostgreSQL](https://www.doctrine-project.org/projects/doctrine-dbal/en/4.0/how-to/postgresql-identity-migration.html)
+* If you want to keep using SQL sequences, you need to configure the ORM this way:
 ```php
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\ORM\Configuration;

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "composer-runtime-api": "^2",
         "ext-ctype": "*",
         "doctrine/collections": "^2.1",
-        "doctrine/dbal": "^3.6 || ^4",
+        "doctrine/dbal": "^3.8.2 || ^4",
         "doctrine/deprecations": "^0.5.3 || ^1",
         "doctrine/event-manager": "^1.2 || ^2",
         "doctrine/inflector": "^1.4 || ^2.0",

diff --git a/src/Query/AST/Functions/DateAddFunction.php b/src/Query/AST/Functions/DateAddFunction.php
@@ -11,8 +11,6 @@
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\TokenType;
 
-use function assert;
-use function is_numeric;
 use function strtolower;
 
 /**
@@ -63,17 +61,10 @@ public function getSql(SqlWalker $sqlWalker): string
         };
     }
 
-    /**
-     * @return numeric-string
-     *
-     * @throws ASTException
-     */
+    /** @throws ASTException */
     private function dispatchIntervalExpression(SqlWalker $sqlWalker): string
     {
-        $sql = $this->intervalExpression->dispatch($sqlWalker);
-        assert(is_numeric($sql));
-
-        return $sql;
+        return $this->intervalExpression->dispatch($sqlWalker);
     }
 
     public function parse(Parser $parser): void

diff --git a/src/Query/AST/Functions/DateSubFunction.php b/src/Query/AST/Functions/DateSubFunction.php
@@ -8,8 +8,6 @@
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\Query\SqlWalker;
 
-use function assert;
-use function is_numeric;
 use function strtolower;
 
 /**
@@ -56,16 +54,9 @@ public function getSql(SqlWalker $sqlWalker): string
         };
     }
 
-    /**
-     * @return numeric-string
-     *
-     * @throws ASTException
-     */
+    /** @throws ASTException */
     private function dispatchIntervalExpression(SqlWalker $sqlWalker): string
     {
-        $sql = $this->intervalExpression->dispatch($sqlWalker);
-        assert(is_numeric($sql));
-
-        return $sql;
+        return $this->intervalExpression->dispatch($sqlWalker);
     }
 }
diff --git a/src/Query/Expr/Base.php b/src/Query/Expr/Base.php
@@ -7,10 +7,12 @@
 use InvalidArgumentException;
 use Stringable;
 
+use function array_key_exists;
 use function count;
 use function get_debug_type;
 use function implode;
 use function in_array;
+use function is_array;
 use function is_string;
 use function sprintf;
 
@@ -33,6 +35,10 @@ abstract class Base implements Stringable
 
     public function __construct(mixed $args = [])
     {
+        if (is_array($args) && array_key_exists(0, $args) && is_array($args[0])) {
+            $args = $args[0];
+        }
+
         $this->addMultiple($args);
     }
 

diff --git a/tests/Tests/ORM/ConfigurationTest.php b/tests/Tests/ORM/ConfigurationTest.php
@@ -4,7 +4,6 @@
 
 namespace Doctrine\Tests\ORM;
 
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Cache\CacheConfiguration;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityRepository;
@@ -26,8 +25,6 @@
  */
 class ConfigurationTest extends TestCase
 {
-    use VerifyDeprecations;
-
     private Configuration $configuration;
 
     protected function setUp(): void

diff --git a/tests/Tests/ORM/EntityManagerTest.php b/tests/Tests/ORM/EntityManagerTest.php
@@ -6,7 +6,6 @@
 
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Exception\EntityManagerClosed;
@@ -27,8 +26,6 @@
 
 class EntityManagerTest extends OrmTestCase
 {
-    use VerifyDeprecations;
-
     private EntityManagerMock $entityManager;
 
     protected function setUp(): void

diff --git a/tests/Tests/ORM/Functional/NativeQueryTest.php b/tests/Tests/ORM/Functional/NativeQueryTest.php
@@ -8,7 +8,6 @@
 use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type as DBALType;
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Internal\Hydration\HydrationException;
 use Doctrine\ORM\Internal\SQLResultCasing;
 use Doctrine\ORM\PersistentCollection;
@@ -33,7 +32,6 @@
 class NativeQueryTest extends OrmFunctionalTestCase
 {
     use SQLResultCasing;
-    use VerifyDeprecations;
 
     private AbstractPlatform|null $platform = null;
 

diff --git a/tests/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -7,6 +7,7 @@
 use DateTimeImmutable;
 use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\Tests\Models\Company\CompanyEmployee;
 use Doctrine\Tests\Models\Company\CompanyManager;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -487,4 +488,34 @@ protected function generateFixture(): void
         $this->_em->flush();
         $this->_em->clear();
     }
+
+    #[Group('GH-11240')]
+    public function testDateAddWithColumnInterval(): void
+    {
+        $query = sprintf(
+            'SELECT DATE_ADD(CURRENT_TIMESTAMP(), m.salary, \'day\') AS add FROM %s m',
+            CompanyEmployee::class,
+        );
+
+        $result = $this->_em->createQuery($query)
+            ->setMaxResults(1)
+            ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
+
+        self::assertArrayHasKey('add', $result);
+    }
+
+    #[Group('GH-11240')]
+    public function testDateSubWithColumnInterval(): void
+    {
+        $query = sprintf(
+            'SELECT DATE_SUB(CURRENT_TIMESTAMP(), m.salary, \'day\') AS add FROM %s m',
+            CompanyEmployee::class,
+        );
+
+        $result = $this->_em->createQuery($query)
+            ->setMaxResults(1)
+            ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
+
+        self::assertArrayHasKey('add', $result);
+    }
 }
diff --git a/tests/Tests/ORM/Functional/Ticket/DDC117Test.php b/tests/Tests/ORM/Functional/Ticket/DDC117Test.php
@@ -4,7 +4,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\UnitOfWork;
 use Doctrine\Tests\Models\DDC117\DDC117ApproveChanges;
 use Doctrine\Tests\Models\DDC117\DDC117Article;
@@ -23,8 +22,6 @@
 #[Group('DDC-117')]
 class DDC117Test extends OrmFunctionalTestCase
 {
-    use VerifyDeprecations;
-
     private DDC117Article|null $article1;
 
     private DDC117Article|null $article2;

diff --git a/tests/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
@@ -4,7 +4,6 @@
 
 namespace Doctrine\Tests\ORM\Mapping;
 
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Id\SequenceGenerator as IdSequenceGenerator;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -42,8 +41,6 @@
 
 class BasicInheritanceMappingTest extends OrmTestCase
 {
-    use VerifyDeprecations;
-
     private ClassMetadataFactory $cmf;
 
     protected function setUp(): void

diff --git a/tests/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -9,7 +9,6 @@
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnClassMetadataNotFoundEventArgs;
@@ -55,8 +54,6 @@
 
 class ClassMetadataFactoryTest extends OrmTestCase
 {
-    use VerifyDeprecations;
-
     public function testGetMetadataForSingleClass(): void
     {
         $platform = $this->createMock(AbstractPlatform::class);

diff --git a/tests/Tests/ORM/Query/QueryTest.php b/tests/Tests/ORM/Query/QueryTest.php
@@ -15,7 +15,6 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\UnitOfWork;
@@ -40,8 +39,6 @@
 
 class QueryTest extends OrmTestCase
 {
-    use VerifyDeprecations;
-
     /** @var EntityManagerMock */
     protected $entityManager;
 

diff --git a/tests/Tests/ORM/QueryBuilderTest.php b/tests/Tests/ORM/QueryBuilderTest.php
@@ -81,6 +81,15 @@ public function testSimpleSelect(): void
         $this->assertValidQueryBuilder($qb, 'SELECT u.id, u.username FROM Doctrine\Tests\Models\CMS\CmsUser u');
     }
 
+    public function testSimpleSelectArray(): void
+    {
+        $qb = $this->entityManager->createQueryBuilder()
+            ->from(CmsUser::class, 'u')
+            ->select(['u.id', 'u.username']);
+
+        $this->assertValidQueryBuilder($qb, 'SELECT u.id, u.username FROM Doctrine\Tests\Models\CMS\CmsUser u');
+    }
+
     public function testSimpleDelete(): void
     {
         $qb = $this->entityManager->createQueryBuilder()

diff --git a/tests/Tests/ORM/UnitOfWorkTest.php b/tests/Tests/ORM/UnitOfWorkTest.php
@@ -11,7 +11,6 @@
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\EntityNotFoundException;
 use Doctrine\ORM\Exception\EntityIdentityCollisionException;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -46,8 +45,6 @@
  */
 class UnitOfWorkTest extends OrmTestCase
 {
-    use VerifyDeprecations;
-
     /**
      * SUT
      */