support php74

Author: chaz6chez

src/AtomicTimeoutException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Workbunny\WebmanSharedCache;
+
+class AtomicTimeoutException extends \RuntimeException
+{
+
+}

src/Traits/BasicMethods.php

@@ -4,6 +4,7 @@
 
 use APCUIterator;
 use Closure;
+use Workbunny\WebmanSharedCache\AtomicTimeoutException;
 
 /**
  * @method static bool Set(string $key, mixed $value, array $optional = []) 设置缓存值
@@ -142,7 +143,9 @@ protected static function _Atomic(string $lockKey, Closure $handler, bool $block
             $startTime = time();
             while ($blocking) {
                 // 阻塞保险
-                if (time() >= $startTime + self::$fuse) {return false;}
+                if (time() >= $startTime + self::$fuse) {
+                    throw new AtomicTimeoutException('Atomic operation timeout');
+                }
                 // 创建锁
                 apcu_entry($lock = self::GetLockKey($lockKey), function () use (
                     $lockKey, $handler, $func, &$result, &$blocking
@@ -239,7 +242,7 @@ protected static function _Incr(string $key, $value = 1, int $ttl = 0)
         $func = __FUNCTION__;
         $result = false;
         $params = func_get_args();
-        $r = self::_Atomic($key, function () use (
+        self::_Atomic($key, function () use (
             $key, $value, $ttl, $func, $params, &$result
         ) {
             $v = self::_Get($key, 0);
@@ -256,7 +259,7 @@ protected static function _Incr(string $key, $value = 1, int $ttl = 0)
                 'result'    => null
             ];
         }, true);
-        return $r ? $result : false;
+        return $result;
     }
 
     /**
@@ -270,7 +273,7 @@ protected static function _Decr(string $key, $value = 1, int $ttl = 0)
         $func = __FUNCTION__;
         $result = false;
         $params = func_get_args();
-        $r = self::_Atomic($key, function () use (
+        self::_Atomic($key, function () use (
             $key, $value, $ttl, $func, $params, &$result
         ) {
             $v = self::_Get($key, 0);
@@ -287,7 +290,7 @@ protected static function _Decr(string $key, $value = 1, int $ttl = 0)
                 'result'    => null
             ];
         }, true);
-        return $r ? $result : false;
+        return $result;
     }
 
     /**

src/Traits/ChannelMethods.php

@@ -3,8 +3,6 @@
 namespace Workbunny\WebmanSharedCache\Traits;
 
 use Closure;
-use MongoDB\Driver\Exception\RuntimeException;
-use Workbunny\WebmanSharedCache\Cache;
 use Workbunny\WebmanSharedCache\Future;
 use Error;
 
@@ -107,9 +105,8 @@ protected static function _ChPublish(string $key, $message, bool $store = true,
     {
         $func = __FUNCTION__;
         $params = func_get_args();
-        $r = false;
-        return $r && self::_Atomic($key, function () use (
-                $key, $message, $func, $params, $store, $workerId, &$r
+        return self::_Atomic($key, function () use (
+                $key, $message, $func, $params, $store, $workerId
             ) {
                 /**
                  * [
@@ -154,7 +151,7 @@ protected static function _ChPublish(string $key, $message, bool $store = true,
                 if (self::isChannelUseSignal()) {
                     $list = self::_Get(self::$_CHANNEL_PID_LIST, []);
                     foreach ($list as $pid) {
-                        $r = self::_Atomic(self::$_CHANNEL_EVENT_LIST, function () use ($pid) {
+                        self::_Atomic(self::$_CHANNEL_EVENT_LIST, function () use ($pid) {
                             // 设置通道事件标记
                             $channelEventList = self::_Get(self::$_CHANNEL_EVENT_LIST, []);
                             $channelEventList[$pid][] = 1;
@@ -192,7 +189,7 @@ protected static function _ChCreateListener(string $key, $workerId, Closure $lis
         if (isset(self::$_listeners[$key])) {
             throw new Error("Channel $key listener already exist. ");
         }
-        $r = self::_Atomic($key, function () use (
+        self::_Atomic($key, function () use (
             $key, $workerId, $func, $params, $listener, &$result
         ) {
             // 信号监听则注册pid
@@ -213,7 +210,7 @@ protected static function _ChCreateListener(string $key, $workerId, Closure $lis
             // 监听器回调函数
             $callback = function () use ($key, $workerId, $listener) {
                 // 原子性执行
-                $r = self::_Atomic($key, function () use ($key, $workerId, $listener) {
+                self::_Atomic($key, function () use ($key, $workerId, $listener) {
                     // 信号监听
                     if (self::isChannelUseSignal()) {
                         $pid = posix_getpid();
@@ -239,9 +236,6 @@ protected static function _ChCreateListener(string $key, $workerId, Closure $lis
                     }
 
                 });
-                if (!$r) {
-                    throw new \RuntimeException('Channel callback failed.');
-                }
             };
             // 设置回调
             $channel[$workerId]['futureId'] = self::$_listeners[$key] = $result = Future::add($callback, [], self::$interval);
@@ -261,7 +255,7 @@ protected static function _ChCreateListener(string $key, $workerId, Closure $lis
                 'result'    => null
             ];
         }, true);
-        return $r ? $result : false;
+        return $result;
     }
 
     /**
@@ -276,7 +270,7 @@ protected static function _ChRemoveListener(string $key, $workerId, bool $remove
     {
         $func = __FUNCTION__;
         $params = func_get_args();
-        $r = self::_Atomic($key, function () use (
+        self::_Atomic($key, function () use (
             $key, $workerId, $func, $params, $remove
         ) {
             if ($id = self::$_listeners[$key] ?? null) {
@@ -320,8 +314,5 @@ protected static function _ChRemoveListener(string $key, $workerId, bool $remove
                 'result'    => null
             ];
         }, true);
-        if (!$r) {
-            throw new RuntimeException("Channel {$key} listener remove failed");
-        }
     }
 }