Skip to content

Commit ca3bdee

Browse files
Merge branch '5.3' into 5.4
* 5.3: fix cs Update validators.lv.xlf Fix API gateway service name Fix CS in composer.json Update validators.uz.xlf [ExpressionLanguage] Fix LexerTest number types [Process] intersect with getenv() to populate default envs Improve CI script a bit Fix Loco Provider [Cache] fix dbindex Redis Fix typos in a test message Never rely on dynamic properties
2 parents aa56227 + 3793617 commit ca3bdee

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Tests/ContainerBuilderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ public function testGetServiceIds()
260260
{
261261
$builder = new ContainerBuilder();
262262
$builder->register('foo', 'stdClass');
263-
$builder->bar = $bar = new \stdClass();
264263
$builder->register('bar', 'stdClass');
265264
$this->assertEquals(
266265
[

Tests/Fixtures/StdClassDecorator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
final class StdClassDecorator
66
{
7+
public $foo;
8+
79
public function __construct(\stdClass $foo)
810
{
911
$this->foo = $foo;

Tests/Fixtures/includes/classes.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ public static function create($config)
142142

143143
class FoobarCircular
144144
{
145+
public $foo;
146+
145147
public function __construct(FooCircular $foo)
146148
{
147149
$this->foo = $foo;
@@ -150,6 +152,8 @@ public function __construct(FooCircular $foo)
150152

151153
class FooCircular
152154
{
155+
public $bar;
156+
153157
public function __construct(BarCircular $bar)
154158
{
155159
$this->bar = $bar;
@@ -158,6 +162,8 @@ public function __construct(BarCircular $bar)
158162

159163
class BarCircular
160164
{
165+
public $foobar;
166+
161167
public function addFoobar(FoobarCircular $foobar)
162168
{
163169
$this->foobar = $foobar;

0 commit comments

Comments
 (0)