PHP8 support (#29)

* PHP8 support * Align assignments
kadet1090 · Oct 24, 2020 · c6e0096 · c6e0096
1 parent a43b647
commit c6e0096
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Parser/Rules.php b/Parser/Rules.php
@@ -192,7 +192,7 @@ public function all()
             return [];
         }
 
-        return call_user_func_array('array_merge', $items);
+        return call_user_func_array('array_merge', array_values($items));
     }
 
     /**

diff --git a/Parser/Token/Token.php b/Parser/Token/Token.php
@@ -69,7 +69,7 @@ public function __construct($name = null, array $options = [])
 
         $this->name     = $name;
         $this->rule     = isset($options['rule']) ? $options['rule'] : new Rule();
-        $this->options &= $options;
+        $this->options  = $options;
 
         $this->id = ++self::$_id;
     }

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     }
   ],
   "require": {
-    "php": "^7.1.3"
+    "php": "^7.1.3 | ^8.0"
   },
   "require-dev": {
     "ext-json": "*",