Made all classes final, updated tests to phpunit 8 and removed some tests that were useless under the new php version

Author: lordthorzonus

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 namespace leinonen\DataLoader;
 
-class CacheMap implements CacheMapInterface, \Countable
+final class CacheMap implements CacheMapInterface, \Countable
 {
     /**
      * @var array

src/CacheMap.php

@@ -2,11 +2,11 @@
 
 namespace leinonen\DataLoader;
 
+use React\Promise\ExtendedPromiseInterface;
 use React\Promise\Promise;
 use React\EventLoop\LoopInterface;
-use React\Promise\PromiseInterface;
 
-class DataLoader implements DataLoaderInterface
+final class DataLoader implements DataLoaderInterface
 {
     /**
      * @var callable
@@ -57,7 +57,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function load($key): PromiseInterface
+    public function load($key): ExtendedPromiseInterface
     {
         if ($key === null) {
             throw new \InvalidArgumentException(self::class . '::load must be called with a value, but got null');
@@ -91,7 +91,7 @@ function (callable $resolve, callable $reject) use ($key) {
     /**
      * {@inheritdoc}
      */
-    public function loadMany(array $keys): PromiseInterface
+    public function loadMany(array $keys): ExtendedPromiseInterface
     {
         return \React\Promise\all(
             \array_map(

src/DataLoader.php

@@ -2,6 +2,6 @@
 
 namespace leinonen\DataLoader;
 
-class DataLoaderException extends \RuntimeException
+final class DataLoaderException extends \RuntimeException
 {
 }

src/DataLoaderException.php

@@ -2,8 +2,9 @@
 
 namespace leinonen\DataLoader;
 
+use React\Promise\ExtendedPromiseInterface;
 use React\Promise\Promise;
-use React\Promise\PromiseInterface;
+
 
 interface DataLoaderInterface
 {
@@ -15,7 +16,7 @@ interface DataLoaderInterface
      * @return Promise
      * @throws \InvalidArgumentException
      */
-    public function load($key): PromiseInterface;
+    public function load($key): ExtendedPromiseInterface;
 
     /**
      * Loads multiple keys, promising an array of values.
@@ -32,7 +33,7 @@ public function load($key): PromiseInterface;
      * @return Promise
      * @throws \InvalidArgumentException
      */
-    public function loadMany(array $keys): PromiseInterface;
+    public function loadMany(array $keys): ExtendedPromiseInterface;
 
     /**
      * Clears the value for the given key from the cache if it exists. Returns itself for method chaining.

src/DataLoaderInterface.php

@@ -2,7 +2,7 @@
 
 namespace leinonen\DataLoader;
 
-class DataLoaderOptions
+final class DataLoaderOptions
 {
     /**
      * @var bool
@@ -31,7 +31,7 @@ public function __construct(
         bool $shouldBatch = true,
         bool $shouldCache = true
     ) {
-        $this->validateOptions($maxBatchSize, $shouldBatch, $shouldCache);
+        $this->validateMaxBatchSizeOption($maxBatchSize);
         $this->shouldBatch = $shouldBatch;
         $this->maxBatchSize = $maxBatchSize;
         $this->shouldCache = $shouldCache;
@@ -61,18 +61,6 @@ public function shouldCache(): bool
         return $this->shouldCache;
     }
 
-    /**
-     * Validates the options.
-     *
-     * @param null|int $maxBatchSize
-     * @param bool $shouldBatch
-     * @param bool $shouldCache
-     */
-    private function validateOptions($maxBatchSize, $shouldBatch, $shouldCache): void
-    {
-        $this->validateMaxBatchSizeOption($maxBatchSize);
-    }
-
     /**
      * @param null|int $maxBatchSize
      */

src/DataLoaderOptions.php

@@ -24,11 +24,12 @@ public function setUp(): void
 
     /**
      * @test
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage leinonen\DataLoader\DataLoader::load must be called with a value, but got null
      */
     public function load_method_requires_an_actual_key()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('leinonen\DataLoader\DataLoader::load must be called with a value, but got null');
+
         $loader = $this->createDataLoader(function ($keys) {
             return \React\Promise\resolve($keys);
         });
@@ -46,11 +47,12 @@ public function falsey_values_are_however_permitted()
 
     /**
      * @test
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage leinonen\DataLoader\DataLoader::load must be called with a value, but got null
      */
     public function load_many_requires_actual_keys()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('leinonen\DataLoader\DataLoader::load must be called with a value, but got null');
+
         $loader = $this->createDataLoader(function ($keys) {
             return \React\Promise\resolve($keys);
         });

tests/Unit/DataLoaderAbuseTest.php

@@ -28,8 +28,6 @@ public function it_can_be_initiated()
 
     /**
      * @test
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Expected argument $maxBatchSize to be null or a positive integer
      */
     public function it_should_throw_an_exception_if_maxBatchSize_is_not_a_positive_integer()
     {