Merge branch '3.0'

* 3.0:
  fixed CS
  fixed CS
  fixed CS
  fixed test
  fixed CS
  Remove default match from AbstractConfigCommand::findExtension
  Remove unused imports
  [FrameworkBundle][Validator] Fix apc cache service deprecation

Author: fabpot

Command/AbstractConfigCommand.php

@@ -45,26 +45,25 @@ protected function listBundles($output)
 
     protected function findExtension($name)
     {
-        $extension = null;
         $bundles = $this->initializeBundles();
         foreach ($bundles as $bundle) {
-            $extension = $bundle->getContainerExtension();
+            if ($name === $bundle->getName()) {
+                return $bundle->getContainerExtension();
+            }
 
-            if ($extension && ($name === $extension->getAlias() || $name === $bundle->getName())) {
-                break;
+            $extension = $bundle->getContainerExtension();
+            if ($extension && $name === $extension->getAlias()) {
+                return $extension;
             }
         }
 
-        if (!$extension) {
+        if ('Bundle' !== substr($name, -6)) {
+            $message = sprintf('No extensions with configuration available for "%s"', $name);
+        } else {
             $message = sprintf('No extension with alias "%s" is enabled', $name);
-            if (preg_match('/Bundle$/', $name)) {
-                $message = sprintf('No extensions with configuration available for "%s"', $name);
-            }
-
-            throw new \LogicException($message);
         }
 
-        return $extension;
+        throw new \LogicException($message);
     }
 
     public function validateConfiguration(ExtensionInterface $extension, $configuration)

Command/AssetsInstallCommand.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Command;
 
-use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

Console/Descriptor/MarkdownDescriptor.php

@@ -191,7 +191,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
             $output .= "\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no');
 
             foreach ($definition->getAutowiringTypes() as $autowiringType) {
-                    $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
+                $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
             }
         }
 

Controller/Controller.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -25,7 +24,6 @@
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Doctrine\Bundle\DoctrineBundle\Registry;
 
 /**

DependencyInjection/Configuration.php

@@ -439,7 +439,15 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                         ->scalarNode('cache')
                             ->beforeNormalization()
                                 // Can be removed in 3.0, once ApcCache support is dropped
-                                ->ifString()->then(function ($v) { return 'apc' === $v ? 'validator.mapping.cache.apc' : $v; })
+                                ->ifString()->then(function ($v) {
+                                    if ('apc' === $v) {
+                                        @trigger_error('The ability to pass "apc" as the framework.validation.cache configuration key value is deprecated since version 2.8 and will be removed in 3.0. Use the "validator.mapping.cache.doctrine.apc" service id instead.', E_USER_DEPRECATED);
+
+                                        return 'validator.mapping.cache.apc';
+                                    }
+
+                                    return $v;
+                                })
                             ->end()
                         ->end()
                         ->booleanNode('enable_annotations')->defaultFalse()->end()

Resources/config/validator.xml

@@ -28,8 +28,14 @@
 
         <service id="validator.mapping.class_metadata_factory" alias="validator" public="false" />
 
-        <service id="validator.mapping.cache.apc" class="Symfony\Component\Validator\Mapping\Cache\ApcCache" public="false">
-            <argument>%validator.mapping.cache.prefix%</argument>
+        <service id="validator.mapping.cache.doctrine.apc" class="Symfony\Component\Validator\Mapping\Cache\DoctrineCache" public="false">
+            <argument type="service">
+                <service class="Doctrine\Common\Cache\ApcCache">
+                    <call method="setNamespace">
+                        <argument>%validator.mapping.cache.prefix%</argument>
+                    </call>
+                </service>
+            </argument>
         </service>
 
         <service id="validator.validator_factory" class="Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory" public="false">

Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php

@@ -53,7 +53,7 @@ public function testReturningEmptyArrayWhenNoService()
     {
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('findTaggedServiceIds'));
 
-            $container->expects($this->any())
+        $container->expects($this->any())
             ->method('findTaggedServiceIds')
             ->will($this->returnValue(array()));
 

Tests/DependencyInjection/Fixtures/php/full.php

@@ -56,7 +56,7 @@
     ),
     'validation' => array(
         'enabled' => true,
-        'cache' => 'apc',
+        'cache' => 'validator.mapping.cache.doctrine.apc',
     ),
     'annotations' => array(
         'cache' => 'file',

Tests/DependencyInjection/Fixtures/xml/full.xml

@@ -38,7 +38,7 @@
         <framework:translator enabled="true" fallback="fr" logging="true">
             <framework:path>%kernel.root_dir%/Fixtures/translations</framework:path>
         </framework:translator>
-        <framework:validation enabled="true" cache="apc" />
+        <framework:validation enabled="true" cache="validator.mapping.cache.doctrine.apc" />
         <framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
         <framework:serializer enabled="true" enable-annotations="true" cache="serializer.mapping.cache.apc" name-converter="serializer.name_converter.camel_case_to_snake_case" />
     </framework:config>

Tests/DependencyInjection/Fixtures/yml/full.yml

@@ -44,7 +44,7 @@ framework:
         paths: ['%kernel.root_dir%/Fixtures/translations']
     validation:
         enabled: true
-        cache:   apc
+        cache:   validator.mapping.cache.doctrine.apc
     annotations:
         cache:   file
         debug:   true