Merge branch '4.3'

GrahamCampbell · GrahamCampbell · commit 4c165455a670 · 2022-10-15T23:21:51.000+01:00
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
      */
diff --git a/src/Repository/AdapterRepository.php b/src/Repository/AdapterRepository.php
diff --git a/src/Repository/RepositoryInterface.php b/src/Repository/RepositoryInterface.php
diff --git a/tests/Dotenv/Repository/Adapter/EnvConstAdapterTest.php b/tests/Dotenv/Repository/Adapter/EnvConstAdapterTest.php
diff --git a/tests/Dotenv/Repository/Adapter/ServerConstAdapterTest.php b/tests/Dotenv/Repository/Adapter/ServerConstAdapterTest.php
diff --git a/tests/Dotenv/Repository/RepositoryTest.php b/tests/Dotenv/Repository/RepositoryTest.php
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ private static function parseValue(string $value)`
`164`	`164`	`});`
`165`	`165`	`});`
`166`	`166`	`}, Success::create([Value::blank(), self::INITIAL_STATE]))->flatMap(static function (array $result) {`
	`167`	`+ /** @psalm-suppress DocblockTypeContradiction */`
`167`	`168`	`if (in_array($result[1], self::REJECT_STATES, true)) {`
`168`	`169`	`return Error::create('a missing closing quote');`
`169`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private static function isSupported()`
`50`	`50`	`/**`
`51`	`51`	`* Read an environment variable, if it exists.`
`52`	`52`	`*`
`53`		`- * @param string $name`
	`53`	`+ * @param non-empty-string $name`
`54`	`54`	`*`
`55`	`55`	`* @return \PhpOption\Option<string>`
`56`	`56`	`*/`
`@@ -65,8 +65,8 @@ public function read(string $name)`
`65`	`65`	`/**`
`66`	`66`	`* Write to an environment variable, if possible.`
`67`	`67`	`*`
`68`		`- * @param string $name`
`69`		`- * @param string $value`
	`68`	`+ * @param non-empty-string $name`
	`69`	`+ * @param string $value`
`70`	`70`	`*`
`71`	`71`	`* @return bool`
`72`	`72`	`*/`
`@@ -78,7 +78,7 @@ public function write(string $name, string $value)`
`78`	`78`	`/**`
`79`	`79`	`* Delete an environment variable, if possible.`
`80`	`80`	`*`
`81`		`- * @param string $name`
	`81`	`+ * @param non-empty-string $name`
`82`	`82`	`*`
`83`	`83`	`* @return bool`
`84`	`84`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static function create()`
`40`	`40`	`/**`
`41`	`41`	`* Read an environment variable, if it exists.`
`42`	`42`	`*`
`43`		`- * @param string $name`
	`43`	`+ * @param non-empty-string $name`
`44`	`44`	`*`
`45`	`45`	`* @return \PhpOption\Option<string>`
`46`	`46`	`*/`
`@@ -52,8 +52,8 @@ public function read(string $name)`
`52`	`52`	`/**`
`53`	`53`	`* Write to an environment variable, if possible.`
`54`	`54`	`*`
`55`		`- * @param string $name`
`56`		`- * @param string $value`
	`55`	`+ * @param non-empty-string $name`
	`56`	`+ * @param string $value`
`57`	`57`	`*`
`58`	`58`	`* @return bool`
`59`	`59`	`*/`
`@@ -67,7 +67,7 @@ public function write(string $name, string $value)`
`67`	`67`	`/**`
`68`	`68`	`* Delete an environment variable, if possible.`
`69`	`69`	`*`
`70`		`- * @param string $name`
	`70`	`+ * @param non-empty-string $name`
`71`	`71`	`*`
`72`	`72`	`* @return bool`
`73`	`73`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,17 @@ public static function create()`
`33`	`33`	`/**`
`34`	`34`	`* Read an environment variable, if it exists.`
`35`	`35`	`*`
`36`		`- * @param string $name`
	`36`	`+ * @param non-empty-string $name`
`37`	`37`	`*`
`38`	`38`	`* @return \PhpOption\Option<string>`
`39`	`39`	`*/`
`40`	`40`	`public function read(string $name)`
`41`	`41`	`{`
`42`	`42`	`/** @var \PhpOption\Option<string> */`
`43`	`43`	`return Option::fromArraysValue($_ENV, $name)`
	`44`	`+ ->filter(static function ($value) {`
	`45`	`+ return \is_scalar($value);`
	`46`	`+ })`
`44`	`47`	`->map(static function ($value) {`
`45`	`48`	`if ($value === false) {`
`46`	`49`	`return 'false';`
`@@ -50,17 +53,15 @@ public function read(string $name)`
`50`	`53`	`return 'true';`
`51`	`54`	`}`
`52`	`55`
`53`		`- return $value;`
`54`		`- })->filter(static function ($value) {`
`55`		`- return \is_string($value);`
	`56`	`+ return (string) $value;`
`56`	`57`	`});`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`/**`
`60`	`61`	`* Write to an environment variable, if possible.`
`61`	`62`	`*`
`62`		`- * @param string $name`
`63`		`- * @param string $value`
	`63`	`+ * @param non-empty-string $name`
	`64`	`+ * @param string $value`
`64`	`65`	`*`
`65`	`66`	`* @return bool`
`66`	`67`	`*/`
`@@ -74,7 +75,7 @@ public function write(string $name, string $value)`
`74`	`75`	`/**`
`75`	`76`	`* Delete an environment variable, if possible.`
`76`	`77`	`*`
`77`		`- * @param string $name`
	`78`	`+ * @param non-empty-string $name`
`78`	`79`	`*`
`79`	`80`	`* @return bool`
`80`	`81`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public function __construct(WriterInterface $writer, array $allowList)`
`37`	`37`	`/**`
`38`	`38`	`* Write to an environment variable, if possible.`
`39`	`39`	`*`
`40`		`- * @param string $name`
`41`		`- * @param string $value`
	`40`	`+ * @param non-empty-string $name`
	`41`	`+ * @param string $value`
`42`	`42`	`*`
`43`	`43`	`* @return bool`
`44`	`44`	`*/`
`@@ -56,7 +56,7 @@ public function write(string $name, string $value)`
`56`	`56`	`/**`
`57`	`57`	`* Delete an environment variable, if possible.`
`58`	`58`	`*`
`59`		`- * @param string $name`
	`59`	`+ * @param non-empty-string $name`
`60`	`60`	`*`
`61`	`61`	`* @return bool`
`62`	`62`	`*/`
`@@ -74,7 +74,7 @@ public function delete(string $name)`
`74`	`74`	`/**`
`75`	`75`	`* Determine if the given variable is allowed.`
`76`	`76`	`*`
`77`		`- * @param string $name`
	`77`	`+ * @param non-empty-string $name`
`78`	`78`	`*`
`79`	`79`	`* @return bool`
`80`	`80`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public function __construct(WriterInterface $writer, ReaderInterface $reader)`
`45`	`45`	`/**`
`46`	`46`	`* Write to an environment variable, if possible.`
`47`	`47`	`*`
`48`		`- * @param string $name`
`49`		`- * @param string $value`
	`48`	`+ * @param non-empty-string $name`
	`49`	`+ * @param string $value`
`50`	`50`	`*`
`51`	`51`	`* @return bool`
`52`	`52`	`*/`
`@@ -72,7 +72,7 @@ public function write(string $name, string $value)`
`72`	`72`	`/**`
`73`	`73`	`* Delete an environment variable, if possible.`
`74`	`74`	`*`
`75`		`- * @param string $name`
	`75`	`+ * @param non-empty-string $name`
`76`	`76`	`*`
`77`	`77`	`* @return bool`
`78`	`78`	`*/`
`@@ -99,7 +99,7 @@ public function delete(string $name)`
`99`	`99`	`*`
`100`	`100`	`* That is, is it an "existing" variable.`
`101`	`101`	`*`
`102`		`- * @param string $name`
	`102`	`+ * @param non-empty-string $name`
`103`	`103`	`*`
`104`	`104`	`* @return bool`
`105`	`105`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(array $readers)`
`30`	`30`	`/**`
`31`	`31`	`* Read an environment variable, if it exists.`
`32`	`32`	`*`
`33`		`- * @param string $name`
	`33`	`+ * @param non-empty-string $name`
`34`	`34`	`*`
`35`	`35`	`* @return \PhpOption\Option<string>`
`36`	`36`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public function __construct(array $writers)`
`28`	`28`	`/**`
`29`	`29`	`* Write to an environment variable, if possible.`
`30`	`30`	`*`
`31`		`- * @param string $name`
`32`		`- * @param string $value`
	`31`	`+ * @param non-empty-string $name`
	`32`	`+ * @param string $value`
`33`	`33`	`*`
`34`	`34`	`* @return bool`
`35`	`35`	`*/`
`@@ -47,7 +47,7 @@ public function write(string $name, string $value)`
`47`	`47`	`/**`
`48`	`48`	`* Delete an environment variable, if possible.`
`49`	`49`	`*`
`50`		`- * @param string $name`
	`50`	`+ * @param non-empty-string $name`
`51`	`51`	`*`
`52`	`52`	`* @return bool`
`53`	`53`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private static function isSupported()`
`48`	`48`	`/**`
`49`	`49`	`* Read an environment variable, if it exists.`
`50`	`50`	`*`
`51`		`- * @param string $name`
	`51`	`+ * @param non-empty-string $name`
`52`	`52`	`*`
`53`	`53`	`* @return \PhpOption\Option<string>`
`54`	`54`	`*/`
`@@ -63,8 +63,8 @@ public function read(string $name)`
`63`	`63`	`/**`
`64`	`64`	`* Write to an environment variable, if possible.`
`65`	`65`	`*`
`66`		`- * @param string $name`
`67`		`- * @param string $value`
	`66`	`+ * @param non-empty-string $name`
	`67`	`+ * @param string $value`
`68`	`68`	`*`
`69`	`69`	`* @return bool`
`70`	`70`	`*/`
`@@ -78,7 +78,7 @@ public function write(string $name, string $value)`
`78`	`78`	`/**`
`79`	`79`	`* Delete an environment variable, if possible.`
`80`	`80`	`*`
`81`		`- * @param string $name`
	`81`	`+ * @param non-empty-string $name`
`82`	`82`	`*`
`83`	`83`	`* @return bool`
`84`	`84`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ interface ReaderInterface`
`9`	`9`	`/**`
`10`	`10`	`* Read an environment variable, if it exists.`
`11`	`11`	`*`
`12`		`- * @param string $name`
	`12`	`+ * @param non-empty-string $name`
`13`	`13`	`*`
`14`	`14`	`* @return \PhpOption\Option<string>`
`15`	`15`	`*/`