Skip to content

Commit

Permalink
Merge pull request #468 from greg0ire/drop-psalm
Browse files Browse the repository at this point in the history
Drop Psalm
  • Loading branch information
SenseException authored Nov 28, 2024
2 parents 3004c9b + 5a5d13c commit ce4376e
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 36 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
/phpunit.xml.dist export-ignore
/phpstan.neon.dist export-ignore
/phpstan-baseline.neon export-ignore
/psalm.xml export-ignore
/psalm-baseline.xml export-ignore
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ on:

jobs:
static-analysis:
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.3.0"
uses: "doctrine/.github/.github/workflows/phpstan.yml@5.3.0"
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"doctrine/coding-standard": "^12",
"phpstan/phpstan": "^1.10.39",
"phpunit/phpunit": "^9.6.13",
"symfony/phpunit-bridge": "^6.3.6",
"vimeo/psalm": "^5.15"
"symfony/phpunit-bridge": "^6.3.6"
},
"conflict": {
"doctrine/dbal": "< 3"
Expand Down
28 changes: 0 additions & 28 deletions psalm.xml

This file was deleted.

4 changes: 2 additions & 2 deletions src/Loader/SymfonyFixturesLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class SymfonyFixturesLoader extends SymfonyBridgeLoader
/**
* @internal
*
* @psalm-param list<array{fixture: FixtureInterface, groups: list<string>}> $fixtures
* @phpstan-param list<array{fixture: FixtureInterface, groups: list<string>}> $fixtures
*/
public function addFixtures(array $fixtures): void
{
Expand Down Expand Up @@ -134,7 +134,7 @@ private function addGroupsFixtureMapping(string $className, array $groups): void
/**
* Collect any dependent fixtures from the given classes.
*
* @psalm-return array<string,true>
* @phpstan-return array<string,true>
*/
private function collectDependencies(string ...$fixtureClass): array
{
Expand Down
2 changes: 1 addition & 1 deletion src/Purger/PurgerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

interface PurgerFactory
{
/** @psalm-param list<string> $excluded */
/** @phpstan-param list<string> $excluded */
public function createForEntityManager(
?string $emName,
EntityManagerInterface $em,
Expand Down

0 comments on commit ce4376e

Please sign in to comment.