Add xdebug recursion nesting level fix

Author: Kirill Nesmeyanov

composer.json

@@ -18,13 +18,13 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": "^7.4|^8.0",
         "ffi/preprocessor-contracts": "^1.0",
         "psr/log": "^1.0|^2.0|^3.0",
-        "phplrt/parser": "^3.1",
-        "phplrt/lexer": "^3.1",
-        "symfony/polyfill-php80": "^1.24",
-        "symfony/polyfill-ctype": "^1.24"
+        "phplrt/parser": "^3.2",
+        "phplrt/lexer": "^3.2",
+        "symfony/polyfill-php80": "^1.27",
+        "symfony/polyfill-ctype": "^1.27"
     },
     "autoload": {
         "psr-4": {
@@ -33,11 +33,11 @@
     },
     "require-dev": {
         "jetbrains/phpstorm-attributes": "^1.0",
-        "phpunit/phpunit": "^9.5",
-        "monolog/monolog": "^2.3",
-        "phplrt/phplrt": "^3.1",
-        "vimeo/psalm": "^4.21",
-        "squizlabs/php_codesniffer": "^3.6"
+        "phpunit/phpunit": "^9.6",
+        "monolog/monolog": "^2.9|^3.0",
+        "phplrt/phplrt": "^3.2",
+        "vimeo/psalm": "^5.14",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "autoload-dev": {
         "psr-4": {

psalm.xml

@@ -1,13 +1,20 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    resolveFromConfigFile="true"
+    findUnusedCode="false"
+    findUnusedBaselineEntry="true"
+    findUnusedPsalmSuppress="true"
+    cacheDirectory="vendor/.psalm.cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
         <directory name="src" />
+
         <ignoreFiles>
+            <!-- vendor -->
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>

src/Directive/Directive.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Directive;
@@ -16,37 +9,32 @@
 abstract class Directive implements FunctionLikeDirectiveInterface
 {
     /**
-     * @var string
+     * @var non-empty-string
      */
     private const ERROR_TOO_MANY_ARGUMENTS = 'Too many arguments when macro directive is called, %s required';
 
     /**
-     * @var string
+     * @var non-empty-string
      */
     private const ERROR_TOO_FEW_ARGUMENTS = 'Too few arguments when macro directive is called, %s required';
 
     /**
-     * @var positive-int|0
+     * @var int<0, max>
      */
     protected int $minArgumentsCount = 0;
 
     /**
-     * @var positive-int|0
+     * @var int<0, max>
      */
     protected int $maxArgumentsCount = 0;
 
-    /**
-     * @param string $body
-     * @return string
-     */
     protected function normalizeBody(string $body): string
     {
         return \str_replace("\\\n", "\n", $body);
     }
 
     /**
-     * @param array|string[] $arguments
-     * @return void
+     * @param list<string> $arguments
      */
     protected function assertArgumentsCount(array $arguments): void
     {
@@ -61,26 +49,16 @@ protected function assertArgumentsCount(array $arguments): void
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function getMaxArgumentsCount(): int
     {
         return $this->maxArgumentsCount;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function getMinArgumentsCount(): int
     {
         return $this->minArgumentsCount;
     }
 
-    /**
-     * @param mixed $result
-     * @return string
-     */
     public static function render($result): string
     {
         switch (true) {

src/Directive/FunctionDirective.php

@@ -1,25 +1,14 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Directive;
 
 final class FunctionDirective extends Directive
 {
-    /**
-     * @var \Closure
-     */
     private \Closure $callback;
 
     /**
-     * @param callable $cb
      * @throws \ReflectionException
      */
     public function __construct(callable $cb)
@@ -32,12 +21,8 @@ public function __construct(callable $cb)
         $this->maxArgumentsCount = $reflection->getNumberOfParameters();
     }
 
-    /**
-     * @param string ...$args
-     * @return string
-     */
     public function __invoke(string ...$args): string
     {
-        return $this->render(($this->callback)(...$args));
+        return self::render(($this->callback)(...$args));
     }
 }

src/Directive/FunctionLikeDirective.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Directive;

src/Directive/FunctionLikeDirective/Compiler.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Directive\FunctionLikeDirective;

src/Directive/ObjectLikeDirective.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Directive;

src/Directive/Repository.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Directive;
@@ -54,9 +47,6 @@ private function cast($directive): DirectiveInterface
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function define(string $directive, $value = DirectiveInterface::DEFAULT_VALUE): void
     {
         try {
@@ -72,9 +62,6 @@ public function define(string $directive, $value = DirectiveInterface::DEFAULT_V
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function undef(string $directive): bool
     {
         $exists = $this->defined($directive);
@@ -84,33 +71,21 @@ public function undef(string $directive): bool
         return $exists;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function defined(string $directive): bool
     {
         return isset($this->directives[$directive]);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function find(string $directive): ?DirectiveInterface
     {
         return $this->directives[$directive] ?? null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function getIterator(): \Traversable
     {
         return new \ArrayIterator($this->directives);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function count(): int
     {
         return \count($this->directives);

src/Environment/CVersion.php

@@ -1,35 +1,28 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Environment;
 
 final class CVersion
 {
     /**
-     * @var int
+     * @var int<0, max>
      */
     public const VERSION_ISO_C94 = 199409;
 
     /**
-     * @var int
+     * @var int<0, max>
      */
     public const VERSION_ISO_C99 = 199901;
 
     /**
-     * @var int
+     * @var int<0, max>
      */
     public const VERSION_ISO_C11 = 201112;
 
     /**
-     * @var int
+     * @var int<0, max>
      */
     public const VERSION_ISO_C18 = 201710;
 }

src/Environment/EnvironmentInterface.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of FFI package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace FFI\Preprocessor\Environment;
@@ -15,8 +8,5 @@
 
 interface EnvironmentInterface
 {
-    /**
-     * @param PreprocessorInterface $pre
-     */
     public function applyTo(PreprocessorInterface $pre): void;
 }