From 3db3ac6f24a9feb6de8aa0b4a459958d2881c61b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 09:06:01 +0200 Subject: [PATCH 1/8] Bump doctrine/.github from 5.0.1 to 5.1.0 (#555) Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.0.1 to 5.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/5.0.1...5.1.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index d82ba21f..d9d74909 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@5.1.0" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 03cd733d..167eb31a 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@5.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@5.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 3cac620a..e193d87b 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@5.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 b48b3a22..7fe8add1 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/static-analysis.yml@5.1.0" From b9712ed45c4b0dadcc770a6993ad5916a3afb53d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:56:25 +0200 Subject: [PATCH 2/8] Bump doctrine/.github from 5.1.0 to 5.2.0 (#556) --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index d9d74909..0c8e7f30 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.1.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 167eb31a..6df5de85 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.1.0" + uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.2.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.1.0" + uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@5.2.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 e193d87b..67a81bf8 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.1.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.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 7fe8add1..49a55f4a 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.1.0" + uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.2.0" From ab2a5b532838225c29a4a840b44d84bbefece101 Mon Sep 17 00:00:00 2001 From: Matthieu Lempereur Date: Wed, 6 Nov 2024 08:42:03 +0100 Subject: [PATCH 3/8] add attributes example for entity in documentation --- Resources/doc/index.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst index e2fb02b8..69652107 100644 --- a/Resources/doc/index.rst +++ b/Resources/doc/index.rst @@ -311,6 +311,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 From f51a03edc9ab4dfd9341e0a8a39a1f73a64b4ddc Mon Sep 17 00:00:00 2001 From: Matthieu Lempereur Date: Fri, 8 Nov 2024 09:09:02 +0100 Subject: [PATCH 4/8] Update doc for dependencies injection and Symfony 7 (#559) * doc for dependencies injection and symfony 7 * apply review * Update Resources/doc/index.rst --------- Co-authored-by: Alexander M. Turek --- Resources/doc/index.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst index 69652107..f9a967bd 100644 --- a/Resources/doc/index.rst +++ b/Resources/doc/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 ----------------------------------- From ec4a9cf5be7ccdfe72c40cd325d34a03ef7de6a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 02:06:44 +0000 Subject: [PATCH 5/8] Bump doctrine/.github from 5.2.0 to 5.3.0 Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/5.2.0...5.3.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 0c8e7f30..9fb3dc0b 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.2.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.3.0" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6df5de85..e29a1cbc 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.2.0" + uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.3.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.2.0" + uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@5.3.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 67a81bf8..429cc0b1 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.2.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.3.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 49a55f4a..a18a9f14 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.2.0" + uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.3.0" From 8016515094c6d8ce533e5656675202bb3ae90ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 2 Dec 2024 21:25:04 +0100 Subject: [PATCH 6/8] Drop Psalm (#562) As per our decision during the Hackathon. --- .gitattributes | 2 -- .github/workflows/static-analysis.yml | 2 +- .../DoctrineCommandsTest.php | 2 +- composer.json | 5 +--- psalm-baseline.xml | 21 --------------- psalm.xml | 26 ------------------- 6 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 psalm-baseline.xml delete mode 100644 psalm.xml diff --git a/.gitattributes b/.gitattributes index dbad283e..0c3c467b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,5 +9,3 @@ phpcs.xml.dist export-ignore phpstan.neon export-ignore phpstan.neon.dist export-ignore phpunit.xml.dist export-ignore -psalm.xml export-ignore -psalm-baseline.xml export-ignore diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index a18a9f14..b2f2a1fb 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.3.0" + uses: "doctrine/.github/.github/workflows/phpstan.yml@5.3.0" diff --git a/Tests/DependencyInjection/DoctrineCommandsTest.php b/Tests/DependencyInjection/DoctrineCommandsTest.php index e72f4086..c63b7a47 100644 --- a/Tests/DependencyInjection/DoctrineCommandsTest.php +++ b/Tests/DependencyInjection/DoctrineCommandsTest.php @@ -51,7 +51,7 @@ public function testCommandRegistered(string $name, string $instance): void /** * @return string[][] - * @psalm-return list}> + * @phpstan-return list}> */ public function getCommands(): array { diff --git a/composer.json b/composer.json index 6e1908e1..17a00ac5 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\\": "" }, diff --git a/psalm-baseline.xml b/psalm-baseline.xml deleted file mode 100644 index fa484db5..00000000 --- a/psalm-baseline.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/psalm.xml b/psalm.xml deleted file mode 100644 index dc18a016..00000000 --- a/psalm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - From 14ec6f439b5d250ec13f9435f12b1ef5e70a24b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:25:44 +0000 Subject: [PATCH 7/8] Bump doctrine/.github from 5.3.0 to 6.0.0 Bumps [doctrine/.github](https://github.com/doctrine/.github) from 5.3.0 to 6.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/5.3.0...6.0.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 9fb3dc0b..3857b06e 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.3.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e29a1cbc..7a9aae7d 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.3.0" + uses: "doctrine/.github/.github/workflows/continuous-integration.yml@6.0.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.3.0" + uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@6.0.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 429cc0b1..af9efcda 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.3.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@6.0.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 b2f2a1fb..758fcc4a 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/phpstan.yml@5.3.0" + uses: "doctrine/.github/.github/workflows/phpstan.yml@6.0.0" From 1ef4f6e946610b0afd5010665ef0fa21dfd4b052 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 01:06:51 +0000 Subject: [PATCH 8/8] Bump doctrine/.github from 6.0.0 to 7.1.0 Bumps [doctrine/.github](https://github.com/doctrine/.github) from 6.0.0 to 7.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](https://github.com/doctrine/.github/compare/6.0.0...7.1.0) --- updated-dependencies: - dependency-name: doctrine/.github dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 3857b06e..9f949bde 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@6.0.0" + 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 7a9aae7d..6fa0eac1 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@6.0.0" + 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@6.0.0" + 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 af9efcda..0c4ee4a5 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@6.0.0" + 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 758fcc4a..d1e53833 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/phpstan.yml@6.0.0" + uses: "doctrine/.github/.github/workflows/phpstan.yml@7.1.0"