Merge branch '2.8' into 3.3

* 2.8:
  CS: recover no_break_comment
This commit is contained in:
Fabien Potencier 2017-09-15 10:08:21 -07:00
commit e48617b467
6 changed files with 12 additions and 3 deletions

View File

@ -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)

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -349,7 +349,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
$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;

View File

@ -328,6 +328,7 @@ class CliDumper extends AbstractDumper
break;
}
$style = 'index';
// no break
case Cursor::HASH_ASSOC:
if (is_int($key)) {
$this->line .= $this->style($style, $key).' => ';
@ -338,7 +339,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).': ';