8000 Merge branch '5.1' · symfony/symfony@6ad781c · GitHub
[go: up one dir, main page]
Skip to content

Commit 6ad781c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.1'
* 5.1: [DI] fix merge
2 parents f0fa3b0 + 71b65d4 commit 6ad781c

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,10 @@ class ProjectServiceContainer extends Container
891891

892892
use Symfony\Component\DependencyInjection\Dumper\Preloader;
893893

894+
if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
895+
return;
896+
}
897+
894898
require dirname(__DIR__, %d).'%svendor/autoload.php';
895899
require __DIR__.'/Container%s/ProjectServiceContainer.php';
896900
require __DIR__.'/Container%s/getThrowingOneService.php';

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,10 @@ class ProjectServiceContainer extends Container
546546

547547
use Symfony\Component\DependencyInjection\Dumper\Preloader;
548548

549+
if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
550+
return;
551+
}
552+
549553
require dirname(__DIR__, %d).'%svendor/autoload.php';
550554
require __DIR__.'/Container%s/ProjectServiceContainer.php';
551555

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ if (!\class_exists('FooClass_%s', false)) {
171171

172172
use Symfony\Component\DependencyInjection\Dumper\Preloader;
173173

174+
if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
175+
return;
176+
}
177+
174178
require dirname(__DIR__, %d).'%svendor/autoload.php';
175179
require __DIR__.'/Container%s/ProjectServiceContainer.php';
176180

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ class ProjectServiceContainer extends Container
110110

111111
use Symfony\Component\DependencyInjection\Dumper\Preloader;
112112

113+
if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
114+
return;
115+
}
116+
113117
require dirname(__DIR__, %d).'%svendor/autoload.php';
114118
require __DIR__.'/Container%s/ProjectServiceContainer.php';
115119
require __DIR__.'/Container%s/getNonSharedFooService.php';

0 commit comments

Comments
 (0)
0