Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit 3a8377aa8667 · 2017-11-20T22:12:12.000+01:00
* 3.4:
  [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone
  [DI] Analyze setter-circular deps more precisely
  fixing that PropertyNormalizer supports parent properties
  [SecurityBundle] Don't trigger auto-picking notice if provider is set per listener
  [TwigBundle][FrameworkBundle] Remove the internals from debug autowiring
  [DI] Skip hot_path tag for deprecated services as their class might also be
  [Cache] Memcached options should ignore "lazy"
  [FrameworkBundle] Dont create empty bundles directory
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
@@ -98,9 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        // Create the bundles directory otherwise symlink will fail.
         $bundlesDir = $targetArg.'/bundles/';
-        $this->filesystem->mkdir($bundlesDir, 0777);
 
         $io = new SymfonyStyle($input, $output);
         $io->newLine();
@@ -164,18 +162,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
         // remove the assets of the bundles that no longer exist
-        $dirsToRemove = Finder::create()->depth(0)->directories()->exclude($validAssetDirs)->in($bundlesDir);
-        $this->filesystem->remove($dirsToRemove);
+        if (is_dir($bundlesDir)) {
+            $dirsToRemove = Finder::create()->depth(0)->directories()->exclude($validAssetDirs)->in($bundlesDir);
+            $this->filesystem->remove($dirsToRemove);
+        }
 
-        $io->table(array('', 'Bundle', 'Method / Error'), $rows);
+        if ($rows) {
+            $io->table(array('', 'Bundle', 'Method / Error'), $rows);
+        }
 
         if (0 !== $exitCode) {
             $io->error('Some errors occurred while installing assets.');
         } else {
             if ($copyUsed) {
                 $io->note('Some assets were installed via copy. If you make changes to these assets you have to run this command again.');
             }
-            $io->success('All assets were successfully installed.');
+            $io->success($rows ? 'All assets were successfully installed.' : 'No assets were provided by any bundle.');
         }
 
         return $exitCode;
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -13,13 +13,6 @@
 
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Bridge\Monolog\Processor\DebugProcessor;
-use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;
-use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;
-use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
-use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;
-use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
-use Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand;
-use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;
@@ -120,10 +113,10 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('console.xml');
 
             if (!class_exists(BaseXliffLintCommand::class)) {
-                $container->removeDefinition(XliffLintCommand::class);
+                $container->removeDefinition('console.command.xliff_lint');
             }
             if (!class_exists(BaseYamlLintCommand::class)) {
-                $container->removeDefinition(YamlLintCommand::class);
+                $container->removeDefinition('console.command.yaml_lint');
             }
         }
 
@@ -203,7 +196,7 @@ public function load(array $configs, ContainerBuilder $container)
                 $container->removeDefinition('form.type_guesser.validator');
             }
         } else {
-            $container->removeDefinition('Symfony\Component\Form\Command\DebugCommand');
+            $container->removeDefinition('console.command.form_debug');
         }
 
         $this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);
@@ -431,7 +424,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
     private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$config['enabled']) {
-            $container->removeDefinition(WorkflowDumpCommand::class);
+            $container->removeDefinition('console.command.workflow_dump');
 
             return;
         }
@@ -603,8 +596,8 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
     private function registerRouterConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
-            $container->removeDefinition(RouterDebugCommand::class);
-            $container->removeDefinition(RouterMatchCommand::class);
+            $container->removeDefinition('console.command.router_debug');
+            $container->removeDefinition('console.command.router_match');
 
             return;
         }
@@ -857,8 +850,8 @@ private function createVersion(ContainerBuilder $container, $version, $format, $
     private function registerTranslatorConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
-            $container->removeDefinition(TranslationDebugCommand::class);
-            $container->removeDefinition(TranslationUpdateCommand::class);
+            $container->removeDefinition('console.command.translation_debug');
+            $container->removeDefinition('console.command.translation_update');
 
             return;
         }
diff --git a/Resources/config/console.xml b/Resources/config/console.xml
@@ -13,95 +13,95 @@
             <tag name="monolog.logger" channel="console" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\AboutCommand">
+        <service id="console.command.about" class="Symfony\Bundle\FrameworkBundle\Command\AboutCommand">
             <tag name="console.command" command="about" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\AssetsInstallCommand">
+        <service id="console.command.assets_install" class="Symfony\Bundle\FrameworkBundle\Command\AssetsInstallCommand">
             <argument type="service" id="filesystem" />
             <tag name="console.command" command="assets:install" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CacheClearCommand">
+        <service id="console.command.cache_clear" class="Symfony\Bundle\FrameworkBundle\Command\CacheClearCommand">
             <argument type="service" id="cache_clearer" />
             <argument type="service" id="filesystem" />
             <tag name="console.command" command="cache:clear" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand">
+        <service id="console.command.cache_pool_clear" class="Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand">
             <argument type="service" id="cache.global_clearer" />
             <tag name="console.command" command="cache:pool:clear" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand">
+        <service id="console.command.cache_pool_prune" class="Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand">
             <argument type="iterator" />
             <tag name="console.command" command="cache:pool:prune" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CacheWarmupCommand">
+        <service id="console.command.cache_warmup" class="Symfony\Bundle\FrameworkBundle\Command\CacheWarmupCommand">
             <argument type="service" id="cache_warmer" />
             <tag name="console.command" command="cache:warmup" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\ConfigDebugCommand">
+        <service id="console.command.config_debug" class="Symfony\Bundle\FrameworkBundle\Command\ConfigDebugCommand">
             <tag name="console.command" command="debug:config" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\ConfigDumpReferenceCommand">
+        <service id="console.command.config_dump_reference" class="Symfony\Bundle\FrameworkBundle\Command\ConfigDumpReferenceCommand">
             <tag name="console.command" command="config:dump-reference" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\ContainerDebugCommand">
+        <service id="console.command.container_debug" class="Symfony\Bundle\FrameworkBundle\Command\ContainerDebugCommand">
             <tag name="console.command" command="debug:container" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand">
+        <service id="console.command.debug_autowiring" class="Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand">
             <tag name="console.command" command="debug:autowiring" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\EventDispatcherDebugCommand">
+        <service id="console.command.event_dispatcher_debug" class="Symfony\Bundle\FrameworkBundle\Command\EventDispatcherDebugCommand">
             <argument type="service" id="event_dispatcher" />
             <tag name="console.command" command="debug:event-dispatcher" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">
+        <service id="console.command.router_debug" class="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">
             <argument type="service" id="router" />
             <tag name="console.command" command="debug:router" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand">
+        <service id="console.command.router_match" class="Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand">
             <argument type="service" id="router" />
             <tag name="console.command" command="router:match" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand">
+        <service id="console.command.translation_debug" class="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand">
             <argument type="service" id="translator" />
             <argument type="service" id="translation.reader" />
             <argument type="service" id="translation.extractor" />
             <tag name="console.command" command="debug:translation" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand">
+        <service id="console.command.translation_update" class="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand">
             <argument type="service" id="translation.writer" />
             <argument type="service" id="translation.reader" />
             <argument type="service" id="translation.extractor" />
             <argument>%kernel.default_locale%</argument>
             <tag name="console.command" command="translation:update" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
+        <service id="console.command.workflow_dump" class="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
             <tag name="console.command" command="workflow:dump" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand">
+        <service id="console.command.xliff_lint" class="Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand">
             <tag name="console.command" command="lint:xliff" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand">
+        <service id="console.command.yaml_lint" class="Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand">
             <tag name="console.command" command="lint:yaml" />
         </service>
 
-        <service id="Symfony\Component\Form\Command\DebugCommand">
+        <service id="console.command.form_debug" class="Symfony\Component\Form\Command\DebugCommand">
             <argument type="service" id="form.registry" />
             <argument type="collection" /> <!-- All form types namespaces are stored here by FormPass -->
             <argument type="collection" /> <!-- All services form types are stored here by FormPass -->
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -55,12 +55,12 @@
             <argument type="tagged" tag="config_cache.resource_checker" />
         </service>
 
-        <service id="Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker">
+        <service id="dependency_injection.config.container_parameters_resource_checker" class="Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker">
             <argument type="service" id="service_container" />
             <tag name="config_cache.resource_checker" priority="-980" />
         </service>
 
-        <service id="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
+        <service id="config.resource.self_checking_resource_checker" class="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
             <tag name="config_cache.resource_checker" priority="-990" />
         </service>
 
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
 
 use Doctrine\Common\Annotations\Annotation;
-use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
 use Symfony\Bundle\FullStack;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
@@ -307,7 +306,7 @@ public function testWorkflowServicesCanBeEnabled()
         $container = $this->createContainerFromFile('workflows_enabled');
 
         $this->assertTrue($container->has(Registry::class));
-        $this->assertTrue($container->hasDefinition(WorkflowDumpCommand::class));
+        $this->assertTrue($container->hasDefinition('console.command.workflow_dump'));
     }
 
     public function testRouter()

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- // Create the bundles directory otherwise symlink will fail.`
`102`	`101`	`$bundlesDir = $targetArg.'/bundles/';`
`103`		`- $this->filesystem->mkdir($bundlesDir, 0777);`
`104`	`102`
`105`	`103`	`$io = new SymfonyStyle($input, $output);`
`106`	`104`	`$io->newLine();`
`@@ -164,18 +162,22 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`164`	`162`	`}`
`165`	`163`	`}`
`166`	`164`	`// remove the assets of the bundles that no longer exist`
`167`		`- $dirsToRemove = Finder::create()->depth(0)->directories()->exclude($validAssetDirs)->in($bundlesDir);`
`168`		`- $this->filesystem->remove($dirsToRemove);`
	`165`	`+ if (is_dir($bundlesDir)) {`
	`166`	`+ $dirsToRemove = Finder::create()->depth(0)->directories()->exclude($validAssetDirs)->in($bundlesDir);`
	`167`	`+ $this->filesystem->remove($dirsToRemove);`
	`168`	`+ }`
`169`	`169`
`170`		`- $io->table(array('', 'Bundle', 'Method / Error'), $rows);`
	`170`	`+ if ($rows) {`
	`171`	`+ $io->table(array('', 'Bundle', 'Method / Error'), $rows);`
	`172`	`+ }`
`171`	`173`
`172`	`174`	`if (0 !== $exitCode) {`
`173`	`175`	`$io->error('Some errors occurred while installing assets.');`
`174`	`176`	`} else {`
`175`	`177`	`if ($copyUsed) {`
`176`	`178`	`$io->note('Some assets were installed via copy. If you make changes to these assets you have to run this command again.');`
`177`	`179`	`}`
`178`		`- $io->success('All assets were successfully installed.');`
	`180`	`+ $io->success($rows ? 'All assets were successfully installed.' : 'No assets were provided by any bundle.');`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`return $exitCode;`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,6 @@`
`13`	`13`
`14`	`14`	`use Doctrine\Common\Annotations\Reader;`
`15`	`15`	`use Symfony\Bridge\Monolog\Processor\DebugProcessor;`
`16`		`-use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;`
`17`		`-use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;`
`18`		`-use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;`
`19`		`-use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;`
`20`		`-use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;`
`21`		`-use Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand;`
`22`		`-use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;`
`23`	`16`	`use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;`
`24`	`17`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`25`	`18`	`use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;`
`@@ -120,10 +113,10 @@ public function load(array $configs, ContainerBuilder $container)`
`120`	`113`	`$loader->load('console.xml');`
`121`	`114`
`122`	`115`	`if (!class_exists(BaseXliffLintCommand::class)) {`
`123`		`- $container->removeDefinition(XliffLintCommand::class);`
	`116`	`+ $container->removeDefinition('console.command.xliff_lint');`
`124`	`117`	`}`
`125`	`118`	`if (!class_exists(BaseYamlLintCommand::class)) {`
`126`		`- $container->removeDefinition(YamlLintCommand::class);`
	`119`	`+ $container->removeDefinition('console.command.yaml_lint');`
`127`	`120`	`}`
`128`	`121`	`}`
`129`	`122`
`@@ -203,7 +196,7 @@ public function load(array $configs, ContainerBuilder $container)`
`203`	`196`	`$container->removeDefinition('form.type_guesser.validator');`
`204`	`197`	`}`
`205`	`198`	`} else {`
`206`		`- $container->removeDefinition('Symfony\Component\Form\Command\DebugCommand');`
	`199`	`+ $container->removeDefinition('console.command.form_debug');`
`207`	`200`	`}`
`208`	`201`
`209`	`202`	`$this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);`
`@@ -431,7 +424,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $`
`431`	`424`	`private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`432`	`425`	`{`
`433`	`426`	`if (!$config['enabled']) {`
`434`		`- $container->removeDefinition(WorkflowDumpCommand::class);`
	`427`	`+ $container->removeDefinition('console.command.workflow_dump');`
`435`	`428`
`436`	`429`	`return;`
`437`	`430`	`}`
`@@ -603,8 +596,8 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con`
`603`	`596`	`private function registerRouterConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`604`	`597`	`{`
`605`	`598`	`if (!$this->isConfigEnabled($container, $config)) {`
`606`		`- $container->removeDefinition(RouterDebugCommand::class);`
`607`		`- $container->removeDefinition(RouterMatchCommand::class);`
	`599`	`+ $container->removeDefinition('console.command.router_debug');`
	`600`	`+ $container->removeDefinition('console.command.router_match');`
`608`	`601`
`609`	`602`	`return;`
`610`	`603`	`}`
`@@ -857,8 +850,8 @@ private function createVersion(ContainerBuilder $container, $version, $format, $`
`857`	`850`	`private function registerTranslatorConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader)`
`858`	`851`	`{`
`859`	`852`	`if (!$this->isConfigEnabled($container, $config)) {`
`860`		`- $container->removeDefinition(TranslationDebugCommand::class);`
`861`		`- $container->removeDefinition(TranslationUpdateCommand::class);`
	`853`	`+ $container->removeDefinition('console.command.translation_debug');`
	`854`	`+ $container->removeDefinition('console.command.translation_update');`
`862`	`855`
`863`	`856`	`return;`
`864`	`857`	`}`