fixup! Refactor code and add serialization test

ray-di · May 13, 2024 · 3cfd2d6 · 3cfd2d6
1 parent e4b9fb5
commit 3cfd2d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/src-deprecated/MemcachdAdapter.php b/src-deprecated/MemcachdAdapter.php
@@ -19,18 +19,10 @@ class MemcachdAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
 
-    /**
-     * @param ProviderInterface<Memcached> $clientProvider
-     *
-     * @Named("memcached")
-     * @CacheNamespace("namespace")
-     */
-    #[CacheNamespace('namespace')]
-    #[Named('memcached')]
-    public function __construct(ProviderInterface $clientProvider, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
+    public function __construct(MemcachedProvider $provider, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         $this->args = func_get_args();
 
-        parent::__construct($clientProvider->get(), $namespace, $defaultLifetime, $marshaller);
+        parent::__construct($provider->get(), $namespace, $defaultLifetime, $marshaller);
     }
 }
diff --git a/src/MemcachedAdapter.php b/src/MemcachedAdapter.php
@@ -4,9 +4,6 @@
 
 namespace Ray\PsrCacheModule;
 
-use Memcached;
-use Ray\Di\ProviderInterface;
-use Ray\PsrCacheModule\Annotation\CacheNamespace;
 use Serializable;
 use Symfony\Component\Cache\Adapter\MemcachedAdapter as OriginAdapter;
 use Symfony\Component\Cache\Marshaller\MarshallerInterface;
@@ -18,16 +15,10 @@ class MemcachedAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
 
-    /**
-     * @param ProviderInterface<Memcached> $clientProvider
-     *
-     * @CacheNamespace("namespace")
-     */
-    #[CacheNamespace('namespace')]
-    public function __construct(MemcachedProvider $clientProvider, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
+    public function __construct(MemcachedProvider $provider, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         $this->args = func_get_args();
 
-        parent::__construct($clientProvider->get(), $namespace, $defaultLifetime, $marshaller);
+        parent::__construct($provider->get(), $namespace, $defaultLifetime, $marshaller);
     }
 }