Merge pull request #11 from adamwojs/php_8_support

Added support for PHP8
adamwojs · Mar 3, 2021 · 023af49 · 023af49
2 parents d1a236a + 04a993a
commit 023af49
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^7.1||^8.0",
     "friendsofphp/php-cs-fixer": "^2.7"
   },
   "autoload": {

diff --git a/src/Analyzer/NamespaceAnalyzer.php b/src/Analyzer/NamespaceAnalyzer.php
@@ -38,7 +38,10 @@ public function getNamespaces(): array
             ];
         }
 
-        $this->tokens->rewind();
+        if (\PHP_VERSION_ID < 80000) {
+            $this->tokens->rewind();
+        }
+
         foreach ($this->tokens as $index => $token) {
             if (!$token->isGivenKind(T_NAMESPACE)) {
                 continue;

diff --git a/src/Fixer/Phpdoc/ForceFQCNFixer.php b/src/Fixer/Phpdoc/ForceFQCNFixer.php
@@ -57,7 +57,9 @@ public function fix(SplFileInfo $file, Tokens $tokens): void
     {
         $namespaces = (new NamespaceAnalyzer($tokens))->getNamespaces();
 
-        $tokens->rewind();
+        if (\PHP_VERSION_ID < 80000) {
+            $tokens->rewind();
+        }
 
         foreach ($tokens as $index => $token) {
             if ($token->isGivenKind(T_DOC_COMMENT)) {