Merge pull request #566 from greg0ire/3.4.x

Merge 3.3.x up into 3.4.x

Author: greg0ire

.gitattributes

@@ -10,5 +10,3 @@ phpcs.xml.dist export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 phpunit.xml.dist export-ignore
-psalm.xml export-ignore
-psalm-baseline.xml export-ignore

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.1.0"

.github/workflows/continuous-integration.yml

@@ -12,15 +12,15 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@7.1.0"
     with:
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
 
   phpunit-with-dev-deps:
     name: "PHPUnit with dev dependencies"
-    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@7.1.0"
     with:
       symfony-version-constraint: "^7"
     secrets:

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

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.1.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.0.1"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.1.0"

composer.json

@@ -37,11 +37,8 @@
         "phpstan/phpstan-symfony": "^1.3",
         "doctrine/orm": "^2.6 || ^3",
         "doctrine/persistence": "^2.0 || ^3 ",
-        "psalm/plugin-phpunit": "^0.18.4",
-        "psalm/plugin-symfony": "^3 || ^5",
         "symfony/phpunit-bridge": "^6.3 || ^7",
-        "symfony/var-exporter": "^5.4 || ^6 || ^7",
-        "vimeo/psalm": "^4.30 || ^5.15"
+        "symfony/var-exporter": "^5.4 || ^6 || ^7"
     },
     "autoload": {
         "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "src" }

docs/index.rst

@@ -297,6 +297,11 @@ Here is an example on how to inject the service container into your migrations:
     this bundle will automatically inject the default symfony container into your migration class
     (this because the ``MigrationFactoryDecorator`` shown in this example is the default migration factory used by this bundle).
 
+.. caution::
+
+    The interface ``Symfony\Component\DependencyInjection\ContainerAwareInterface`` has been deprecated in Symfony 6.4 and
+    removed in 7.0. If you use this version or newer, there is currently no way to inject the service container into migrations.
+
 
 Generating Migrations Automatically
 -----------------------------------
@@ -311,6 +316,26 @@ for Doctrine's ORM:
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/Entity/User.php
+        namespace App\Entity;
+
+        use Doctrine\DBAL\Types\Types;
+        use Doctrine\ORM\Mapping as ORM;
+
+        #[Entity]
+        #[Table(name: 'user')]
+        class User
+        {
+            #[ORM\Id]
+            #[ORM\GeneratedValue(strategy: 'AUTO')]
+            #[ORM\Column(type: Types:INT)]
+            private $id;
+
+            #[ORM\Column(type: Types:STRING, length: 255)]
+            private $name;
+
     .. code-block:: php-annotations
 
         // src/Entity/User.php

psalm-baseline.xml

@@ -51,7 +51,7 @@ public function testCommandRegistered(string $name, string $instance): void
 
     /**
      * @return string[][]
-     * @psalm-return list<array{string, class-string<DoctrineCommand>}>
+     * @phpstan-return list<array{string, class-string<DoctrineCommand>}>
      */
     public function getCommands(): array
     {