Skip to content

Commit 843940a

Browse files
Merge branch '3.4' into 4.4
* 3.4: Make PHP 8 green on Travis
2 parents 471c0b3 + 4b330f9 commit 843940a

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
@@ -245,7 +245,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
245245
*
246246
* @return string[]
247247
*/
248-
protected function getAttributes($object, $format = null, array $context)
248+
protected function getAttributes($object, $format, array $context)
249249
{
250250
$class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
251251
$key = $class.'-'.$context['cache_key'];

Tests/Normalizer/GetSetMethodNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ class GetConstructorArgsWithDefaultValueDummy
663663
protected $foo;
664664
protected $bar;
665665

666-
public function __construct($foo = [], $bar)
666+
public function __construct($foo = [], $bar = null)
667667
{
668668
$this->foo = $foo;
669669
$this->bar = $bar;

Tests/Normalizer/ObjectNormalizerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ class ObjectConstructorArgsWithDefaultValueDummy
941941
protected $foo;
942942
protected $bar;
943943

944-
public function __construct($foo = [], $bar)
944+
public function __construct($foo = [], $bar = null)
945945
{
946946
$this->foo = $foo;
947947
$this->bar = $bar;
@@ -1091,7 +1091,7 @@ class DummyWithConstructorObjectAndDefaultValue
10911091
private $foo;
10921092
private $inner;
10931093

1094-
public function __construct($foo = 'a', ObjectInner $inner)
1094+
public function __construct($foo = 'a', ObjectInner $inner = null)
10951095
{
10961096
$this->foo = $foo;
10971097
$this->inner = $inner;

0 commit comments

Comments
 (0)