Update psalm to 5.23

pheature-flags · Apr 11, 2024 · 7c8b090 · 7c8b090
1 parent 7afce43
commit 7c8b090
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "squizlabs/php_codesniffer": "^3.4",
         "symfony/var-dumper": "^4.2 || ^5.0 || ^6.0 || ^7.0",
         "twig/twig": "^2.4.4 || ^3.0",
-        "vimeo/psalm": "^4.4"
+        "vimeo/psalm": "^4.4 || ^5.23"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -11,7 +11,7 @@
 final class Configuration implements ConfigurationInterface
 {
     /**
-     * @psalm-suppress ReservedWord
+     * @psalm-suppress UndefinedInterfaceMethod
      * @return TreeBuilder
      */
     public function getConfigTreeBuilder(): TreeBuilder
@@ -42,7 +42,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    /** @psalm-suppress ReservedWord */
+    /** @psalm-suppress UndefinedInterfaceMethod */
     private function addStrategyTypes(ArrayNodeDefinition $rootNode): void
     {
         /** @phpstan-ignore-next-line */
@@ -64,7 +64,7 @@ private function addStrategyTypes(ArrayNodeDefinition $rootNode): void
                 ->end();
     }
 
-    /** @psalm-suppress ReservedWord */
+    /** @psalm-suppress UndefinedInterfaceMethod */
     private function addSegmentTypes(ArrayNodeDefinition $rootNode): void
     {
         /** @phpstan-ignore-next-line */
@@ -86,7 +86,7 @@ private function addSegmentTypes(ArrayNodeDefinition $rootNode): void
                 ->end();
     }
 
-    /** @psalm-suppress ReservedWord */
+    /** @psalm-suppress UndefinedInterfaceMethod */
     private function addToggles(ArrayNodeDefinition $rootNode): void
     {
         /** @phpstan-ignore-next-line */

diff --git a/src/DependencyInjection/FeatureFinderFactoryPass.php b/src/DependencyInjection/FeatureFinderFactoryPass.php
@@ -23,7 +23,7 @@ public function process(ContainerBuilder $container): void
     {
         /** @var array<array<mixed>> $pheatureFlagsConfig */
         $pheatureFlagsConfig = $container->getExtensionConfig('pheature_flags');
-        $mergedConfig = array_merge(...$pheatureFlagsConfig);
+        $mergedConfig = array_replace(...$pheatureFlagsConfig);
 
         $finder = $container->register(FeatureFinder::class, FeatureFinder::class)
             ->setAutowired(false)

diff --git a/src/DependencyInjection/FeatureRepositoryFactoryPass.php b/src/DependencyInjection/FeatureRepositoryFactoryPass.php
@@ -19,7 +19,7 @@ public function process(ContainerBuilder $container): void
     {
         /** @var array<array<mixed>> $pheatureFlagsConfig */
         $pheatureFlagsConfig = $container->getExtensionConfig('pheature_flags');
-        $mergedConfig = array_merge(...$pheatureFlagsConfig);
+        $mergedConfig = array_replace(...$pheatureFlagsConfig);
 
         $repository = $container->register(FeatureRepository::class, FeatureRepository::class)
             ->setAutowired(false)

diff --git a/src/DependencyInjection/SegmentFactoryPass.php b/src/DependencyInjection/SegmentFactoryPass.php
@@ -17,7 +17,7 @@ public function process(ContainerBuilder $container): void
     {
         /** @var array<array<mixed>> $pheatureFlagsConfig */
         $pheatureFlagsConfig = $container->getExtensionConfig('pheature_flags');
-        $mergedConfig = array_merge(...$pheatureFlagsConfig);
+        $mergedConfig = array_replace(...$pheatureFlagsConfig);
 
         $segmentFactory = $container->register(SegmentFactory::class, SegmentFactory::class)
             ->setAutowired(false)

diff --git a/src/DependencyInjection/ToggleAPIPass.php b/src/DependencyInjection/ToggleAPIPass.php
@@ -18,7 +18,7 @@ public function process(ContainerBuilder $container): void
         /** @var array<array<mixed>> $pheatureFlagsConfig */
         $pheatureFlagsConfig = $container->getExtensionConfig('pheature_flags');
 
-        $mergedConfig = array_merge(...$pheatureFlagsConfig);
+        $mergedConfig = array_replace(...$pheatureFlagsConfig);
         Assert::keyExists($mergedConfig, 'api_enabled');
         Assert::boolean($mergedConfig['api_enabled']);
 

diff --git a/src/DependencyInjection/ToggleStrategyFactoryPass.php b/src/DependencyInjection/ToggleStrategyFactoryPass.php
@@ -17,7 +17,7 @@ public function process(ContainerBuilder $container): void
     {
         /** @var array<array<mixed>> $pheatureFlagsConfig */
         $pheatureFlagsConfig = $container->getExtensionConfig('pheature_flags');
-        $mergedConfig = array_merge(...$pheatureFlagsConfig);
+        $mergedConfig = array_replace(...$pheatureFlagsConfig);
 
         $toggleStrategyFactory = $container->register(
             ChainToggleStrategyFactory::class,