Skip to content

Commit 73f5500

Browse files
Merge branch '4.4' into 5.0
* 4.4: Parse and render anonymous classes correctly on php 8 Enable APCu for the php 8 build. [Process] Fix failing test on php 8. [HttpKernel] fix test Make PHP 8 green on Travis Revert "[Cache] allow DBAL v3" [PropertyAccessor] Added missing property path on php 8. Don't execute tests with DBAL 2.x on php 8.
2 parents d324206 + 843940a commit 73f5500

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Normalizer/AbstractObjectNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex
237237
*
238238
* @return string[]
239239
*/
240-
protected function getAttributes($object, string $format = null, array $context)
240+
protected function getAttributes($object, ?string $format, array $context)
241241
{
242242
$class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
243243
$key = $class.'-'.$context['cache_key'];

Tests/Normalizer/GetSetMethodNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ class GetConstructorArgsWithDefaultValueDummy
603603
protected $foo;
604604
protected $bar;
605605

606-
public function __construct($foo = [], $bar)
606+
public function __construct($foo = [], $bar = null)
607607
{
608608
$this->foo = $foo;
609609
$this->bar = $bar;

Tests/Normalizer/ObjectNormalizerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ class ObjectConstructorArgsWithDefaultValueDummy
770770
protected $foo;
771771
protected $bar;
772772

773-
public function __construct($foo = [], $bar)
773+
public function __construct($foo = [], $bar = null)
774774
{
775775
$this->foo = $foo;
776776
$this->bar = $bar;
@@ -920,7 +920,7 @@ class DummyWithConstructorObjectAndDefaultValue
920920
private $foo;
921921
private $inner;
922922

923-
public function __construct($foo = 'a', ObjectInner $inner)
923+
public function __construct($foo = 'a', ObjectInner $inner = null)
924924
{
925925
$this->foo = $foo;
926926
$this->inner = $inner;

0 commit comments

Comments
 (0)