deps: remove dependency on rekalogika/psr-16-simple-cache-bundle (#40)

* deps: remove dependency on `rekalogika/psr-16-simple-cache-bundle`

* bump

Author: priyadi

CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
 
-## 1.6.2
+## 1.7.0
 
 * test: fix twig test deprecations
 * test: update phpstan & psalm
 * deps: update js deps
 * chore: rector run
+* deps: remove dependency on `rekalogika/psr-16-simple-cache-bundle`
 
 ## 1.6.1
 

composer.json

@@ -28,8 +28,9 @@
     },
     "require": {
         "php": "^8.2",
-        "rekalogika/psr-16-simple-cache-bundle": "^1.0",
+        "psr/cache": "^3.0",
         "psr/simple-cache": "^3.0",
+        "symfony/cache": "^6.3 || ^7.0",
         "symfony/config": "^6.3 || ^7.0",
         "symfony/dependency-injection": "^6.3 || ^7.0",
         "symfony/http-foundation": "^6.3 || ^7.0",

config/services.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-use Psr\SimpleCache\CacheInterface;
+use Psr\Cache\CacheItemPoolInterface;
 use Rekalogika\TemporaryUrl\DataServer;
 use Rekalogika\TemporaryUrl\Internal\TemporaryUrlController;
 use Rekalogika\TemporaryUrl\TemporaryUrlGenerator;
@@ -21,14 +21,15 @@
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
     $services->set(TemporaryUrlManager::class)
         ->args([
-            service(CacheInterface::class),
+            service(CacheItemPoolInterface::class),
             service(TemporaryUrlResourceTransformer::class),
         ]);
 

config/services_test.php

@@ -11,6 +11,7 @@
 
 declare(strict_types=1);
 
+use Psr\Cache\CacheItemPoolInterface;
 use Psr\SimpleCache\CacheInterface;
 use Rekalogika\TemporaryUrl\Internal\TemporaryUrlController;
 use Rekalogika\TemporaryUrl\Internal\TemporaryUrlManager;
@@ -29,7 +30,7 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(CacheInterface::class)
+    $services->set(CacheItemPoolInterface::class)
         ->factory([MockFactory::class, 'createCache']);
 
     $services->set(RequestStack::class)

src/Internal/TemporaryUrlManager.php

@@ -13,9 +13,11 @@
 
 namespace Rekalogika\TemporaryUrl\Internal;
 
+use Psr\Cache\CacheItemPoolInterface;
 use Psr\SimpleCache\CacheInterface;
 use Rekalogika\TemporaryUrl\Exception\ServerNotFoundException;
 use Rekalogika\TemporaryUrl\Exception\TicketNotFoundException;
+use Symfony\Component\Cache\Psr16Cache;
 
 /**
  * Manages temporary URLS
@@ -29,11 +31,13 @@
      */
     private array $resourceToServerMap;
 
+    private CacheInterface $cache;
+
     /**
      * @param iterable<class-string,array{0:object,1:string}> $resourceToServerMap
      */
     public function __construct(
-        private CacheInterface $cache,
+        CacheItemPoolInterface $cache,
         private TemporaryUrlResourceTransformer $resourceTransformer,
         iterable $resourceToServerMap,
         private string $cachePrefix = 'temporary-url-',
@@ -44,6 +48,7 @@ public function __construct(
         }
 
         $this->resourceToServerMap = $resourceToServerMap;
+        $this->cache = new Psr16Cache($cache);
     }
 
     public function createTicket(

tests/MockFactory.php

@@ -13,18 +13,17 @@
 
 namespace Rekalogika\TemporaryUrl\Tests;
 
-use Psr\SimpleCache\CacheInterface;
+use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Psr16Cache;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 final class MockFactory
 {
-    public static function createCache(): CacheInterface
+    public static function createCache(): CacheItemPoolInterface
     {
-        return new Psr16Cache(new ArrayAdapter());
+        return new ArrayAdapter();
     }
 
     public static function createRequestStack(): RequestStack