From 1a0735d2644ace6104bd869a4759dc462a00fa26 Mon Sep 17 00:00:00 2001 From: Jordan Date: Tue, 12 Aug 2025 18:20:12 -0400 Subject: [PATCH 1/2] Fix for BC break in goaop/framework --- src/AspectMock/Intercept/BeforeMockTransformer.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/AspectMock/Intercept/BeforeMockTransformer.php b/src/AspectMock/Intercept/BeforeMockTransformer.php index 84a42d3..48dfac0 100644 --- a/src/AspectMock/Intercept/BeforeMockTransformer.php +++ b/src/AspectMock/Intercept/BeforeMockTransformer.php @@ -6,6 +6,7 @@ use Go\Aop\Aspect; use Go\Instrument\Transformer\StreamMetaData; +use Go\Instrument\Transformer\TransformerResultEnum; use Go\Instrument\Transformer\WeavingTransformer; use Go\ParserReflection\ReflectionFile; use Go\ParserReflection\ReflectionMethod; @@ -15,9 +16,9 @@ class BeforeMockTransformer extends WeavingTransformer protected string $before = " if ((\$__am_res = __amock_before(\$this, __CLASS__, __FUNCTION__, array(%s), false)) !== __AM_CONTINUE__) return \$__am_res; "; protected string $beforeStatic = " if ((\$__am_res = __amock_before(get_called_class(), __CLASS__, __FUNCTION__, array(%s), true)) !== __AM_CONTINUE__) return \$__am_res; "; - public function transform(StreamMetaData $metadata): string + public function transform(StreamMetaData $metadata): TransformerResultEnum { - $result = self::RESULT_ABSTAIN; + $result = TransformerResultEnum::RESULT_ABSTAIN; $reflectedFile = new ReflectionFile($metadata->uri, $metadata->syntaxTree); $namespaces = $reflectedFile->getFileNamespaces(); @@ -75,7 +76,7 @@ public function transform(StreamMetaData $metadata): string do { if (($metadata->tokenStream[$tokenPosition]->text ?? '') === '{') { $metadata->tokenStream[$tokenPosition]->text .= $beforeDefinition; - $result = self::RESULT_TRANSFORMED; + $result = TransformerResultEnum::RESULT_TRANSFORMED; break; } $tokenPosition++; From 240a63e40648d71e5ece7d51f7552460b716daea Mon Sep 17 00:00:00 2001 From: Jordan Date: Fri, 6 Feb 2026 16:03:36 -0500 Subject: [PATCH 2/2] Fix callable syntax for PHP 8.2 --- src/AspectMock/Util/ArgumentsFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspectMock/Util/ArgumentsFormatter.php b/src/AspectMock/Util/ArgumentsFormatter.php index 4dfd3f3..e28f322 100644 --- a/src/AspectMock/Util/ArgumentsFormatter.php +++ b/src/AspectMock/Util/ArgumentsFormatter.php @@ -10,7 +10,7 @@ final class ArgumentsFormatter { public static function toString($args): string { - return implode(',',array_map('self::format', $args)); + return implode(',',array_map([self::class, 'format'], $args)); } protected static function format($arg)