[Step 1] Bump requirement to PHP 8.2 and parser-reflection 4.0.0-RC1

.github/workflows/phpstan.yml

@@ -1,6 +1,7 @@
 name: "PHPStan analysis"
 
 on:
+  pull_request:
   push:
 
 jobs:
@@ -12,7 +13,7 @@ jobs:
       - name: "Install PHP"
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "7.4"
+          php-version: "8.2"
           ini-values: memory_limit=-1
           tools: composer:v2
       - name: "Cache dependencies"
@@ -21,8 +22,8 @@ jobs:
           path: |
             ~/.composer/cache
             vendor
-          key: "php-7.4"
-          restore-keys: "php-7.4"
+          key: "php-8.2"
+          restore-keys: "php-8.2"
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress --no-suggest"
       - name: "Static analysis"

.github/workflows/phpunit.yml

@@ -1,6 +1,7 @@
 name: "PHPUnit tests"
 
 on:
+  pull_request:
   push:
 
 jobs:
@@ -15,7 +16,7 @@ jobs:
           - "lowest"
           - "highest"
         php-version:
-          - "7.4"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 phpunit.xml
 tests/Fixtures/project/var/cache/*
 build/
+/.phpunit.result.cache

composer.json

@@ -8,23 +8,24 @@
     "license": "MIT",
 
     "require": {
-        "php": "^7.4.0",
+        "php": "^8.2.0",
         "doctrine/annotations": "^1.11.1",
         "doctrine/cache": "^1.10",
-        "goaop/parser-reflection": "^3.0.1",
-        "jakubledl/dissect": "~1.0",
-        "laminas/laminas-code": "^4.0",
-        "symfony/finder": "^4.4|^5.1"
+        "goaop/parser-reflection": "4.x-dev",
+        "goaop/dissect": "^3.0",
+        "laminas/laminas-code": "^4.13",
+        "symfony/finder": "^5.1"
     },
 
     "require-dev": {
         "adlawson/vfs": "^0.12.1",
         "doctrine/orm": "^2.5",
-        "phpstan/phpstan": "^0.12.64",
-        "phpunit/phpunit": "^9.5",
+        "phpstan/phpstan": "^1.10.57",
+        "phpunit/phpunit": "^10.5.10",
         "symfony/console": "^4.4|^5.1",
         "symfony/filesystem": "^4.4|^5.1",
         "symfony/process": "^4.4|^5.1",
+        "tracy/tracy": "^2.10",
         "webmozart/glob": "^4.1"
     },
 

demos/Demo/Aspect/CachingAspect.php

@@ -12,7 +12,7 @@
 
 namespace Demo\Aspect;
 
-use Demo\Annotation\Cacheable;
+use Demo\Attribute\Cacheable;
 use Go\Aop\Aspect;
 use Go\Aop\Intercept\MethodInvocation;
 use Go\Lang\Annotation\Around;
@@ -32,7 +32,7 @@ class CachingAspect implements Aspect
      *
      * @return mixed Result of invocation
      *
-     * @Around("@execution(Demo\Annotation\Cacheable)")
+     * @Around("@execution(Demo\Attribute\Cacheable)")
      */
     public function aroundCacheable(MethodInvocation $invocation)
     {
@@ -44,8 +44,8 @@ public function aroundCacheable(MethodInvocation $invocation)
         $class = is_object($obj) ? get_class($obj) : $obj;
         $key   = $class . ':' . $invocation->getMethod()->name;
         if (!isset($memoryCache[$key])) {
-            // We can use ttl value from annotation, but Doctrine annotations doesn't work under GAE
-            echo "Ttl is: ", $invocation->getMethod()->getAnnotation(Cacheable::class)->time, PHP_EOL;
+            $attributeArgs = $invocation->getMethod()->getAttributes(Cacheable::class)[0]->getArguments();
+            echo "Ttl is: ", $attributeArgs['time'], PHP_EOL;
 
             $memoryCache[$key] = $invocation->proceed();
         }

demos/Demo/Aspect/DeclareErrorAspect.php

@@ -23,7 +23,7 @@ class DeclareErrorAspect implements Aspect
     /**
      * Message to show when calling the method
      *
-     * @DeclareError("@execution(Demo\Annotation\Deprecated)", level=16384) // E_USER_DEPRECATED
+     * @DeclareError("@execution(Demo\Attribute\Deprecated)", level=16384) // E_USER_DEPRECATED
      */
     protected string $message = 'Method is deprecated and should not be called in debug mode';
 

demos/Demo/Aspect/LoggingAspect.php

@@ -33,7 +33,7 @@ class LoggingAspect implements Aspect
      *
      * To inject logger into this aspect you can look at Warlock framework with DI+AOP
      *
-     * @Before("@execution(Demo\Annotation\Loggable)")
+     * @Before("@execution(Demo\Attribute\Loggable)")
      */
     public function beforeMethodExecution(MethodInvocation $invocation): void
     {

demos/Demo/Annotation/Cacheable.php → demos/Demo/Attribute/Cacheable.php

@@ -10,18 +10,12 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Demo\Annotation;
+namespace Demo\Attribute;
 
-use Doctrine\Common\Annotations\Annotation;
+use Attribute;
 
-/**
- * @Annotation
- * @Target("METHOD")
- */
-class Cacheable extends Annotation
+#[Attribute(Attribute::TARGET_METHOD)]
+readonly class Cacheable
 {
-    /**
-     * Time to cache
-     */
-    public int $time = 0;
+    public function __construct(public int $time) {}
 }

demos/Demo/Annotation/Deprecated.php → demos/Demo/Attribute/Deprecated.php

@@ -10,14 +10,11 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Demo\Annotation;
+namespace Demo\Attribute;
 
-use Doctrine\Common\Annotations\Annotation;
+use Attribute;
 
-/**
- * @Annotation
- * @Target("METHOD")
- */
-class Deprecated extends Annotation
+#[Attribute(Attribute::TARGET_METHOD)]
+class Deprecated extends \JetBrains\PhpStorm\Deprecated
 {
 }

demos/Demo/Annotation/Loggable.php → demos/Demo/Attribute/Loggable.php

@@ -10,14 +10,11 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Demo\Annotation;
+namespace Demo\Attribute;
 
-use Doctrine\Common\Annotations\Annotation;
+use Attribute;
 
-/**
- * @Annotation
- * @Target("METHOD")
- */
-class Loggable extends Annotation
+#[Attribute(Attribute::TARGET_METHOD)]
+class Loggable
 {
 }

demos/Demo/Example/CacheableDemo.php

@@ -12,7 +12,7 @@
 
 namespace Demo\Example;
 
-use Demo\Annotation\Cacheable;
+use Demo\Attribute\Cacheable;
 
 /**
  * Example class to show how to use caching with AOP
@@ -23,12 +23,8 @@ class CacheableDemo
      * Returns a report and explicitly cache a result for future use
      *
      * In this example we use "Cacheable" annotation to explicit mark a method
-     *
-     * @param string $from This can be any value
-     * @Cacheable(time=10)
-     *
-     * @return string
      */
+    #[Cacheable(time: 10)]
     public function getReport(string $from): string
     {
         // long calculation for 100ms

demos/Demo/Example/ErrorDemo.php

@@ -12,7 +12,7 @@
 
 namespace Demo\Example;
 
-use Demo\Annotation\Deprecated as deprecated; // <== We import specific system annotation
+use Demo\Attribute\Deprecated;
 
 /**
  * In this class we use system functions that will be intercepted by aspect
@@ -21,9 +21,8 @@ class ErrorDemo
 {
     /**
      * Some old method that is used by system in production, but shouldn't be used for the new code
-     *
-     * @deprecated
      */
+    #[Deprecated]
     public function oldMethod(): void
     {
         echo "Hello, I'm old method", PHP_EOL;

demos/Demo/Example/LoggingDemo.php

@@ -12,7 +12,7 @@
 
 namespace Demo\Example;
 
-use Demo\Annotation\Loggable;
+use Demo\Attribute\Loggable;
 
 /**
  * Example class to show how to use logging with AOP
@@ -23,10 +23,9 @@ class LoggingDemo
     /**
      * Executes a task and logs all incoming arguments
      *
-     * @Loggable
-     *
      * @param string $task Some specific argument
      */
+    #[Loggable]
     public function execute(string $task): void
     {
         $this->perform($task, 'first');
@@ -36,11 +35,10 @@ public function execute(string $task): void
     /**
      * Protected method can be also loggable
      *
-     * @Loggable
-     *
      * @param string $task Specific task
      * @param string $level
      */
+    #[Loggable]
     protected function perform(string $task, string $level): void
     {
         // some logic here
@@ -49,10 +47,9 @@ protected function perform(string $task, string $level): void
     /**
      * Everything is possible with AOP, so static methods can be intercepted too
      *
-     * @Loggable
-     *
      * @param string $task Some specific argument
      */
+    #[Loggable]
     public static function runByName(string $task): void
     {
         $instance = new static(); // Go! AOP requires LSB to work correctly

nitpick.json

@@ -1,5 +1,6 @@
 {
   "ignore": [
-    "tests/*"
+    "tests/*",
+    "phpstan-baseline.php"
   ]
 }

phpstan-baseline.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+$ignoreErrors = [];
+$ignoreErrors[] = [
+	'message' => '#^Instanceof between stdClass and Go\\\\ParserReflection\\\\ReflectionFileNamespace will always evaluate to false\\.$#',
+	'count' => 1,
+	'path' => __DIR__ . '/src/Aop/Support/SimpleNamespaceFilter.php',
+];
+$ignoreErrors[] = [
+	'message' => '#^Property Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\<object\\>\\:\\:\\$table \\(array\\{name\\: string, schema\\?\\: string, indexes\\?\\: array, uniqueConstraints\\?\\: array, options\\?\\: array\\<string, mixed\\>, quoted\\?\\: bool\\}\\) does not accept array\\{\\}\\.$#',
+	'count' => 1,
+	'path' => __DIR__ . '/src/Bridge/Doctrine/MetadataLoadInterceptor.php',
+];
+$ignoreErrors[] = [
+	'message' => '#^Call to function file_get_contents\\(\\) on a separate line has no effect\\.$#',
+	'count' => 1,
+	'path' => __DIR__ . '/src/Instrument/ClassLoading/CacheWarmer.php',
+];
+
+return ['parameters' => ['ignoreErrors' => $ignoreErrors]];

phpstan.neon

@@ -1,3 +1,6 @@
+includes:
+	- phpstan-baseline.php
+
 parameters:
   level: 4
   paths:

phpunit.xml.dist

@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         colors="true"
-         bootstrap="./vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Go! AOP Test Suite">
-            <directory>./tests/Go/</directory>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory>./src/</directory>
-        </include>
-        <report>
-            <clover outputFile="./build/logs/clover.xml"/>
-            <crap4j outputFile="./build/logs/crap4j.xml"/>
-            <xml outputDirectory="./build/coverage/xml"/>
-        </report>
-    </coverage>
-
-
-    <logging>
-        <junit outputFile="./build/logs/junit.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" colors="true" bootstrap="./vendor/autoload.php">
+  <testsuites>
+    <testsuite name="Go! AOP Test Suite">
+      <directory>./tests/Go/</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <clover outputFile="./build/logs/clover.xml"/>
+      <crap4j outputFile="./build/logs/crap4j.xml"/>
+      <xml outputDirectory="./build/coverage/xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="./build/logs/junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory>./src/</directory>
+    </include>
+  </source>
 </phpunit>