Merge branch '4.4' into 5.1
* 4.4: fix passing arguments to call_user_func_array() on PHP 8 allow Doctrine DBAL 3 [Filesystem] fix test on PHP 8
This commit is contained in:
commit
0611b6331c
|
@ -112,7 +112,7 @@
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/collections": "~1.0",
|
"doctrine/collections": "~1.0",
|
||||||
"doctrine/data-fixtures": "^1.1",
|
"doctrine/data-fixtures": "^1.1",
|
||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4|^3.0",
|
||||||
"doctrine/orm": "~2.4,>=2.4.5",
|
"doctrine/orm": "~2.4,>=2.4.5",
|
||||||
"doctrine/reflection": "~1.0",
|
"doctrine/reflection": "~1.0",
|
||||||
"doctrine/doctrine-bundle": "^2.0",
|
"doctrine/doctrine-bundle": "^2.0",
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/collections": "~1.0",
|
"doctrine/collections": "~1.0",
|
||||||
"doctrine/data-fixtures": "^1.1",
|
"doctrine/data-fixtures": "^1.1",
|
||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4|^3.0",
|
||||||
"doctrine/orm": "^2.6.3",
|
"doctrine/orm": "^2.6.3",
|
||||||
"doctrine/reflection": "~1.0"
|
"doctrine/reflection": "~1.0"
|
||||||
},
|
},
|
||||||
|
|
|
@ -194,7 +194,7 @@ class Filesystem
|
||||||
public function chmod($files, int $mode, int $umask = 0000, bool $recursive = false)
|
public function chmod($files, int $mode, int $umask = 0000, bool $recursive = false)
|
||||||
{
|
{
|
||||||
foreach ($this->toIterable($files) as $file) {
|
foreach ($this->toIterable($files) as $file) {
|
||||||
if (true !== @chmod($file, $mode & ~$umask)) {
|
if ((\PHP_VERSION_ID < 80000 || \is_int($mode)) && true !== @chmod($file, $mode & ~$umask)) {
|
||||||
throw new IOException(sprintf('Failed to chmod file "%s".', $file), 0, null, $file);
|
throw new IOException(sprintf('Failed to chmod file "%s".', $file), 0, null, $file);
|
||||||
}
|
}
|
||||||
if ($recursive && is_dir($file) && !is_link($file)) {
|
if ($recursive && is_dir($file) && !is_link($file)) {
|
||||||
|
|
Reference in New Issue