updaet 2.0

Author: amuluowin

.gitignore

@@ -1,5 +1,6 @@
 composer.phar
 /vendor/
+.idea
 
 # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

composer.json

@@ -3,9 +3,19 @@
   "description": "rabbit cache",
   "type": "library",
   "require": {
-    "rabbit/framework": "^1.0",
+    "php": ">=7.4.0",
+    "ext-swoole": ">=4.5.0",
+    "rabbit/base": "dev-master",
+    "rabbit/parser": "dev-master",
     "psr/simple-cache": "^1.0.0"
   },
+  "require-dev": {
+    "swoole/ide-helper": "@dev",
+    "phpunit/phpunit": "*"
+  },
+  "suggest": {
+    "ext-igbinary": "use igbinary serialize"
+  },
   "license": "MIT",
   "authors": [
     {
@@ -15,7 +25,7 @@
   ],
   "autoload": {
     "psr-4": {
-      "rabbit\\cache\\": "src/"
+      "Rabbit\\Cache\\": "src/"
     }
   }
 }

src/AbstractCache.php

@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
+namespace Rabbit\Cache;
 
-namespace rabbit\cache;
-
-use rabbit\helper\StringHelper;
+use Rabbit\Base\Helper\StringHelper;
+use function extension_loaded;
 
 /**
  * Class AbstractCache
@@ -14,14 +15,14 @@ class AbstractCache
     /**
      * @var bool whether [igbinary serialization](https://pecl.php.net/package/igbinary) is available or not.
      */
-    private $igbinaryAvailable = false;
+    private bool $igbinaryAvailable = false;
 
     /**
      * AbstractCache constructor.
      */
     public function __construct()
     {
-        $this->igbinaryAvailable = \extension_loaded('igbinary');
+        $this->igbinaryAvailable = extension_loaded('igbinary');
     }
 
     /**

src/Cache.php

@@ -1,15 +1,11 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2018/10/24
- * Time: 18:00
- */
+declare(strict_types=1);
 
-namespace rabbit\cache;
+namespace Rabbit\Cache;
 
 use Psr\SimpleCache\CacheInterface;
-use rabbit\parser\ParserInterface;
+use Psr\SimpleCache\InvalidArgumentException;
+use Rabbit\Parser\ParserInterface;
 
 /**
  * Class Cache
@@ -20,20 +16,22 @@ class Cache implements CacheInterface
     /**
      * @var string
      */
-    private $driver = 'memory';
+    private string $driver = 'memory';
 
     /**
      * @var array
      */
-    private $drivers = [];
+    private array $drivers = [];
 
     /**
      * @var ParserInterface|null
      */
-    private $serializer = null;
+    private ?ParserInterface $serializer = null;
 
     /**
      * Cache constructor.
+     * @param array $drivers
+     * @param ParserInterface|null $serializer
      */
     public function __construct(array $drivers, ParserInterface $serializer = null)
     {
@@ -62,7 +60,7 @@ public function getDriver(string $driver = null): CacheInterface
      * @param int $duration
      * @param string $driver
      * @return mixed
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function cache(string $key, callable $function, int $duration = 0, string $driver = 'memory')
     {
@@ -87,7 +85,7 @@ private function getDrivers(): array
      * @param string $key
      * @param null $default
      * @return mixed
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function get($key, $default = null)
     {
@@ -99,7 +97,7 @@ public function get($key, $default = null)
      * @param mixed $value
      * @param null $ttl
      * @return bool
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function set($key, $value, $ttl = null)
     {
@@ -109,7 +107,7 @@ public function set($key, $value, $ttl = null)
     /**
      * @param string $key
      * @return bool
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function delete($key)
     {
@@ -128,7 +126,7 @@ public function clear()
      * @param iterable $keys
      * @param null $default
      * @return iterable
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function getMultiple($keys, $default = null)
     {
@@ -139,7 +137,7 @@ public function getMultiple($keys, $default = null)
      * @param iterable $values
      * @param null $ttl
      * @return bool
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setMultiple($values, $ttl = null)
     {
@@ -149,7 +147,7 @@ public function setMultiple($values, $ttl = null)
     /**
      * @param iterable $keys
      * @return bool
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function deleteMultiple($keys)
     {
@@ -159,7 +157,7 @@ public function deleteMultiple($keys)
     /**
      * @param string $key
      * @return bool
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function has($key)
     {