From a1ed5264645db1cb5fe240da05380d97bdad440c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 5 May 2024 22:07:38 +0200 Subject: [PATCH 1/5] Upgrade codecov/codecov-action to v4 --- .github/workflows/continuous-integration.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 817a97eb..fb143a1b 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -116,6 +116,8 @@ jobs: path: "reports" - name: "Upload to Codecov" - uses: "codecov/codecov-action@v3" + uses: "codecov/codecov-action@v4" with: directory: reports + env: + CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}" From e920c6b5536cebeb56b2ad952a5bf55e7a0672a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 5 May 2024 22:07:55 +0200 Subject: [PATCH 2/5] Setup Dependabot for Github actions --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..15bd1729 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + labels: + - "CI" From 9a3894baea2b4154ff73e1098ce5dd5b5e49df46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 5 May 2024 22:09:26 +0200 Subject: [PATCH 3/5] Remove redundant aliases Being "current" means these aliases are automatically added. See https://github.com/doctrine/doctrine-website/blob/9ddbea42cf36e2e64bbbd99aced023c737a9c661/lib/Model/ProjectVersion.php#L68-L72 --- .doctrine-project.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.doctrine-project.json b/.doctrine-project.json index d1e41f78..1b2574a7 100644 --- a/.doctrine-project.json +++ b/.doctrine-project.json @@ -13,11 +13,7 @@ "name": "5.0", "branchName": "5.0.x", "slug": "5.0", - "current": true, - "aliases": [ - "current", - "stable" - ] + "current": true }, { "name": "4.7", From a4a633da132af4a8b9de825e4661bc6bb686e0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 5 May 2024 22:16:18 +0200 Subject: [PATCH 4/5] Apply latest coding standards --- src/Loader/SymfonyFixturesLoader.php | 6 +----- src/ManagerConfigurator.php | 4 ---- tests/Fixtures/Form/Guesser.php | 1 - tests/Fixtures/Validator/Document.php | 2 -- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Loader/SymfonyFixturesLoader.php b/src/Loader/SymfonyFixturesLoader.php index 4589796f..9a519dbb 100644 --- a/src/Loader/SymfonyFixturesLoader.php +++ b/src/Loader/SymfonyFixturesLoader.php @@ -26,11 +26,7 @@ final class SymfonyFixturesLoader extends Loader implements SymfonyFixturesLoade /** @var array> */ private array $groupsFixtureMapping = []; - /** - * @internal - * - * @param array $fixtures - */ + /** @internal */ public function addFixtures(array $fixtures): void { // Because parent::addFixture may call $this->createFixture diff --git a/src/ManagerConfigurator.php b/src/ManagerConfigurator.php index 36878ec6..e9aa637d 100644 --- a/src/ManagerConfigurator.php +++ b/src/ManagerConfigurator.php @@ -15,8 +15,6 @@ class ManagerConfigurator { /** * Construct. - * - * @param array $enabledFilters */ public function __construct(private array $enabledFilters = []) { @@ -48,8 +46,6 @@ private function enableFilters(DocumentManager $documentManager): void /** * Loads custom types. * - * @param array $types - * * @throws MappingException */ public static function loadTypes(array $types): void diff --git a/tests/Fixtures/Form/Guesser.php b/tests/Fixtures/Form/Guesser.php index 3afa0f29..e394b3ba 100644 --- a/tests/Fixtures/Form/Guesser.php +++ b/tests/Fixtures/Form/Guesser.php @@ -43,7 +43,6 @@ class Guesser #[ODM\Field(type: Type::INT)] public ?int $intField = null; - /** @var array */ #[ODM\Field(type: Type::COLLECTION)] public array $collectionField; diff --git a/tests/Fixtures/Validator/Document.php b/tests/Fixtures/Validator/Document.php index f2cc90c6..58b915c5 100644 --- a/tests/Fixtures/Validator/Document.php +++ b/tests/Fixtures/Validator/Document.php @@ -17,11 +17,9 @@ class Document #[ODM\Field(type: Type::STRING)] public string $name; - /** @var array */ #[ODM\Field(type: Type::HASH)] public array $hash; - /** @var array */ #[ODM\Field(type: Type::COLLECTION)] public array $collection; From 9251fa5e6c992b5c2deec35ff8de6a564b5492f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 5 May 2024 22:20:52 +0200 Subject: [PATCH 5/5] Ignore issue about callable not being static See https://github.com/vimeo/psalm/issues/10936 --- psalm-baseline.xml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 1ae94734..8532853d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,29 +1,35 @@ - + - ExpressionLanguage + - ask + - arrayNode - end - scalarNode - scalarNode + + + + - children + + + + + + + - GuesserTestType +