Added new option to allow EventManager override + improved EventManager tests

Author: Geolim4

lib/Phpfastcache/Event/EventManagerInterface.php

@@ -52,6 +52,12 @@ interface EventManagerInterface
      */
     public static function getInstance(): static;
 
+    /**
+     * @param EventManagerInterface $eventManagerInstance
+     * @return void
+     */
+    public static function setInstance(EventManagerInterface $eventManagerInstance): void;
+
     /**
      * @param string $eventName
      * @param array ...$args

lib/Phpfastcache/Event/EventReferenceParameter.php

@@ -19,13 +19,10 @@
 
 class EventReferenceParameter
 {
-    protected mixed $parameter;
-
     public function __construct(
-        mixed &$parameter,
+        protected mixed &$parameter,
         protected bool $allowTypeChange = false
     ) {
-        $this->parameter = &$parameter;
     }
 
     public function getParameterValue(): mixed

lib/Phpfastcache/EventManager.php

@@ -45,6 +45,16 @@ public static function getInstance(): static
         return (self::$instance ?? self::$instance = new static());
     }
 
+    /**
+     * @param EventManagerInterface $eventManagerInstance
+     * @return void
+     */
+    public static function setInstance(EventManagerInterface $eventManagerInstance): void
+    {
+        self::$instance = $eventManagerInstance;
+    }
+
+
     /**
      * @param string $eventName
      * @param array $args
@@ -59,7 +69,7 @@ public function dispatch(string $eventName, ...$args): void
         if (isset($this->events[$eventName]) && $eventName !== self::ON_EVERY_EVENT) {
             $loopArgs = array_merge($args, [$eventName]);
             foreach ($this->events[$eventName] as $event) {
-                $event(... $loopArgs);
+                $event(...$loopArgs);
             }
         }
         foreach ($this->events[self::ON_EVERY_EVENT] as $event) {
@@ -107,7 +117,7 @@ public function onEveryEvents(callable $callback, string $callbackName): void
     public function on(array $events, callable $callback): void
     {
         foreach ($events as $event) {
-            if (!\preg_match('#^([a-zA-z])*$#', $event)) {
+            if (!\preg_match('#^([a-zA-Z])*$#', $event)) {
                 throw new PhpfastcacheEventManagerException(\sprintf('Invalid event name "%s"', $event));
             }
 

tests/EventManager.test.php

@@ -17,6 +17,7 @@
 use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
 use Phpfastcache\Event\EventReferenceParameter;
 use Phpfastcache\EventManager;
+use Phpfastcache\Exceptions\PhpfastcacheInvalidTypeException;
 use Phpfastcache\Tests\Helper\TestHelper;
 
 chdir(__DIR__);
@@ -33,18 +34,26 @@
     }
 });
 
+$eventInstance->onCacheItemSet(static function (ExtendedCacheItemInterface $item, EventReferenceParameter $eventReferenceParameter) use ($testHelper) {
+    try{
+        $eventReferenceParameter->setParameterValue(1000);
+        $testHelper->assertPass('The event reference parameter accepted a value type change');
+    } catch(PhpfastcacheInvalidTypeException){
+        $testHelper->assertFail('The event reference parameter denied a value type change');
+    }
+});
 
 $cacheKey = 'testItem';
 $cacheKey2 = 'testItem2';
 
 $item = $cacheInstance->getItem($cacheKey);
-$item->set(1000)->expiresAfter(60);
+$item->set(false)->expiresAfter(60);
 $cacheInstance->save($item);
 
 if ($cacheInstance->getItem($cacheKey)->get() === 1337) {
     $testHelper->assertPass('The dispatched event executed the custom callback to alter the item');
 } else {
-    $testHelper->assertFail("The dispatched event is not working properly, the expected value '1337', got '" . (int) $cacheInstance->getItem($cacheKey)->get() . "'");
+    $testHelper->assertFail("The dispatched event is not working properly, the expected value '1337', got '" . $cacheInstance->getItem($cacheKey)->get() . "'");
 }
 $cacheInstance->clear();
 unset($item);
@@ -53,7 +62,14 @@
 
 $eventInstance->onCacheSaveMultipleItems(static function (ExtendedCacheItemPoolInterface $itemPool, EventReferenceParameter $eventReferenceParameter) use ($testHelper) {
     $parameterValue = $eventReferenceParameter->getParameterValue();
-    $eventReferenceParameter->setParameterValue([]);
+
+    try{
+        $eventReferenceParameter->setParameterValue(null);
+        $testHelper->assertFail('The event reference parameter accepted a value type change');
+    } catch(PhpfastcacheInvalidTypeException){
+        $testHelper->assertPass('The event reference parameter denied a value type change');
+        $eventReferenceParameter->setParameterValue([]);
+    }
 
     if (is_array($parameterValue) && count($parameterValue) === 2) {
         $testHelper->assertPass('The event reference parameter returned an array of 2 cache items');