Fixed ReadOnly classes not interceptable

Author: WalterWoshid

src/Core/Transform/ProxiedClassModifier.php

@@ -99,6 +99,7 @@ public function modify(): void
     {
         $this->convertToProxy();
         $this->unFinalMethods();
+        $this->unReadOnlyClasses();
         $this->changeVisibility();
         $this->replaceSelfType();
         $this->replaceMagicConstants();
@@ -174,6 +175,15 @@ private function unFinalMethods(): void
         };
     }
 
+    private function unReadOnlyClasses(): void
+    {
+        $this->tokenCallbacks[] = function (Token $token) {
+            if ($token->kind === TokenKind::ReadonlyKeyword) {
+                $this->edit($token, '');
+            }
+        };
+    }
+
     /**
      * Change the visibility of the class members.
      *

src/Core/Transform/WovenClassBuilder.php

@@ -218,18 +218,9 @@ private function buildMethod(BetterReflectionMethod $refMethod): Method
 
         $methodName = $refMethod->getName();
 
-        // ReadOnly Hack: https://github.com/nette/php-generator/issues/158
-        foreach ($refMethod->getParameters() as $refParameter) {
-            if ($refParameter->isPromoted()
-                && ($declaringClass = $refParameter->getDeclaringClass())
-                && ($refParameterName = $refParameter->getName())
-                && $declaringClass->hasProperty($refParameterName)
-                && ($property = $declaringClass->getProperty($refParameterName))
-                && $property->isReadOnly()
-            ) {
-                /** @var PromotedParameter $parameter */
-                $parameter = $method->getParameter($refParameterName);
-                $parameter->setReadOnly();
+        foreach ($method->getParameters() as $parameter) {
+            if ($parameter instanceof PromotedParameter) {
+                $parameter->setReadOnly(false);
             }
         }
 

tests/Functional/AdviceBehavior/Readonly/Aspect/ReadonlyAspect.php

@@ -0,0 +1,16 @@
+<?php
+/** @noinspection PhpUnused */
+namespace Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly\Aspect;
+
+use Okapi\Aop\Attributes\Around;
+use Okapi\Aop\Attributes\Aspect;
+
+#[Aspect]
+class ReadonlyAspect
+{
+    #[Around(
+        class: 'Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly\Target\Readonly*',
+        method: '*',
+    )]
+    public function doNothing(): void {}
+}

tests/Functional/AdviceBehavior/Readonly/Kernel.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly;
+
+use Okapi\Aop\AopKernel;
+use Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly\Aspect\ReadonlyAspect;
+use Okapi\Aop\Tests\Util;
+
+class Kernel extends AopKernel
+{
+    protected ?string $cacheDir = Util::CACHE_DIR;
+
+    protected array $aspects = [
+        ReadonlyAspect::class,
+    ];
+}

tests/Functional/AdviceBehavior/Readonly/ReadonlyTest.php

@@ -0,0 +1,44 @@
+<?php
+/** @noinspection PhpExpressionResultUnusedInspection */
+namespace Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly;
+
+use Okapi\Aop\Tests\ClassLoaderMockTrait;
+use Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly\Target\ReadonlyClass;
+use Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly\Target\ReadonlyPromotedProperties;
+use Okapi\Aop\Tests\Util;
+use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\TestCase;
+
+#[RunTestsInSeparateProcesses]
+class ReadonlyTest extends TestCase
+{
+    use ClassLoaderMockTrait;
+
+    public function testReadonlyClass(): void
+    {
+        if (PHP_VERSION_ID < 80200) {
+            $this->markTestSkipped('Readonly classes are supported only in PHP 8.2 and later.');
+        }
+
+        Util::clearCache();
+        Kernel::init();
+
+        $this->assertWillBeWoven(ReadonlyClass::class);
+
+        new ReadonlyClass();
+
+        $this->assertTrue(true);
+    }
+
+    public function testReadonlyPromotedProperties(): void
+    {
+        Util::clearCache();
+        Kernel::init();
+
+        $this->assertWillBeWoven(ReadonlyPromotedProperties::class);
+
+        new ReadonlyPromotedProperties('Walter Woshid', 42);
+
+        $this->assertTrue(true);
+    }
+}

tests/Functional/AdviceBehavior/Readonly/Target/ReadonlyClass.php

@@ -0,0 +1,8 @@
+<?php
+/** @noinspection PhpLanguageLevelInspection Test will be skipped */
+namespace Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly\Target;
+
+readonly class ReadonlyClass
+{
+    public function ok(): void {}
+}

tests/Functional/AdviceBehavior/Readonly/Target/ReadonlyPromotedProperties.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Okapi\Aop\Tests\Functional\AdviceBehavior\Readonly\Target;
+
+class ReadonlyPromotedProperties
+{
+    public function __construct(
+        public readonly string $name,
+        public readonly int $age,
+    ) {}
+}