Apply class_keyword (#945)

kubawerlos · Jan 8, 2024 · b58e7a0 · b58e7a0
1 parent 2f5c03b
commit b58e7a0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -26,8 +26,6 @@
     }
 }
 
-unset($rules['class_keyword']); // temporary
-
 // PhpCsFixerCustomFixersDev\Fixer\OrderedClassElementsInternalFixer will handle this
 unset($rules['ordered_class_elements']);
 unset($rules['ordered_interfaces']);

diff --git a/src/Fixer/StringableInterfaceFixer.php b/src/Fixer/StringableInterfaceFixer.php
@@ -209,7 +209,7 @@ private function addStringableInterface(Tokens $tokens, int $classIndex): void
                     new Token([\T_IMPLEMENTS, 'implements']),
                     new Token([\T_WHITESPACE, ' ']),
                     new Token([\T_NS_SEPARATOR, '\\']),
-                    new Token([\T_STRING, 'Stringable']),
+                    new Token([\T_STRING, \Stringable::class]),
                 ],
             );
 
@@ -223,7 +223,7 @@ private function addStringableInterface(Tokens $tokens, int $classIndex): void
             $afterImplementsIndex,
             [
                 new Token([\T_NS_SEPARATOR, '\\']),
-                new Token([\T_STRING, 'Stringable']),
+                new Token([\T_STRING, \Stringable::class]),
                 new Token(','),
                 new Token([\T_WHITESPACE, ' ']),
             ],

diff --git a/tests/Fixer/StringableInterfaceFixerTest.php b/tests/Fixer/StringableInterfaceFixerTest.php
@@ -153,7 +153,7 @@ public function __toString() { return "Foo"; }
         ';
 
         $implementedInterfacesCases = [
-            'Stringable',
+            \Stringable::class,
             'Foo\Stringable',
             '\Foo\Stringable',
             'Foo\Stringable\Bar',

diff --git a/tests/autoload.php b/tests/autoload.php
@@ -11,7 +11,7 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-if (!interface_exists('PhpCsFixer\\Fixer\\FixerInterface')) {
+if (!interface_exists(PhpCsFixer\Fixer\FixerInterface::class)) {
     $phars = [
         __DIR__ . '/../vendor/php-cs-fixer/shim/php-cs-fixer.phar',
         __DIR__ . '/../vendor/php-cs-fixer/shim/php-cs-fixer',