Upgrade psalm

hlecorche · Nov 18, 2024 · 077014d · 077014d
1 parent c3551f1
commit 077014d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -57,7 +57,7 @@
         "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3|^2.1.1",
         "symfony/yaml": "^6.4|^7.1",
-        "vimeo/psalm": "^4.22"
+        "vimeo/psalm": "^5.0"
     },
     "autoload": {
         "psr-4": { "Ecommit\\CrudBundle\\": "src/" }

diff --git a/psalm.xml b/psalm.xml
@@ -20,5 +20,19 @@
                 <referencedClass name="UnitEnum"/>
             </errorLevel>
         </UndefinedDocblockClass>
+        <MissingTemplateParam>
+            <errorLevel type="suppress">
+                <!-- DataTransformer to be rewritten -->
+                <file name="src/Form/DataTransformer/Entity/AbstractEntityTransformer.php" />
+                <file name="src/Crud/CrudConfig.php" />
+            </errorLevel>
+        </MissingTemplateParam>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <!-- Doctrine ORM v2 support -->
+                <referencedClass name="Doctrine\ORM\Mapping\ClassMetadataInfo"/>
+                <file name="src/EventListener/MappingEntities.php" />
+            </errorLevel>
+        </UndefinedClass>
     </issueHandlers>
 </psalm>
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
@@ -115,7 +115,7 @@ public function __construct(array $options, protected ContainerInterface $contai
                     throw new \Exception('A column must be an array or a CrudColum instance.');
                 }
                 if (\array_key_exists($column->getId(), $columns)) {
-                    throw new \Exception(\sprintf('The column "column1" already exists.', $column->getId()));
+                    throw new \Exception(\sprintf('The column "%s" already exists.', $column->getId()));
                 }
                 $columns[$column->getId()] = $column;
             }
@@ -133,7 +133,7 @@ public function __construct(array $options, protected ContainerInterface $contai
                     throw new \Exception('A column must be an array or a CrudColum instance.');
                 }
                 if (\array_key_exists($column->getId(), $columns)) {
-                    throw new \Exception(\sprintf('The column "column1" already exists.', $column->getId()));
+                    throw new \Exception(\sprintf('The column "%s" already exists.', $column->getId()));
                 }
                 $columns[$column->getId()] = $column;
             }
@@ -186,12 +186,10 @@ public function __construct(array $options, protected ContainerInterface $contai
         // Check duplicates in columns / vitual columns
         $duplicates = array_intersect_key($this->options['columns'], $this->options['virtual_columns']);
         if (\count($duplicates) > 0) {
-            throw new \Exception(\sprintf('The column "column1" already exists.', array_keys($duplicates)[0]));
+            throw new \Exception(\sprintf('The column "%s" already exists.', array_keys($duplicates)[0]));
         }
 
         $this->init();
-
-        return $this;
     }
 
     protected function init(): void

diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
@@ -53,7 +53,7 @@ protected function createFormBuilder(?string $type): void
             $formOptions['validation_groups'] = $this->options['validation_groups'];
         }
 
-        if ($type) {
+        if (null !== $type) {
             $this->form = $formFactory->createBuilder($type, null, $formOptions);
         } else {
             $formName = \sprintf('crud_search_%s', $this->crud->getSessionName());

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -27,6 +27,7 @@ class Configuration implements ConfigurationInterface
     /**
      * @psalm-suppress PossiblyUndefinedMethod
      * @psalm-suppress PossiblyNullReference
+     * @psalm-suppress UndefinedInterfaceMethod
      */
     public function getConfigTreeBuilder(): TreeBuilder
     {

diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
@@ -45,8 +45,8 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
             $queryBuilder->andWhere(\sprintf('%s = :%s', $options['alias_search'], $parameterName))
                 ->setParameter($parameterName, $value);
         } else {
-            $after = ($options['must_begin']) ? '' : '%';
-            $before = ($options['must_end']) ? '' : '%';
+            $after = (true === $options['must_begin']) ? '' : '%';
+            $before = (true === $options['must_end']) ? '' : '%';
             $value = addcslashes($value, '%_');
             $like = $after.$value.$before;
             $queryBuilder->andWhere($queryBuilder->expr()->like($options['alias_search'], ':'.$parameterName))

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
@@ -683,6 +683,11 @@ protected function validateAjaxOptions(array $options, array $requiredOptions =
         return $resolver->resolve($options);
     }
 
+    /**
+     * @param array<string, string|bool|array<array-key, mixed>|null> $options
+     *
+     * @return array<string, string>
+     */
     protected function getAjaxAttributes(array $options): array
     {
         $attributes = [];