summaryrefslogtreecommitdiff
path: root/vendor/sebastian
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2022-07-12 22:26:21 +0300
committerAndrew Dolgov <[email protected]>2022-07-12 22:26:21 +0300
commit80d3db1dcf8fe9ca66d4e3f2e2116d3bc39ae2b4 (patch)
tree04b33bfb9c9368c4a31e287153abec690b9014e0 /vendor/sebastian
parent4b6161892000cb2b8392dce92a9cf2cabdf2d20e (diff)
upgrade idiorm to php8.1-patched version (aaronpk/idiorm)
Diffstat (limited to 'vendor/sebastian')
-rw-r--r--vendor/sebastian/environment/ChangeLog.md7
-rw-r--r--vendor/sebastian/environment/LICENSE2
-rw-r--r--vendor/sebastian/environment/README.md1
-rw-r--r--vendor/sebastian/environment/src/Console.php10
-rw-r--r--vendor/sebastian/environment/src/Runtime.php8
5 files changed, 19 insertions, 9 deletions
diff --git a/vendor/sebastian/environment/ChangeLog.md b/vendor/sebastian/environment/ChangeLog.md
index 67daf0356..8943aee4c 100644
--- a/vendor/sebastian/environment/ChangeLog.md
+++ b/vendor/sebastian/environment/ChangeLog.md
@@ -2,6 +2,12 @@
All notable changes in `sebastianbergmann/environment` are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+## [5.1.4] - 2022-04-03
+
+### Fixed
+
+* [#63](https://github.com/sebastianbergmann/environment/pull/63): `Runtime::getCurrentSettings()` does not correctly process INI settings
+
## [5.1.3] - 2020-09-28
### Changed
@@ -145,6 +151,7 @@ All notable changes in `sebastianbergmann/environment` are documented in this fi
* This component is no longer supported on PHP 5.6
+[5.1.4]: https://github.com/sebastianbergmann/environment/compare/5.1.3...5.1.4
[5.1.3]: https://github.com/sebastianbergmann/environment/compare/5.1.2...5.1.3
[5.1.2]: https://github.com/sebastianbergmann/environment/compare/5.1.1...5.1.2
[5.1.1]: https://github.com/sebastianbergmann/environment/compare/5.1.0...5.1.1
diff --git a/vendor/sebastian/environment/LICENSE b/vendor/sebastian/environment/LICENSE
index c58093991..42546339c 100644
--- a/vendor/sebastian/environment/LICENSE
+++ b/vendor/sebastian/environment/LICENSE
@@ -1,6 +1,6 @@
sebastian/environment
-Copyright (c) 2014-2020, Sebastian Bergmann <[email protected]>.
+Copyright (c) 2014-2022, Sebastian Bergmann <[email protected]>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/vendor/sebastian/environment/README.md b/vendor/sebastian/environment/README.md
index 24a9831e4..1fead13ef 100644
--- a/vendor/sebastian/environment/README.md
+++ b/vendor/sebastian/environment/README.md
@@ -1,7 +1,6 @@
# sebastian/environment
[![Latest Stable Version](https://img.shields.io/packagist/v/sebastian/environment.svg?style=flat-square)](https://packagist.org/packages/sebastian/environment)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg?style=flat-square)](https://php.net/)
[![CI Status](https://github.com/sebastianbergmann/environment/workflows/CI/badge.svg)](https://github.com/sebastianbergmann/environment/actions)
[![Type Coverage](https://shepherd.dev/github/sebastianbergmann/environment/coverage.svg)](https://shepherd.dev/github/sebastianbergmann/environment)
diff --git a/vendor/sebastian/environment/src/Console.php b/vendor/sebastian/environment/src/Console.php
index c4a2348f0..e7fd1643f 100644
--- a/vendor/sebastian/environment/src/Console.php
+++ b/vendor/sebastian/environment/src/Console.php
@@ -34,7 +34,7 @@ final class Console
/**
* @var int
*/
- public const STDIN = 0;
+ public const STDIN = 0;
/**
* @var int
@@ -60,10 +60,10 @@ final class Console
if ($this->isWindows()) {
// @codeCoverageIgnoreStart
- return (defined('STDOUT') && function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT))
- || false !== getenv('ANSICON')
- || 'ON' === getenv('ConEmuANSI')
- || 'xterm' === getenv('TERM');
+ return (defined('STDOUT') && function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT)) ||
+ false !== getenv('ANSICON') ||
+ 'ON' === getenv('ConEmuANSI') ||
+ 'xterm' === getenv('TERM');
// @codeCoverageIgnoreEnd
}
diff --git a/vendor/sebastian/environment/src/Runtime.php b/vendor/sebastian/environment/src/Runtime.php
index 311aefcb6..d1b92d620 100644
--- a/vendor/sebastian/environment/src/Runtime.php
+++ b/vendor/sebastian/environment/src/Runtime.php
@@ -289,8 +289,12 @@ final class Runtime
foreach ($values as $value) {
$set = ini_get($value);
- if (isset($config[$value]) && $set != $config[$value]) {
- $diff[] = sprintf('%s=%s', $value, $set);
+ if (empty($set)) {
+ continue;
+ }
+
+ if ((!isset($config[$value]) || ($set !== $config[$value]))) {
+ $diff[$value] = sprintf('%s=%s', $value, $set);
}
}
}