diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.4

Browse Source 
* 3.4:
  Fix CS
This commit is contained in:
Fabien Potencier 2020-02-04 10:01:01 +01:00
commit 3ee39e7468
29 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View File

@ -1620,7 +1620,7 @@ abstract class FrameworkExtensionTest extends TestCase
protected function createContainerFromFile($file, $data = [], $resetCompilerPasses = true, $compile = true)
{
$cacheKey = md5(\get_class($this).$file.serialize($data));
$cacheKey = md5(static::class.$file.serialize($data));
if ($compile && isset(self::$containerCache[$cacheKey])) {
return self::$containerCache[$cacheKey];
}

2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php
View File

@ -69,6 +69,6 @@ abstract class AbstractWebTestCase extends BaseWebTestCase
protected static function getVarDir()
{
return 'FB'.substr(strrchr(\get_called_class(), '\\'), 1);
return 'FB'.substr(strrchr(static::class, '\\'), 1);
}
}

2
src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php
View File

@ -69,6 +69,6 @@ abstract class AbstractWebTestCase extends BaseWebTestCase
protected static function getVarDir()
{
return 'SB'.substr(strrchr(\get_called_class(), '\\'), 1);
return 'SB'.substr(strrchr(static::class, '\\'), 1);
}
}

4
src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
View File

@ -55,7 +55,7 @@ class ApcuAdapterTest extends AdapterTestCase
public function testVersion()
{
$namespace = str_replace('\\', '.', \get_class($this));
$namespace = str_replace('\\', '.', static::class);
$pool1 = new ApcuAdapter($namespace, 0, 'p1');
@ -80,7 +80,7 @@ class ApcuAdapterTest extends AdapterTestCase
public function testNamespace()
{
$namespace = str_replace('\\', '.', \get_class($this));
$namespace = str_replace('\\', '.', static::class);
$pool1 = new ApcuAdapter($namespace.'_1', 0, 'p1');

4
src/Symfony/Component/Console/Command/Command.php
View File

@ -55,7 +55,7 @@ class Command
*/
public static function getDefaultName()
{
$class = \get_called_class();
$class = static::class;
$r = new \ReflectionProperty($class, 'defaultName');
return $class === $r->class ? static::$defaultName : null;
@ -344,7 +344,7 @@ class Command
public function getDefinition()
{
if (null === $this->definition) {
throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', \get_class($this)));
throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', static::class));
}
return $this->definition;

2
src/Symfony/Component/CssSelector/Node/AbstractNode.php
View File

@ -31,7 +31,7 @@ abstract class AbstractNode implements NodeInterface
public function getNodeName(): string
{
if (null === $this->nodeName) {
$this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', \get_called_class());
$this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', static::class);
}
return $this->nodeName;

4
src/Symfony/Component/DependencyInjection/Extension/Extension.php
View File

@ -65,7 +65,7 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
*/
public function getAlias()
{
$className = \get_class($this);
$className = static::class;
if ('Extension' != substr($className, -9)) {
throw new BadMethodCallException('This extension does not follow the naming convention; you must overwrite the getAlias() method.');
}
@ -79,7 +79,7 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
*/
public function getConfiguration(array $config, ContainerBuilder $container)
{
$class = \get_class($this);
$class = static::class;
if (false !== strpos($class, "\0")) {
return null; // ignore anonymous classes

2
src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
View File

@ -31,7 +31,7 @@ abstract class AbstractConfigurator
return $this->{'set'.$method}(...$args);
}
throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', \get_class($this), $method));
throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', static::class, $method));
}
/**

4
src/Symfony/Component/ExpressionLanguage/Node/Node.php
View File

@ -43,7 +43,7 @@ class Node
$attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
}
$repr = [str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', \get_class($this)).'('.implode(', ', $attributes)];
$repr = [str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', static::class).'('.implode(', ', $attributes)];
if (\count($this->nodes)) {
foreach ($this->nodes as $node) {
@ -79,7 +79,7 @@ class Node
public function toArray()
{
throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', \get_class($this)));
throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', static::class));
}
public function dump()

2
src/Symfony/Component/Form/AbstractType.php
View File

@ -52,7 +52,7 @@ abstract class AbstractType implements FormTypeInterface
*/
public function getBlockPrefix()
{
return StringUtil::fqcnToBlockPrefix(\get_class($this)) ?: '';
return StringUtil::fqcnToBlockPrefix(static::class) ?: '';
}
/**

2
src/Symfony/Component/HttpFoundation/RedirectResponse.php
View File

@ -47,7 +47,7 @@ class RedirectResponse extends Response
throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
}
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, CASE_LOWER))) {
$this->headers->remove('cache-control');
}
}

2
src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
View File

@ -121,7 +121,7 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
{
if (!headers_sent() && filter_var(ini_get('session.use_cookies'), FILTER_VALIDATE_BOOLEAN)) {
if (!$this->sessionName) {
throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', \get_class($this)));
throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
}
$cookie = SessionUtils::popSessionCookie($this->sessionName, $sessionId);

8
src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
View File

@ -139,7 +139,7 @@ class NativeSessionStorage implements SessionStorageInterface
return true;
}
if (\PHP_SESSION_ACTIVE === session_status()) {
if (PHP_SESSION_ACTIVE === session_status()) {
throw new \RuntimeException('Failed to start the session: already started by PHP.');
}
@ -202,7 +202,7 @@ class NativeSessionStorage implements SessionStorageInterface
public function regenerate($destroy = false, $lifetime = null)
{
// Cannot regenerate the session ID for non-active sessions.
if (\PHP_SESSION_ACTIVE !== session_status()) {
if (PHP_SESSION_ACTIVE !== session_status()) {
return false;
}
@ -362,7 +362,7 @@ class NativeSessionStorage implements SessionStorageInterface
*/
public function setOptions(array $options)
{
if (headers_sent() || \PHP_SESSION_ACTIVE === session_status()) {
if (headers_sent() || PHP_SESSION_ACTIVE === session_status()) {
return;
}
@ -427,7 +427,7 @@ class NativeSessionStorage implements SessionStorageInterface
}
$this->saveHandler = $saveHandler;
if (headers_sent() || \PHP_SESSION_ACTIVE === session_status()) {
if (headers_sent() || PHP_SESSION_ACTIVE === session_status()) {
return;
}

2
src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
View File

@ -65,7 +65,7 @@ abstract class AbstractProxy
*/
public function isActive()
{
return \PHP_SESSION_ACTIVE === session_status();
return PHP_SESSION_ACTIVE === session_status();
}
/**

2
src/Symfony/Component/HttpKernel/Log/Logger.php
View File

@ -101,6 +101,6 @@ class Logger extends AbstractLogger
$message = strtr($message, $replacements);
}
return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).\PHP_EOL;
return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).PHP_EOL;
}
}

2
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
View File

@ -99,7 +99,7 @@ class RequestDataCollectorTest extends TestCase
'"Regular" callable',
[$this, 'testControllerInspection'],
[
'class' => RequestDataCollectorTest::class,
'class' => self::class,
'method' => 'testControllerInspection',
'file' => __FILE__,
'line' => $r1->getStartLine(),

2
src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
View File

@ -186,7 +186,7 @@ class LoggerTest extends TestCase
public function testFormatter()
{
$this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) {
return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).\PHP_EOL;
return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).PHP_EOL;
});
$this->logger->error('An error', ['foo' => 'bar']);

6
src/Symfony/Component/Intl/Collator/Collator.php
View File

@ -109,9 +109,9 @@ abstract class Collator
public function asort(&$array, $sortFlag = self::SORT_REGULAR)
{
$intlToPlainFlagMap = [
self::SORT_REGULAR => \SORT_REGULAR,
self::SORT_NUMERIC => \SORT_NUMERIC,
self::SORT_STRING => \SORT_STRING,
self::SORT_REGULAR => SORT_REGULAR,
self::SORT_NUMERIC => SORT_NUMERIC,
self::SORT_STRING => SORT_STRING,
];
$plainSortFlag = isset($intlToPlainFlagMap[$sortFlag]) ? $intlToPlainFlagMap[$sortFlag] : self::SORT_REGULAR;

10
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
View File

@ -201,9 +201,9 @@ abstract class NumberFormatter
* @see https://php.net/round
*/
private static $phpRoundingMap = [
self::ROUND_HALFDOWN => \PHP_ROUND_HALF_DOWN,
self::ROUND_HALFEVEN => \PHP_ROUND_HALF_EVEN,
self::ROUND_HALFUP => \PHP_ROUND_HALF_UP,
self::ROUND_HALFDOWN => PHP_ROUND_HALF_DOWN,
self::ROUND_HALFEVEN => PHP_ROUND_HALF_EVEN,
self::ROUND_HALFUP => PHP_ROUND_HALF_UP,
];
/**
@ -357,7 +357,7 @@ abstract class NumberFormatter
// The original NumberFormatter does not support this format type
if (self::TYPE_CURRENCY === $type) {
trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
trigger_error(__METHOD__.'(): Unsupported format type '.$type, E_USER_WARNING);
return false;
}
@ -513,7 +513,7 @@ abstract class NumberFormatter
$type = (int) $type;
if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
trigger_error(__METHOD__.'(): Unsupported format type '.$type, E_USER_WARNING);
return false;
}

10
src/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
View File

@ -29,15 +29,15 @@ while ($read || $write) {
$n = stream_select($r, $w, $e, 5);
if (false === $n) {
die(ERR_SELECT_FAILED);
exit(ERR_SELECT_FAILED);
} elseif ($n < 1) {
die(ERR_TIMEOUT);
exit(ERR_TIMEOUT);
}
if (in_array(STDOUT, $w) && strlen($out) > 0) {
$written = fwrite(STDOUT, (string) $out, 32768);
if (false === $written) {
die(ERR_WRITE_FAILED);
exit(ERR_WRITE_FAILED);
}
$out = (string) substr($out, $written);
}
@ -48,7 +48,7 @@ while ($read || $write) {
if (in_array(STDERR, $w) && strlen($err) > 0) {
$written = fwrite(STDERR, (string) $err, 32768);
if (false === $written) {
die(ERR_WRITE_FAILED);
exit(ERR_WRITE_FAILED);
}
$err = (string) substr($err, $written);
}
@ -65,7 +65,7 @@ while ($read || $write) {
if (false === $str || feof(STDIN)) {
$read = null;
if (!feof(STDIN)) {
die(ERR_READ_FAILED);
exit(ERR_READ_FAILED);
}
}
}

2
src/Symfony/Component/Routing/Annotation/Route.php
View File

@ -74,7 +74,7 @@ class Route
foreach ($data as $key => $value) {
$method = 'set'.str_replace('_', '', $key);
if (!method_exists($this, $method)) {
throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, \get_class($this)));
throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, static::class));
}
$this->$method($value);
}

2
src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
View File

@ -288,7 +288,7 @@ abstract class AbstractToken implements TokenInterface
*/
public function __toString()
{
$class = \get_class($this);
$class = static::class;
$class = substr($class, strrpos($class, '\\') + 1);
$roles = [];

8
src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php
View File

@ -51,7 +51,7 @@ class Argon2iPasswordEncoder extends BasePasswordEncoder implements SelfSaltingE
return true;
}
return version_compare(\extension_loaded('sodium') ? \SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');
return version_compare(\extension_loaded('sodium') ? SODIUM_LIBRARY_VERSION : phpversion('libsodium'), '1.0.9', '>=');
}
/**
@ -104,15 +104,15 @@ class Argon2iPasswordEncoder extends BasePasswordEncoder implements SelfSaltingE
private function encodePasswordNative(string $raw): string
{
return password_hash($raw, \PASSWORD_ARGON2I, $this->config);
return password_hash($raw, PASSWORD_ARGON2I, $this->config);
}
private function encodePasswordSodiumFunction(string $raw): string
{
$hash = sodium_crypto_pwhash_str(
$raw,
\SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
\SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
);
sodium_memzero($raw);

4
src/Symfony/Component/Serializer/Annotation/Groups.php
View File

@ -34,13 +34,13 @@ class Groups
public function __construct(array $data)
{
if (!isset($data['value']) || !$data['value']) {
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', \get_class($this)));
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', static::class));
}
$value = (array) $data['value'];
foreach ($value as $group) {
if (!\is_string($group)) {
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string or an array of strings.', \get_class($this)));
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string or an array of strings.', static::class));
}
}

4
src/Symfony/Component/Serializer/Annotation/MaxDepth.php
View File

@ -31,11 +31,11 @@ class MaxDepth
public function __construct(array $data)
{
if (!isset($data['value'])) {
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', \get_class($this)));
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', static::class));
}
if (!\is_int($data['value']) || $data['value'] <= 0) {
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a positive integer.', \get_class($this)));
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a positive integer.', static::class));
}
$this->maxDepth = $data['value'];

16
src/Symfony/Component/Validator/Constraint.php
View File

@ -70,7 +70,7 @@ abstract class Constraint
public static function getErrorName($errorCode)
{
if (!isset(static::$errorNames[$errorCode])) {
throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, \get_called_class()));
throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, static::class));
}
return static::$errorNames[$errorCode];
@ -115,7 +115,7 @@ abstract class Constraint
if (\is_array($options) && isset($options['value']) && !property_exists($this, 'value')) {
if (null === $defaultOption) {
throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));
throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));
}
$options[$defaultOption] = $options['value'];
@ -136,7 +136,7 @@ abstract class Constraint
}
} elseif (null !== $options && !(\is_array($options) && 0 === \count($options))) {
if (null === $defaultOption) {
throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));
throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));
}
if (\array_key_exists($defaultOption, $knownOptions)) {
@ -148,11 +148,11 @@ abstract class Constraint
}
if (\count($invalidOptions) > 0) {
throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), \get_class($this)), $invalidOptions);
throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), static::class), $invalidOptions);
}
if (\count($missingOptions) > 0) {
throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), \get_class($this)), array_keys($missingOptions));
throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), static::class), array_keys($missingOptions));
}
}
@ -176,7 +176,7 @@ abstract class Constraint
return;
}
throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);
throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);
}
/**
@ -202,7 +202,7 @@ abstract class Constraint
return $this->groups;
}
throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);
throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);
}
/**
@ -266,7 +266,7 @@ abstract class Constraint
*/
public function validatedBy()
{
return \get_class($this).'Validator';
return static::class.'Validator';
}
/**

4
src/Symfony/Component/Validator/Constraints/AbstractComparison.php
View File

@ -39,11 +39,11 @@ abstract class AbstractComparison extends Constraint
if (\is_array($options)) {
if (!isset($options['value']) && !isset($options['propertyPath'])) {
throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', \get_class($this)));
throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', static::class));
}
if (isset($options['value']) && isset($options['propertyPath'])) {
throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', \get_class($this)));
throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', static::class));
}
if (isset($options['propertyPath']) && !class_exists(PropertyAccess::class)) {

6
src/Symfony/Component/Validator/Constraints/Composite.php
View File

@ -71,11 +71,11 @@ abstract class Composite extends Constraint
$constraint = \get_class($constraint);
}
throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, \get_class($this)));
throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, static::class));
}
if ($constraint instanceof Valid) {
throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', \get_class($this)));
throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', static::class));
}
}
@ -99,7 +99,7 @@ abstract class Composite extends Constraint
$excessGroups = array_diff($constraint->groups, $this->groups);
if (\count($excessGroups) > 0) {
throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s', implode('", "', $excessGroups), \get_class($constraint), \get_class($this)));
throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s', implode('", "', $excessGroups), \get_class($constraint), static::class));
}
} else {
$constraint->groups = $this->groups;

2
src/Symfony/Component/VarDumper/Cloner/Stub.php
View File

@ -48,7 +48,7 @@ class Stub
{
$properties = [];
if (!isset(self::$defaultProperties[$c = \get_class($this)])) {
if (!isset(self::$defaultProperties[$c = static::class])) {
self::$defaultProperties[$c] = get_class_vars($c);
foreach ((new \ReflectionClass($c))->getStaticProperties() as $k => $v) {