Merge pull request #27 from chrisryan/master

Add support for PHP 8.x.

Author: chadicus

README.md

@@ -115,15 +115,15 @@ $compute = function() {
 $result = $memoize->memoizeCallable('myLongOperation', $compute);
 ```
 
-### Never
+### None
 This memoizer does not actually memoize anything - it always calls the
 `$compute` function.  It is useful for testing and can also be used when you
 disable memoization for debugging, etc. because you can swap your real memoizer
 out for this one and everything will still work.
 
 #### Example
 ```php
-$memoize = new \TraderInteractive\Memoize\Never();
+$memoize = new \TraderInteractive\Memoize\None();
 
 $compute = function() {
     // Perform some long operation that you want to memoize

composer.json

@@ -14,20 +14,20 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.0"
+        "php": "^7.0 || ^8.0"
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^1.0",
-        "phpunit/phpunit": "^6.0",
-        "predis/predis": "~1.0",
+        "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "predis/predis": "^1.0",
         "squizlabs/php_codesniffer": "^3.2"
     },
     "suggest": {
         "predis/predis": "Allows for Redis-based memoization."
     },
     "autoload": {
         "psr-4": { "TraderInteractive\\Memoize\\": "src/" }
-    }
+    },
     "scripts": {
         "lint": "vendor/bin/phpcs",
         "test": "vendor/bin/phpunit"

phpunit.xml.dist

@@ -1,4 +1,4 @@
-<phpunit colors="true" forceCoversAnnotation="true" strict="true">
+<phpunit colors="true" forceCoversAnnotation="true">
     <testsuite name="Unit Tests">
         <directory>./tests</directory>
     </testsuite>

src/Never.php renamed to src/None.php

@@ -6,7 +6,7 @@
  * A memoizer that never caches and always recomputes the result.
  * This is useful for turning off memoization (e.g., for debugging).
  */
-class Never implements Memoize
+class None implements Memoize
 {
     /**
      * $cacheTime and $key are ignored - this always calls $compute.

tests/NeverTest.php renamed to tests/NoneTest.php

@@ -5,9 +5,9 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @coversDefaultClass \TraderInteractive\Memoize\Never
+ * @coversDefaultClass \TraderInteractive\Memoize\None
  */
-class NeverTest extends TestCase
+class NoneTest extends TestCase
 {
     /**
      * @test
@@ -24,7 +24,7 @@ public function memoizeCallableTwice()
             return $value;
         };
 
-        $memoizer = new Never();
+        $memoizer = new None();
 
         $this->assertSame($value, $memoizer->memoizeCallable($key, $compute));
         $this->assertSame($value, $memoizer->memoizeCallable($key, $compute));

tests/PredisTest.php

@@ -88,13 +88,15 @@ public function memoizeCallableRefreshRequest()
         };
 
         $client = $this->getPredisMock();
-        $client->expects($this->at(0))->method('get')->with(
+        $client->expects($this->once())->method('get')->with(
             $this->equalTo("{$key}.runtime")
         )->will($this->returnValue(.2));
-        $client->expects($this->at(1))->method('pttl')->with($this->equalTo($key))->will($this->returnValue(10));
-        $client->expects($this->at(2))->method('set')->with($this->equalTo($key), $this->equalTo($cachedValue));
-        $client->expects($this->at(3))->method('set')->with($this->equalTo("{$key}.runtime"), $this->lessThan(1));
-        $client->expects($this->at(4))->method('expire')->with($this->equalTo($key), $this->equalTo($cacheTime));
+        $client->expects($this->once())->method('pttl')->with($this->equalTo($key))->will($this->returnValue(10));
+        $client->expects($this->exactly(2))->method('set')->withConsecutive(
+            [$this->equalTo($key), $this->equalTo($cachedValue)],
+            [$this->equalTo("{$key}.runtime"), $this->lessThan(1)]
+        );
+        $client->expects($this->once())->method('expire')->with($this->equalTo($key), $this->equalTo($cacheTime));
 
         $memoizer = new Predis($client, false, 100);
 
@@ -121,10 +123,12 @@ public function memoizeCallableWithUncachedKey()
         };
 
         $client = $this->getPredisMock();
-        $client->expects($this->at(0))->method('get')->with($this->equalTo($key))->will($this->returnValue(null));
-        $client->expects($this->at(1))->method('set')->with($this->equalTo($key), $this->equalTo($cachedValue));
-        $client->expects($this->at(2))->method('set')->with($this->equalTo("{$key}.runtime"), $this->lessThan(1));
-        $client->expects($this->at(3))->method('expire')->with($this->equalTo($key), $this->equalTo($cacheTime));
+        $client->expects($this->once())->method('get')->with($this->equalTo($key))->will($this->returnValue(null));
+        $client->expects($this->exactly(2))->method('set')->withConsecutive(
+            [$this->equalTo($key), $this->equalTo($cachedValue)],
+            [$this->equalTo("{$key}.runtime"), $this->lessThan(1)]
+        );
+        $client->expects($this->once())->method('expire')->with($this->equalTo($key), $this->equalTo($cacheTime));
 
         $memoizer = new Predis($client);