Skip to content

Commit

Permalink
Merge branch '5.3' into 5.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Nov 17, 2021
2 parents aa56227 + 3793617 commit ca3bdee
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 0 additions & 1 deletion Tests/ContainerBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ public function testGetServiceIds()
{
$builder = new ContainerBuilder();
$builder->register('foo', 'stdClass');
$builder->bar = $bar = new \stdClass();
$builder->register('bar', 'stdClass');
$this->assertEquals(
[
Expand Down
2 changes: 2 additions & 0 deletions Tests/Fixtures/StdClassDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

final class StdClassDecorator
{
public $foo;

public function __construct(\stdClass $foo)
{
$this->foo = $foo;
Expand Down
6 changes: 6 additions & 0 deletions Tests/Fixtures/includes/classes.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ public static function create($config)

class FoobarCircular
{
public $foo;

public function __construct(FooCircular $foo)
{
$this->foo = $foo;
Expand All @@ -150,6 +152,8 @@ public function __construct(FooCircular $foo)

class FooCircular
{
public $bar;

public function __construct(BarCircular $bar)
{
$this->bar = $bar;
Expand All @@ -158,6 +162,8 @@ public function __construct(BarCircular $bar)

class BarCircular
{
public $foobar;

public function addFoobar(FoobarCircular $foobar)
{
$this->foobar = $foobar;
Expand Down

0 comments on commit ca3bdee

Please sign in to comment.