feat(lock): improve tests, fix priority

Author: sidux

src/Interceptor/Impl/CacheInterceptor.php

@@ -39,12 +39,15 @@ final class CacheInterceptor extends AbstractInterceptor implements SuffixInterc
      */
     private static array $reservedCharacters = ['{', '}', '(', ')', '/', '@', ':'];
 
+    private CacheInterceptorConfig $config;
+
     public function __construct(
-        private readonly CacheInterceptorConfig $config,
-        iterable                                $handlers = [],
+        ?CacheInterceptorConfig $config = null,
+        iterable                $handlers = [],
     ) {
         parent::__construct($handlers);
 
+        $this->config = $config ?? new CacheInterceptorConfig();
         $this->typesExtractor = new TypesExtractor();
     }
 

src/Interceptor/Impl/LockInterceptor.php

@@ -33,7 +33,7 @@ public function __construct(
 
     public function getPrefixPriority(): int
     {
-        return -10;
+        return 1;
     }
 
     public function getSuffixPriority(): int

tests/Handler/Impl/Lock/SymfonyLockHandlerTest.php

@@ -37,6 +37,8 @@ public function test2(): void
         $this->assertTrue($this->handler2->isAcquired('key2'));
         $this->handler1->release('key1');
         $this->assertFalse($this->handler1->isAcquired('key1'));
+        $this->handler2->release('key2');
+        $this->assertFalse($this->handler2->isAcquired('key2'));
     }
 
     public function test3(): void

tests/ProxyFactoryTest.php

@@ -4,19 +4,16 @@
 
 namespace OpenClassrooms\ServiceProxy\Tests;
 
-use OpenClassrooms\ServiceProxy\Interceptor\Config\CacheInterceptorConfig;
 use OpenClassrooms\ServiceProxy\Interceptor\Contract\PrefixInterceptor;
 use OpenClassrooms\ServiceProxy\Interceptor\Contract\SuffixInterceptor;
 use OpenClassrooms\ServiceProxy\Interceptor\Impl\CacheInterceptor;
 use OpenClassrooms\ServiceProxy\Interceptor\Impl\EventInterceptor;
 use OpenClassrooms\ServiceProxy\Interceptor\Impl\InvalidateCacheInterceptor;
+use OpenClassrooms\ServiceProxy\Interceptor\Impl\LegacyCacheInterceptor;
+use OpenClassrooms\ServiceProxy\Interceptor\Impl\LockInterceptor;
 use OpenClassrooms\ServiceProxy\Interceptor\Impl\SecurityInterceptor;
 use OpenClassrooms\ServiceProxy\Interceptor\Impl\TransactionInterceptor;
 use OpenClassrooms\ServiceProxy\ProxyFactory;
-use OpenClassrooms\ServiceProxy\Tests\Double\Mock\Cache\CacheHandlerMock;
-use OpenClassrooms\ServiceProxy\Tests\Double\Mock\Event\EventHandlerMock;
-use OpenClassrooms\ServiceProxy\Tests\Double\Mock\Security\SecurityHandlerMock;
-use OpenClassrooms\ServiceProxy\Tests\Double\Mock\Transaction\TransactionHandlerMock;
 use OpenClassrooms\ServiceProxy\Tests\Double\Stub\Cache\ClassWithCacheAttributes;
 use OpenClassrooms\ServiceProxy\Tests\Double\Stub\WithConstructorAnnotationClass;
 use OpenClassrooms\ServiceProxy\Tests\Double\Stub\WithoutAnnotationClass;
@@ -30,15 +27,22 @@ final class ProxyFactoryTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->factory = $this->getProxyFactory(
-            [
-                new CacheInterceptor(new CacheInterceptorConfig(), [new CacheHandlerMock()]),
-                new EventInterceptor([new EventHandlerMock()]),
-                new TransactionInterceptor([new TransactionHandlerMock()]),
-                new SecurityInterceptor([new SecurityHandlerMock()]),
-                new InvalidateCacheInterceptor(),
-            ]
-        );
+        //auto load all interceptors using glob from folder
+        $interceptorsFiles = glob(__DIR__ . '/../src/Interceptor/Impl/*Interceptor.php');
+        $interceptors = [];
+        foreach ($interceptorsFiles as $interceptorFile) {
+            require_once $interceptorFile;
+        }
+
+        $classes = get_declared_classes();
+
+        foreach ($classes as $class) {
+            if (is_subclass_of($class, PrefixInterceptor::class) || is_subclass_of($class, SuffixInterceptor::class)) {
+                $interceptors[] = new $class();
+            }
+        }
+
+        $this->factory = $this->getProxyFactory($interceptors);
     }
 
     public function testWithoutAnnotationReturnServiceProxyInterface(): void
@@ -88,15 +92,19 @@ public function testCheckInterceptorsOrders(): void
                 SecurityInterceptor::class,
                 EventInterceptor::class,
                 CacheInterceptor::class,
+                LegacyCacheInterceptor::class,
+                LockInterceptor::class,
                 TransactionInterceptor::class,
             ],
             $prefixInterceptorsClasses
         );
         $this->assertEquals(
             [
                 TransactionInterceptor::class,
+                LockInterceptor::class,
                 InvalidateCacheInterceptor::class,
                 CacheInterceptor::class,
+                LegacyCacheInterceptor::class,
                 EventInterceptor::class,
             ],
             $suffixInterceptorsClasses