From 4e9d1600eec7ee368df9b61cab69b672b1d27751 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Fri, 15 Sep 2017 12:36:22 +0200 Subject: [PATCH] CS: recover no_break_comment --- .php_cs.dist | 1 - src/Symfony/Component/Form/Util/ServerParams.php | 3 +++ src/Symfony/Component/HttpFoundation/File/UploadedFile.php | 3 +++ .../Component/HttpKernel/DataCollector/MemoryDataCollector.php | 3 +++ src/Symfony/Component/VarDumper/Cloner/Data.php | 2 +- src/Symfony/Component/VarDumper/Dumper/CliDumper.php | 3 ++- src/Symfony/Component/Yaml/Inline.php | 1 + 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.php_cs.dist b/.php_cs.dist index 624618ab80..f1a3691142 100644 --- a/.php_cs.dist +++ b/.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) diff --git a/src/Symfony/Component/Form/Util/ServerParams.php b/src/Symfony/Component/Form/Util/ServerParams.php index b9f5aaff55..fc5e9dd27a 100644 --- a/src/Symfony/Component/Form/Util/ServerParams.php +++ b/src/Symfony/Component/Form/Util/ServerParams.php @@ -62,8 +62,11 @@ class ServerParams 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; } diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php index d32ec176cc..9a2d28491a 100644 --- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -259,8 +259,11 @@ class UploadedFile extends File 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; } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php index 9385010844..b7f61f46fd 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php @@ -99,8 +99,11 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte 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; } diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php index cf21f0e4bc..9244a567e3 100644 --- a/src/Symfony/Component/VarDumper/Cloner/Data.php +++ b/src/Symfony/Component/VarDumper/Cloner/Data.php @@ -179,7 +179,7 @@ class Data $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; diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php index 822736abd5..107a2a438d 100644 --- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php @@ -317,6 +317,7 @@ class CliDumper extends AbstractDumper default: case Cursor::HASH_INDEXED: $style = 'index'; + // no break case Cursor::HASH_ASSOC: if (is_int($key)) { $this->line .= $this->style($style, $key).' => '; @@ -327,7 +328,7 @@ class CliDumper extends AbstractDumper 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).': '; diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 6d5ac1cd80..1dd9761e97 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -537,6 +537,7 @@ class Inline return $time; } + // no break default: return (string) $scalar; }