Merge branch '3.3' into 3.4

* 3.3:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction
  [Filesystem] mirror - fix copying content with same name as source/target.
  Removed unnecessary getDefinition() call.
  .php_cs.dist - simplify config
  [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces

Author: nicolas-grekas

.php_cs.dist

@@ -9,15 +9,14 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
-        'no_unreachable_default_argument_value' => false,
-        'braces' => array('allow_single_line_closure' => true),
-        'heredoc_to_nowdoc' => false,
+        'no_break_comment' => false,
         'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__.'/src')
+            ->append(array(__FILE__))
             ->exclude(array(
                 // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
                 'Symfony/Component/DependencyInjection/Tests/Fixtures',

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -198,13 +198,13 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
             if ($container->hasDefinition($mappingService)) {
                 $mappingDriverDef = $container->getDefinition($mappingService);
                 $args = $mappingDriverDef->getArguments();
-                if ($driverType == 'annotation') {
+                if ('annotation' == $driverType) {
                     $args[1] = array_merge(array_values($driverPaths), $args[1]);
                 } else {
                     $args[0] = array_merge(array_values($driverPaths), $args[0]);
                 }
                 $mappingDriverDef->setArguments($args);
-            } elseif ($driverType == 'annotation') {
+            } elseif ('annotation' == $driverType) {
                 $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), array(
                     new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
                     array_values($driverPaths),
@@ -330,7 +330,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
                 $memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcache.class').'%';
                 $memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.memcache_instance.class').'%';
                 $memcacheHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.memcache_host').'%';
-                $memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
+                $memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && 0 === $cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
                 $cacheDef = new Definition($memcacheClass);
                 $memcacheInstance = new Definition($memcacheInstanceClass);
                 $memcacheInstance->setPrivate(true);

src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

@@ -77,7 +77,7 @@ public function getEntitiesByIds($identifier, array $values)
 
             // Like above, but we just filter out empty strings.
             $values = array_values(array_filter($values, function ($v) {
-                return (string) $v !== '';
+                return '' !== (string) $v;
             }));
         } else {
             $parameterType = Connection::PARAM_STR_ARRAY;

src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php

@@ -60,7 +60,7 @@ public function onSubmit(FormEvent $event)
 
         // If all items were removed, call clear which has a higher
         // performance on persistent collections
-        if ($collection instanceof Collection && count($data) === 0) {
+        if ($collection instanceof Collection && 0 === count($data)) {
             $collection->clear();
         }
     }

src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

@@ -151,7 +151,7 @@ public function configureOptions(OptionsResolver $resolver)
                     $entityLoader
                 );
 
-                if ($hash !== null) {
+                if (null !== $hash) {
                     $this->choiceLoaders[$hash] = $doctrineChoiceLoader;
                 }
 

src/Symfony/Bridge/Twig/Command/DebugCommand.php

@@ -116,7 +116,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $types = array('functions', 'filters', 'tests', 'globals');
 
-        if ($input->getOption('format') === 'json') {
+        if ('json' === $input->getOption('format')) {
             $data = array();
             foreach ($types as $type) {
                 foreach ($this->twig->{'get'.ucfirst($type)}() as $name => $entity) {
@@ -200,13 +200,13 @@ private function getLoaderPaths()
 
     private function getMetadata($type, $entity)
     {
-        if ($type === 'globals') {
+        if ('globals' === $type) {
             return $entity;
         }
-        if ($type === 'tests') {
+        if ('tests' === $type) {
             return;
         }
-        if ($type === 'functions' || $type === 'filters') {
+        if ('functions' === $type || 'filters' === $type) {
             $cb = $entity->getCallable();
             if (null === $cb) {
                 return;
@@ -236,7 +236,7 @@ private function getMetadata($type, $entity)
                 array_shift($args);
             }
 
-            if ($type === 'filters') {
+            if ('filters' === $type) {
                 // remove the value the filter is applied on
                 array_shift($args);
             }
@@ -256,32 +256,32 @@ private function getMetadata($type, $entity)
 
     private function getPrettyMetadata($type, $entity)
     {
-        if ($type === 'tests') {
+        if ('tests' === $type) {
             return '';
         }
 
         try {
             $meta = $this->getMetadata($type, $entity);
-            if ($meta === null) {
+            if (null === $meta) {
                 return '(unknown?)';
             }
         } catch (\UnexpectedValueException $e) {
             return ' <error>'.$e->getMessage().'</error>';
         }
 
-        if ($type === 'globals') {
+        if ('globals' === $type) {
             if (is_object($meta)) {
                 return ' = object('.get_class($meta).')';
             }
 
             return ' = '.substr(@json_encode($meta), 0, 50);
         }
 
-        if ($type === 'functions') {
+        if ('functions' === $type) {
             return '('.implode(', ', $meta).')';
         }
 
-        if ($type === 'filters') {
+        if ('filters' === $type) {
             return $meta ? '('.implode(', ', $meta).')' : '';
         }
     }

src/Symfony/Bridge/Twig/Command/LintCommand.php

@@ -201,7 +201,7 @@ private function displayTxt(OutputInterface $output, SymfonyStyle $io, $filesInf
             }
         }
 
-        if ($errors === 0) {
+        if (0 === $errors) {
             $io->success(sprintf('All %d Twig files contain valid syntax.', count($filesInfo)));
         } else {
             $io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', count($filesInfo) - $errors, $errors));

src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php

@@ -48,7 +48,7 @@ public function getTokenParsers()
              * Some stuff which will be recorded on the timeline
              * {% endstopwatch %}
              */
-            new StopwatchTokenParser($this->stopwatch !== null && $this->enabled),
+            new StopwatchTokenParser(null !== $this->stopwatch && $this->enabled),
         );
     }
 

src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php

@@ -62,7 +62,7 @@ protected function renderForm(FormView $view, array $vars = array())
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }
 

src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php

@@ -82,7 +82,7 @@ protected function renderForm(FormView $view, array $vars = array())
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        if ($label !== null) {
+        if (null !== $label) {
             $vars += array('label' => $label);
         }