Merge branch '4.3'

vlucas · Oct 15, 2022 · 4c16545 · 4c16545
2 parents dd46c26 + 3b56df1
commit 4c16545
Show file tree

Hide file tree

Showing 21 changed files with 119 additions and 54 deletions.
diff --git a/composer.json b/composer.json
@@ -49,6 +49,10 @@
         "preferred-install": "dist"
     },
     "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": true
+        },
         "branch-alias": {
             "dev-master": "5.4-dev"
         }

diff --git a/src/Parser/EntryParser.php b/src/Parser/EntryParser.php
@@ -164,6 +164,7 @@ private static function parseValue(string $value)
                 });
             });
         }, Success::create([Value::blank(), self::INITIAL_STATE]))->flatMap(static function (array $result) {
+            /** @psalm-suppress DocblockTypeContradiction */
             if (in_array($result[1], self::REJECT_STATES, true)) {
                 return Error::create('a missing closing quote');
             }

diff --git a/src/Repository/Adapter/ApacheAdapter.php b/src/Repository/Adapter/ApacheAdapter.php
@@ -50,7 +50,7 @@ private static function isSupported()
     /**
      * Read an environment variable, if it exists.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return \PhpOption\Option<string>
      */
@@ -65,8 +65,8 @@ public function read(string $name)
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -78,7 +78,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/ArrayAdapter.php b/src/Repository/Adapter/ArrayAdapter.php
@@ -40,7 +40,7 @@ public static function create()
     /**
      * Read an environment variable, if it exists.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return \PhpOption\Option<string>
      */
@@ -52,8 +52,8 @@ public function read(string $name)
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -67,7 +67,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/EnvConstAdapter.php b/src/Repository/Adapter/EnvConstAdapter.php
@@ -33,14 +33,17 @@ public static function create()
     /**
      * Read an environment variable, if it exists.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return \PhpOption\Option<string>
      */
     public function read(string $name)
     {
         /** @var \PhpOption\Option<string> */
         return Option::fromArraysValue($_ENV, $name)
+            ->filter(static function ($value) {
+                return \is_scalar($value);
+            })
             ->map(static function ($value) {
                 if ($value === false) {
                     return 'false';
@@ -50,17 +53,15 @@ public function read(string $name)
                     return 'true';
                 }
 
-                return $value;
-            })->filter(static function ($value) {
-                return \is_string($value);
+                return (string) $value;
             });
     }
 
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -74,7 +75,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/GuardedWriter.php b/src/Repository/Adapter/GuardedWriter.php
@@ -37,8 +37,8 @@ public function __construct(WriterInterface $writer, array $allowList)
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -56,7 +56,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */
@@ -74,7 +74,7 @@ public function delete(string $name)
     /**
      * Determine if the given variable is allowed.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/ImmutableWriter.php b/src/Repository/Adapter/ImmutableWriter.php
@@ -45,8 +45,8 @@ public function __construct(WriterInterface $writer, ReaderInterface $reader)
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -72,7 +72,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */
@@ -99,7 +99,7 @@ public function delete(string $name)
      *
      * That is, is it an "existing" variable.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/MultiReader.php b/src/Repository/Adapter/MultiReader.php
@@ -30,7 +30,7 @@ public function __construct(array $readers)
     /**
      * Read an environment variable, if it exists.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return \PhpOption\Option<string>
      */

diff --git a/src/Repository/Adapter/MultiWriter.php b/src/Repository/Adapter/MultiWriter.php
@@ -28,8 +28,8 @@ public function __construct(array $writers)
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -47,7 +47,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/PutenvAdapter.php b/src/Repository/Adapter/PutenvAdapter.php
@@ -48,7 +48,7 @@ private static function isSupported()
     /**
      * Read an environment variable, if it exists.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return \PhpOption\Option<string>
      */
@@ -63,8 +63,8 @@ public function read(string $name)
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -78,7 +78,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/ReaderInterface.php b/src/Repository/Adapter/ReaderInterface.php
@@ -9,7 +9,7 @@ interface ReaderInterface
     /**
      * Read an environment variable, if it exists.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return \PhpOption\Option<string>
      */

diff --git a/src/Repository/Adapter/ReplacingWriter.php b/src/Repository/Adapter/ReplacingWriter.php
@@ -45,8 +45,8 @@ public function __construct(WriterInterface $writer, ReaderInterface $reader)
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -63,7 +63,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */
@@ -83,7 +83,7 @@ public function delete(string $name)
      * Returns true if it currently exists, or existed at any point in the past
      * that we are aware of.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/ServerConstAdapter.php b/src/Repository/Adapter/ServerConstAdapter.php
@@ -33,14 +33,17 @@ public static function create()
     /**
      * Read an environment variable, if it exists.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return \PhpOption\Option<string>
      */
     public function read(string $name)
     {
         /** @var \PhpOption\Option<string> */
         return Option::fromArraysValue($_SERVER, $name)
+            ->filter(static function ($value) {
+                return \is_scalar($value);
+            })
             ->map(static function ($value) {
                 if ($value === false) {
                     return 'false';
@@ -50,17 +53,15 @@ public function read(string $name)
                     return 'true';
                 }
 
-                return $value;
-            })->filter(static function ($value) {
-                return \is_string($value);
+                return (string) $value;
             });
     }
 
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -74,7 +75,7 @@ public function write(string $name, string $value)
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */

diff --git a/src/Repository/Adapter/WriterInterface.php b/src/Repository/Adapter/WriterInterface.php
@@ -9,8 +9,8 @@ interface WriterInterface
     /**
      * Write to an environment variable, if possible.
      *
-     * @param string $name
-     * @param string $value
+     * @param non-empty-string $name
+     * @param string           $value
      *
      * @return bool
      */
@@ -19,7 +19,7 @@ public function write(string $name, string $value);
     /**
      * Delete an environment variable, if possible.
      *
-     * @param string $name
+     * @param non-empty-string $name
      *
      * @return bool
      */