Merge pull request #112 from core23/remove-psalm

core23 · web-flow · commit e59de412eed5 · 2025-02-07T17:40:19.000+01:00
Remove psalm in favor of phpstan
diff --git a/.gitattributes b/.gitattributes
@@ -3,8 +3,6 @@ infection.json          export-ignore
 Makefile                export-ignore
 phpstan.neon.dist       export-ignore
 phpstan-baseline.neon   export-ignore
-psalm-baseline.xml      export-ignore
-psalm.xml               export-ignore
 phpunit.xml.dist        export-ignore
 /tests                  export-ignore
 /vendor-bin             export-ignore
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -48,7 +48,7 @@
            'import_functions' => false,
         ],
         'phpdoc_to_comment' => [
-            'ignored_tags' => ['psalm-suppress'],
+            'ignored_tags' => [],
         ],
     ])
     ->setFinder($finder)
diff --git a/Makefile b/Makefile
@@ -32,10 +32,6 @@ cs: vendor-bin/tools/vendor
 cs-fix: vendor-bin/tools/vendor
 	vendor/bin/php-cs-fixer fix --verbose
 
-.PHONY: psalm
-psalm: vendor-bin/tools/vendor
-	vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4
-
 .PHONY: phpstan
 phpstan: vendor-bin/tools/vendor
 	vendor/bin/phpstan analyse
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
diff --git a/psalm.xml b/psalm.xml
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -36,7 +36,6 @@ private function getAdminNode(): NodeDefinition
     {
         $node = (new TreeBuilder('admin'))->getRootNode();
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
         $node
             ->addDefaultsIfNotSet()
             ->children()
@@ -73,7 +72,6 @@ private function getEntityNode(): NodeDefinition
     {
         $node = (new TreeBuilder('entity'))->getRootNode();
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
         $node
             ->addDefaultsIfNotSet()
             ->children()
@@ -100,7 +98,6 @@ private function getControllerNode(): NodeDefinition
     {
         $node = (new TreeBuilder('controller'))->getRootNode();
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
         $node
             ->addDefaultsIfNotSet()
             ->children()
diff --git a/src/Exception/EntityNotFound.php b/src/Exception/EntityNotFound.php
@@ -22,7 +22,7 @@ final class EntityNotFound extends RuntimeException implements SonataAutoConfigu
      */
     public function __construct(string $name, array $namespaces)
     {
-        parent::__construct(sprintf(
+        parent::__construct(\sprintf(
             'Entity "%s" not found, looked in "%s" namespaces.',
             $name,
             implode(', ', array_column($namespaces, 'namespace'))
diff --git a/tests/DependencyInjection/Compiler/AutoConfigureAdminClassesCompilerPassTest.php b/tests/DependencyInjection/Compiler/AutoConfigureAdminClassesCompilerPassTest.php
@@ -100,7 +100,7 @@ public function testProcess(
     /**
      * @return mixed[]
      */
-    public function provideProcessCases(): iterable
+    public static function provideProcessCases(): iterable
     {
         yield [
             CategoryAdmin::class,
diff --git a/tests/DependencyInjection/Compiler/AutoConfigureExtensionsCompilerPassTest.php b/tests/DependencyInjection/Compiler/AutoConfigureExtensionsCompilerPassTest.php
@@ -66,7 +66,7 @@ public function testProcess(string $extensionServiceId, array $expectedTags = []
     /**
      * @return mixed[]
      */
-    public function provideProcessCases(): iterable
+    public static function provideProcessCases(): iterable
     {
         yield [ExtensionWithoutOptions::class];
 
diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -14,10 +14,7 @@
         "phpstan/phpstan-strict-rules": "^1.5.1",
         "phpstan/phpstan-symfony": "^1.3.1",
         "phpunit/phpunit": "^10.1.2",
-        "psalm/plugin-phpunit": "^0.19.0",
-        "psalm/plugin-symfony": "^5.0.3",
-        "symfony/phpunit-bridge": "^7.0.0",
-        "vimeo/psalm": "^5.9"
+        "symfony/phpunit-bridge": "^7.0.0"
     },
     "config": {
         "allow-plugins": {
diff --git a/vendor-bin/tools/composer.lock b/vendor-bin/tools/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ private function getAdminNode(): NodeDefinition`
`36`	`36`	`{`
`37`	`37`	`$node = (new TreeBuilder('admin'))->getRootNode();`
`38`	`38`
`39`		`- /** @psalm-suppress UndefinedInterfaceMethod */`
`40`	`39`	`$node`
`41`	`40`	`->addDefaultsIfNotSet()`
`42`	`41`	`->children()`
`@@ -73,7 +72,6 @@ private function getEntityNode(): NodeDefinition`
`73`	`72`	`{`
`74`	`73`	`$node = (new TreeBuilder('entity'))->getRootNode();`
`75`	`74`
`76`		`- /** @psalm-suppress UndefinedInterfaceMethod */`
`77`	`75`	`$node`
`78`	`76`	`->addDefaultsIfNotSet()`
`79`	`77`	`->children()`
`@@ -100,7 +98,6 @@ private function getControllerNode(): NodeDefinition`
`100`	`98`	`{`
`101`	`99`	`$node = (new TreeBuilder('controller'))->getRootNode();`
`102`	`100`
`103`		`- /** @psalm-suppress UndefinedInterfaceMethod */`
`104`	`101`	`$node`
`105`	`102`	`->addDefaultsIfNotSet()`
`106`	`103`	`->children()`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ final class EntityNotFound extends RuntimeException implements SonataAutoConfigu`
`22`	`22`	`*/`
`23`	`23`	`public function __construct(string $name, array $namespaces)`
`24`	`24`	`{`
`25`		`- parent::__construct(sprintf(`
	`25`	`+ parent::__construct(\sprintf(`
`26`	`26`	`'Entity "%s" not found, looked in "%s" namespaces.',`
`27`	`27`	`$name,`
`28`	`28`	`implode(', ', array_column($namespaces, 'namespace'))`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function testProcess(`
`100`	`100`	`/**`
`101`	`101`	`* @return mixed[]`
`102`	`102`	`*/`
`103`		`- public function provideProcessCases(): iterable`
	`103`	`+ public static function provideProcessCases(): iterable`
`104`	`104`	`{`
`105`	`105`	`yield [`
`106`	`106`	`CategoryAdmin::class,`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function testProcess(string $extensionServiceId, array $expectedTags = []`
`66`	`66`	`/**`
`67`	`67`	`* @return mixed[]`
`68`	`68`	`*/`
`69`		`- public function provideProcessCases(): iterable`
	`69`	`+ public static function provideProcessCases(): iterable`
`70`	`70`	`{`
`71`	`71`	`yield [ExtensionWithoutOptions::class];`
`72`	`72`