Skip to content

Commit 549ca8e

Browse files
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
2 parents 60bb7f7 + d0fc068 commit 549ca8e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Read/Splitter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private static function createListBoundaries(\Iterator $tokens): \Iterator
7979
}
8080

8181
[$value, $position] = $token;
82-
$offset = $offset ?? $position;
82+
$offset ??= $position;
8383

8484
if (isset(self::NESTING_CHARS[$value])) {
8585
++$level;

Read/StreamReaderGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function generate(Type $type, bool $decodeFromStream, array $options = []
7676
try {
7777
$this->fs->dumpFile($tmpFile, $php);
7878
$this->fs->rename($tmpFile, $path);
79-
$this->fs->chmod($path, 0666 & ~umask());
79+
$this->fs->chmod($path, 0o666 & ~umask());
8080
} catch (IOException $e) {
8181
throw new RuntimeException(\sprintf('Failed to write "%s" stream reader file.', $path), previous: $e);
8282
}

Write/StreamWriterGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function generate(Type $type, array $options = []): string
7676
try {
7777
$this->fs->dumpFile($tmpFile, $php);
7878
$this->fs->rename($tmpFile, $path);
79-
$this->fs->chmod($path, 0666 & ~umask());
79+
$this->fs->chmod($path, 0o666 & ~umask());
8080
} catch (IOException $e) {
8181
throw new RuntimeException(\sprintf('Failed to write "%s" stream writer file.', $path), previous: $e);
8282
}

0 commit comments

Comments
 (0)