Revert "Fix AbstractJoinpointTest static usage"

This reverts commit 9d55bcc.
goaop · Feb 7, 2024 · 626730e · 626730e
1 parent 9d55bcc
commit 626730e
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/tests/Go/Aop/Framework/AbstractJoinpointTest.php b/tests/Go/Aop/Framework/AbstractJoinpointTest.php
@@ -27,14 +27,14 @@ public function testSortingLogic(array $advices, array $order = []): void
         }
     }
 
-    public static function sortingTestSource(): array
+    public function sortingTestSource(): array
     {
         return [
             // #0
             [
                 [
-                    static::createMock(AdviceAfter::class),
-                    static::createMock(AdviceBefore::class)
+                    $this->createMock(AdviceAfter::class),
+                    $this->createMock(AdviceBefore::class)
                 ],
                 [
                     AdviceBefore::class,
@@ -44,8 +44,8 @@ public static function sortingTestSource(): array
             // #1
             [
                 [
-                    static::createMock(AdviceAfter::class),
-                    static::createMock(AdviceAround::class)
+                    $this->createMock(AdviceAfter::class),
+                    $this->createMock(AdviceAround::class)
                 ],
                 [
                     AdviceAfter::class,
@@ -55,8 +55,8 @@ public static function sortingTestSource(): array
             // #2
             [
                 [
-                    static::createMock(AdviceBefore::class),
-                    static::createMock(AdviceAfter::class)
+                    $this->createMock(AdviceBefore::class),
+                    $this->createMock(AdviceAfter::class)
                 ],
                 [
                     AdviceBefore::class,
@@ -66,8 +66,8 @@ public static function sortingTestSource(): array
             // #3
             [
                 [
-                    static::createMock(AdviceBefore::class),
-                    static::createMock(AdviceAround::class)
+                    $this->createMock(AdviceBefore::class),
+                    $this->createMock(AdviceAround::class)
                 ],
                 [
                     AdviceBefore::class,
@@ -77,8 +77,8 @@ public static function sortingTestSource(): array
             // #4
             [
                 [
-                    static::createMock(AdviceAround::class),
-                    static::createMock(AdviceAfter::class)
+                    $this->createMock(AdviceAround::class),
+                    $this->createMock(AdviceAfter::class)
                 ],
                 [
                     AdviceAfter::class,
@@ -88,8 +88,8 @@ public static function sortingTestSource(): array
             // #5
             [
                 [
-                    static::createMock(AdviceAround::class),
-                    static::createMock(AdviceBefore::class)
+                    $this->createMock(AdviceAround::class),
+                    $this->createMock(AdviceBefore::class)
                 ],
                 [
                     AdviceBefore::class,
@@ -99,10 +99,10 @@ public static function sortingTestSource(): array
             // #6
             [
                 [
-                    static::createMock(AdviceBefore::class),
-                    static::createMock(AdviceAround::class),
-                    static::createMock(AdviceBefore::class),
-                    static::createMock(AdviceAfter::class),
+                    $this->createMock(AdviceBefore::class),
+                    $this->createMock(AdviceAround::class),
+                    $this->createMock(AdviceBefore::class),
+                    $this->createMock(AdviceAfter::class),
                 ],
                 [
                     AdviceBefore::class,
@@ -114,8 +114,8 @@ public static function sortingTestSource(): array
             // #7
             [
                 [
-                    $forth = static::getOrderedAdvice(4),
-                    $first = static::getOrderedAdvice(1)
+                    $forth = $this->getOrderedAdvice(4),
+                    $first = $this->getOrderedAdvice(1)
                 ],
                 [
                     get_class($first),
@@ -128,9 +128,9 @@ public static function sortingTestSource(): array
     /**
      * Returns the ordered advice
      */
-    private static function getOrderedAdvice(int $order): OrderedAdvice
+    private function getOrderedAdvice(int $order): OrderedAdvice
     {
-        $mock = static::createMock(OrderedAdvice::class);
+        $mock = $this->createMock(OrderedAdvice::class);
         $mock
             ->method('getAdviceOrder')
             ->willReturn($order);