Merge pull request #12269 from greg0ire/3.5.x

Undo merge from 3.6.x into 3.5.x

Author: greg0ire

.github/workflows/continuous-integration.yml

@@ -44,38 +44,26 @@ jobs:
           - "pdo_sqlite"
         deps:
           - "highest"
-        stability:
-          - "stable"
         native_lazy:
           - "0"
         include:
           - php-version: "8.2"
             dbal-version: "4@dev"
             extension: "pdo_sqlite"
-            stability: "stable"
             native_lazy: "0"
           - php-version: "8.2"
             dbal-version: "4@dev"
             extension: "sqlite3"
-            stability: "stable"
             native_lazy: "0"
           - php-version: "8.1"
             dbal-version: "default"
             deps: "lowest"
             extension: "pdo_sqlite"
-            stability: "stable"
             native_lazy: "0"
           - php-version: "8.4"
             dbal-version: "default"
             deps: "highest"
             extension: "pdo_sqlite"
-            stability: "stable"
-            native_lazy: "1"
-          - php-version: "8.4"
-            dbal-version: "default"
-            deps: "highest"
-            extension: "sqlite3"
-            stability: "dev"
             native_lazy: "1"
 
     steps:
@@ -92,14 +80,6 @@ jobs:
           coverage: "pcov"
           ini-values: "zend.assertions=1, apc.enable_cli=1"
 
-      - name: "Allow dev dependencies"
-        run: |
-          composer config minimum-stability dev
-          composer remove --no-update --dev phpbench/phpbench phpdocumentor/guides-cli
-          composer require --no-update symfony/console:^8 symfony/var-exporter:^8 doctrine/dbal:^4.4
-          composer require --dev --no-update symfony/cache:^8
-        if: "${{ matrix.stability == 'dev' }}"
-
       - name: "Require specific DBAL version"
         run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
         if: "${{ matrix.dbal-version != 'default' }}"
@@ -141,7 +121,7 @@ jobs:
       - name: "Upload coverage file"
         uses: "actions/upload-artifact@v5"
         with:
-          name: "phpunit-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-${{ matrix.deps }}-${{ matrix.stability }}-${{ matrix.native_lazy }}-coverage"
+          name: "phpunit-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-${{ matrix.deps }}-${{ matrix.native_lazy }}-coverage"
           path: "coverage*.xml"
 
 

UPGRADE.md

@@ -27,54 +27,6 @@ At this point, we recommend upgrading to PHP 8.4 first and then directly from
 ORM 2.19 to 3.5 and up so that you can skip the lazy ghost proxy generation
 and directly start using native lazy objects.
 
-# Upgrade to 3.6
-
-## Deprecate specifying `nullable` on columns that end up being used in a primary key
-
-Specifying `nullable` on join columns that are part of a primary key is
-deprecated and will be an error in 4.0.
-
-This can happen when using a join column mapping together with an id mapping,
-or when using a join column mapping or an inverse join column mapping on a
-many-to-many relationship.
-
-```diff
- class User
- {
-     #[ORM\Id]
-     #[ORM\Column(type: 'integer')]
-     private int $id;
-
-     #[ORM\Id]
-     #[ORM\ManyToOne(targetEntity: Family::class, inversedBy: 'users')]
--    #[ORM\JoinColumn(name: 'family_id', referencedColumnName: 'id', nullable: true)]
-+    #[ORM\JoinColumn(name: 'family_id', referencedColumnName: 'id')]
-     private ?Family $family;
-
-     #[ORM\ManyToMany(targetEntity: Group::class)]
-     #[ORM\JoinTable(name: 'user_group')]
--    #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
--    #[ORM\InverseJoinColumn(name: 'group_id', referencedColumnName: 'id', nullable: true)]
-+    #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id')]
-+    #[ORM\InverseJoinColumn(name: 'group_id', referencedColumnName: 'id')]
-     private Collection $groups;
- }
-```
-
-## Deprecate `Doctrine\ORM\QueryBuilder::add('join', ...)` with a list of join parts
-
-Using `Doctrine\ORM\QueryBuilder::add('join', ...)` with a list of join parts
-is deprecated in favor of using an associative array of join parts with the
-root alias as key.
-
-## Deprecate using the `WITH` keyword for arbitrary DQL joins
-
-Using the `WITH` keyword to specify the condition for an arbitrary DQL join is
-deprecated in favor of using the `ON` keyword (similar to the SQL syntax for
-joins).
-The `WITH` keyword is now meant to be used only for filtering conditions in
-association joins.
-
 # Upgrade to 3.5
 
 See the General notes to upgrading to 3.x versions above.

composer.json

@@ -43,8 +43,8 @@
         "doctrine/lexer": "^3",
         "doctrine/persistence": "^3.3.1 || ^4",
         "psr/cache": "^1 || ^2 || ^3",
-        "symfony/console": "^5.4 || ^6.0 || ^7.0 || ^8.0",
-        "symfony/var-exporter": "^6.3.9 || ^7.0 || ^8.0"
+        "symfony/console": "^5.4 || ^6.0 || ^7.0",
+        "symfony/var-exporter": "^6.3.9 || ^7.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^14.0",
@@ -55,7 +55,7 @@
         "phpstan/phpstan-deprecation-rules": "^2",
         "phpunit/phpunit": "^10.5.0 || ^11.5",
         "psr/log": "^1 || ^2 || ^3",
-        "symfony/cache": "^5.4 || ^6.2 || ^7.0 || ^8.0"
+        "symfony/cache": "^5.4 || ^6.2 || ^7.0"
     },
     "suggest": {
         "ext-dom": "Provides support for XSD validation for XML mapping files",

docs/en/reference/advanced-configuration.rst

@@ -29,7 +29,7 @@ steps of configuration.
 
     $config = new Configuration;
     $config->setMetadataCache($metadataCache);
-    $driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities']);
+    $driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities'], true);
     $config->setMetadataDriverImpl($driverImpl);
     $config->setQueryCache($queryCache);
 
@@ -156,59 +156,15 @@ The attribute driver can be injected in the ``Doctrine\ORM\Configuration``:
     <?php
     use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 
-    $driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities']);
+    $driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities'], true);
     $config->setMetadataDriverImpl($driverImpl);
 
 The path information to the entities is required for the attribute
 driver, because otherwise mass-operations on all entities through
-the console could not work correctly. Metadata drivers can accept either
-a single directory as a string or an array of directories.
-
-AttributeDriver also accepts ``Doctrine\Persistence\Mapping\Driver\ClassLocator``,
-allowing one to customize file discovery logic. You may choose to use Symfony Finder, or
-utilize directory scan with ``FileClassLocator::createFromDirectories()``:
-
-.. code-block:: php
-
-    <?php
-    use Doctrine\ORM\Mapping\Driver\AttributeDriver;
-	use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
-
-	$paths = ['/path/to/lib/MyProject/Entities'];
-	$classLocator = FileClassLocator::createFromDirectories($paths);
-
-    $driverImpl = new AttributeDriver($classLocator);
-    $config->setMetadataDriverImpl($driverImpl);
-
-With this feature, you're empowered to provide a fine-grained iterator of only necessary
-files to the Driver. For example, if you are using Vertical Slice architecture, you can
-exclude ``*Test.php``, ``*Controller.php``, ``*Service.php``, etc.:
-
-.. code-block:: php
-
-    <?php
-	use Symfony\Component\Finder\Finder;
-
-	$finder = new Finder()->files()->in($paths)
-		->name('*.php')
-		->notName(['*Test.php', '*Controller.php', '*Service.php']);
-
-	$classLocator = new FileClassLocator($finder);
-
-If you know the list of class names you want to track, use
-``Doctrine\Persistence\Mapping\Driver\ClassNames``:
-
-.. code-block:: php
-
-    <?php
-	use Doctrine\Persistence\Mapping\Driver\ClassNames;
-	use App\Entity\{Article, Book};
-
-	$entityClasses = [Article::class, Book::class];
-	$classLocator = new ClassNames($entityClasses);
-
-	$driverImpl = new AttributeDriver($classLocator);
-	$config->setMetadataDriverImpl($driverImpl);
+the console could not work correctly. All of metadata drivers
+accept either a single directory as a string or an array of
+directories. With this feature a single driver can support multiple
+directories of Entities.
 
 Metadata Cache (**RECOMMENDED**)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/en/reference/dql-doctrine-query-language.rst

@@ -490,7 +490,7 @@ where you can generate an arbitrary join with the following syntax:
 .. code-block:: php
 
     <?php
-    $query = $em->createQuery('SELECT u FROM User u JOIN Banlist b ON u.email = b.email');
+    $query = $em->createQuery('SELECT u FROM User u JOIN Banlist b WITH u.email = b.email');
 
 With an arbitrary join the result differs from the joins using a mapped property.
 The result of an arbitrary join is an one dimensional array with a mix of the entity from the ``SELECT``
@@ -513,15 +513,13 @@ it loads all the related ``Banlist`` objects corresponding to this ``User``. Thi
 when the DQL is switched to an arbitrary join.
 
 .. note::
-    The differences between WHERE, WITH, ON and HAVING clauses may be
+    The differences between WHERE, WITH and HAVING clauses may be
     confusing.
 
     - WHERE is applied to the results of an entire query
-    - ON is applied to arbitrary joins as the join condition. For
-      arbitrary joins (SELECT f, b FROM Foo f, Bar b ON f.id = b.id)
-      the ON is required, even if it is 1 = 1. WITH is also
-      supported as alternative keyword for that case for BC reasons.
-    - WITH is applied to an association join as an additional condition.
+    - WITH is applied to a join as an additional condition. For
+      arbitrary joins (SELECT f, b FROM Foo f, Bar b WITH f.id = b.id)
+      the WITH is required, even if it is 1 = 1
     - HAVING is applied to the results of a query after
       aggregation (GROUP BY)
 
@@ -1701,14 +1699,9 @@ From, Join and Index by
     SubselectIdentificationVariableDeclaration ::= IdentificationVariableDeclaration
     RangeVariableDeclaration                   ::= AbstractSchemaName ["AS"] AliasIdentificationVariable
     JoinAssociationDeclaration                 ::= JoinAssociationPathExpression ["AS"] AliasIdentificationVariable [IndexBy]
-    Join                                       ::= ["LEFT" ["OUTER"] | "INNER"] "JOIN" (JoinAssociationDeclaration ["WITH" ConditionalExpression] | RangeVariableDeclaration [("ON" | "WITH") ConditionalExpression])
+    Join                                       ::= ["LEFT" ["OUTER"] | "INNER"] "JOIN" (JoinAssociationDeclaration | RangeVariableDeclaration) ["WITH" ConditionalExpression]
     IndexBy                                    ::= "INDEX" "BY" SingleValuedPathExpression
 
-.. note::
-    Using the ``WITH`` keyword for the ``ConditionalExpression`` of a
-    ``RangeVariableDeclaration`` is deprecated and will be removed in
-    ORM 4.0. Use the ``ON`` keyword instead.
-
 Select Expressions
 ~~~~~~~~~~~~~~~~~~
 

phpstan-baseline.neon

@@ -2563,7 +2563,7 @@ parameters:
 			path: src/Query/Exec/MultiTableUpdateExecutor.php
 
 		-
-			message: '#^Parameter \#3 \$types of method Doctrine\\DBAL\\Connection\:\:executeStatement\(\) expects array\<int\<0, max\>\|string, Doctrine\\DBAL\\ArrayParameterType\|Doctrine\\DBAL\\ParameterType\|Doctrine\\DBAL\\Types\\Type\|string\>, list\<Doctrine\\DBAL\\ArrayParameterType\:\:ASCII\|Doctrine\\DBAL\\ArrayParameterType\:\:BINARY\|Doctrine\\DBAL\\ArrayParameterType\:\:INTEGER\|Doctrine\\DBAL\\ArrayParameterType\:\:STRING\|Doctrine\\DBAL\\ParameterType\:\:ASCII\|Doctrine\\DBAL\\ParameterType\:\:BINARY\|Doctrine\\DBAL\\ParameterType\:\:BOOLEAN\|Doctrine\\DBAL\\ParameterType\:\:INTEGER\|Doctrine\\DBAL\\ParameterType\:\:LARGE_OBJECT\|Doctrine\\DBAL\\ParameterType\:\:NULL\|Doctrine\\DBAL\\ParameterType\:\:STRING\|Doctrine\\DBAL\\Types\\Type\|int\|string\> given\.$#'
+			message: '#^Parameter \#3 \$types of method Doctrine\\DBAL\\Connection\:\:executeStatement\(\) expects array\<int\<0, max\>\|string, Doctrine\\DBAL\\ArrayParameterType\|Doctrine\\DBAL\\ParameterType\|Doctrine\\DBAL\\Types\\Type\|string\>, list\<Doctrine\\DBAL\\ArrayParameterType\|Doctrine\\DBAL\\ParameterType\|Doctrine\\DBAL\\Types\\Type\|int\|string\> given\.$#'
 			identifier: argument.type
 			count: 1
 			path: src/Query/Exec/MultiTableUpdateExecutor.php
@@ -2610,6 +2610,12 @@ parameters:
 			count: 1
 			path: src/Query/Expr/Select.php
 
+		-
+			message: '#^Property Doctrine\\ORM\\Query\\Filter\\SQLFilter\:\:\$parameters \(array\<string, array\{type\: string, value\: mixed, is_list\: bool\}\>\) does not accept non\-empty\-array\<string, array\{value\: mixed, type\: Doctrine\\DBAL\\ArrayParameterType\|Doctrine\\DBAL\\ParameterType\|int\|string, is_list\: bool\}\>\.$#'
+			identifier: assign.propertyType
+			count: 2
+			path: src/Query/Filter/SQLFilter.php
+
 		-
 			message: '#^Method Doctrine\\ORM\\Query\\ParameterTypeInferer\:\:inferType\(\) never returns int so it can be removed from the return type\.$#'
 			identifier: return.unusedType

phpstan-dbal3.neon

@@ -149,8 +149,3 @@ parameters:
         -
             message: '~inferType.*never returns~'
             path: src/Query/ParameterTypeInferer.php
-
-        # Compatibility with Symfony 8
-        -
-            message: '#^Call to function method_exists\(\) with ''Symfony\\\\Component\\\\VarExporter\\\\ProxyHelper'' and ''generateLazyGhost'' will always evaluate to true\.$#'
-            path: src/Proxy/ProxyFactory.php

phpstan.neon

@@ -12,10 +12,6 @@ parameters:
             message: '~^Match expression does not handle remaining values:~'
             path: src/Utility/PersisterHelper.php
 
-        # The return type is already narrow enough.
-        - '~^Method Doctrine\\ORM\\Query\\ParameterTypeInferer\:\:inferType\(\) never returns ''[a-z_]+'' so it can be removed from the return type\.$~'
-        - '~^Method Doctrine\\ORM\\Query\\ParameterTypeInferer\:\:inferType\(\) never returns Doctrine\\DBAL\\(?:Array)?ParameterType\:\:[A-Z_]+ so it can be removed from the return type\.$~'
-
         # DBAL 4 compatibility
         -
             message: '~^Method Doctrine\\ORM\\Query\\AST\\Functions\\TrimFunction::getTrimMode\(\) never returns .* so it can be removed from the return type\.$~'
@@ -54,8 +50,3 @@ parameters:
         -
             message: '#Expression on left side of \?\? is not nullable.#'
             path: src/Mapping/Driver/AttributeDriver.php
-
-        # Compatibility with Symfony 8
-        -
-            message: '#^Call to function method_exists\(\) with ''Symfony\\\\Component\\\\VarExporter\\\\ProxyHelper'' and ''generateLazyGhost'' will always evaluate to true\.$#'
-            path: src/Proxy/ProxyFactory.php

src/Internal/Hydration/ScalarColumnHydrator.php

@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Driver\Exception;
 use Doctrine\ORM\Exception\MultipleSelectorsFoundException;
 
+use function array_column;
 use function count;
 
 /**
@@ -26,6 +27,8 @@ protected function hydrateAllData(): array
             throw MultipleSelectorsFoundException::create($this->resultSetMapping()->fieldMappings);
         }
 
-        return $this->statement()->fetchFirstColumn();
+        $result = $this->statement()->fetchAllNumeric();
+
+        return array_column($result, 0);
     }
 }

src/Mapping/Builder/AssociationBuilder.php

@@ -113,10 +113,6 @@ public function addJoinColumn(
         string|null $onDelete = null,
         string|null $columnDef = null,
     ): static {
-        if ($this->mapping['id'] ?? false) {
-            $nullable = null;
-        }
-
         $this->joinColumns[] = [
             'name' => $columnName,
             'referencedColumnName' => $referencedColumnName,
@@ -137,9 +133,6 @@ public function addJoinColumn(
     public function makePrimaryKey(): static
     {
         $this->mapping['id'] = true;
-        foreach ($this->joinColumns ?? [] as $i => $joinColumn) {
-            $this->joinColumns[$i]['nullable'] = null;
-        }
 
         return $this;
     }