Skip to content

Commit ec542cc

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 6bba31a + c6b79fd commit ec542cc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Tests/DataCollector/DoctrineDataCollectorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function testCollectQueries($param, $types, $expected, $explainable, bool
8888

8989
$collectedParam = $collectedQueries['default'][0]['params'][0];
9090
if ($collectedParam instanceof Data) {
91-
$dumper = new CliDumper($out = fopen('php://memory', 'r+b'));
91+
$dumper = new CliDumper($out = fopen('php://memory', 'r+'));
9292
$dumper->setColors(false);
9393
$collectedParam->dump($dumper);
9494
$this->assertStringMatchesFormat($expected, print_r(stream_get_contents($out, -1, 0), true));
@@ -162,7 +162,7 @@ public function testSerialization($param, $types, $expected, $explainable, bool
162162

163163
$collectedParam = $collectedQueries['default'][0]['params'][0];
164164
if ($collectedParam instanceof Data) {
165-
$dumper = new CliDumper($out = fopen('php://memory', 'r+b'));
165+
$dumper = new CliDumper($out = fopen('php://memory', 'r+'));
166166
$dumper->setColors(false);
167167
$collectedParam->dump($dumper);
168168
$this->assertStringMatchesFormat($expected, print_r(stream_get_contents($out, -1, 0), true));

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"symfony/validator": "^5.0.2",
4444
"symfony/translation": "^4.4|^5.0",
4545
"symfony/var-dumper": "^4.4|^5.0",
46-
"doctrine/annotations": "~1.7",
46+
"doctrine/annotations": "^1.10.4",
4747
"doctrine/cache": "~1.6",
4848
"doctrine/collections": "~1.0",
4949
"doctrine/data-fixtures": "^1.1",
50-
"doctrine/dbal": "~2.4|^3.0",
50+
"doctrine/dbal": "^2.6|^3.0",
5151
"doctrine/orm": "^2.6.3"
5252
},
5353
"conflict": {

0 commit comments

Comments
 (0)