Use ::class instead of get_class()

twigphp · Oct 22, 2023 · 70e830e · 70e830e
1 parent c44aa28
commit 70e830e
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/src/ExpressionParser.php b/src/ExpressionParser.php
@@ -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');
 

diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
@@ -529,7 +529,7 @@ function twig_date_converter(Environment $env, $date = null, $timezone = null)
 function twig_replace_filter($str, $from)
 {
     if (!is_iterable($from)) {
-        throw new RuntimeError(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".', \is_object($from) ? \get_class($from) : \gettype($from)));
+        throw new RuntimeError(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".', \is_object($from) ? $from::class : \gettype($from)));
     }
 
     return strtr($str ?? '', twig_to_array($from));
@@ -1384,10 +1384,10 @@ function twig_constant($constant, $object = null)
 {
     if (null !== $object) {
         if ('class' === $constant) {
-            return \get_class($object);
+            return $object::class;
         }
 
-        $constant = \get_class($object).'::'.$constant;
+        $constant = $object::class.'::'.$constant;
     }
 
     if (!\defined($constant)) {
@@ -1412,7 +1412,7 @@ function twig_constant_is_defined($constant, $object = null)
             return true;
         }
 
-        $constant = \get_class($object).'::'.$constant;
+        $constant = $object::class.'::'.$constant;
     }
 
     return \defined($constant);
@@ -1430,7 +1430,7 @@ function twig_constant_is_defined($constant, $object = null)
 function twig_array_batch($items, $size, $fill = null, $preserveKeys = true)
 {
     if (!is_iterable($items)) {
-        throw new RuntimeError(sprintf('The "batch" filter expects an array or "Traversable", got "%s".', \is_object($items) ? \get_class($items) : \gettype($items)));
+        throw new RuntimeError(sprintf('The "batch" filter expects an array or "Traversable", got "%s".', \is_object($items) ? $items::class : \gettype($items)));
     }
 
     $size = ceil($size);
@@ -1492,9 +1492,9 @@ function twig_get_attribute(Environment $env, Source $source, $object, $item, ar
             }
 
             if ($object instanceof ArrayAccess) {
-                $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist.', $arrayItem, \get_class($object));
+                $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist.', $arrayItem, $object::class);
             } elseif (\is_object($object)) {
-                $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, \get_class($object));
+                $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, $object::class);
             } elseif (\is_array($object)) {
                 if (empty($object)) {
                     $message = sprintf('Key "%s" does not exist as the array is empty.', $arrayItem);
@@ -1558,7 +1558,7 @@ function twig_get_attribute(Environment $env, Source $source, $object, $item, ar
 
     static $cache = [];
 
-    $class = \get_class($object);
+    $class = $object::class;
 
     // object method
     // precedence: getXxx() > isXxx() > hasXxx()
@@ -1674,7 +1674,7 @@ function twig_array_column($array, $name, $index = null): array
 function twig_array_filter(Environment $env, $array, $arrow)
 {
     if (!is_iterable($array)) {
-        throw new RuntimeError(sprintf('The "filter" filter expects an array or "Traversable", got "%s".', \is_object($array) ? \get_class($array) : \gettype($array)));
+        throw new RuntimeError(sprintf('The "filter" filter expects an array or "Traversable", got "%s".', \is_object($array) ? $array::class : \gettype($array)));
     }
 
     twig_check_arrow_in_sandbox($env, $arrow, 'filter', 'filter');

diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php
@@ -172,7 +172,7 @@ function twig_escape_filter(Environment $env, $string, $strategy = 'html', $char
     if (!\is_string($string)) {
         if (\is_object($string) && method_exists($string, '__toString')) {
             if ($autoescape) {
-                $c = \get_class($string);
+                $c = $string::class;
                 $ext = $env->getExtension(EscaperExtension::class);
                 if (!isset($ext->safeClasses[$c])) {
                     $ext->safeClasses[$c] = [];

diff --git a/src/ExtensionSet.php b/src/ExtensionSet.php
@@ -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));
@@ -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);
@@ -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]);

diff --git a/src/Loader/ChainLoader.php b/src/Loader/ChainLoader.php
@@ -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();
             }
         }
 
@@ -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();
             }
         }
 

diff --git a/src/Node/Node.php b/src/Node/Node.php
@@ -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;

diff --git a/src/NodeVisitor/EscaperNodeVisitor.php b/src/NodeVisitor/EscaperNodeVisitor.php
@@ -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());
     }

diff --git a/src/Parser.php b/src/Parser.php
@@ -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);

diff --git a/src/Sandbox/SecurityPolicy.php b/src/Sandbox/SecurityPolicy.php
@@ -102,7 +102,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);
         }
     }
@@ -119,7 +119,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);
         }
     }

diff --git a/src/Test/IntegrationTestCase.php b/src/Test/IntegrationTestCase.php
@@ -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();
             }
@@ -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) {

diff --git a/tests/EnvironmentTest.php b/tests/EnvironmentTest.php
@@ -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()));
     }
 

diff --git a/tests/Node/Expression/FilterTest.php b/tests/Node/Expression/FilterTest.php
@@ -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];