Skip to content

Commit 08fadcd

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: [DependencyInjection] Fix dumping containers with null-referenced services [Routing] Fix removing aliases pointing to removed route in RouteCollection::remove() [VarExporter] Fix lazy ghost trait when using nullsafe operator
2 parents 5dc8ad5 + 8301f8a commit 08fadcd

File tree

5 files changed

+5
-0
lines changed

5 files changed

+5
-0
lines changed

Dumper/PhpDumper.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ public function dump(array $options = []): string|array
258258
<?php
259259
260260
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
261+
use Symfony\Component\DependencyInjection\ContainerInterface;
261262
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
262263
263264
/*{$this->docStar}

Tests/Fixtures/php/services10_as_files.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ return [
1313
namespace Container%s;
1414

1515
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
16+
use Symfony\Component\DependencyInjection\ContainerInterface;
1617
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
1718

1819
/**

Tests/Fixtures/php/services9_as_files.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ return [
2323
namespace Container%s;
2424

2525
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
26+
use Symfony\Component\DependencyInjection\ContainerInterface;
2627
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
2728

2829
/**

Tests/Fixtures/php/services_deprecated_parameters_as_files.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Array
55
namespace Container%s;
66

77
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
8+
use Symfony\Component\DependencyInjection\ContainerInterface;
89
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
910

1011
/**

Tests/Fixtures/php/services_non_shared_lazy_as_files.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Array
55
namespace Container%s;
66

77
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
8+
use Symfony\Component\DependencyInjection\ContainerInterface;
89
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
910

1011
/**

0 commit comments

Comments
 (0)