Merge pull request #4 from doctena-org/v2

V2 : Laminas3 support

Author: doc-david-m

composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": ">=8.0",
         "laminas/laminas-modulemanager": "^2.5 || ^3.0",
         "laminas/laminas-eventmanager": "^2.5 || ^3.0",
         "laminas/laminas-mvc": "^2.5 || ^3.0",

src/SlmCache/Listener/Cache.php

@@ -40,14 +40,14 @@
 
 namespace SlmCache\Listener;
 
+use Laminas\Cache\Storage\StorageInterface;
+use Laminas\Cache\StorageFactory;
 use Laminas\EventManager\AbstractListenerAggregate;
 use Laminas\EventManager\EventManagerInterface;
-use Laminas\Mvc\MvcEvent;
-use Laminas\Mvc\Router\RouteMatch;
 use Laminas\Http\Response;
+use Laminas\Mvc\MvcEvent;
+use Laminas\Router\Http\RouteMatch;
 use Laminas\ServiceManager\ServiceLocatorInterface;
-use Laminas\Cache\StorageFactory;
-use Laminas\Cache\Storage\StorageInterface;
 
 class Cache extends AbstractListenerAggregate
 {
@@ -70,7 +70,7 @@ public function __construct(ServiceLocatorInterface $sl)
     /**
      * {@inheritDoc}
      */
-    public function attach(EventManagerInterface $events)
+    public function attach(EventManagerInterface $events, $priority = 1)
     {
         $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'matchRoute'));
         $events->attach(MvcEvent::EVENT_FINISH, array($this, 'saveRoute'));
@@ -113,20 +113,20 @@ protected function match(MvcEvent $e)
             return;
         }
 
-        $route  = $match->getMatchedRouteName();
+        $route = $match->getMatchedRouteName();
         $routeParameters = $match->getParams();
         $config = $this->serviceLocator->get('Config');
         $routes = $config['slm_cache']['routes'];
 
         if (!array_key_exists($route, $routes)) {
             return;
         }
-        $config = (array) $routes[$route];
+        $config = (array)$routes[$route];
 
         // Match HTTP request method to configured methods
         if (array_key_exists('match_method', $config)) {
-            $methods = (array) $config['match_method'];
-            $method  = $e->getRequest()->getMethod();
+            $methods = (array)$config['match_method'];
+            $method = $e->getRequest()->getMethod();
 
             if (!in_array($method, $methods)) {
                 return;
@@ -135,7 +135,7 @@ protected function match(MvcEvent $e)
 
         // Match route request parameters to configured parameters
         if (array_key_exists('match_route_params', $config)) {
-            $params = (array) $config['match_route_params'];
+            $params = (array)$config['match_route_params'];
 
             foreach ($params as $name => $value) {
                 // There is a specific route parameter
@@ -150,24 +150,24 @@ protected function match(MvcEvent $e)
             }
         }
 
-        $match  = ['route' => $route, 'config' => $config, 'parameters' => $routeParameters];
+        $match = ['route' => $route, 'config' => $config, 'parameters' => $routeParameters];
         $this->match = $match;
 
         return $match;
     }
 
     protected function fromCache(MvcEvent $e, $match)
     {
-        $key    = $this->getCacheKey($match);
-        $cache  = $this->getCache($e);
+        $key = $this->getCacheKey($match);
+        $cache = $this->getCache($e);
 
         $response = $e->getResponse();
 
         if (($result = $cache->getItem($key))) {
             $response->setContent(
                 empty($this->serviceLocator->get('Config')['slm_cache']['use_compression'])
-                ? $result
-                : gzuncompress($result)
+                    ? $result
+                    : gzuncompress($result)
             );
             $response->getHeaders()->addHeaderLine('X-Slm-Cache', 'Fetch: Hit; route=' . $match['route']);
             $e->setParam('cached', true);
@@ -180,8 +180,8 @@ protected function fromCache(MvcEvent $e, $match)
 
     protected function storeCache(MvcEvent $e, $match)
     {
-        $key    = $this->getCacheKey($match);
-        $cache  = $this->getCache($e);
+        $key = $this->getCacheKey($match);
+        $cache = $this->getCache($e);
 
         $response = $e->getResponse();
         $response->getHeaders()->addHeaderLine('X-Slm-Cache', 'Storage: Success; route=' . $match['route']);
@@ -218,6 +218,6 @@ protected function getCache(MvcEvent $e)
      */
     protected function getCacheKey(array $match)
     {
-        return $this->cache_prefix.sha1(serialize($match));
+        return $this->cache_prefix . sha1(serialize($match));
     }
 }