Merge branch 'php8'

vim-php · Jan 2, 2021 · cf1d4fe · cf1d4fe
2 parents 06d948c + a3a3063
commit cf1d4fe
Show file tree

Hide file tree

Showing 5 changed files with 1,598 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 .test_fs
 build/
 vendor/
-composer.lock
diff --git a/PHPCtags.class.php b/PHPCtags.class.php
@@ -5,7 +5,7 @@
 
 class PHPCtags
 {
-    const VERSION = '0.8.1';
+    const VERSION = '0.9.0';
 
     private $mFile;
 
@@ -323,14 +323,16 @@ private function render($structure)
             if (in_array('s', $this->mOptions['fields']) && !empty($struct['scope'])) {
                 // $scope, $type, $name are current scope variables
                 $scope = array_pop($struct['scope']);
-                list($type, $name) = each($scope);
+                $type = key($scope);
+                $name = current($scope);
                 switch ($type) {
                     case 'class':
                         // n_* stuffs are namespace related scope variables
                         // current > class > namespace
                         $n_scope = array_pop($struct['scope']);
                         if(!empty($n_scope)) {
-                            list($n_type, $n_name) = each($n_scope);
+                            $n_type = key($n_scope);
+                            $n_name = current($n_scope);
                             $s_str = 'class:' . $n_name . '\\' . $name;
                         } else {
                             $s_str = 'class:' . $name;
@@ -340,10 +342,12 @@ private function render($structure)
                         // c_* stuffs are class related scope variables
                         // current > method > class > namespace
                         $c_scope = array_pop($struct['scope']);
-                        list($c_type, $c_name) = each($c_scope);
+                        $c_type = key($c_scope);
+                        $c_name = current($c_scope);
                         $n_scope = array_pop($struct['scope']);
                         if(!empty($n_scope)) {
-                            list($n_type, $n_name) = each($n_scope);
+                            $n_type = key($n_scope);
+                            $n_name = current($n_scope);
                             $s_str = 'method:' . $n_name . '\\' . $c_name . '::' . $name;
                         } else {
                             $s_str = 'method:' . $c_name . '::' . $name;

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "type": "library",
     "require": {
         "php": ">=7.0",
-        "nikic/php-parser": "^4.5"
+        "nikic/php-parser": "^4.10"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5"