Merge pull request #1 from valantic-CEC-Deutschland-GmbH/feature/SPRY…

…-3032 SPRY-3032 Rename CacheManagerGui namespace to CacheManager in CacheMa…
valantic-CEC-Deutschland-GmbH · May 22, 2024 · 5a52b65 · 5a52b65
2 parents 273248d + 9dc92b2
commit 5a52b65
Show file tree

Hide file tree

Showing 11 changed files with 187 additions and 74 deletions.
diff --git a/src/ValanticSpryker/Zed/CacheManager/Business/CacheManagerBusinessFactory.php b/src/ValanticSpryker/Zed/CacheManager/Business/CacheManagerBusinessFactory.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace ValanticSpryker\Zed\CacheManager\Business;
+
+use Spryker\Client\Storage\StorageClientInterface;
+use Spryker\Zed\Kernel\Business\AbstractBusinessFactory;
+use ValanticSpryker\Zed\CacheManager\Business\Model\CacheManager;
+use ValanticSpryker\Zed\CacheManager\CacheManagerDependencyProvider;
+use ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginCollection;
+
+class CacheManagerBusinessFactory extends AbstractBusinessFactory
+{
+    /**
+     * @return \ValanticSpryker\Zed\CacheManager\Business\Model\CacheManager
+     */
+    public function createCacheManager(): CacheManager
+    {
+        return new CacheManager(
+            $this->createCacheManagerPluginCollection(),
+            $this->getStorageClient(),
+        );
+    }
+
+    /**
+     * @return \ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginCollection
+     */
+    protected function createCacheManagerPluginCollection(): CacheManagerPluginCollection
+    {
+        return new CacheManagerPluginCollection($this->getCacheManagerPlugins());
+    }
+
+    /**
+     * @return array<\ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginInterface>
+     */
+    protected function getCacheManagerPlugins(): array
+    {
+        return $this->getProvidedDependency(CacheManagerDependencyProvider::CACHE_MANAGER_PLUGINS);
+    }
+
+    /**
+     * @return \Spryker\Client\Storage\StorageClientInterface
+     */
+    protected function getStorageClient(): StorageClientInterface
+    {
+        return $this->getProvidedDependency(CacheManagerDependencyProvider::CLIENT_STORAGE);
+    }
+}
diff --git a/src/ValanticSpryker/Zed/CacheManager/Business/CacheManagerFacade.php b/src/ValanticSpryker/Zed/CacheManager/Business/CacheManagerFacade.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace ValanticSpryker\Zed\CacheManager\Business;
+
+use Generated\Shared\Transfer\CacheManagerDeleteTransfer;
+use Spryker\Zed\Kernel\Business\AbstractFacade;
+
+/**
+ * @method \ValanticSpryker\Zed\CacheManager\Business\CacheManagerBusinessFactory getFactory()
+ */
+class CacheManagerFacade extends AbstractFacade implements CacheManagerFacadeInterface
+{
+    /**
+     * @return array<\Generated\Shared\Transfer\CacheManagerPluginTransfer>
+     */
+    public function getCacheManagerPluginsData(): array
+    {
+        return $this->getFactory()->createCacheManager()->getPlugins();
+    }
+
+    /**
+     * @param \Generated\Shared\Transfer\CacheManagerDeleteTransfer $cacheManagerDeleteTransfer
+     *
+     * @return \Generated\Shared\Transfer\CacheManagerDeleteTransfer
+     */
+    public function deleteCache(CacheManagerDeleteTransfer $cacheManagerDeleteTransfer): CacheManagerDeleteTransfer
+    {
+        return $this->getFactory()->createCacheManager()->deleteCache($cacheManagerDeleteTransfer);
+    }
+}
diff --git a/src/ValanticSpryker/Zed/CacheManager/Business/CacheManagerFacadeInterface.php b/src/ValanticSpryker/Zed/CacheManager/Business/CacheManagerFacadeInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace ValanticSpryker\Zed\CacheManager\Business;
+
+use Generated\Shared\Transfer\CacheManagerDeleteTransfer;
+
+interface CacheManagerFacadeInterface
+{
+    /**
+     * @return array<\Generated\Shared\Transfer\CacheManagerPluginTransfer>
+     */
+    public function getCacheManagerPluginsData(): array;
+
+    /**
+     * @param \Generated\Shared\Transfer\CacheManagerDeleteTransfer $cacheManagerDeleteTransfer
+     *
+     * @return \Generated\Shared\Transfer\CacheManagerDeleteTransfer
+     */
+    public function deleteCache(CacheManagerDeleteTransfer $cacheManagerDeleteTransfer): CacheManagerDeleteTransfer;
+}
diff --git a/...anagerGui/Business/Model/CacheManager.php → ...heManager/Business/Model/CacheManager.php b/...anagerGui/Business/Model/CacheManager.php → ...heManager/Business/Model/CacheManager.php
@@ -2,18 +2,18 @@
 
 declare(strict_types = 1);
 
-namespace ValanticSpryker\Zed\CacheManagerGui\Business\Model;
+namespace ValanticSpryker\Zed\CacheManager\Business\Model;
 
 use Generated\Shared\Transfer\CacheManagerDeleteTransfer;
 use Generated\Shared\Transfer\CacheManagerPluginTransfer;
 use Spryker\Client\Storage\Redis\Service;
 use Spryker\Client\Storage\StorageClientInterface;
-use ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginCollection;
+use ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginCollection;
 
 class CacheManager
 {
     /**
-     * @param \ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginCollection $cacheManagerPluginCollection
+     * @param \ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginCollection $cacheManagerPluginCollection
      * @param \Spryker\Client\Storage\StorageClientInterface $storageClient
      */
     public function __construct(private CacheManagerPluginCollection $cacheManagerPluginCollection, private StorageClientInterface $storageClient)

diff --git a/src/ValanticSpryker/Zed/CacheManager/CacheManagerDependencyProvider.php b/src/ValanticSpryker/Zed/CacheManager/CacheManagerDependencyProvider.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace ValanticSpryker\Zed\CacheManager;
+
+use Spryker\Client\Storage\StorageClientInterface;
+use Spryker\Zed\Kernel\AbstractBundleDependencyProvider;
+use Spryker\Zed\Kernel\Container;
+
+class CacheManagerDependencyProvider extends AbstractBundleDependencyProvider
+{
+    public const CACHE_MANAGER_PLUGINS = 'CACHE_MANAGER_PLUGINS';
+    public const CLIENT_STORAGE = 'CLIENT_STORAGE';
+
+    /**
+     * @param \Spryker\Zed\Kernel\Container $container
+     *
+     * @return \Spryker\Zed\Kernel\Container
+     */
+    public function provideBusinessLayerDependencies(Container $container): Container
+    {
+        $container = parent::provideBusinessLayerDependencies($container);
+
+        $this->addCacheManagerPlugins($container);
+        $this->addStorageClient($container);
+
+        return $container;
+    }
+
+    /**
+     * @param \Spryker\Zed\Kernel\Container $container
+     *
+     * @return void
+     */
+    protected function addCacheManagerPlugins(Container $container): void
+    {
+        $container->set(self::CACHE_MANAGER_PLUGINS, function () {
+            return $this->getCacheManagerPlugins();
+        });
+    }
+
+    /**
+     * @return array<\ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginInterface>
+     */
+    protected function getCacheManagerPlugins(): array
+    {
+        return [];
+    }
+
+    /**
+     * @param \Spryker\Zed\Kernel\Container $container
+     *
+     * @return void
+     */
+    protected function addStorageClient(Container $container): void
+    {
+        $container->set(
+            self::CLIENT_STORAGE,
+            fn (): StorageClientInterface => $container->getLocator()->storage()->client(), // @phpstan-ignore method.notFound
+        );
+    }
+}
diff --git a/...n/Plugin/CacheManagerPluginCollection.php → ...n/Plugin/CacheManagerPluginCollection.php b/...n/Plugin/CacheManagerPluginCollection.php → ...n/Plugin/CacheManagerPluginCollection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin;
+namespace ValanticSpryker\Zed\CacheManager\Communication\Plugin;
 
 use InvalidArgumentException;
 
@@ -11,7 +11,7 @@ class CacheManagerPluginCollection
     private array $plugins = [];
 
     /**
-     * @param array<\ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginInterface> $plugins
+     * @param array<\ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginInterface> $plugins
      */
     public function __construct(array $plugins)
     {
@@ -21,7 +21,7 @@ public function __construct(array $plugins)
     }
 
     /**
-     * @param \ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginInterface $plugin
+     * @param \ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginInterface $plugin
      *
      * @return void
      */
@@ -35,7 +35,7 @@ public function add(CacheManagerPluginInterface $plugin): void
      *
      * @throws \InvalidArgumentException
      *
-     * @return \ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginInterface
+     * @return \ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginInterface
      */
     public function get(string $name): CacheManagerPluginInterface
     {
@@ -57,7 +57,7 @@ public function has(string $name): bool
     }
 
     /**
-     * @return array<\ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginInterface>
+     * @return array<\ValanticSpryker\Zed\CacheManager\Communication\Plugin\CacheManagerPluginInterface>
      */
     public function getAll(): array
     {

diff --git a/...on/Plugin/CacheManagerPluginInterface.php → ...on/Plugin/CacheManagerPluginInterface.php b/...on/Plugin/CacheManagerPluginInterface.php → ...on/Plugin/CacheManagerPluginInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin;
+namespace ValanticSpryker\Zed\CacheManager\Communication\Plugin;
 
 interface CacheManagerPluginInterface
 {

diff --git a/src/ValanticSpryker/Zed/CacheManagerGui/Business/CacheManagerGuiBusinessFactory.php b/src/ValanticSpryker/Zed/CacheManagerGui/Business/CacheManagerGuiBusinessFactory.php
@@ -4,46 +4,17 @@
 
 namespace ValanticSpryker\Zed\CacheManagerGui\Business;
 
-use Spryker\Client\Storage\StorageClientInterface;
 use Spryker\Zed\Kernel\Business\AbstractBusinessFactory;
-use ValanticSpryker\Zed\CacheManagerGui\Business\Model\CacheManager;
+use ValanticSpryker\Zed\CacheManager\Business\CacheManagerFacadeInterface;
 use ValanticSpryker\Zed\CacheManagerGui\CacheManagerGuiDependencyProvider;
-use ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginCollection;
 
 class CacheManagerGuiBusinessFactory extends AbstractBusinessFactory
 {
     /**
-     * @return \ValanticSpryker\Zed\CacheManagerGui\Business\Model\CacheManager
+     * @return \ValanticSpryker\Zed\CacheManager\Business\CacheManagerFacadeInterface
      */
-    public function createCacheManager(): CacheManager
+    public function getCacheManagerFacade(): CacheManagerFacadeInterface
     {
-        return new CacheManager(
-            $this->createCacheManagerPluginCollection(),
-            $this->getStorageClient(),
-        );
-    }
-
-    /**
-     * @return \ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginCollection
-     */
-    protected function createCacheManagerPluginCollection(): CacheManagerPluginCollection
-    {
-        return new CacheManagerPluginCollection($this->getCacheManagerPlugins());
-    }
-
-    /**
-     * @return array<\ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginInterface>
-     */
-    protected function getCacheManagerPlugins(): array
-    {
-        return $this->getProvidedDependency(CacheManagerGuiDependencyProvider::CACHE_MANAGER_PLUGINS);
-    }
-
-    /**
-     * @return \Spryker\Client\Storage\StorageClientInterface
-     */
-    protected function getStorageClient(): StorageClientInterface
-    {
-        return $this->getProvidedDependency(CacheManagerGuiDependencyProvider::CLIENT_STORAGE);
+        return $this->getProvidedDependency(CacheManagerGuiDependencyProvider::FACADE_CACHE_MANAGER);
     }
 }
diff --git a/src/ValanticSpryker/Zed/CacheManagerGui/Business/CacheManagerGuiFacade.php b/src/ValanticSpryker/Zed/CacheManagerGui/Business/CacheManagerGuiFacade.php
@@ -17,7 +17,7 @@ class CacheManagerGuiFacade extends AbstractFacade implements CacheManagerGuiFac
      */
     public function getCacheManagerPluginsData(): array
     {
-        return $this->getFactory()->createCacheManager()->getPlugins();
+        return $this->getFactory()->getCacheManagerFacade()->getCacheManagerPluginsData();
     }
 
     /**
@@ -27,6 +27,6 @@ public function getCacheManagerPluginsData(): array
      */
     public function deleteCache(CacheManagerDeleteTransfer $cacheManagerDeleteTransfer): CacheManagerDeleteTransfer
     {
-        return $this->getFactory()->createCacheManager()->deleteCache($cacheManagerDeleteTransfer);
+        return $this->getFactory()->getCacheManagerFacade()->deleteCache($cacheManagerDeleteTransfer);
     }
 }
diff --git a/src/ValanticSpryker/Zed/CacheManagerGui/Business/CacheManagerGuiFacadeInterface.php b/src/ValanticSpryker/Zed/CacheManagerGui/Business/CacheManagerGuiFacadeInterface.php
@@ -7,7 +7,7 @@
 use Generated\Shared\Transfer\CacheManagerDeleteTransfer;
 
 /**
- * @method \ValanticSpryker\Zed\CacheManagerGui\Business\CacheManagerGuiBusinessFactory getFactory()
+ * @method \ValanticSpryker\Zed\CacheManager\Business\CacheManagerBusinessFactory getFactory()
  */
 interface CacheManagerGuiFacadeInterface
 {

diff --git a/src/ValanticSpryker/Zed/CacheManagerGui/CacheManagerGuiDependencyProvider.php b/src/ValanticSpryker/Zed/CacheManagerGui/CacheManagerGuiDependencyProvider.php
@@ -4,14 +4,12 @@
 
 namespace ValanticSpryker\Zed\CacheManagerGui;
 
-use Spryker\Client\Storage\StorageClientInterface;
 use Spryker\Zed\Kernel\AbstractBundleDependencyProvider;
 use Spryker\Zed\Kernel\Container;
 
 class CacheManagerGuiDependencyProvider extends AbstractBundleDependencyProvider
 {
-    public const CACHE_MANAGER_PLUGINS = 'CACHE_MANAGER_PLUGINS';
-    public const CLIENT_STORAGE = 'CLIENT_STORAGE';
+    public const FACADE_CACHE_MANAGER = 'FACADE_CACHE_MANAGER';
 
     /**
      * @param \Spryker\Zed\Kernel\Container $container
@@ -22,8 +20,7 @@ public function provideBusinessLayerDependencies(Container $container): Containe
     {
         $container = parent::provideBusinessLayerDependencies($container);
 
-        $this->addCacheManagerPlugins($container);
-        $this->addStorageClient($container);
+        $this->addCacheManagerFacade($container);
 
         return $container;
     }
@@ -33,31 +30,10 @@ public function provideBusinessLayerDependencies(Container $container): Containe
      *
      * @return void
      */
-    protected function addCacheManagerPlugins(Container $container): void
+    private function addCacheManagerFacade(Container $container): void
     {
-        $container->set(self::CACHE_MANAGER_PLUGINS, function () {
-            return $this->getCacheManagerPlugins();
+        $container->set(static::FACADE_CACHE_MANAGER, function (Container $container) {
+            return $container->getLocator()->cacheManager()->facade(); // @phpstan-ignore method.notFound
         });
     }
-
-    /**
-     * @return array<\ValanticSpryker\Zed\CacheManagerGui\Communication\Plugin\CacheManagerPluginInterface>
-     */
-    protected function getCacheManagerPlugins(): array
-    {
-        return [];
-    }
-
-    /**
-     * @param \Spryker\Zed\Kernel\Container $container
-     *
-     * @return void
-     */
-    protected function addStorageClient(Container $container): void
-    {
-        $container->set(
-            self::CLIENT_STORAGE,
-            fn (): StorageClientInterface => $container->getLocator()->storage()->client()
-        );
-    }
 }