Merge branch '7.4' into 8.0

* 7.4:
  [Messenger] fix tests using Redis
  fix intl tests PHPUnit command
  chore: PHP CS Fixer - restore PHP / PHPUnit rulesets

Author: nicolas-grekas

Tests/FinderTest.php

@@ -1590,7 +1590,7 @@ public function testAccessDeniedException()
 
         // make 'foo' directory non-readable
         $testDir = self::$tmpDir.\DIRECTORY_SEPARATOR.'foo';
-        chmod($testDir, 0333);
+        chmod($testDir, 0o333);
 
         if (false === $couldRead = is_readable($testDir)) {
             try {
@@ -1607,7 +1607,7 @@ public function testAccessDeniedException()
         }
 
         // restore original permissions
-        chmod($testDir, 0777);
+        chmod($testDir, 0o777);
         clearstatcache(true, $testDir);
 
         if ($couldRead) {
@@ -1626,7 +1626,7 @@ public function testIgnoredAccessDeniedException()
 
         // make 'foo' directory non-readable
         $testDir = self::$tmpDir.\DIRECTORY_SEPARATOR.'foo';
-        chmod($testDir, 0333);
+        chmod($testDir, 0o333);
 
         if (false === ($couldRead = is_readable($testDir))) {
             $this->assertIterator($this->toAbsolute([
@@ -1648,7 +1648,7 @@ public function testIgnoredAccessDeniedException()
         }
 
         // restore original permissions
-        chmod($testDir, 0777);
+        chmod($testDir, 0o777);
         clearstatcache(true, $testDir);
 
         if ($couldRead) {

Tests/Iterator/VfsIteratorTestTrait.php

@@ -108,7 +108,7 @@ public function url_stat(string $url): array
                 $isDir = $providerFx($path, 'is_dir');
                 \assert(\is_bool($isDir));
 
-                return ['mode' => $isDir ? 0040755 : 0100644];
+                return ['mode' => $isDir ? 0o040755 : 0o100644];
             }
         });
         self::$vfsProviders = &$vfsWrapperClass::$vfsProviders;