fix(global): Psalm fixes

secretary · Jan 9, 2024 · e06a27e · e06a27e
1 parent d934f5b
commit e06a27e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 41 deletions.
diff --git a/composer.json b/composer.json
@@ -3,11 +3,11 @@
 	"description": "Monorepo for Secretary's PHP implementation",
 	"type":        "library",
 	"require-dev": {
-		"aws/aws-sdk-php":               "^3.91",
+		"php":                           "^8.0",
 		"ext-json":                      "*",
+		"aws/aws-sdk-php":               "^3.91",
 		"guzzlehttp/guzzle":             "^7.0",
 		"mockery/mockery":               "^1.4",
-		"php":                           "^8.0",
 		"phpunit/phpunit":               "^9.0 || ^10.0",
 		"psr/simple-cache":              "^1.0 || ^2.0 || ^3.0",
 		"symfony/config":                "^5.3 || ^6.0 || ^7.0",
@@ -36,6 +36,12 @@
 			"**/Tests/"
 		]
 	},
+	"config": {
+		"preferred-install": {
+			"*": "dist"
+		},
+		"sort-packages": true
+	},
 	"scripts": {
 		"ecs": "ecs check",
 		"ecs:fix": "ecs check --fix",

diff --git a/src/Bundle/SecretaryBundle/DependencyInjection/Configuration.php b/src/Bundle/SecretaryBundle/DependencyInjection/Configuration.php
@@ -15,16 +15,16 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * Class Configuration.
- *
  * @package Secretary\Bundle\SecretaryBundle\DependencyInjection
  */
 class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder('secretary');
-        $rootNode    = $treeBuilder->getRootNode();
+        $treeBuilder = new TreeBuilder('secretary', 'array');
+
+        /** @var ArrayNodeDefinition $rootNode */
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
@@ -34,30 +34,39 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
+    /**
+     * @psalm-suppress UndefinedInterfaceMethod
+     */
     private function addAdaptersSection(): ArrayNodeDefinition
     {
         $treeBuilder = new TreeBuilder('adapters');
-        $node        = $treeBuilder->getRootNode();
+
+        /** @var ArrayNodeDefinition $node */
+        $node = $treeBuilder->getRootNode();
 
         $node
             ->useAttributeAsKey('name')
             ->arrayPrototype()
             ->addDefaultsIfNotSet()
             ->children()
-            ->scalarNode('adapter')
-            ->isRequired()
-            ->info('Class name, or service ID of adapter')
-            ->end()
-            ->arrayNode('config')->ignoreExtraKeys(false)->end()
-            ->arrayNode('cache')
-            ->canBeEnabled()
-            ->addDefaultsIfNotSet()
-            ->children()
-            ->enumNode('type')->values(['psr6', 'psr16'])->end()
-            ->scalarNode('service_id')->end()
-            ->end()
-            ->end()
-            ->end()
+                ->scalarNode('adapter')
+                    ->isRequired()
+                    ->info('Class name, or service ID of adapter')
+                ->end()
+                ->arrayNode('config')
+                    ->ignoreExtraKeys(false)
+                    ->end()
+                ->arrayNode('cache')
+                    ->canBeEnabled()
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->enumNode('type')
+                            ->values(['psr6', 'psr16'])
+                        ->end()
+                        ->scalarNode('service_id')->end()
+                    ->end()
+                ->end()
+                ->end()
             ->end();
 
         return $node;

diff --git a/src/Core/Helper/ArrayHelper.php b/src/Core/Helper/ArrayHelper.php
@@ -33,26 +33,18 @@ public static function without(array $array, ...$keys): array
     }
 
     /**
-     * @psalm-suppress InvalidArrayOffset
-     *
      * @param string ...$keys
      */
     public static function remove(array &$array, ...$keys): array
     {
         $newArray = [];
-        foreach (array_keys($newArray) as $key) {
-            if (!in_array($key, $keys)) {
+        foreach (array_keys($array) as $key) {
+            if (in_array($key, $keys)) {
                 $newArray[$key] = $array[$key];
                 unset($array[$key]);
             }
         }
 
-        foreach ($keys as $key) {
-            if (!array_key_exists($key, $newArray)) {
-                $newArray[$key] = null;
-            }
-        }
-
         return $newArray;
     }
 }
diff --git a/src/Core/Secret.php b/src/Core/Secret.php
@@ -13,23 +13,17 @@
 use Secretary\Exception\ValueNotSupportedException;
 
 /**
- * @package Secretary
+ * @implements \ArrayAccess<string, mixed>
  */
 class Secret implements \ArrayAccess
 {
     private string $key;
 
-    /**
-     * @var array|string
-     */
-    private $value;
+    private array|string $value;
 
-    private ?array $metadata = null;
+    private ?array $metadata;
 
-    /**
-     * @param array|string $value
-     */
-    public function __construct(string $key, $value, ?array $metadata = null)
+    public function __construct(string $key, array|string $value, ?array $metadata = null)
     {
         $this->key      = $key;
         $this->value    = $value;