Skip to content

Commit 9d473e3

Browse files
Merge branch '5.4' into 6.4
* 5.4: [Serializer] Fix fixture [FrameworkBundle] Fix PHP 8.4 deprecation Add an experimental CI job for PHP 8.4
2 parents 97d1624 + 7dae80d commit 9d473e3

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ jobs:
3232
- php: '8.2'
3333
mode: low-deps
3434
- php: '8.3'
35-
#mode: experimental
35+
- php: '8.4'
36+
mode: experimental
3637
fail-fast: false
3738

3839
runs-on: ubuntu-20.04

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ private function formatControllerLink(mixed $controller, string $anchorText, ?ca
597597
} elseif (!\is_string($controller)) {
598598
return $anchorText;
599599
} elseif (str_contains($controller, '::')) {
600-
$r = new \ReflectionMethod($controller);
600+
$r = new \ReflectionMethod(...explode('::', $controller, 2));
601601
} else {
602602
$r = new \ReflectionFunction($controller);
603603
}

src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,11 @@ public function __get($name)
10241024
return $this->foo = 123;
10251025
}
10261026
}
1027+
1028+
public function __isset($name)
1029+
{
1030+
return 'foo' === $name;
1031+
}
10271032
}
10281033

10291034
class DummyWithConstructorObject

0 commit comments

Comments
 (0)