Merge pull request #2 from seregazhuk/update-for-react-cache-0.5

Update for reactphp/cache 0.5

Author: seregazhuk

.travis.yml

@@ -1,9 +1,6 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
 
 services:

README.md

@@ -35,15 +35,18 @@ $cache = new Memcached($loop);
 // store
 $cache->set('key', 12345);
 
+// store for a minute
+$cache->set('key', 12345, 60);
+
 // retrieve
 $cache->get('key')->then(function($value){
     // handle data
 });
 
 // ...
 
-// remove
-$cache->remove('key');
+// delete
+$cache->delete('key');
 
 $loop->run();
 ```

composer.json

@@ -16,9 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
-        "react/cache": "^0.4.1",
-        "seregazhuk/react-memcached": "0.1.4"
+        "php": ">=7.2",
+        "seregazhuk/react-memcached": "^0.2"
     },
     "autoload": {
         "psr-4": {
@@ -31,7 +30,6 @@
         }
     },
     "require-dev": {
-        "seregazhuk/react-promise-testing": "0.*",
-        "phpunit/phpunit": "~5.0"
+        "seregazhuk/react-promise-testing": "0.2"
     }
 }

src/Memcached.php

@@ -33,29 +33,30 @@ public function __construct(LoopInterface $loop, $address = 'localhost:11211', $
 
     /**
      * @param string $key
+     * @param null|mixed $default
      * @return PromiseInterface
      */
-    public function get($key)
+    public function get($key, $default = null): PromiseInterface
     {
         return $this->client->get($this->prefix . $key);
     }
 
-
     /**
      * @param string $key
      * @param mixed $value
+     * @param null|int $ttl
      * @return PromiseInterface
      */
-    public function set($key, $value)
+    public function set($key, $value, $ttl = null): PromiseInterface
     {
-        return $this->client->set($this->prefix . $key, $value);
+        return $this->client->set($this->prefix . $key, $value, 0, $ttl ?: 0);
     }
 
     /**
      * @param string $key
      * @return PromiseInterface
      */
-    public function remove($key)
+    public function delete($key): PromiseInterface
     {
         return $this->client->delete($this->prefix . $key);
     }

tests/CacheTest.php

@@ -8,10 +8,7 @@
 
 class CacheTest extends TestCase
 {
-    /**
-     * @var Memcached
-     */
-    protected $cache;
+    private $cache;
 
     protected function setUp()
     {
@@ -20,24 +17,24 @@ protected function setUp()
     }
 
     /** @test */
-    public function it_stores_and_retrieves_values()
+    public function it_stores_and_retrieves_values(): void
     {
         $this->waitForPromise($this->cache->set('key', 'test'));
 
         $this->assertPromiseFulfillsWith($this->cache->get('key'), 'test');
     }
 
     /** @test */
-    public function it_rejects_promise_when_retrieving_non_existing_key()
+    public function it_rejects_promise_when_retrieving_non_existing_key(): void
     {
         $this->assertPromiseRejectsWith($this->cache->get('non-existing-key'), Exception::class);
     }
 
     /** @test */
-    public function it_removes_value_by_key()
+    public function it_removes_value_by_key(): void
     {
         $this->waitForPromise($this->cache->set('key-to-remove', 'test'));
-        $this->cache->remove('key-to-remove');
+        $this->cache->delete('key-to-remove');
         $this->assertPromiseRejectsWith($this->cache->get('key-to-remove'), Exception::class);
     }
 }