diff --git a/.gitattributes b/.gitattributes
index a200fcf..9eba80c 100644
--- a/.gitattributes
+++ b/.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
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index d82ba21..9f949bd 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.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"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 03cd733..6fa0eac 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -12,7 +12,7 @@ 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:
@@ -20,7 +20,7 @@ jobs:
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:
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
index 3cac620..0c4ee4a 100644
--- a/.github/workflows/release-on-milestone-closed.yml
+++ b/.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 }}
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index b48b3a2..d1e5383 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.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"
diff --git a/composer.json b/composer.json
index b9deff2..3102244 100644
--- a/composer.json
+++ b/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" }
diff --git a/docs/index.rst b/docs/index.rst
index e2fb02b..f9a967b 100644
--- a/docs/index.rst
+++ b/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
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
deleted file mode 100644
index aba2296..0000000
--- a/psalm-baseline.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-