[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,10 +8,10 @@
     "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",
+        "goaop/parser-reflection": "^4.0.0-RC1",
         "jakubledl/dissect": "~1.0",
         "laminas/laminas-code": "^4.0",
         "symfony/finder": "^4.4|^5.1"
@@ -20,8 +20,8 @@
     "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.8",
         "symfony/console": "^4.4|^5.1",
         "symfony/filesystem": "^4.4|^5.1",
         "symfony/process": "^4.4|^5.1",

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>

src/Instrument/ClassLoading/SourceTransformingLoader.php

@@ -94,7 +94,6 @@ public function filter($in, $out, &$consumed, $closing): int
             $this->data .= $bucket->data;
         }
 
-        /** @phpstan-ignore-next-line PhpStan uses old version of phpstorm-stubs, $bucket can be nullable */
         if ($closing || feof($this->stream)) {
             $consumed = strlen($this->data);
 

tests/Go/Aop/Bridge/Doctrine/MetadataLoadInterceptorTest.php

@@ -29,7 +29,7 @@ public function testItWillNotModifyClassMetadataForNonProxiedClasses(): void
         ];
 
         $metadataInterceptor = new MetadataLoadInterceptor();
-        $entityManager = $this->getMockBuilder(EntityManager::class)->disableOriginalConstructor()->getMock();
+        $entityManager = $this->createMock(EntityManager::class);
 
         /**
          * @var ClassMetadata $metadata
@@ -46,7 +46,7 @@ public function testItWillModifyClassMetadataForNonProxiedClasses(): void
     {
         $metadata = new ClassMetadata(Entity__AopProxied::class);
         $metadataInterceptor = new MetadataLoadInterceptor();
-        $entityManager = $this->getMockBuilder(EntityManager::class)->disableOriginalConstructor()->getMock();
+        $entityManager = $this->createMock(EntityManager::class);
 
         $metadata->isMappedSuperclass = false;
         $metadata->isEmbeddedClass = true;

tests/Go/Aop/Framework/AbstractInterceptorTest.php

@@ -47,7 +47,7 @@ protected function getAdvice(array &$sequenceRecorder): Closure
      */
     protected function getInvocation(array &$sequenceRecorder, bool $throwException = false): Invocation
     {
-        $invocation = $this->getMockBuilder(static::INVOCATION_CLASS)->getMock();
+        $invocation = $this->createMock(static::INVOCATION_CLASS);
         $invocation
             ->expects($this->any())
             ->method('proceed')

tests/Go/Aop/Framework/AbstractJoinpointTest.php

@@ -14,10 +14,10 @@ class AbstractJoinpointTest extends TestCase
     protected AbstractJoinpoint $joinpoint;
 
     /**
-     * @dataProvider sortingTestSource
      * @param array $advices
      * @param array $order
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('sortingTestSource')]
     public function testSortingLogic(array $advices, array $order = []): void
     {
         $advices = AbstractJoinpoint::sortAdvices($advices);

tests/Go/Aop/Framework/DynamicClosureSplatMethodInvocationTest.php

@@ -16,9 +16,8 @@ class DynamicClosureSplatMethodInvocationTest extends TestCase
 {
     /**
      * Tests dynamic method invocations
-     *
-     * @dataProvider dynamicMethodsBatch
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dynamicMethodsBatch')]
     public function testDynamicMethodInvocation(string $methodName, int $expectedResult): void
     {
         $child      = $this->createMock(First::class);
@@ -103,7 +102,7 @@ public function testInterceptorIsCalledForInvocation(): void
         $this->assertEquals(T_PUBLIC, $result);
     }
 
-    public function dynamicMethodsBatch(): array
+    public static function dynamicMethodsBatch(): array
     {
         return [
             ['publicMethod', T_PUBLIC],

tests/Go/Aop/Framework/StaticClosureMethodInvocationTest.php

@@ -16,10 +16,10 @@ class StaticClosureMethodInvocationTest extends TestCase
     /**
      * Tests static method invocations with self
      *
-     * @dataProvider staticSelfMethodsBatch
      * @param string $methodName Method to invoke
      * @param int $expectedResult Expected result
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('staticSelfMethodsBatch')]
     public function testStaticSelfMethodInvocation(string $methodName, int $expectedResult): void
     {
         $invocation = new StaticClosureMethodInvocation([],First::class, $methodName);
@@ -30,9 +30,9 @@ public function testStaticSelfMethodInvocation(string $methodName, int $expected
     /**
      * Tests static method invocations with Late Static Binding
      *
-     * @dataProvider staticLsbMethodsBatch
      * @param string $methodName Method to invoke
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('staticLsbMethodsBatch')]
     public function testStaticLsbIsWorking($methodName): void
     {
         $invocation = new StaticClosureMethodInvocation([], First::class, $methodName);
@@ -101,7 +101,7 @@ public function testInvocationWithVariadicArguments(): void
         }
     }
 
-    public function staticSelfMethodsBatch(): array
+    public static function staticSelfMethodsBatch(): array
     {
         return [
             ['staticSelfPublic', T_PUBLIC],
@@ -110,7 +110,7 @@ public function staticSelfMethodsBatch(): array
         ];
     }
 
-    public function staticLsbMethodsBatch(): array
+    public static function staticLsbMethodsBatch(): array
     {
         return [
             ['staticLsbPublic'],

tests/Go/Aop/Pointcut/PointcutParserTest.php

@@ -39,17 +39,16 @@ protected function setUp(): void
 
     /**
      * Tests parsing
-     *
-     * @dataProvider validPointcutDefinitions
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('validPointcutDefinitions')]
     public function testParsingExpression(string $pointcutExpression): void
     {
         $stream = $this->lexer->lex($pointcutExpression);
         $result = $this->parser->parse($stream);
         $this->assertNotNull($result);
     }
 
-    public function validPointcutDefinitions(): array
+    public static function validPointcutDefinitions(): array
     {
         return [
             // Execution pointcuts

tests/Go/Aop/Support/AndPointFilterTest.php

@@ -37,17 +37,15 @@ public function testKindIsIntersected(): void
         $this->assertEquals(PointFilter::KIND_METHOD, $filter->getKind());
     }
 
-    /**
-     * @dataProvider logicCases
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('logicCases')]
     public function testMatches(PointFilter $first, PointFilter $second, $expected): void
     {
         $filter = new AndPointFilter($first, $second);
         $result = $filter->matches(new ReflectionClass(__CLASS__) /* anything */);
         $this->assertSame($expected, $result);
     }
 
-    public function logicCases(): array
+    public static function logicCases(): array
     {
         $true  = TruePointFilter::getInstance();
         $false = new NotPointFilter($true);

tests/Go/Aop/Support/NotPointFilterTest.php

@@ -18,17 +18,15 @@
 
 class NotPointFilterTest extends TestCase
 {
-    /**
-     * @dataProvider logicCases
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('logicCases')]
     public function testMatches(PointFilter $first, bool $expected): void
     {
         $filter = new NotPointFilter($first);
         $result = $filter->matches(new ReflectionClass(self::class));
         $this->assertSame($expected, $result);
     }
 
-    public function logicCases(): array
+    public static function logicCases(): array
     {
         $true  = TruePointFilter::getInstance();
         $false = new NotPointFilter($true);

tests/Go/Aop/Support/OrPointFilterTest.php

@@ -37,17 +37,15 @@ public function testKindIsCombined(): void
         $this->assertEquals($expected, $filter->getKind());
     }
 
-    /**
-     * @dataProvider logicCases
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('logicCases')]
     public function testMatches(PointFilter $first, PointFilter $second, bool $expected): void
     {
         $filter = new OrPointFilter($first, $second);
         $result = $filter->matches(new \ReflectionClass(__CLASS__) /* anything */);
         $this->assertSame($expected, $result);
     }
 
-    public function logicCases(): array
+    public static function logicCases(): array
     {
         $true  = TruePointFilter::getInstance();
         $false = new NotPointFilter($true);

tests/Go/Core/GoAspectContainerTest.php

@@ -30,16 +30,15 @@ protected function setUp(): void
 
     /**
      * Tests that all services are registered
-     *
-     * @dataProvider internalServicesList
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('internalServicesList')]
     public function testAllServicesAreConfigured(string $serviceId): void
     {
         $service = $this->container->get($serviceId);
         $this->assertNotNull($service);
     }
 
-    public function internalServicesList(): array
+    public static function internalServicesList(): array
     {
         return [
             ['aspect.loader'],

tests/Go/Instrument/FileSystem/EnumeratorTest.php

@@ -47,7 +47,7 @@ public static function tearDownAfterClass(): void
         static::$fileSystem->unmount();
     }
 
-    public function pathsProvider(): array
+    public static function pathsProvider(): array
     {
         return [
             [
@@ -92,12 +92,12 @@ public function pathsProvider(): array
     /**
      * Test wildcard path matching for Enumerator.
      *
-     * @dataProvider pathsProvider
      *
      * @throws \InvalidArgumentException
      * @throws \LogicException
      * @throws \UnexpectedValueException
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('pathsProvider')]
     public function testExclude(array $expectedPaths, array $includePaths, array $excludePaths): void
     {
         $testPaths = [];