Merge pull request #1649 from tarlepp/feat/psalm-plugin-doctrine

Feat - Added `doctrine-psalm-plugin` for Psalm
tarlepp · Jan 28, 2022 · b6412c1 · b6412c1
2 parents e74d1fe + 3e3d782
commit b6412c1
Show file tree

Hide file tree

Showing 18 changed files with 139 additions and 65 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/psalm.xml b/psalm.xml
@@ -19,6 +19,7 @@
     <plugins>
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin" />
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin" />
+        <pluginClass class="Weirdan\DoctrinePsalmPlugin\Plugin" />
     </plugins>
 
     <issueHandlers>

diff --git a/src/DataFixtures/ORM/LoadApiKeyData.php b/src/DataFixtures/ORM/LoadApiKeyData.php
@@ -26,7 +26,6 @@
  * @package App\DataFixtures\ORM
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  *
- * @psalm-suppress MissingConstructor
  * @psalm-suppress PropertyNotSetInConstructor
  */
 final class LoadApiKeyData extends Fixture implements OrderedFixtureInterface

diff --git a/src/DataFixtures/ORM/LoadRoleData.php b/src/DataFixtures/ORM/LoadRoleData.php
@@ -22,7 +22,6 @@
  * @package App\DataFixtures\ORM
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  *
- * @psalm-suppress MissingConstructor
  * @psalm-suppress PropertyNotSetInConstructor
  */
 final class LoadRoleData extends Fixture implements OrderedFixtureInterface

diff --git a/src/DataFixtures/ORM/LoadUserData.php b/src/DataFixtures/ORM/LoadUserData.php
@@ -25,7 +25,6 @@
  * @package App\DataFixtures\ORM
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  *
- * @psalm-suppress MissingConstructor
  * @psalm-suppress PropertyNotSetInConstructor
  */
 final class LoadUserData extends Fixture implements OrderedFixtureInterface

diff --git a/src/DataFixtures/ORM/LoadUserGroupData.php b/src/DataFixtures/ORM/LoadUserGroupData.php
@@ -25,7 +25,6 @@
  * @package App\DataFixtures\ORM
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  *
- * @psalm-suppress MissingConstructor
  * @psalm-suppress PropertyNotSetInConstructor
  */
 final class LoadUserGroupData extends Fixture implements OrderedFixtureInterface

diff --git a/src/Repository/Traits/RepositoryMethodsTrait.php b/src/Repository/Traits/RepositoryMethodsTrait.php
@@ -105,10 +105,8 @@ public function findByAdvanced(
          */
         RepositoryHelper::resetParameterCount();
 
-        /** @psalm-suppress InvalidTemplateParam */
-        $iterator = (new Paginator($queryBuilder, true))->getIterator();
-
-        return $iterator->getArrayCopy();
+        /** @psalm-suppress UndefinedInterfaceMethod */
+        return (new Paginator($queryBuilder, true))->getIterator()->getArrayCopy();
     }
 
     /**

diff --git a/tools/01_phpunit/composer.lock b/tools/01_phpunit/composer.lock
diff --git a/tools/02_phpstan/composer.lock b/tools/02_phpstan/composer.lock
diff --git a/tools/03_psalm/composer.json b/tools/03_psalm/composer.json
@@ -6,7 +6,8 @@
 		"roave/security-advisories": "dev-latest",
 		"psalm/plugin-phpunit": "0.16.1",
 		"psalm/plugin-symfony": "3.1.2",
-		"vimeo/psalm": "4.18.1"
+		"vimeo/psalm": "4.18.1",
+		"weirdan/doctrine-psalm-plugin": "2.1.0"
 	},
 	"config": {
 		"platform": {

diff --git a/tools/03_psalm/composer.lock b/tools/03_psalm/composer.lock
diff --git a/tools/04_symplify/composer.lock b/tools/04_symplify/composer.lock
diff --git a/tools/05_infection/composer.lock b/tools/05_infection/composer.lock
diff --git a/tools/06_php-coveralls/composer.lock b/tools/06_php-coveralls/composer.lock