From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Thu, 2 Apr 2020 16:19:15 -1000 Subject: [DependencyInjection] Drop parts of expectated output The [ProjectServiceContainer.preload.php] part is not currently included in the file of our (test?) environment. To be investigated. --- .../Tests/Fixtures/php/services10_as_files.txt | 21 -------- .../Tests/Fixtures/php/services9_as_files.txt | 57 ---------------------- .../Fixtures/php/services9_inlined_factories.txt | 31 ------------ ...es9_inlined_factories_with_tagged_iterrator.txt | 21 -------- .../php/services9_lazy_inlined_factories.txt | 21 -------- .../services_deprecated_parameters_as_files.txt | 21 -------- .../php/services_non_shared_lazy_as_files.txt | 22 --------- 7 files changed, 194 deletions(-) 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 index 54189a2..156924a 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt @@ -114,27 +114,6 @@ class ProjectServiceContainer extends Container } } - [ProjectServiceContainer.preload.php] => = 7.4 when preloading is desired - -use Symfony\Component\DependencyInjection\Dumper\Preloader; - -if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - return; -} - -require dirname(__DIR__, %d).'%svendor/autoload.php'; -(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null); -require __DIR__.'/Container%s/getClosureService.php'; - -$classes = []; -$classes[] = 'FooClass'; -$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface'; - -$preloaded = Preloader::preload($classes); - [ProjectServiceContainer.php] => = 7.4 when preloading is desired - -use Symfony\Component\DependencyInjection\Dumper\Preloader; - -if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - return; -} - -require dirname(__DIR__, %d).'%svendor/autoload.php'; -(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'; -require __DIR__.'/Container%s/getRuntimeErrorService.php'; -require __DIR__.'/Container%s/getPreloadSidekickService.php'; -require __DIR__.'/Container%s/getNonSharedFooService.php'; -require __DIR__.'/Container%s/getNewFactoryServiceService.php'; -require __DIR__.'/Container%s/getMethodCall1Service.php'; -require __DIR__.'/Container%s/getLazyContextIgnoreInvalidRefService.php'; -require __DIR__.'/Container%s/getLazyContextService.php'; -require __DIR__.'/Container%s/getFooWithInlineService.php'; -require __DIR__.'/Container%s/getFooBarService.php'; -require __DIR__.'/Container%s/getFoo_BazService.php'; -require __DIR__.'/Container%s/getFooService.php'; -require __DIR__.'/Container%s/getFactoryServiceSimpleService.php'; -require __DIR__.'/Container%s/getFactoryServiceService.php'; -require __DIR__.'/Container%s/getDecoratorServiceWithNameService.php'; -require __DIR__.'/Container%s/getDecoratorServiceService.php'; -require __DIR__.'/Container%s/getConfiguredServiceSimpleService.php'; -require __DIR__.'/Container%s/getConfiguredServiceService.php'; -require __DIR__.'/Container%s/getBazService.php'; -require __DIR__.'/Container%s/getBar23Service.php'; -require __DIR__.'/Container%s/getBServiceService.php'; -require __DIR__.'/Container%s/getAServiceService.php'; -require __DIR__.'/Container%s/getBAR22Service.php'; -require __DIR__.'/Container%s/getBAR2Service.php'; - -$classes = []; -$classes[] = 'Bar'; -$classes[] = 'Bar\FooClass'; -$classes[] = 'Baz'; -$classes[] = 'ConfClass'; -$classes[] = 'BazClass'; -$classes[] = 'Foo'; -$classes[] = 'LazyContext'; -$classes[] = 'FooBarBaz'; -$classes[] = 'FactoryClass'; -$classes[] = 'Some\Sidekick1'; -$classes[] = 'Some\Sidekick2'; -$classes[] = 'Request'; -$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface'; - -$preloaded = Preloader::preload($classes); - [ProjectServiceContainer.php] => = 7.4 when preloading is desired - -use Symfony\Component\DependencyInjection\Dumper\Preloader; - -if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - return; -} - -require dirname(__DIR__, %d).'%svendor/autoload.php'; -(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null); - -$classes = []; -$classes[] = 'Bar'; -$classes[] = 'Bar\FooClass'; -$classes[] = 'Baz'; -$classes[] = 'ConfClass'; -$classes[] = 'BazClass'; -$classes[] = 'Foo'; -$classes[] = 'LazyContext'; -$classes[] = 'FooBarBaz'; -$classes[] = 'FactoryClass'; -$classes[] = 'Some\Sidekick1'; -$classes[] = 'Some\Sidekick2'; -$classes[] = 'Request'; -$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface'; - -$preloaded = Preloader::preload($classes); - [ProjectServiceContainer.php] => = 7.4 when preloading is desired - -use Symfony\Component\DependencyInjection\Dumper\Preloader; - -if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - return; -} - -require dirname(__DIR__, %d).'/vendor/autoload.php'; -(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null); - -$classes = []; -$classes[] = 'Bar'; -$classes[] = 'Symfony\Component\DependencyInjection\Tests\Dumper\FooClass'; -$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface'; - -$preloaded = Preloader::preload($classes); - [ProjectServiceContainer.php] => = 7.4 when preloading is desired - -use Symfony\Component\DependencyInjection\Dumper\Preloader; - -if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - return; -} - -require dirname(__DIR__, %d).'%svendor/autoload.php'; -(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null); - -$classes = []; -$classes[] = 'Bar\FooClass'; -$classes[] = 'Bar\FooLazyClass'; -$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface'; - -$preloaded = Preloader::preload($classes); - [ProjectServiceContainer.php] => = 7.4 when preloading is desired - -use Symfony\Component\DependencyInjection\Dumper\Preloader; - -if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - return; -} - -require dirname(__DIR__, %d)%svendor/autoload.php'; -(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null); -require __DIR__.'/Container%s/getFooService.php'; - -$classes = []; -$classes[] = 'FooClass\Foo'; -$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface'; - -$preloaded = Preloader::preload($classes); - [ProjectServiceContainer.php] => = 7.4 when preloading is desired - -use Symfony\Component\DependencyInjection\Dumper\Preloader; - -if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - return; -} - -require '%svendor/autoload.php'; -(require __DIR__.'/Symfony_DI_PhpDumper_Service_Non_Shared_Lazy_As_File.php')->set(\Container%s\Symfony_DI_PhpDumper_Service_Non_Shared_Lazy_As_File::class, null); -require __DIR__.'/Container%s/FooLazyClassGhost%s.php'; -require __DIR__.'/Container%s/getNonSharedFooService.php'; - -$classes = []; -$classes[] = 'Bar\FooLazyClass'; -$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface'; - -$preloaded = Preloader::preload($classes); - [Symfony_DI_PhpDumper_Service_Non_Shared_Lazy_As_File.php] =>