Symfony 7

Author: deluxetom

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;
     }
 }

README.md

@@ -30,7 +30,8 @@ $ composer req secretary/core
 
 | Version (X.Y.Z) |    PHP     |  Symfony   | Comment             |
 |:---------------:|:----------:|:----------:|:--------------------|
-|      `2.*`      | `>= 8.1.0` | `5.4, 6.0` | **Current version** |
+|      `3.*`      | `>= 8.1.0` |   `7.0`    | **Current version** |
+|      `2.*`      | `>= 8.1.0` | `5.4, 6.0` | Previous version    |
 |      `1.*`      | `>= 7.4.0` |   `5.3`    | Previous version    |
 
 By itself, the core is useless. You will also need to add at least one adapter:

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;
@@ -55,15 +49,13 @@ public function getMetadata(): array
     }
 
     /**
-     * @param mixed $offset
      */
     public function offsetExists($offset): bool
     {
         return is_array($this->value) && array_key_exists($offset, $this->value);
     }
 
     /**
-     * @param mixed $offset
      *
      * @throws ValueNotSupportedException
      */

composer.json

@@ -19,7 +19,7 @@
     "minimum-stability": "stable",
     "require":           {
         "php":                      "^8.0",
-        "symfony/options-resolver": "^5.4 || ^6.0"
+        "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev":       {
         "phpunit/phpunit":   "^9.0",