fix:更新已知bug,优化代码
This commit is contained in:
@@ -50,7 +50,7 @@ final class ApacheAdapter implements AdapterInterface
|
||||
/**
|
||||
* Read an environment variable, if it exists.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return \PhpOption\Option<string>
|
||||
*/
|
||||
@@ -65,8 +65,8 @@ final class ApacheAdapter implements AdapterInterface
|
||||
/**
|
||||
* 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 @@ final class ApacheAdapter implements AdapterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -40,7 +40,7 @@ final class ArrayAdapter implements AdapterInterface
|
||||
/**
|
||||
* Read an environment variable, if it exists.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return \PhpOption\Option<string>
|
||||
*/
|
||||
@@ -52,8 +52,8 @@ final class ArrayAdapter implements AdapterInterface
|
||||
/**
|
||||
* 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 @@ final class ArrayAdapter implements AdapterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -33,7 +33,7 @@ final class EnvConstAdapter implements AdapterInterface
|
||||
/**
|
||||
* Read an environment variable, if it exists.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return \PhpOption\Option<string>
|
||||
*/
|
||||
@@ -41,6 +41,9 @@ final class EnvConstAdapter implements AdapterInterface
|
||||
{
|
||||
/** @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,16 @@ final class EnvConstAdapter implements AdapterInterface
|
||||
return 'true';
|
||||
}
|
||||
|
||||
return $value;
|
||||
})->filter(static function ($value) {
|
||||
return \is_string($value);
|
||||
/** @psalm-suppress PossiblyInvalidCast */
|
||||
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 +76,7 @@ final class EnvConstAdapter implements AdapterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -37,8 +37,8 @@ final class GuardedWriter implements WriterInterface
|
||||
/**
|
||||
* 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 @@ final class GuardedWriter implements WriterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
@@ -74,7 +74,7 @@ final class GuardedWriter implements WriterInterface
|
||||
/**
|
||||
* Determine if the given variable is allowed.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -45,8 +45,8 @@ final class ImmutableWriter implements WriterInterface
|
||||
/**
|
||||
* 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 @@ final class ImmutableWriter implements WriterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
@@ -99,7 +99,7 @@ final class ImmutableWriter implements WriterInterface
|
||||
*
|
||||
* That is, is it an "existing" variable.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -30,7 +30,7 @@ final class MultiReader implements ReaderInterface
|
||||
/**
|
||||
* Read an environment variable, if it exists.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return \PhpOption\Option<string>
|
||||
*/
|
||||
|
||||
@@ -28,8 +28,8 @@ final class MultiWriter implements WriterInterface
|
||||
/**
|
||||
* 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 @@ final class MultiWriter implements WriterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -48,7 +48,7 @@ final class PutenvAdapter implements AdapterInterface
|
||||
/**
|
||||
* Read an environment variable, if it exists.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return \PhpOption\Option<string>
|
||||
*/
|
||||
@@ -63,8 +63,8 @@ final class PutenvAdapter implements AdapterInterface
|
||||
/**
|
||||
* 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 @@ final class PutenvAdapter implements AdapterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -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>
|
||||
*/
|
||||
|
||||
@@ -45,8 +45,8 @@ final class ReplacingWriter implements WriterInterface
|
||||
/**
|
||||
* 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 @@ final class ReplacingWriter implements WriterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
@@ -83,7 +83,7 @@ final class ReplacingWriter implements WriterInterface
|
||||
* 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
|
||||
*/
|
||||
|
||||
@@ -33,7 +33,7 @@ final class ServerConstAdapter implements AdapterInterface
|
||||
/**
|
||||
* Read an environment variable, if it exists.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return \PhpOption\Option<string>
|
||||
*/
|
||||
@@ -41,6 +41,9 @@ final class ServerConstAdapter implements AdapterInterface
|
||||
{
|
||||
/** @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,16 @@ final class ServerConstAdapter implements AdapterInterface
|
||||
return 'true';
|
||||
}
|
||||
|
||||
return $value;
|
||||
})->filter(static function ($value) {
|
||||
return \is_string($value);
|
||||
/** @psalm-suppress PossiblyInvalidCast */
|
||||
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 +76,7 @@ final class ServerConstAdapter implements AdapterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -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 @@ interface WriterInterface
|
||||
/**
|
||||
* Delete an environment variable, if possible.
|
||||
*
|
||||
* @param string $name
|
||||
* @param non-empty-string $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user