Skip to content

Commit 20c813d

Browse files
author
Jeremiah VALERIE
committed
Merge branch '0.14'
2 parents ff42a94 + 8d5a5aa commit 20c813d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"symfony/console": "^4.4 || ^5.3",
6060
"symfony/css-selector": "^4.4 || ^5.3",
6161
"symfony/monolog-bundle": "^3.7",
62-
"symfony/phpunit-bridge": "^4.4 || ^5.3",
62+
"symfony/phpunit-bridge": "^6.0",
6363
"symfony/process": "^4.4 || ^5.3",
6464
"symfony/security-bundle": "^4.4 || ^5.3",
6565
"symfony/validator": "^4.4 || ^5.3",
@@ -69,8 +69,7 @@
6969
},
7070
"conflict": {
7171
"phpdocumentor/type-resolver": "<1.4.0",
72-
"react/promise": "<2.8",
73-
"symfony/phpunit-bridge": "<4.4.9"
72+
"react/promise": "<2.8"
7473
},
7574
"extra": {
7675
"branch-alias": {

src/Definition/Argument.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ public function offsetExists($offset): bool
4242
*
4343
* @return mixed|null
4444
*/
45+
#[\ReturnTypeWillChange]
4546
public function offsetGet($offset)
4647
{
48+
// TODO 1.0: Drop PHP 7.4 support and add mixed return type.
49+
4750
return $this->offsetExists($offset) ? $this->rawArguments[$offset] : null;
4851
}
4952

0 commit comments

Comments
 (0)