8000 Merge branch '2.7' into 2.8 · iamluc/symfony@6edfa4b · GitHub
[go: up one dir, main page]
Skip to content

Commit 6edfa4b

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: CS: recover no_break_comment
2 parents 6f92475 + b973ecf commit 6edfa4b

File tree

7 files changed

+13
-3
lines changed

7 files changed

+13
-3
lines changed

‎.php_cs.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ return PhpCsFixer\Config::create()
99
'@Symfony' => true,
1010
'@Symfony:risky' => true,
1111
'array_syntax' => array('syntax' => 'long'),
12-
'no_break_comment' => false,
1312
'protected_to_private' => false,
1413
))
1514
->setRiskyAllowed(true)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,11 @@ public function getPostMaxSize()
6262

6363
switch (substr($iniMax, -1)) {
6464
case 't': $max *= 1024;
65+
// no break
6566
case 'g': $max *= 1024;
67+
// no break
6668
case 'm': $max *= 1024;
69+
// no break
6770
case 'k': $max *= 1024;
6871
}
6972

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,11 @@ public static function getMaxFilesize()
259259

260260
switch (substr($iniMax, -1)) {
261261
case 't': $max *= 1024;
262+
// no break
262263
case 'g': $max *= 1024;
264+
// no break
263265
case 'm': $max *= 1024;
266+
// no break
264267
case 'k': $max *= 1024;
265268
}
266269

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,11 @@ private function convertToBytes($memoryLimit)
9999

100100
switch (substr($memoryLimit, -1)) {
101101
case 't': $max *= 1024;
102+
// no break
102103
case 'g': $max *= 1024;
104+
// no break
103105
case 'm': $max *= 1024;
106+
// no break
104107
case 'k': $max *= 1024;
105108
}
106109

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private function dumpItem($dumper, $cursor, &$refs, $item)
179179
$item = clone $item;
180180
$item->type = $item->class;
181181
$item->class = $item->value;
182-
// No break;
182+
// no break
183183
case Stub::TYPE_OBJECT:
184184
case Stub::TYPE_RESOURCE:
185185
$withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ protected function dumpKey(Cursor $cursor)
315315
default:
316316
case Cursor::HASH_INDEXED:
317317
$style = 'index';
318+
// no break
318319
case Cursor::HASH_ASSOC:
319320
if (is_int($key)) {
320321
$this->line .= $this->style($style, $key).' => ';
@@ -325,7 +326,7 @@ protected function dumpKey(Cursor $cursor)
325326

326327
case Cursor::HASH_RESOURCE:
327328
$key = "\0~\0".$key;
328-
// No break;
329+
// no break
329330
case Cursor::HASH_OBJECT:
330331
if (!isset($key[0]) || "\0" !== $key[0]) {
331332
$this->line .= '+'.$bin.$this->style('public', $key).': ';

‎src/Symfony/Component/Yaml/Inline.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@ private static function evaluateScalar($scalar, $references = array())
547547

548548
return $time;
549549
}
550+
// no break
550551
default:
551552
return (string) $scalar;
552553
}

0 commit comments

Comments
 (0)
0