From bfde85ba9fe06ba866844b9d9d4152a5b2497c15 Mon Sep 17 00:00:00 2001
From: Marco van 't Wout <marco@tremani.nl>
Date: Tue, 9 Jul 2024 17:29:25 +0200
Subject: [PATCH 1/3] [41a5f8b] CHG: bump minimum version to php 8.2 and use
 dev versions of the goap packages, which are compatible

---
 composer.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 984950b..8a5f567 100644
--- 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"
     },

From 0c89debc9dedf590cf31be54c0776be6d4ea1ce7 Mon Sep 17 00:00:00 2001
From: Marco van 't Wout <marco@tremani.nl>
Date: Tue, 9 Jul 2024 17:46:33 +0200
Subject: [PATCH 2/3] CHG: apply goaop/framework internal changes from
 https://github.com/goaop/framework/commit/f5e90ffdf235fef5f5cb09ebe9c237e73c04cbf3

---
 src/AspectMock/Intercept/BeforeMockTransformer.php | 4 ++--
 src/AspectMock/Kernel.php                          | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/AspectMock/Intercept/BeforeMockTransformer.php b/src/AspectMock/Intercept/BeforeMockTransformer.php
index 1a73bc8..84a42d3 100644
--- 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
index fe76ee0..8c53506 100644
--- 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)
             )
         ];
 

From 37a8f2673379f10c619f24ccd067eb277d204b4b Mon Sep 17 00:00:00 2001
From: Gintautas Miselis <395992+Naktibalda@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:01:41 +0300
Subject: [PATCH 3/3] Declare branch-alias for master branch

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 8a5f567..7f79282 100644
--- a/composer.json
+++ b/composer.json
@@ -25,5 +25,10 @@
         "codeception/verify": "^2.2",
         "codeception/specify": "^2.0",
         "consolidation/robo": "^3.0"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "5.0-dev"
+        }
     }
 }