Merge pull request #210 from marcovtwout/php8-compatibility

PHP 8.2 compatibility
Codeception · Nov 16, 2024 · 7247230 · 7247230
2 parents bec82f5 + 37a8f26
commit 7247230
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,9 @@
            }
        },
     "require": {
-        "php": "^7.4",
-        "goaop/framework": "^3.0",
+        "php": "^8.2",
+        "goaop/framework": "^4.0@dev",
+        "goaop/parser-reflection": "^4.0@dev",
         "phpunit/phpunit": "^9.5",
         "symfony/finder": "^4.4 | ^5.4 | ^6.0"
     },
@@ -24,5 +25,10 @@
         "codeception/verify": "^2.2",
         "codeception/specify": "^2.0",
         "consolidation/robo": "^3.0"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "5.0-dev"
+        }
     }
 }
diff --git a/src/AspectMock/Intercept/BeforeMockTransformer.php b/src/AspectMock/Intercept/BeforeMockTransformer.php
@@ -73,8 +73,8 @@ public function transform(StreamMetaData $metadata): string
                     $beforeDefinition = sprintf($beforeDefinition, $params);
                     $tokenPosition    = $method->getNode()->getAttribute('startTokenPos');
                     do {
-                        if (($metadata->tokenStream[$tokenPosition][1] ?? '') === '{') {
-                            $metadata->tokenStream[$tokenPosition][1] .= $beforeDefinition;
+                        if (($metadata->tokenStream[$tokenPosition]->text ?? '') === '{') {
+                            $metadata->tokenStream[$tokenPosition]->text .= $beforeDefinition;
                             $result = self::RESULT_TRANSFORMED;
                             break;
                         }

diff --git a/src/AspectMock/Kernel.php b/src/AspectMock/Kernel.php
@@ -8,6 +8,9 @@
 use AspectMock\Intercept\BeforeMockTransformer;
 use Go\Core\AspectContainer;
 use Go\Core\AspectKernel;
+use Go\Core\AdviceMatcher;
+use Go\Core\CachedAspectLoader;
+use Go\Instrument\ClassLoading\CachePathManager;
 use Go\Instrument\ClassLoading\SourceTransformingLoader;
 use Go\Instrument\Transformer\CachingTransformer;
 use Go\Instrument\Transformer\FilterInjectorTransformer;
@@ -61,16 +64,16 @@ public function loadFile(string $file)
 
     protected function registerTransformers(): array
     {
-        $cachePathManager = $this->getContainer()->get('aspect.cache.path.manager');
+        $cachePathManager = $this->getContainer()->getService(CachePathManager::class);
 
         $sourceTransformers = [
             new FilterInjectorTransformer($this, SourceTransformingLoader::getId(), $cachePathManager),
             new MagicConstantTransformer($this),
             new BeforeMockTransformer(
                 $this,
-                $this->getContainer()->get('aspect.advice_matcher'),
+                $this->getContainer()->getService(AdviceMatcher::class),
                 $cachePathManager,
-                $this->getContainer()->get('aspect.cached.loader')
+                $this->getContainer()->getService(CachedAspectLoader::class)
             )
         ];