Skip to content

Commit 0f6f25c

Browse files
Merge branch '4.4' into 5.1
* 4.4: CS fix [travis] use PHP 8.0 to patch return types and run deps=low Update sl_SI translations Don't trigger deprecation for deprecated aliases pointing to deprecated definitions [HttpFoundation] use atomic writes in MockFileSessionStorage [DI] fix param annotation [Config] Add \Symfony\Component\Config\Loader::load() return type Simplify PHP CS Fixer config Rename normalize param
2 parents cb8ba3b + 27eff2a commit 0f6f25c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

DataCollector/DumpDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function getDumpsCount(): int
189189

190190
public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1): array
191191
{
192-
$data = fopen('php://memory', 'r+b');
192+
$data = fopen('php://memory', 'r+');
193193

194194
if ('html' === $format) {
195195
$dumper = new HtmlDumper($data, $this->charset);

HttpCache/Store.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function lock(Request $request)
6969
if (!file_exists(\dirname($path)) && false === @mkdir(\dirname($path), 0777, true) && !is_dir(\dirname($path))) {
7070
return $path;
7171
}
72-
$h = fopen($path, 'cb');
72+
$h = fopen($path, 'c');
7373
if (!flock($h, \LOCK_EX | \LOCK_NB)) {
7474
fclose($h);
7575

@@ -114,7 +114,7 @@ public function isLocked(Request $request)
114114
return false;
115115
}
116116

117-
$h = fopen($path, 'rb');
117+
$h = fopen($path, 'r');
118118
flock($h, \LOCK_EX | \LOCK_NB, $wouldBlock);
119119
flock($h, \LOCK_UN); // release the lock we just acquired
120120
fclose($h);
@@ -377,7 +377,7 @@ private function save(string $key, string $data, bool $overwrite = true): bool
377377
}
378378

379379
$tmpFile = tempnam(\dirname($path), basename($path));
380-
if (false === $fp = @fopen($tmpFile, 'wb')) {
380+
if (false === $fp = @fopen($tmpFile, 'w')) {
381381
@unlink($tmpFile);
382382

383383
return false;

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"symfony/translation": "^4.4|^5.0",
4343
"symfony/translation-contracts": "^1.1|^2",
4444
"psr/cache": "~1.0",
45-
"twig/twig": "^2.4|^3.0"
45+
"twig/twig": "^2.13|^3.0.4"
4646
},
4747
"provide": {
4848
"psr/log-implementation": "1.0"
@@ -61,7 +61,7 @@
6161
"symfony/translation": "<5.0",
6262
"symfony/twig-bridge": "<5.0",
6363
"symfony/validator": "<5.0",
64-
"twig/twig": "<2.4"
64+
"twig/twig": "<2.13"
6565
},
6666
"suggest": {
6767
"symfony/browser-kit": "",

0 commit comments

Comments
 (0)