symfony 6 support (psalm)

Author: dsbe-ak

composer.json

@@ -94,7 +94,7 @@
         "ensure-env-dev-copied": "(cd tests/Application && ([[ -f .env.dev.local ]] || cp .env  .env.dev.local))",
         "ensure-env-test-copied": "(cd tests/Application && ([[ -f .env.test.local ]] || cp .env.test .env.test.local))",
         "ensure-schema-updated": "composer ensure-env-copied && (cd tests/Application && bin/console doctrine:schema:update --force -e ${SYMFONY_ENV:-'dev'})",
-        "ensure-test-container-exists": "[[ -f tests/Application/var/cache/test/ApplicationTests_Setono_SyliusTermsPlugin_Application_KernelTestDebugContainer.xml ]] || tests/Application/bin/console cache:warmup --env=test",
+        "ensure-test-container-exists": "[[ -f tests/Application/var/cache/test/Tests_Setono_SyliusTermsPlugin_Application_KernelTestDebugContainer.xml ]] || tests/Application/bin/console cache:warmup --env=test",
         "ensure-vendors-installed": "[[ -f vendor/autoload.php ]] || php -d memory_limit=-1 /usr/local/bin/composer install",
         "fix-style": "ecs check --fix",
         "fixtures": [

psalm.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    totallyTyped="true"
     errorLevel="1"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

src/ClickStrategy.php

@@ -17,6 +17,9 @@ private function __construct()
 
     public const CLICK_STRATEGY_MODAL = 'modal';
 
+    /**
+     * @return string[]
+     */
     public static function getClickStrategies(): array
     {
         return [

src/ClickStrategyApplicator/CompositeClickStrategyApplicator.php

@@ -11,11 +11,11 @@ final class CompositeClickStrategyApplicator extends ArrayCollection implements
     /** @var string */
     private $clickStrategy;
 
-    public function __construct(string $clickStrategy)
+    public function __construct(array $elements = [], string $clickStrategy = '')
     {
         $this->clickStrategy = $clickStrategy;
 
-        parent::__construct();
+        parent::__construct($elements);
     }
 
     public function addClickStrategyApplicator(ClickStrategyApplicatorInterface $clickStrategyApplicator, string $alias): void

src/DependencyInjection/SetonoSyliusTermsExtension.php

@@ -16,7 +16,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
 
-        $container->setParameter('setono_sylius_terms.click_strategy', $config['click_strategy']);
+        $container->setParameter('setono_sylius_terms.click_strategy', (string) $config['click_strategy']);
 
         $loader->load('services.xml');
 

src/Fixture/Factory/TermsExampleFactory.php

@@ -111,7 +111,9 @@ protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
             ->setDefault('name', function (Options $options): string {
-                return implode(' ', (array) $this->faker->words(3));
+                /** @var string[] $words */
+                $words = (array) $this->faker->words(3);
+                return implode(' ', $words);
             })
 
             ->setDefault('code', function (Options $options): string {