Skip to content

Commit 7b4c580

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 6a7497a + 0309120 commit 7b4c580

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Twig/WebProfilerExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class WebProfilerExtension extends ProfilerExtension
4545
public function __construct(HtmlDumper $dumper = null)
4646
{
4747
$this->dumper = $dumper ?: new HtmlDumper();
48-
$this->dumper->setOutput($this->output = fopen('php://memory', 'r+b'));
48+
$this->dumper->setOutput($this->output = fopen('php://memory', 'r+'));
4949
}
5050

5151
public function enter(Profile $profile): void
@@ -56,7 +56,7 @@ public function enter(Profile $profile): void
5656
public function leave(Profile $profile): void
5757
{
5858
if (0 === --$this->stackLevel) {
59-
$this->dumper->setOutput($this->output = fopen('php://memory', 'r+b'));
59+
$this->dumper->setOutput($this->output = fopen('php://memory', 'r+'));
6060
}
6161
}
6262

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/http-kernel": "^4.4|^5.0",
2323
"symfony/routing": "^4.4|^5.0",
2424
"symfony/twig-bundle": "^4.4|^5.0",
25-
"twig/twig": "^2.10|^3.0"
25+
"twig/twig": "^2.13|^3.0.4"
2626
},
2727
"require-dev": {
2828
"symfony/browser-kit": "^4.4|^5.0",

0 commit comments

Comments
 (0)