Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CS #3912

Closed
wants to merge 1 commit into from
Closed

Fix CS #3912

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ExpressionParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ public function parseArguments($namedArguments = false, $definition = false, $al
$name = null;
if ($namedArguments && $token = $stream->nextIf(/* Token::OPERATOR_TYPE */ 8, '=')) {
if (!$value instanceof NameExpression) {
throw new SyntaxError(sprintf('A parameter name must be a string, "%s" given.', \get_class($value)), $token->getLine(), $stream->getSourceContext());
throw new SyntaxError(sprintf('A parameter name must be a string, "%s" given.', $value::class), $token->getLine(), $stream->getSourceContext());
}
$name = $value->getAttribute('name');

Expand Down
8 changes: 4 additions & 4 deletions src/ExtensionSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function getLastModified(): int

public function addExtension(ExtensionInterface $extension): void
{
$class = \get_class($extension);
$class = $extension::class;

if ($this->initialized) {
throw new \LogicException(sprintf('Unable to register extension "%s" as extensions have already been initialized.', $class));
Expand Down Expand Up @@ -330,7 +330,7 @@ public function getGlobals(): array

$extGlobals = $extension->getGlobals();
if (!\is_array($extGlobals)) {
throw new \UnexpectedValueException(sprintf('"%s::getGlobals()" must return an array of globals.', \get_class($extension)));
throw new \UnexpectedValueException(sprintf('"%s::getGlobals()" must return an array of globals.', $extension::class));
}

$globals = array_merge($globals, $extGlobals);
Expand Down Expand Up @@ -466,11 +466,11 @@ private function initExtension(ExtensionInterface $extension): void
// operators
if ($operators = $extension->getOperators()) {
if (!\is_array($operators)) {
throw new \InvalidArgumentException(sprintf('"%s::getOperators()" must return an array with operators, got "%s".', \get_class($extension), \is_object($operators) ? \get_class($operators) : \gettype($operators).(\is_resource($operators) ? '' : '#'.$operators)));
throw new \InvalidArgumentException(sprintf('"%s::getOperators()" must return an array with operators, got "%s".', $extension::class, \is_object($operators) ? $operators::class : \gettype($operators).(\is_resource($operators) ? '' : '#'.$operators)));
}

if (2 !== \count($operators)) {
throw new \InvalidArgumentException(sprintf('"%s::getOperators()" must return an array of 2 elements, got %d.', \get_class($extension), \count($operators)));
throw new \InvalidArgumentException(sprintf('"%s::getOperators()" must return an array of 2 elements, got %d.', $extension::class, \count($operators)));
}

$this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
Expand Down
4 changes: 2 additions & 2 deletions src/Loader/ChainLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function getCacheKey(string $name): string
try {
return $loader->getCacheKey($name);
} catch (LoaderError $e) {
$exceptions[] = \get_class($loader).': '.$e->getMessage();
$exceptions[] = $loader::class.': '.$e->getMessage();
}
}

Expand All @@ -110,7 +110,7 @@ public function isFresh(string $name, int $time): bool
try {
return $loader->isFresh($name, $time);
} catch (LoaderError $e) {
$exceptions[] = \get_class($loader).': '.$e->getMessage();
$exceptions[] = $loader::class.': '.$e->getMessage();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Node/Node.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function __construct(array $nodes = [], array $attributes = [], int $line
{
foreach ($nodes as $name => $node) {
if (!$node instanceof self) {
throw new \InvalidArgumentException(sprintf('Using "%s" for the value of node "%s" of "%s" is not supported. You must pass a \Twig\Node\Node instance.', \is_object($node) ? \get_class($node) : (null === $node ? 'null' : \gettype($node)), $name, static::class));
throw new \InvalidArgumentException(sprintf('Using "%s" for the value of node "%s" of "%s" is not supported. You must pass a \Twig\Node\Node instance.', \is_object($node) ? $node::class : (null === $node ? 'null' : \gettype($node)), $name, static::class));
}
}
$this->nodes = $nodes;
Expand Down
2 changes: 1 addition & 1 deletion src/NodeVisitor/EscaperNodeVisitor.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private function escapePrintNode(PrintNode $node, Environment $env, string $type
return $node;
}

$class = \get_class($node);
$class = $node::class;

return new $class($this->getEscaperFilter($type, $expression), $node->getTemplateLine());
}
Expand Down
2 changes: 1 addition & 1 deletion src/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ private function filterBodyNodes(Node $node, bool $nested = false): ?Node

// here, $nested means "being at the root level of a child template"
// we need to discard the wrapping "Node" for the "body" node
$nested = $nested || Node::class !== \get_class($node);
$nested = $nested || Node::class !== $node::class;
foreach ($node as $k => $n) {
if (null !== $n && null === $this->filterBodyNodes($n, $nested)) {
$node->removeNode($k);
Expand Down
4 changes: 2 additions & 2 deletions src/Sandbox/SecurityPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function checkMethodAllowed($obj, $method): void
}

if (!$allowed) {
$class = \get_class($obj);
$class = $obj::class;
throw new SecurityNotAllowedMethodError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, $class), $class, $method);
}
}
Expand All @@ -117,7 +117,7 @@ public function checkPropertyAllowed($obj, $property): void
}

if (!$allowed) {
$class = \get_class($obj);
$class = $obj::class;
throw new SecurityNotAllowedPropertyError(sprintf('Calling "%s" property on a "%s" object is not allowed.', $property, $class), $class, $property);
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/Test/IntegrationTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
} catch (\Exception $e) {
if (false !== $exception) {
$message = $e->getMessage();
$this->assertSame(trim($exception), trim(sprintf('%s: %s', \get_class($e), $message)));
$this->assertSame(trim($exception), trim(sprintf('%s: %s', $e::class, $message)));
$last = substr($message, \strlen($message) - 1);
$this->assertTrue('.' === $last || '?' === $last, 'Exception message must end with a dot or a question mark.');

return;
}

throw new Error(sprintf('%s: %s', \get_class($e), $e->getMessage()), -1, null, $e);
throw new Error(sprintf('%s: %s', $e::class, $e->getMessage()), -1, null, $e);
} finally {
restore_error_handler();
}
Expand All @@ -223,14 +223,14 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
$output = trim($template->render(eval($match[1].';')), "\n ");
} catch (\Exception $e) {
if (false !== $exception) {
$this->assertSame(trim($exception), trim(sprintf('%s: %s', \get_class($e), $e->getMessage())));
$this->assertSame(trim($exception), trim(sprintf('%s: %s', $e::class, $e->getMessage())));

return;
}

$e = new Error(sprintf('%s: %s', \get_class($e), $e->getMessage()), -1, null, $e);
$e = new Error(sprintf('%s: %s', $e::class, $e->getMessage()), -1, null, $e);

$output = trim(sprintf('%s: %s', \get_class($e), $e->getMessage()));
$output = trim(sprintf('%s: %s', $e::class, $e->getMessage()));
}

if (false !== $exception) {
Expand Down
2 changes: 1 addition & 1 deletion tests/EnvironmentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public function testAddMockExtension()
$twig = new Environment($loader);
$twig->addExtension($extension);

$this->assertInstanceOf(ExtensionInterface::class, $twig->getExtension(\get_class($extension)));
$this->assertInstanceOf(ExtensionInterface::class, $twig->getExtension($extension::class));
$this->assertTrue($twig->isTemplateFresh('page', time()));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Extension/SandboxTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ public function testMultipleClassMatchesViaInheritanceInAllowedMethods()
$twig_parent_first->load('1_childobj_childmethod')->render(self::$params);
} catch (SecurityError $e) {
$this->fail('checkMethodAllowed is exiting prematurely after matching a parent class and not seeing a method allowed on a child class later in the list');
}
}

try {
$twig_child_first->load('1_childobj_parentmethod')->render(self::$params);
Expand Down
2 changes: 1 addition & 1 deletion tests/IntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public function br()

public function is_multi_word($value)
{
return false !== strpos($value, ' ');
return str_contains($value, ' ');
}

public function __call($method, $arguments)
Expand Down
2 changes: 1 addition & 1 deletion tests/Node/Expression/FilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected function foobar()

// from extension
$node = $this->createFilter($string, 'foo');
$tests[] = [$node, sprintf('$this->extensions[\'%s\']->foo("abc")', \get_class($extension)), $environment];
$tests[] = [$node, sprintf('$this->extensions[\'%s\']->foo("abc")', $extension::class), $environment];

$node = $this->createFilter($string, 'foobar');
$tests[] = [$node, '$this->env->getFilter(\'foobar\')->getCallable()("abc")', $environment];
Expand Down
Loading