Updated psalm configuration.

laurentmuller · Oct 3, 2023 · 75e421a · 75e421a
1 parent 4597ea2
commit 75e421a
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 47 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -37,12 +37,6 @@
             </errorLevel>
         </PropertyNotSetInConstructor>
 
-        <MissingPropertyType>
-            <errorLevel type="suppress">
-                <referencedProperty name="App\Faker\CustomCompany::$formats"/>
-            </errorLevel>
-        </MissingPropertyType>
-
         <InternalMethod>
             <errorLevel type="suppress">
                 <file name="src/Service/DatabaseInfoService.php"/>
@@ -57,14 +51,6 @@
             </errorLevel>
         </UndefinedFunction>
 
-        <InvalidClassConstantType>
-            <errorLevel type="suppress">
-                <referencedConstant name="App\Validator\Captcha::ERROR_NAMES"/>
-                <referencedConstant name="App\Validator\Password::ERROR_NAMES"/>
-                <referencedConstant name="App\Validator\Strength::ERROR_NAMES"/>
-            </errorLevel>
-        </InvalidClassConstantType>
-
         <UnsupportedPropertyReferenceUsage>
             <errorLevel type="suppress">
                 <file name="src/Form/Extension/AbstractFileTypeExtension.php"/>
@@ -100,12 +86,12 @@
             </errorLevel>
         </MixedReturnStatement>
 
-        <InvalidArgument>
+        <MixedArgumentTypeCoercion>
             <errorLevel type="suppress">
-                <file name="src/Twig/HighlightExtension.php" />
-                <referencedFunction name="exportPhp"/>
+                <file name="src/Model/TaskComputeQuery.php" />
+                <referencedFunction name="updateItems" />
             </errorLevel>
-        </InvalidArgument>
+        </MixedArgumentTypeCoercion>
     </issueHandlers>
 
     <plugins>

diff --git a/src/Chart/AbstractHighchart.php b/src/Chart/AbstractHighchart.php
@@ -24,8 +24,6 @@
 
 /**
  * Extends the Highchart with method shortcuts.
- *
- * @psalm-suppress PropertyNotSetInConstructor
  */
 class AbstractHighchart extends Highchart implements ServiceSubscriberInterface
 {

diff --git a/src/Chart/MonthChart.php b/src/Chart/MonthChart.php
@@ -20,8 +20,6 @@
 /**
  * Chart to display calculations by month.
  *
- * @psalm-suppress PropertyNotSetInConstructor
- *
  * @psalm-import-type CalculationByMonthType from CalculationRepository
  */
 class MonthChart extends AbstractHighchart

diff --git a/src/Chart/StateChart.php b/src/Chart/StateChart.php
@@ -22,8 +22,6 @@
  * Chart to display calculations by state.
  *
  * @psalm-import-type QueryCalculationType from CalculationStateRepository
- *
- * @psalm-suppress PropertyNotSetInConstructor
  */
 class StateChart extends AbstractHighchart
 {

diff --git a/src/Faker/CustomCompany.php b/src/Faker/CustomCompany.php
@@ -19,6 +19,11 @@
  */
 class CustomCompany extends \Faker\Provider\fr_CH\Company
 {
+    /**
+     * @psalm-var mixed
+     *
+     * @phpstan-var string[]
+     */
     protected static $formats = [
         '{{lastName}} {{companySuffix}}',
         '{{lastName}} {{firstName}} {{companySuffix}}',

diff --git a/src/Model/TaskComputeQuery.php b/src/Model/TaskComputeQuery.php
@@ -74,11 +74,8 @@ public function setQuantity(float $quantity): self
         return $this;
     }
 
-    /**
-     * @psalm-suppress MixedArgumentTypeCoercion
-     */
     private function updateItems(): void
     {
-        $this->items = $this->task->getItems()->map(static fn (TaskItem $item) => (int) $item->getId())->toArray();
+        $this->items = $this->task->getItems()->map(static fn (TaskItem $item): int => (int) $item->getId())->toArray();
     }
 }
diff --git a/src/Twig/HighlightExtension.php b/src/Twig/HighlightExtension.php
@@ -26,7 +26,7 @@
 class HighlightExtension extends AbstractExtension
 {
     /**
-     * @const array<non-empty-string, non-empty-string>
+     * @const array<non-empty-string, string>
      */
     private const PHP_PATTERNS = [
         '/title="(.*?)"/i' => '',
@@ -84,7 +84,7 @@ private function exportPhp(Environment $env, mixed $variable, string $id = ''):
         if (!\is_string($content)) {
             return null;
         }
-        $content = StringUtils::pregReplace(self::PHP_PATTERNS, $content); // @phpstan-ignore-line
+        $content = StringUtils::pregReplace(self::PHP_PATTERNS, $content);
         if ('' !== $id) {
             $content = (string) \preg_replace('/highlight-php-\d+/', $id, $content);
         }

diff --git a/src/Utils/StringUtils.php b/src/Utils/StringUtils.php
@@ -215,7 +215,7 @@ public static function isString(?string $str): bool
      *
      * @phpstan-return ($subject is string ? string : string[])
      *
-     * @psalm-param array<non-empty-string, non-empty-string> $values
+     * @psalm-param array<non-empty-string, string> $values
      */
     public static function pregReplace(array $values, string|array $subject): string|array
     {

diff --git a/src/Validator/Captcha.php b/src/Validator/Captcha.php
@@ -16,10 +16,6 @@
 
 /**
  * Captcha contraint.
- *
- * @Annotation
- *
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Captcha extends Constraint

diff --git a/src/Validator/Password.php b/src/Validator/Password.php
@@ -16,10 +16,6 @@
 
 /**
  * Password constraint.
- *
- * @Annotation
- *
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Password extends Constraint

diff --git a/src/Validator/Recaptcha.php b/src/Validator/Recaptcha.php
@@ -16,10 +16,6 @@
 
 /**
  * Google reCaptcha contraint.
- *
- * @Annotation
- *
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Recaptcha extends Constraint

diff --git a/src/Validator/Strength.php b/src/Validator/Strength.php
@@ -18,10 +18,6 @@
 
 /**
  * Strength constraint.
- *
- * @Annotation
- *
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Strength extends Constraint
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,8 +24,6 @@ @@
     /**
      * Extends the Highchart with method shortcuts.
-     *
-     * @psalm-suppress PropertyNotSetInConstructor
      */
     class AbstractHighchart extends Highchart implements ServiceSubscriberInterface
     {
@@ Expand Down @@