Merge release 2.20.9 into 2.21.x

.github/workflows/coding-standards.yml

@@ -24,4 +24,4 @@ on:
 
 jobs:
   coding-standards:
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.0.0"

.github/workflows/composer-lint.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.0.0"

.github/workflows/continuous-integration.yml

@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
@@ -149,7 +149,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
@@ -221,7 +221,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
@@ -293,7 +293,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
@@ -345,7 +345,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
@@ -377,7 +377,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@13.0.0"

.github/workflows/phpbench.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 

.github/workflows/release-on-milestone-closed.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   release:
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

composer.json

@@ -45,7 +45,7 @@
         "doctrine/lexer": "^2 || ^3",
         "doctrine/persistence": "^2.4 || ^3",
         "psr/cache": "^1 || ^2 || ^3",
-        "symfony/console": "^4.2 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/console": "^4.2 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
         "symfony/polyfill-php72": "^1.23",
         "symfony/polyfill-php80": "^1.16"
     },
@@ -60,7 +60,7 @@
         "psr/log": "^1 || ^2 || ^3",
         "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7.0",
         "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2 || ^7.0",
-        "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 3.0"

docs/en/reference/basic-mapping.rst

@@ -254,6 +254,21 @@ Here is a complete list of ``Column``s attributes (all optional):
 - ``options``: Key-value pairs of options that get passed
   to the underlying database platform when generating DDL statements.
 
+Specifying default values
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+While it is possible to specify default values for properties in your
+PHP class, Doctrine also allows you to specify default values for
+database columns using the ``default`` key in the ``options`` array of
+the ``Column`` attribute.
+
+.. configuration-block::
+   .. literalinclude:: basic-mapping/DefaultValues.php
+       :language: attribute
+
+   .. literalinclude:: basic-mapping/default-values.xml
+       :language: xml
+
 .. _reference-php-mapping-types:
 
 PHP Types Mapping

docs/en/reference/basic-mapping/DefaultValues.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+
+#[Entity]
+class Message
+{
+    #[Column(options: ['default' => 'Hello World!'])]
+    private string $text;
+}

docs/en/reference/basic-mapping/default-values.xml

@@ -0,0 +1,9 @@
+<doctrine-mapping>
+  <entity name="Message">
+    <field name="text">
+      <options>
+        <option name="default">Hello World!</option>
+      </options>
+    </field>
+  </entity>
+</doctrine-mapping>

docs/en/reference/faq.rst

@@ -18,30 +18,6 @@ In your mapping configuration, the column definition (for example, the
 the ``charset`` and ``collation``. The default values are ``utf8`` and
 ``utf8_unicode_ci``, respectively.
 
-Entity Classes
---------------
-
-How can I add default values to a column?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Doctrine does not support to set the default values in columns through the "DEFAULT" keyword in SQL.
-This is not necessary however, you can just use your class properties as default values. These are then used
-upon insert:
-
-.. code-block:: php
-
-    class User
-    {
-        private const STATUS_DISABLED = 0;
-        private const STATUS_ENABLED = 1;
-
-        private string $algorithm = "sha1";
-        /** @var self::STATUS_* */
-        private int $status = self::STATUS_DISABLED;
-    }
-
-.
-
 Mapping
 -------
 

src/Configuration.php

@@ -1113,7 +1113,7 @@ public function setLazyGhostObjectEnabled(bool $flag): void
         if ($flag && ! trait_exists(LazyGhostTrait::class)) {
             throw new LogicException(
                 'Lazy ghost objects cannot be enabled because the "symfony/var-exporter" library'
-                . ' version 6.2 or higher is not installed. Please run "composer require symfony/var-exporter:^6.2".'
+                . ' version 6.2 or 7 is not installed. Please run "composer require symfony/var-exporter:^6.4".'
             );
         }
 

src/Tools/Console/ApplicationCompatibility.php

@@ -18,11 +18,12 @@ trait ApplicationCompatibility
 {
     private static function addCommandToApplication(Application $application, Command $command): ?Command
     {
+        // @phpstan-ignore function.alreadyNarrowedType (This method did not exist before Symfony 7.4)
         if (method_exists(Application::class, 'addCommand')) {
-            // @phpstan-ignore method.notFound (This method will be added in Symfony 7.4)
             return $application->addCommand($command);
         }
 
+        // @phpstan-ignore method.notFound
         return $application->add($command);
     }
 }

src/Tools/Console/Command/ClearCache/CollectionRegionCommand.php

@@ -23,8 +23,7 @@ class CollectionRegionCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:clear-cache:region:collection')
              ->setDescription('Clear a second-level cache collection region')

src/Tools/Console/Command/ClearCache/EntityRegionCommand.php

@@ -23,8 +23,7 @@ class EntityRegionCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:clear-cache:region:entity')
              ->setDescription('Clear a second-level cache entity region')

src/Tools/Console/Command/ClearCache/MetadataCommand.php

@@ -21,8 +21,7 @@ class MetadataCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:clear-cache:metadata')
              ->setDescription('Clear all metadata cache of the various cache drivers')

src/Tools/Console/Command/ClearCache/QueryCommand.php

@@ -30,8 +30,7 @@ class QueryCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:clear-cache:query')
              ->setDescription('Clear all query cache of the various cache drivers')

src/Tools/Console/Command/ClearCache/QueryRegionCommand.php

@@ -23,8 +23,7 @@ class QueryRegionCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:clear-cache:region:query')
              ->setDescription('Clear a second-level cache query region')

src/Tools/Console/Command/ClearCache/ResultCommand.php

@@ -32,8 +32,7 @@ class ResultCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:clear-cache:result')
              ->setDescription('Clear all result cache of the various cache drivers')

src/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php

@@ -75,8 +75,7 @@ public function setMetadataExporter(ClassMetadataExporter $metadataExporter)
         $this->metadataExporter = $metadataExporter;
     }
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:convert-d1-schema')
              ->setAliases(['orm:convert:d1-schema'])

src/Tools/Console/Command/ConvertMappingCommand.php

@@ -40,8 +40,7 @@ class ConvertMappingCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:convert-mapping')
              ->setAliases(['orm:convert:mapping'])

src/Tools/Console/Command/EnsureProductionSettingsCommand.php

@@ -22,8 +22,7 @@ class EnsureProductionSettingsCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:ensure-production-settings')
              ->setDescription('Verify that Doctrine is properly configured for a production environment')

src/Tools/Console/Command/GenerateEntitiesCommand.php

@@ -31,8 +31,7 @@ class GenerateEntitiesCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:generate-entities')
              ->setAliases(['orm:generate:entities'])

src/Tools/Console/Command/GenerateProxiesCommand.php

@@ -29,8 +29,7 @@ class GenerateProxiesCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:generate-proxies')
              ->setAliases(['orm:generate:proxies'])

src/Tools/Console/Command/GenerateRepositoriesCommand.php

@@ -30,8 +30,7 @@ class GenerateRepositoriesCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:generate-repositories')
              ->setAliases(['orm:generate:repositories'])

src/Tools/Console/Command/InfoCommand.php

@@ -23,8 +23,7 @@ class InfoCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:info')
              ->setDescription('Show basic information about all mapped entities')

src/Tools/Console/Command/RunDqlCommand.php

@@ -30,8 +30,7 @@ class RunDqlCommand extends AbstractEntityManagerCommand
 {
     use CommandCompatibility;
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this->setName('orm:run-dql')
              ->setDescription('Executes arbitrary DQL directly from the command line')

src/Tools/Console/Command/SchemaTool/AbstractCommand.php

@@ -27,6 +27,10 @@ abstract class AbstractCommand extends AbstractEntityManagerCommand
      */
     abstract protected function executeSchemaCommand(InputInterface $input, OutputInterface $output, SchemaTool $schemaTool, array $metadatas, SymfonyStyle $ui);
 
+    private function doConfigure(): void
+    {
+    }
+
     private function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $ui = new SymfonyStyle($input, $output);