Merge pull request #12014 from greg0ire/3.5.x

Merge 3.4.1 up into 3.5.x

Author: greg0ire

UPGRADE.md

@@ -22,6 +22,13 @@ As a consequence, the following methods are deprecated and will be removed in 4.
 * `Doctrine\ORM\Configuration::setRejectIdCollisionInIdentityMap()`
 * `Doctrine\ORM\Configuration::isRejectIdCollisionInIdentityMapEnabled()`
 
+# Upgrade to 3.4.1
+
+## BC BREAK: You can no longer use the `.*` notation to get all fields of an entity in a DTO
+
+This feature was introduced in 3.4.0, and introduces several issues, so we
+decide to remove it before it is used too widely.
+
 # Upgrade to 3.4
 
 ## Discriminator Map class duplicates

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

@@ -588,7 +588,7 @@ And then use the ``NEW`` DQL keyword :
     $query = $em->createQuery('SELECT NEW CustomerDTO(c.name, e.email, a.city, SUM(o.value)) FROM Customer c JOIN c.email e JOIN c.address a JOIN c.orders o GROUP BY c');
     $users = $query->getResult(); // array of CustomerDTO
 
-You can also nest several DTO : 
+You can also nest several DTO :
 
 .. code-block:: php
 
@@ -684,18 +684,6 @@ You can hydrate an entity nested in a DTO :
 
     // CustomerDTO => {name : 'DOE', email: null, address : {city: 'New York', zip: '10011', address: 'Abbey Road'}
 
-In a Dto, if you want add all fields of an entity, you can use ``.*`` :
-
-.. code-block:: php
-
-    <?php
-    $query = $em->createQuery('SELECT NEW NAMED CustomerDTO(c.name, NEW NAMED AddressDTO(a.*) AS address) FROM Customer c JOIN c.address a');
-    $users = $query->getResult(); // array of CustomerDTO
-
-    // CustomerDTO => {name : 'DOE', email: null, city: null, address: {id: 18, city: 'New York', zip: '10011'}}
-
-It's recommended to use named arguments DTOs with the ``.*`` notation because argument order is not guaranteed.
-
 Using INDEX BY
 ~~~~~~~~~~~~~~
 
@@ -1719,14 +1707,13 @@ Select Expressions
 
 .. code-block:: php
 
-	SelectExpression              ::= (IdentificationVariable | ScalarExpression | AggregateExpression | FunctionDeclaration | PartialObjectExpression | "(" Subselect ")" | CaseExpression | NewObjectExpression) [["AS"] ["HIDDEN"] AliasResultVariable]
-	SimpleSelectExpression        ::= (StateFieldPathExpression | IdentificationVariable | FunctionDeclaration | AggregateExpression | "(" Subselect ")" | ScalarExpression) [["AS"] AliasResultVariable]
+    SelectExpression              ::= (IdentificationVariable | ScalarExpression | AggregateExpression | FunctionDeclaration | PartialObjectExpression | "(" Subselect ")" | CaseExpression | NewObjectExpression) [["AS"] ["HIDDEN"] AliasResultVariable]
+    SimpleSelectExpression        ::= (StateFieldPathExpression | IdentificationVariable | FunctionDeclaration | AggregateExpression | "(" Subselect ")" | ScalarExpression) [["AS"] AliasResultVariable]
     PartialObjectExpression       ::= "PARTIAL" IdentificationVariable "." PartialFieldSet
     PartialFieldSet               ::= "{" SimpleStateField {"," SimpleStateField}* "}"
     NewObjectExpression           ::= "NEW" AbstractSchemaName "(" NewObjectArg {"," NewObjectArg}* ")"
-    NewObjectArg                  ::= ((ScalarExpression | "(" Subselect ")" | NewObjectExpression | EntityAsDtoArgumentExpression) ["AS" AliasResultVariable]) | AllFieldsExpression
+    NewObjectArg                  ::= (ScalarExpression | "(" Subselect ")" | NewObjectExpression | EntityAsDtoArgumentExpression) ["AS" AliasResultVariable]
     EntityAsDtoArgumentExpression ::= IdentificationVariable
-    AllFieldsExpression           ::= IdentificationVariable ".*"
 
 Conditional Expressions
 ~~~~~~~~~~~~~~~~~~~~~~~

phpstan-baseline.neon

@@ -2811,7 +2811,7 @@ parameters:
 		-
 			message: '#^Cannot assign new offset to list\<string\>\|string\.$#'
 			identifier: offsetAssign.dimType
-			count: 3
+			count: 2
 			path: src/Query/SqlWalker.php
 
 		-

phpstan.neon

@@ -45,7 +45,7 @@ parameters:
             path: src/UnitOfWork.php
 
         -
-            message: '~^Parameter #1 \$command of method Symfony\\Component\\Console\\Application::add\(\) expects Symfony\\Component\\Console\\Command\\Command, Doctrine\\DBAL\\Tools\\Console\\Command\\ReservedWordsCommand given\.$~'
+            message: '~^Parameter #2 \$command of static method Doctrine\\ORM\\Tools\\Console\\ConsoleRunner::addCommandToApplication\(\) expects Symfony\\Component\\Console\\Command\\Command, Doctrine\\DBAL\\Tools\\Console\\Command\\ReservedWordsCommand given\.$~'
             path: src/Tools/Console/ConsoleRunner.php
 
         -

src/Proxy/ProxyFactory.php

@@ -132,6 +132,9 @@ public function __serialize(): array
     /** @var array<class-string, Closure> */
     private array $proxyFactories = [];
 
+    private readonly string $proxyDir;
+    private readonly string $proxyNs;
+
     /**
      * Initializes a new instance of the <tt>ProxyFactory</tt> class that is
      * connected to the given <tt>EntityManager</tt>.
@@ -143,8 +146,8 @@ public function __serialize(): array
      */
     public function __construct(
         private readonly EntityManagerInterface $em,
-        private readonly string $proxyDir,
-        private readonly string $proxyNs,
+        string|null $proxyDir = null,
+        string|null $proxyNs = null,
         bool|int $autoGenerate = self::AUTOGENERATE_NEVER,
     ) {
         if (! $proxyDir && ! $em->getConfiguration()->isNativeLazyObjectsEnabled()) {
@@ -159,6 +162,17 @@ public function __construct(
             throw ORMInvalidArgumentException::invalidAutoGenerateMode($autoGenerate);
         }
 
+        if ($proxyDir === null && $em->getConfiguration()->isNativeLazyObjectsEnabled()) {
+            $proxyDir = '';
+        }
+
+        if ($proxyNs === null && $em->getConfiguration()->isNativeLazyObjectsEnabled()) {
+            $proxyNs = '';
+        }
+
+        $this->proxyDir = $proxyDir;
+        $this->proxyNs  = $proxyNs;
+
         $this->uow                 = $em->getUnitOfWork();
         $this->autoGenerate        = (int) $autoGenerate;
         $this->identifierFlattener = new IdentifierFlattener($this->uow, $em->getMetadataFactory());
@@ -171,11 +185,23 @@ public function __construct(
     public function getProxy(string $className, array $identifier): object
     {
         if ($this->em->getConfiguration()->isNativeLazyObjectsEnabled()) {
-            $classMetadata   = $this->em->getClassMetadata($className);
-            $entityPersister = $this->uow->getEntityPersister($className);
-
-            $proxy = $classMetadata->reflClass->newLazyGhost(static function (object $object) use ($identifier, $entityPersister): void {
-                $entityPersister->loadById($identifier, $object);
+            $classMetadata       = $this->em->getClassMetadata($className);
+            $entityPersister     = $this->uow->getEntityPersister($className);
+            $identifierFlattener = $this->identifierFlattener;
+
+            $proxy = $classMetadata->reflClass->newLazyGhost(static function (object $object) use (
+                $identifier,
+                $entityPersister,
+                $identifierFlattener,
+                $classMetadata,
+            ): void {
+                $original = $entityPersister->loadById($identifier, $object);
+                if ($original === null) {
+                    throw EntityNotFoundException::fromClassNameAndIdentifier(
+                        $classMetadata->getName(),
+                        $identifierFlattener->flattenIdentifier($classMetadata, $identifier),
+                    );
+                }
             }, ReflectionClass::SKIP_INITIALIZATION_ON_SERIALIZE);
 
             foreach ($identifier as $idField => $value) {

src/Query/AST/AllFieldsExpression.php

@@ -20,7 +20,7 @@ class NewObjectExpression extends Node
      * @param class-string $className
      * @param mixed[]      $args
      */
-    public function __construct(public string $className, public array $args, public bool $hasNamedArgs = false)
+    public function __construct(public string $className, public array $args)
     {
     }
 

src/Query/AST/NewObjectExpression.php

@@ -1036,7 +1036,6 @@ public function PathExpression(int $expectedTypes): AST\PathExpression
         assert($this->lexer->token !== null);
         if ($this->lexer->isNextToken(TokenType::T_DOT)) {
             $this->match(TokenType::T_DOT);
-
             $this->match(TokenType::T_IDENTIFIER);
 
             $field = $this->lexer->token->value;
@@ -1151,20 +1150,6 @@ public function EntityAsDtoArgumentExpression(): AST\EntityAsDtoArgumentExpressi
         return new AST\EntityAsDtoArgumentExpression($expression, $identVariable);
     }
 
-    /**
-     * AllFieldsExpression ::= IdentificationVariable
-     */
-    public function AllFieldsExpression(): AST\AllFieldsExpression
-    {
-        $identVariable = $this->IdentificationVariable();
-        assert($this->lexer->token !== null);
-
-        $this->match(TokenType::T_DOT);
-        $this->match(TokenType::T_MULTIPLY);
-
-        return new AST\AllFieldsExpression($identVariable);
-    }
-
     /**
      * SelectClause ::= "SELECT" ["DISTINCT"] SelectExpression {"," SelectExpression}
      */
@@ -1841,7 +1826,7 @@ public function NewObjectExpression(): AST\NewObjectExpression
 
         $this->match(TokenType::T_CLOSE_PARENTHESIS);
 
-        $expression = new AST\NewObjectExpression($className, $args, $useNamedArguments);
+        $expression = new AST\NewObjectExpression($className, $args);
 
         // Defer NewObjectExpression validation
         $this->deferredNewObjectExpressions[] = [
@@ -1888,7 +1873,7 @@ public function addArgument(array &$args, bool $useNamedArguments): void
     }
 
     /**
-     * NewObjectArg ::= ((ScalarExpression | "(" Subselect ")" | NewObjectExpression) ["AS" AliasResultVariable]) | AllFieldsExpression
+     * NewObjectArg ::= (ScalarExpression | "(" Subselect ")" | NewObjectExpression) ["AS" AliasResultVariable]
      */
     public function NewObjectArg(string|null &$fieldAlias = null): mixed
     {
@@ -2000,14 +1985,10 @@ public function ScalarExpression(): mixed
             // it is no function, so it must be a field path
             case $lookahead === TokenType::T_IDENTIFIER:
                 $this->lexer->peek(); // lookahead => '.'
-                $token = $this->lexer->peek(); // lookahead => token after '.'
-                $peek  = $this->lexer->peek(); // lookahead => token after the token after the '.'
+                $this->lexer->peek(); // lookahead => token after '.'
+                $peek = $this->lexer->peek(); // lookahead => token after the token after the '.'
                 $this->lexer->resetPeek();
 
-                if ($token->value === '*') {
-                    return $this->AllFieldsExpression();
-                }
-
                 if ($this->isMathOperator($peek)) {
                     return $this->SimpleArithmeticExpression();
                 }

src/Query/Parser.php

@@ -1518,17 +1518,11 @@ public function walkNewObject(AST\NewObjectExpression $newObjectExpression, stri
     {
         $sqlSelectExpressions = [];
         $objIndex             = $newObjectResultAlias ?: $this->newObjectCounter++;
-        $aliasGap             = $newObjectExpression->hasNamedArgs ? null : 0;
 
         foreach ($newObjectExpression->args as $argIndex => $e) {
-            if (! $newObjectExpression->hasNamedArgs) {
-                $argIndex += $aliasGap;
-            }
-
-            $resultAlias    = $this->scalarResultCounter++;
-            $columnAlias    = $this->getSQLColumnAlias('sclr');
-            $fieldType      = 'string';
-            $isScalarResult = true;
+            $resultAlias = $this->scalarResultCounter++;
+            $columnAlias = $this->getSQLColumnAlias('sclr');
+            $fieldType   = 'string';
 
             switch (true) {
                 case $e instanceof AST\NewObjectExpression:
@@ -1582,26 +1576,18 @@ public function walkNewObject(AST\NewObjectExpression $newObjectExpression, stri
                     $sqlSelectExpressions[] = trim($e->dispatch($this));
                     break;
 
-                case $e instanceof AST\AllFieldsExpression:
-                    $isScalarResult         = false;
-                    $sqlSelectExpressions[] = $e->dispatch($this, $objIndex, $argIndex, $aliasGap);
-                    break;
-
                 default:
                     $sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
                     break;
             }
 
-            if ($isScalarResult) {
-                $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
-                $this->rsm->addScalarResult($columnAlias, $resultAlias, $fieldType);
+            $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
+            $this->rsm->addScalarResult($columnAlias, $resultAlias, $fieldType);
 
-                $this->rsm->newObjectMappings[$columnAlias] = [
-                    'className' => $newObjectExpression->className,
-                    'objIndex'  => $objIndex,
-                    'argIndex'  => $argIndex,
-                ];
-            }
+            $this->rsm->newObjectMappings[$columnAlias] = [
+                'objIndex'  => $objIndex,
+                'argIndex'  => $argIndex,
+            ];
         }
 
         $this->rsm->newObject[$objIndex] = $newObjectExpression->className;
@@ -2306,42 +2292,6 @@ public function walkResultVariable(string $resultVariable): string
         return $resultAlias;
     }
 
-    public function walkAllEntityFieldsExpression(AST\AllFieldsExpression $expression, int|string $objIndex, int|string $argIndex, int|null &$aliasGap): string
-    {
-        $dqlAlias = $expression->identificationVariable;
-        $class    = $this->getMetadataForDqlAlias($expression->identificationVariable);
-
-        $sqlParts = [];
-        // Select all fields from the queried class
-        foreach ($class->fieldMappings as $fieldName => $mapping) {
-            $tableName = isset($mapping->inherited)
-                ? $this->em->getClassMetadata($mapping->inherited)->getTableName()
-                : $class->getTableName();
-
-            $sqlTableAlias    = $this->getSQLTableAlias($tableName, $dqlAlias);
-            $columnAlias      = $this->getSQLColumnAlias($mapping->columnName);
-            $quotedColumnName = $this->quoteStrategy->getColumnName($fieldName, $class, $this->platform);
-
-            $col = $sqlTableAlias . '.' . $quotedColumnName;
-
-            $type = Type::getType($mapping->type);
-            $col  = $type->convertToPHPValueSQL($col, $this->platform);
-
-            $sqlParts[] = $col . ' AS ' . $columnAlias;
-
-            $this->scalarResultAliasMap[$objIndex][] = $columnAlias;
-
-            $this->rsm->addScalarResult($columnAlias, $objIndex, $mapping->type);
-
-            $this->rsm->newObjectMappings[$columnAlias] = [
-                'objIndex'  => $objIndex,
-                'argIndex'  => $aliasGap === null ? $fieldName : (int) $argIndex + $aliasGap++,
-            ];
-        }
-
-        return implode(', ', $sqlParts);
-    }
-
     /**
      * @return string The list in parentheses of valid child discriminators from the given class
      *

src/Query/SqlWalker.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM\Tools\Console;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+
+use function method_exists;
+
+/**
+ * Forward compatibility with Symfony Console 7.4
+ *
+ * @internal
+ */
+trait ApplicationCompatibility
+{
+    private static function addCommandToApplication(Application $application, Command $command): Command|null
+    {
+        if (method_exists(Application::class, 'addCommand')) {
+            // @phpstan-ignore method.notFound (This method will be added in Symfony 7.4)
+            return $application->addCommand($command);
+        }
+
+        return $application->add($command);
+    }
+}