Merge branch 'release/0.11.x'

Author: pprkut

.github/workflows/php-tests.yml

@@ -12,7 +12,7 @@ jobs:
       phpstan-level: 10
       allow-style-failures: false
       allow-phpstan-failures: false
-      codestyle-branch: '0.10.2'
+      codestyle-branch: '0.11.0'
       phpcs-whitelist: tests/phan.config.php tests/phpstan.autoload.inc.php tests/test.bootstrap.inc.php
       php-extensions: uopz
       stable-php-versions: '["8.1"]'

src/Lunr/Shadow/GetoptCliParser.php

@@ -112,14 +112,13 @@ protected function wrapArgument(bool|string|array $value): array
         {
             return [];
         }
-        elseif (is_array($value))
+
+        if (is_array($value))
         {
             return $value;
         }
-        else
-        {
-            return [ $value ];
-        }
+
+        return [ $value ];
     }
 
 }

src/Lunr/Shadow/LunrCliParser.php

@@ -120,10 +120,12 @@ public function parse(): array
 
         foreach ($this->args as $index => $arg)
         {
-            if (!in_array($arg, $this->checked) && $index != 0)
+            if (in_array($arg, $this->checked) || $index == 0)
             {
-                $this->isOpt($arg, $index, TRUE);
+                continue;
             }
+
+            $this->isOpt($arg, $index, TRUE);
         }
 
         return $this->ast;
@@ -183,12 +185,11 @@ private function isOpt(string $opt, int $index, bool $toplevel = FALSE): bool
             {
                 return $this->isValidLong(substr($param, 1), $index);
             }
-            else
-            {
-                return $this->isValidLong($opt, $index);
-            }
+
+            return $this->isValidLong($opt, $index);
         }
-        elseif ($toplevel)
+
+        if ($toplevel)
         {
             trigger_error('Superfluous argument: ' . $opt, E_USER_NOTICE);
         }
@@ -235,18 +236,20 @@ private function isValidLong(string $opt, int $index): bool
 
         foreach ($this->long as $key => $arg)
         {
-            if ($opt == substr($arg, 0, strlen($opt)))
+            if ($opt != substr($arg, 0, strlen($opt)))
             {
-                if (strlen($arg) == strlen($opt))
-                {
-                    $match = TRUE;
-                    $args  = $key;
-                }
-                elseif ($arg[strlen($opt)] == ':' || $arg[strlen($opt)] == ';')
-                {
-                    $match = TRUE;
-                    $args  = $key;
-                }
+                continue;
+            }
+
+            if (strlen($arg) == strlen($opt))
+            {
+                $match = TRUE;
+                $args  = $key;
+            }
+            elseif ($arg[strlen($opt)] == ':' || $arg[strlen($opt)] == ';')
+            {
+                $match = TRUE;
+                $args  = $key;
             }
         }
 
@@ -301,12 +304,11 @@ private function checkArgument(string $opt, int $index, int $pos, string $a): bo
                     {
                         return $this->checkArgument($opt, $next, $pos + 1, $a);
                     }
-                    else
-                    {
-                        return TRUE;
-                    }
+
+                    return TRUE;
                 }
-                elseif ($type == ':')
+
+                if ($type == ':')
                 {
                     trigger_error('Missing argument for -' . $opt, E_USER_WARNING);
                     $this->error = TRUE;

tests/phpstan.autoload.inc.php

@@ -14,15 +14,15 @@
 if (file_exists($base . '/vendor/autoload.php') == TRUE)
 {
     // Load composer autoloader.
-    $autoload_file = $base . '/vendor/autoload.php';
+    $autoloadFile = $base . '/vendor/autoload.php';
 }
 else
 {
     // Load decomposer autoloade.
-    $autoload_file = $base . '/decomposer.autoload.inc.php';
+    $autoloadFile = $base . '/decomposer.autoload.inc.php';
 }
 
-require_once $autoload_file;
+require_once $autoloadFile;
 
 // Define application config lookup path
 $paths = [

tests/test.bootstrap.inc.php

@@ -25,15 +25,15 @@
 if (file_exists($base . '/vendor/autoload.php') == TRUE)
 {
     // Load composer autoloader.
-    $autoload_file = $base . '/vendor/autoload.php';
+    $autoloadFile = $base . '/vendor/autoload.php';
 }
 else
 {
     // Load decomposer autoloader.
-    $autoload_file = $base . '/decomposer.autoload.inc.php';
+    $autoloadFile = $base . '/decomposer.autoload.inc.php';
 }
 
-require_once $autoload_file;
+require_once $autoloadFile;
 
 define('REFLECTION_BUG_72194', (PHP_MAJOR_VERSION > 5));