Merge branch '3.3' into 3.4

* 3.3:
  CS: recover no_break_comment
  [DI] Fix non-instantiables auto-discovery

Author: fabpot

.php_cs.dist

@@ -9,7 +9,6 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
-        'no_break_comment' => false,
         'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)

src/Symfony/Component/DependencyInjection/Loader/FileLoader.php

@@ -133,7 +133,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
                 throw new InvalidArgumentException(sprintf('Expected to find class "%s" in file "%s" while importing services from resource "%s", but it was not found! Check the namespace prefix used with the resource.', $class, $path, $pattern));
             }
 
-            if (!$r->isInterface() && !$r->isTrait() && !$r->isAbstract()) {
+            if ($r->isInstantiable()) {
                 $classes[] = $class;
             }
         }

src/Symfony/Component/Form/Util/ServerParams.php

@@ -62,8 +62,11 @@ public function getPostMaxSize()
 
         switch (substr($iniMax, -1)) {
             case 't': $max *= 1024;
+            // no break
             case 'g': $max *= 1024;
+            // no break
             case 'm': $max *= 1024;
+            // no break
             case 'k': $max *= 1024;
         }
 

src/Symfony/Component/HttpFoundation/File/UploadedFile.php

@@ -259,8 +259,11 @@ public static function getMaxFilesize()
 
         switch (substr($iniMax, -1)) {
             case 't': $max *= 1024;
+            // no break
             case 'g': $max *= 1024;
+            // no break
             case 'm': $max *= 1024;
+            // no break
             case 'k': $max *= 1024;
         }
 

src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php

@@ -99,8 +99,11 @@ private function convertToBytes($memoryLimit)
 
         switch (substr($memoryLimit, -1)) {
             case 't': $max *= 1024;
+            // no break
             case 'g': $max *= 1024;
+            // no break
             case 'm': $max *= 1024;
+            // no break
             case 'k': $max *= 1024;
         }
 

src/Symfony/Component/VarDumper/Cloner/Data.php

@@ -349,7 +349,7 @@ private function dumpItem($dumper, $cursor, &$refs, $item)
                     $item = clone $item;
                     $item->type = $item->class;
                     $item->class = $item->value;
-                    // No break;
+                    // no break
                 case Stub::TYPE_OBJECT:
                 case Stub::TYPE_RESOURCE:
                     $withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;

src/Symfony/Component/VarDumper/Dumper/CliDumper.php

@@ -336,6 +336,7 @@ protected function dumpKey(Cursor $cursor)
                         break;
                     }
                     $style = 'index';
+                    // no break
                 case Cursor::HASH_ASSOC:
                     if (is_int($key)) {
                         $this->line .= $this->style($style, $key).' => ';
@@ -346,7 +347,7 @@ protected function dumpKey(Cursor $cursor)
 
                 case Cursor::HASH_RESOURCE:
                     $key = "\0~\0".$key;
-                    // No break;
+                    // no break
                 case Cursor::HASH_OBJECT:
                     if (!isset($key[0]) || "\0" !== $key[0]) {
                         $this->line .= '+'.$bin.$this->style('public', $key).': ';