Merge branch '3.3' into 3.4
* 3.3: CS: recover no_break_comment [DI] Fix non-instantiables auto-discovery
This commit is contained in:
commit
40a3466268
@ -9,7 +9,6 @@ return PhpCsFixer\Config::create()
|
|||||||
'@Symfony' => true,
|
'@Symfony' => true,
|
||||||
'@Symfony:risky' => true,
|
'@Symfony:risky' => true,
|
||||||
'array_syntax' => array('syntax' => 'long'),
|
'array_syntax' => array('syntax' => 'long'),
|
||||||
'no_break_comment' => false,
|
|
||||||
'protected_to_private' => false,
|
'protected_to_private' => false,
|
||||||
))
|
))
|
||||||
->setRiskyAllowed(true)
|
->setRiskyAllowed(true)
|
||||||
|
@ -133,7 +133,7 @@ abstract class FileLoader extends BaseFileLoader
|
|||||||
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));
|
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;
|
$classes[] = $class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -62,8 +62,11 @@ class ServerParams
|
|||||||
|
|
||||||
switch (substr($iniMax, -1)) {
|
switch (substr($iniMax, -1)) {
|
||||||
case 't': $max *= 1024;
|
case 't': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'g': $max *= 1024;
|
case 'g': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'm': $max *= 1024;
|
case 'm': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'k': $max *= 1024;
|
case 'k': $max *= 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -259,8 +259,11 @@ class UploadedFile extends File
|
|||||||
|
|
||||||
switch (substr($iniMax, -1)) {
|
switch (substr($iniMax, -1)) {
|
||||||
case 't': $max *= 1024;
|
case 't': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'g': $max *= 1024;
|
case 'g': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'm': $max *= 1024;
|
case 'm': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'k': $max *= 1024;
|
case 'k': $max *= 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,8 +99,11 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
|
|||||||
|
|
||||||
switch (substr($memoryLimit, -1)) {
|
switch (substr($memoryLimit, -1)) {
|
||||||
case 't': $max *= 1024;
|
case 't': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'g': $max *= 1024;
|
case 'g': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'm': $max *= 1024;
|
case 'm': $max *= 1024;
|
||||||
|
// no break
|
||||||
case 'k': $max *= 1024;
|
case 'k': $max *= 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -349,7 +349,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
|
|||||||
$item = clone $item;
|
$item = clone $item;
|
||||||
$item->type = $item->class;
|
$item->type = $item->class;
|
||||||
$item->class = $item->value;
|
$item->class = $item->value;
|
||||||
// No break;
|
// no break
|
||||||
case Stub::TYPE_OBJECT:
|
case Stub::TYPE_OBJECT:
|
||||||
case Stub::TYPE_RESOURCE:
|
case Stub::TYPE_RESOURCE:
|
||||||
$withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;
|
$withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;
|
||||||
|
@ -336,6 +336,7 @@ class CliDumper extends AbstractDumper
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$style = 'index';
|
$style = 'index';
|
||||||
|
// no break
|
||||||
case Cursor::HASH_ASSOC:
|
case Cursor::HASH_ASSOC:
|
||||||
if (is_int($key)) {
|
if (is_int($key)) {
|
||||||
$this->line .= $this->style($style, $key).' => ';
|
$this->line .= $this->style($style, $key).' => ';
|
||||||
@ -346,7 +347,7 @@ class CliDumper extends AbstractDumper
|
|||||||
|
|
||||||
case Cursor::HASH_RESOURCE:
|
case Cursor::HASH_RESOURCE:
|
||||||
$key = "\0~\0".$key;
|
$key = "\0~\0".$key;
|
||||||
// No break;
|
// no break
|
||||||
case Cursor::HASH_OBJECT:
|
case Cursor::HASH_OBJECT:
|
||||||
if (!isset($key[0]) || "\0" !== $key[0]) {
|
if (!isset($key[0]) || "\0" !== $key[0]) {
|
||||||
$this->line .= '+'.$bin.$this->style('public', $key).': ';
|
$this->line .= '+'.$bin.$this->style('public', $key).': ';
|
||||||
|
Reference in New Issue
Block a user