Merge pull request #11969 from greg0ire/3.3.x

Merge 2.20.x up into 3.3.x

Author: greg0ire

docs/en/cookbook/generated-columns.rst

@@ -15,8 +15,8 @@ There is no explicit mapping instruction for generated columns. Instead, you
 specify that the column should not be written to, and define a custom column
 definition.
 
-.. code-block:: php
-    .. literalinclude:: generated-columns/Person.php
+.. literalinclude:: generated-columns/Person.php
+   :language: php
 
 * ``insertable``, ``updatable``: Setting these to false tells Doctrine to never
   write this column - writing to a generated column would result in an error
@@ -40,5 +40,5 @@ Lets assume we have an entity that stores a blogpost as structured JSON.
 To avoid extracting all titles on the fly when listing the posts, we create a
 generated column with the field.
 
-.. code-block:: php
-    .. literalinclude:: generated-columns/Article.php
+.. literalinclude:: generated-columns/Article.php
+   :language: php

src/Proxy/ProxyFactory.php

@@ -383,6 +383,7 @@ private function generateProxyClass(ClassMetadata $class, string|null $fileName,
 
     private function generateUseLazyGhostTrait(ClassMetadata $class): string
     {
+        // @phpstan-ignore staticMethod.deprecated (Because we support Symfony < 7.3)
         $code = ProxyHelper::generateLazyGhost($class->getReflectionClass());
         $code = substr($code, 7 + (int) strpos($code, "\n{"));
         $code = substr($code, 0, (int) strpos($code, "\n}"));

src/Tools/Console/Command/MappingDescribeCommand.php

@@ -64,7 +64,7 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $ui = (new SymfonyStyle($input, $output))->getErrorStyle();
+        $ui = new SymfonyStyle($input, $output);
 
         $entityManager = $this->getEntityManager($input);