22
33declare (strict_types=1 );
44
5- namespace Acme \SyliusExamplePlugin \ Tests \Application ;
5+ namespace Acme \Tests \ SyliusExamplePlugin \Application ;
66
77use PSS \SymfonyMockerContainer \DependencyInjection \MockerContainer ;
8+ use Sylius \Bundle \CoreBundle \Application \Kernel as SyliusKernel ;
89use Symfony \Bundle \FrameworkBundle \Kernel \MicroKernelTrait ;
910use Symfony \Component \Config \Loader \DelegatingLoader ;
1011use Symfony \Component \Config \Loader \LoaderInterface ;
1920use Symfony \Component \DependencyInjection \Loader \PhpFileLoader ;
2021use Symfony \Component \DependencyInjection \Loader \XmlFileLoader ;
2122use Symfony \Component \DependencyInjection \Loader \YamlFileLoader ;
23+ use Symfony \Component \HttpKernel \Bundle \BundleInterface ;
2224use Symfony \Component \HttpKernel \Config \FileLocator ;
2325use Symfony \Component \HttpKernel \Kernel as BaseKernel ;
2426use Symfony \Component \Routing \RouteCollectionBuilder ;
@@ -42,33 +44,29 @@ public function getLogDir(): string
4244
4345 public function registerBundles (): iterable
4446 {
45- $ contentsrequire $ this getProjectDir () . '/config/bundles.php ' ;
46- foreach ($ contentsas $ class$ envs
47- if (isset ($ envs'all ' ]) || isset ($ envs$ this environment ])) {
48- yield new $ class
49- }
47+ foreach ($ this getConfigurationDirectories () as $ confDir
48+ yield from $ this registerBundlesFromFile ($ confDir'/bundles.php ' );
5049 }
5150 }
5251
5352 protected function configureContainer (ContainerBuilder $ containerLoaderInterface $ loadervoid
5453 {
55- $ containeraddResource (new FileResource ($ this getProjectDir () . '/config/bundles.php ' ));
54+ foreach ($ this getConfigurationDirectories () as $ confDir
55+ $ containeraddResource (new FileResource ($ confDir'/bundles.php ' ));
56+ }
57+
5658 $ containersetParameter ('container.dumper.inline_class_loader ' , true );
57- $ confDir$ this getProjectDir () . '/config ' ;
5859
59- $ loaderload ($ confDir'/{packages}/* ' . self ::CONFIG_EXTS , 'glob ' );
60- $ loaderload ($ confDir'/{packages}/ ' . $ this environment . '/**/* ' . self ::CONFIG_EXTS , 'glob ' );
61- $ loaderload ($ confDir'/{services} ' . self ::CONFIG_EXTS , 'glob ' );
62- $ loaderload ($ confDir'/{services}_ ' . $ this environment . self ::CONFIG_EXTS , 'glob ' );
60+ foreach ($ this getConfigurationDirectories () as $ confDir
61+ $ this loadContainerConfiguration ($ loader$ confDir
62+ }
6363 }
6464
6565 protected function configureRoutes (RouteCollectionBuilder $ routesvoid
6666 {
67- $ confDir$ this getProjectDir () . '/config ' ;
68-
69- $ routesimport ($ confDir'/{routes}/* ' . self ::CONFIG_EXTS , '/ ' , 'glob ' );
70- $ routesimport ($ confDir'/{routes}/ ' . $ this environment . '/**/* ' . self ::CONFIG_EXTS , '/ ' , 'glob ' );
71- $ routesimport ($ confDir'/{routes} ' . self ::CONFIG_EXTS , '/ ' , 'glob ' );
67+ foreach ($ this getConfigurationDirectories () as $ confDir
68+ $ this loadRoutesConfiguration ($ routes$ confDir
69+ }
7270 }
7371
7472 protected function getContainerBaseClass (): string
@@ -80,27 +78,45 @@ protected function getContainerBaseClass(): string
8078 return parent ::getContainerBaseClass ();
8179 }
8280
83- protected function getContainerLoader ( ContainerInterface $ container LoaderInterface
81+ private function isTestEnvironment ( ): bool
8482 {
85- /** @var ContainerBuilder $container */
86- Assert::isInstanceOf ($ container
87-
88- $ locatornew FileLocator ($ this $ this getRootDir () . '/Resources ' );
89- $ resolvernew LoaderResolver (array (
90- new XmlFileLoader ($ container$ locator
91- new YamlFileLoader ($ container$ locator
92- new IniFileLoader ($ container$ locator
93- new PhpFileLoader ($ container$ locator
94- new GlobFileLoader ($ container$ locator
95- new DirectoryLoader ($ container$ locator
96- new ClosureLoader ($ container
97- ));
98-
99- return new DelegatingLoader ($ resolver
83+ return 0 === strpos ($ this getEnvironment (), 'test ' );
10084 }
10185
102- private function isTestEnvironment ( ): bool
86+ private function loadContainerConfiguration ( LoaderInterface $ loader , string $ confDir void
10387 {
104- return 0 === strpos ($ this getEnvironment (), 'test ' );
88+ $ loaderload ($ confDir'/{packages}/* ' . self ::CONFIG_EXTS , 'glob ' );
89+ $ loaderload ($ confDir'/{packages}/ ' . $ this environment . '/**/* ' . self ::CONFIG_EXTS , 'glob ' );
90+ $ loaderload ($ confDir'/{services} ' . self ::CONFIG_EXTS , 'glob ' );
91+ $ loaderload ($ confDir'/{services}_ ' . $ this environment . self ::CONFIG_EXTS , 'glob ' );
92+ }
93+
94+ private function loadRoutesConfiguration (RouteCollectionBuilder $ routesstring $ confDirvoid
95+ {
96+ $ routesimport ($ confDir'/{routes}/* ' . self ::CONFIG_EXTS , '/ ' , 'glob ' );
97+ $ routesimport ($ confDir'/{routes}/ ' . $ this environment . '/**/* ' . self ::CONFIG_EXTS , '/ ' , 'glob ' );
98+ $ routesimport ($ confDir'/{routes} ' . self ::CONFIG_EXTS , '/ ' , 'glob ' );
99+ }
100+
101+ /**
102+ * @return BundleInterface[]
103+ */
104+ private function registerBundlesFromFile (string $ bundlesFileiterable
105+ {
106+ $ contentsrequire $ bundlesFile
107+ foreach ($ contentsas $ class$ envs
108+ if (isset ($ envs'all ' ]) || isset ($ envs$ this environment ])) {
109+ yield new $ class
110+ }
111+ }
112+ }
113+
114+ /**
115+ * @return string[]
116+ */
117+ private function getConfigurationDirectories (): iterable
118+ {
119+ yield $ this getProjectDir () . '/config ' ;
120+ yield $ this getProjectDir () . '/config/sylius/ ' . SyliusKernel::MAJOR_VERSION . '. ' . SyliusKernel::MINOR_VERSION ;
105121 }
106122}
0 commit comments