Use strict typing

Author: lordthorzonus

src/CacheMap.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace leinonen\DataLoader;
 

src/CacheMapInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace leinonen\DataLoader;
 

src/DataLoader.php

@@ -1,10 +1,13 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace leinonen\DataLoader;
 
+use function React\Promise\all;
 use React\Promise\ExtendedPromiseInterface;
 use React\Promise\Promise;
 use React\EventLoop\LoopInterface;
+use function React\Promise\reject;
+use function React\Promise\resolve;
 
 final class DataLoader implements DataLoaderInterface
 {
@@ -51,7 +54,7 @@ public function __construct(
         $this->batchLoadFunction = $batchLoadFunction;
         $this->eventLoop = $loop;
         $this->promiseCache = $cacheMap;
-        $this->options = $options === null ? new DataLoaderOptions() : $options;
+        $this->options = $options ?? new DataLoaderOptions();
     }
 
     /**
@@ -93,7 +96,7 @@ function (callable $resolve, callable $reject) use ($key) {
      */
     public function loadMany(array $keys): ExtendedPromiseInterface
     {
-        return \React\Promise\all(
+        return all(
             \array_map(
                 function ($key) {
                     return $this->load($key);
@@ -127,7 +130,7 @@ public function prime($key, $value): void
         if (! $this->promiseCache->get($key)) {
             // Cache a rejected promise if the value is an Exception, in order to match
             // the behavior of load($key).
-            $promise = $value instanceof \Exception ? \React\Promise\reject($value) : \React\Promise\resolve($value);
+            $promise = $value instanceof \Exception ? reject($value) : resolve($value);
 
             $this->promiseCache->set($key, $promise);
         }

src/DataLoaderException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace leinonen\DataLoader;
 

src/DataLoaderInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace leinonen\DataLoader;
 
@@ -13,7 +13,7 @@ interface DataLoaderInterface
      *
      * @param mixed $key
      *
-     * @return Promise
+     * @return ExtendedPromiseInterface
      * @throws \InvalidArgumentException
      */
     public function load($key): ExtendedPromiseInterface;
@@ -30,7 +30,7 @@ public function load($key): ExtendedPromiseInterface;
      *
      * @param array $keys
      *
-     * @return Promise
+     * @return ExtendedPromiseInterface
      * @throws \InvalidArgumentException
      */
     public function loadMany(array $keys): ExtendedPromiseInterface;
@@ -40,14 +40,14 @@ public function loadMany(array $keys): ExtendedPromiseInterface;
      *
      * @param int|string $key
      *
-     * @return $this
+     * @return void
      */
     public function clear($key): void;
 
     /**
      * Clears the entire cache. Returns itself for method chaining.
      *
-     * @return $this
+     * @return void
      */
     public function clearAll(): void;
 
@@ -58,7 +58,7 @@ public function clearAll(): void;
      * @param int|string $key
      * @param int|string $value
      *
-     * @return $this
+     * @return void
      */
     public function prime($key, $value): void;
 }

src/DataLoaderOptions.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace leinonen\DataLoader;
 
@@ -7,7 +7,7 @@ final class DataLoaderOptions
     /**
      * @var bool
      */
-    private $shouldBatch;
+    private  $shouldBatch;
 
     /**
      * @var null|int
@@ -19,13 +19,6 @@ final class DataLoaderOptions
      */
     private $shouldCache;
 
-    /**
-     * Initiates new DataLoaderOptions.
-     *
-     * @param null|int $maxBatchSize
-     * @param bool $shouldBatch
-     * @param bool $shouldCache
-     */
     public function __construct(
         ?int $maxBatchSize = null,
         bool $shouldBatch = true,
@@ -37,36 +30,24 @@ public function __construct(
         $this->shouldCache = $shouldCache;
     }
 
-    /**
-     * @return bool
-     */
     public function shouldBatch(): bool
     {
         return $this->shouldBatch;
     }
 
-    /**
-     * @return null|int
-     */
     public function getMaxBatchSize(): ?int
     {
         return $this->maxBatchSize;
     }
 
-    /**
-     * @return bool
-     */
     public function shouldCache(): bool
     {
         return $this->shouldCache;
     }
 
-    /**
-     * @param null|int $maxBatchSize
-     */
-    private function validateMaxBatchSizeOption($maxBatchSize)
+    private function validateMaxBatchSizeOption(?int $maxBatchSize)
     {
-        if (($maxBatchSize !== null && ! \is_int($maxBatchSize)) || (int) $maxBatchSize < 0) {
+        if ($maxBatchSize !== null && $maxBatchSize < 0) {
             throw new \InvalidArgumentException('Expected argument $maxBatchSize to be null or a positive integer');
         }
     }