bug symfony#44098 [DependencyInjection] fix preloading (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 41065307c803 · 2021-11-17T10:31:28.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DependencyInjection] fix preloading | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#44074 | License | MIT | Doc PR | - Commits ------- f7b5297 [DependencyInjection] fix preloading
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -331,7 +331,7 @@ class %s extends {$options['class']}
 }
 
 require $autoloadFile;
-(require __DIR__.'/Container{$hash}/{$options['class']}.php')->set(\\Container{$hash}\\{$options['class']}::class, null);
+(require __DIR__.'/{$options['class']}.php')->set(\\Container{$hash}\\{$options['class']}::class, null);
 $preloadedFiles
 \$classes = [];
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -133,7 +133,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 require __DIR__.'/Container%s/getClosureService.php';
 
 $classes = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -907,7 +907,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 require __DIR__.'/Container%s/getThrowingOneService.php';
 require __DIR__.'/Container%s/getTaggedIteratorService.php';
 require __DIR__.'/Container%s/getServiceFromStaticMethodService.php';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -562,7 +562,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 
 $classes = [];
 $classes[] = 'Bar\FooClass';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -186,7 +186,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 
 $classes = [];
 $classes[] = 'Bar\FooClass';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -144,7 +144,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 require __DIR__.'/Container%s/proxy.php';
 require __DIR__.'/Container%s/getNonSharedFooService.php';
 

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ class %s extends {$options['class']}`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`require $autoloadFile;`
`334`		`-(require __DIR__.'/Container{$hash}/{$options['class']}.php')->set(\\Container{$hash}\\{$options['class']}::class, null);`
	`334`	`+(require __DIR__.'/{$options['class']}.php')->set(\\Container{$hash}\\{$options['class']}::class, null);`
`335`	`335`	`$preloadedFiles`
`336`	`336`	`\$classes = [];`
`337`	`337`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`require dirname(__DIR__, %d).'%svendor/autoload.php';`
`136`		`-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
	`136`	`+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
`137`	`137`	`require __DIR__.'/Container%s/getClosureService.php';`
`138`	`138`
`139`	`139`	`$classes = [];`
Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`require dirname(__DIR__, %d).'%svendor/autoload.php';`
`910`		`-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
	`910`	`+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
`911`	`911`	`require __DIR__.'/Container%s/getThrowingOneService.php';`
`912`	`912`	`require __DIR__.'/Container%s/getTaggedIteratorService.php';`
`913`	`913`	`require __DIR__.'/Container%s/getServiceFromStaticMethodService.php';`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`562`	`562`	`}`
`563`	`563`
`564`	`564`	`require dirname(__DIR__, %d).'%svendor/autoload.php';`
`565`		`-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
	`565`	`+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
`566`	`566`	< DF35 /td>
`567`	`567`	`$classes = [];`
`568`	`568`	`$classes[] = 'Bar\FooClass';`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`require dirname(__DIR__, %d).'%svendor/autoload.php';`
`189`		`-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
	`189`	`+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
`190`	`190`
`191`	`191`	`$classes = [];`
`192`	`192`	`$classes[] = 'Bar\FooClass';`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`require dirname(__DIR__, %d).'%svendor/autoload.php';`
`147`		`-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
	`147`	`+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
`148`	`148`	`require __DIR__.'/Container%s/proxy.php';`
`149`	`149`	`require __DIR__.'/Container%s/getNonSharedFooService.php';`
`150`	`150`