Merge pull request #71 from yoeunes/dev

Enhances regex parsing and analysis

Author: yoeunes

composer.json

@@ -14,9 +14,9 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^12.4.5",
-        "phpstan/phpstan": "^2.1.32",
-        "phpstan/phpstan-phpunit": "^2.0.8",
+        "phpunit/phpunit": "^12.5.0",
+        "phpstan/phpstan": "^2.1.33",
+        "phpstan/phpstan-phpunit": "^2.0.9",
         "symfony/console": "^8.0",
         "symfony/http-kernel": "^8.0",
         "symfony/dependency-injection": "^8.0",

rector/Rule/PHPUnit/PreferStaticPHPUnitAssertRector.php

@@ -25,7 +25,7 @@
 /**
  * Converts PHPUnit assertions from $this->assert*() and static::assert*() to explicit Assert::assert*() static calls.
  */
-class PreferStaticPHPUnitAssertRector extends AbstractRector
+final class PreferStaticPHPUnitAssertRector extends AbstractRector
 {
     public function __construct(private AssertMethodAnalyzer $assertMethodAnalyzer) {}
 

src/Bridge/PHPStan/PregValidationRule.php

@@ -36,16 +36,16 @@
  *
  * @implements Rule<FuncCall>
  */
-class PregValidationRule implements Rule
+final class PregValidationRule implements Rule
 {
     // Identifiers for user configuration in phpstan.neon
-    public const IDENTIFIER_SYNTAX_INVALID = 'regex.syntax.invalid';
-    public const IDENTIFIER_SYNTAX_DELIMITER = 'regex.syntax.delimiter';
-    public const IDENTIFIER_SYNTAX_EMPTY = 'regex.syntax.empty';
-    public const IDENTIFIER_REDOS_CRITICAL = 'regex.redos.critical';
-    public const IDENTIFIER_REDOS_HIGH = 'regex.redos.high';
-    public const IDENTIFIER_REDOS_MEDIUM = 'regex.redos.medium';
-    public const IDENTIFIER_REDOS_LOW = 'regex.redos.low';
+    public const string IDENTIFIER_SYNTAX_INVALID = 'regex.syntax.invalid';
+    public const string IDENTIFIER_SYNTAX_DELIMITER = 'regex.syntax.delimiter';
+    public const string IDENTIFIER_SYNTAX_EMPTY = 'regex.syntax.empty';
+    public const string IDENTIFIER_REDOS_CRITICAL = 'regex.redos.critical';
+    public const string IDENTIFIER_REDOS_HIGH = 'regex.redos.high';
+    public const string IDENTIFIER_REDOS_MEDIUM = 'regex.redos.medium';
+    public const string IDENTIFIER_REDOS_LOW = 'regex.redos.low';
 
     private const array PREG_FUNCTION_MAP = [
         'preg_match' => 0,

src/Bridge/Rector/RegexOptimizationRector.php

@@ -31,7 +31,7 @@
  * This rule parses the regex string, applies AST optimizations (like flattening groups
  * or merging character classes), and recompiles it back to a cleaner string.
  */
-class RegexOptimizationRector extends AbstractRector implements ConfigurableRectorInterface
+final class RegexOptimizationRector extends AbstractRector implements ConfigurableRectorInterface
 {
     public const string EXTRA_FUNCTIONS = 'extra_functions';
 

src/Bridge/Symfony/DependencyInjection/Configuration.php

@@ -28,7 +28,7 @@
  *
  * @see https://symfony.com/doc/current/bundles/configuration.html
  */
-class Configuration implements ConfigurationInterface
+final readonly class Configuration implements ConfigurationInterface
 {
     /**
      * Creates a new instance of the bundle's configuration schema.
@@ -41,7 +41,7 @@ class Configuration implements ConfigurationInterface
      * @param bool $debug The value of the `kernel.debug` parameter.
      */
     public function __construct(
-        private readonly bool $debug = false,
+        private bool $debug = false,
     ) {}
 
     /**

src/Bridge/Symfony/DependencyInjection/RegexParserExtension.php

@@ -30,7 +30,7 @@
  * 4. Conditionally loading debug-only services (like the Web Profiler collector)
  *    based on the application's environment and configuration.
  */
-class RegexParserExtension extends Extension
+final class RegexParserExtension extends Extension
 {
     /**
      * Loads the bundle's services and processes its configuration.

src/Bridge/Symfony/RegexParserBundle.php

@@ -27,7 +27,7 @@
  * @see \RegexParser\Bridge\Symfony\DependencyInjection\RegexParserExtension
  * @see \RegexParser\Bridge\Symfony\DependencyInjection\Configuration
  */
-class RegexParserBundle extends Bundle
+final class RegexParserBundle extends Bundle
 {
     /**
      * Overrides the default bundle path to correctly locate resources.

src/Cache/FilesystemCache.php

@@ -13,7 +13,7 @@
 
 namespace RegexParser\Cache;
 
-readonly class FilesystemCache implements RemovableCacheInterface
+final readonly class FilesystemCache implements RemovableCacheInterface
 {
     private string $directory;
 

src/Cache/NullCache.php

@@ -13,7 +13,7 @@
 
 namespace RegexParser\Cache;
 
-readonly class NullCache implements RemovableCacheInterface
+final readonly class NullCache implements RemovableCacheInterface
 {
     #[\Override]
     public function generateKey(string $regex): string

src/Cache/PsrCacheAdapter.php

@@ -14,11 +14,17 @@
 namespace RegexParser\Cache;
 
 use Psr\Cache\CacheItemPoolInterface;
+use RegexParser\Node\RegexNode;
 
 /**
  * PSR-6 bridge for AST caching.
  *
- * Uses the configured pool to store serialized AST payloads.
+ * This adapter lets you plug a PSR-6 cache pool into the RegexParser cache
+ * system. The Regex service passes a compiled cache payload string
+ * (generated by {@see \RegexParser\Regex::compileCachePayload()}); this
+ * adapter evaluates that payload once and stores the resulting RegexNode
+ * instance directly in the pool so that subsequent reads are fast and
+ * type-safe.
  */
 final readonly class PsrCacheAdapter implements RemovableCacheInterface
 {
@@ -42,7 +48,10 @@ public function generateKey(string $regex): string
     public function write(string $key, string $content): void
     {
         $item = $this->pool->getItem($key);
-        $item->set($content);
+
+        $value = $this->decodePayload($content);
+        $item->set($value ?? $content);
+
         $this->pool->save($item);
     }
 
@@ -69,4 +78,31 @@ public function clear(?string $regex = null): void
 
         $this->pool->clear();
     }
+
+    /**
+     * Decodes the compiled cache payload string into a RegexNode instance.
+     *
+     * The Regex service passes a small PHP script generated by
+     * {@see \RegexParser\Regex::compileCachePayload()}. For PSR-6 caches we
+     * execute this script once and store the resulting AST object directly
+     * in the pool so that subsequent reads return a RegexNode instead of
+     * the raw payload string.
+     */
+    private function decodePayload(string $content): ?RegexNode
+    {
+        $code = ltrim($content);
+
+        if (str_starts_with($code, '<?php')) {
+            $code = substr($code, 5);
+        }
+
+        try {
+            $result = eval($code);
+
+            return $result instanceof RegexNode ? $result : null;
+        } catch (\Throwable) {
+            // If anything goes wrong we just fall back to storing the raw payload.
+            return null;
+        }
+    }
 }