Merge pull request #1292 from ergebnis/feature/synchronize

Enhancement: Synchronize with `ergebnis/php-package-template`
ergebnis · Feb 7, 2024 · 5513b2a · 5513b2a
2 parents bdc384b + f391d3c
commit 5513b2a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,5 +1,13 @@
 parameters:
 	ignoreErrors:
+		-
+			message: """
+				#^Call to deprecated method createHelperSet\\(\\) of class Doctrine\\\\ORM\\\\Tools\\\\Console\\\\ConsoleRunner\\:
+				This method will be removed in ORM 3\\.0 without replacement\\.$#
+			"""
+			count: 1
+			path: config/cli-config.php
+
 		-
 			message: "#^Method Example\\\\Entity\\\\Organization\\:\\:members\\(\\) should return array\\<int, Example\\\\Entity\\\\User\\> but returns array\\.$#"
 			count: 1

diff --git a/phpstan.neon b/phpstan.neon
@@ -22,9 +22,11 @@ parameters:
 	level: max
 
 	paths:
+		- config/
 		- example/
 		- src/
 		- test/
+		- .php-cs-fixer.php
 		- rector.php
 
 	tmpDir: .build/phpstan/
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
+<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494">
+  <file src="config/cli-config.php">
+    <DeprecatedMethod>
+      <code>ORM\Tools\Console\ConsoleRunner::createHelperSet($entityManager)</code>
+    </DeprecatedMethod>
+  </file>
   <file src="example/src/Entity/Avatar.php">
     <PossiblyUnusedMethod>
       <code>height</code>

diff --git a/psalm.xml b/psalm.xml
@@ -17,12 +17,11 @@
     </plugins>
 
     <projectFiles>
+        <directory name="config/" />
         <directory name="example/" />
         <directory name="src/" />
         <directory name="test/" />
+        <file name=".php-cs-fixer.php" />
         <file name="rector.php" />
-        <ignoreFiles>
-            <directory name="vendor/" />
-        </ignoreFiles>
     </projectFiles>
 </psalm>
diff --git a/rector.php b/rector.php
@@ -22,9 +22,12 @@
     $rectorConfig->import(__DIR__ . '/vendor/fakerphp/faker/rector-migrate.php');
 
     $rectorConfig->paths([
+        __DIR__ . '/config/',
         __DIR__ . '/example/',
         __DIR__ . '/src/',
         __DIR__ . '/test/',
+        __DIR__ . '/.php-cs-fixer.php',
+        __DIR__ . '/rector.php',
     ]);
 
     $rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_81);