Merge branch 'master' of https://github.com/lordthorzonus/php-dataloader

Author: lordthorzonus

src/DataLoaderException.php

@@ -1,10 +1,7 @@
 <?php
 
-
 namespace leinonen\DataLoader;
 
-
 class DataLoaderException extends \RuntimeException
 {
-
 }

src/DataLoaderOptions.php

@@ -80,7 +80,7 @@ private function validateOptions($maxBatchSize, $shouldBatch, $shouldCache)
      */
     private function validateBatchOption($shouldBatch)
     {
-        if (!\is_bool($shouldBatch)) {
+        if (! \is_bool($shouldBatch)) {
             throw new \InvalidArgumentException('Expected argument $shouldBatch to be a boolean');
         }
     }
@@ -90,7 +90,7 @@ private function validateBatchOption($shouldBatch)
      */
     private function validateCacheOption($shouldCache)
     {
-        if (!\is_bool($shouldCache)) {
+        if (! \is_bool($shouldCache)) {
             throw new \InvalidArgumentException('Expected argument $shouldCache to be a boolean');
         }
     }
@@ -100,7 +100,7 @@ private function validateCacheOption($shouldCache)
      */
     private function validateMaxBatchSizeOption($maxBatchSize)
     {
-        if ($maxBatchSize !== null && !\is_int($maxBatchSize)) {
+        if ($maxBatchSize !== null && ! \is_int($maxBatchSize)) {
             throw new \InvalidArgumentException('Expected argument $maxBatchSize to be null or an integer');
         }
     }

tests/Unit/DataLoaderAbuseTest.php

@@ -2,12 +2,12 @@
 
 namespace leinonen\DataLoader\Tests\Unit;
 
-use leinonen\DataLoader\DataLoaderException;
 use React\Promise\Promise;
 use React\EventLoop\Factory;
 use leinonen\DataLoader\CacheMap;
 use React\EventLoop\LoopInterface;
 use leinonen\DataLoader\DataLoader;
+use leinonen\DataLoader\DataLoaderException;
 
 class DataLoaderAbuseTest extends \PHPUnit_Framework_TestCase
 {
@@ -62,7 +62,6 @@ public function load_many_requires_actual_keys()
     public function batch_function_must_return_a_promise_not_null()
     {
         $badLoader = $this->createDataLoader(function ($keys) {
-            return null;
         });
 
         $exception = null;