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

* 'master' of github.com:lordthorzonus/php-dataloader:
  Fix readme
  Fix DataLoaderInterface comments
  Update CHANGELOG.md
  Update .scrutinizer.yml
  Update .scrutinizer.yml
  Apply fixes from StyleCI
  Update CHANGELOG.md
  Update travis to only run on newest php version

Author: lordthorzonus

.scrutinizer.yml

@@ -9,7 +9,7 @@ build:
     tests:
         override:
             -
-                command: 'phpunit --coverage-clover=coverage.clover'
+                command: 'vendor/bin/phpunit --coverage-clover=coverage.clover'
                 coverage:
                     file: 'coverage.clover'
                     format: 'php-clover'

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## Updating from 1.0.0 to 2.0.0
  - Overall php version requirement was bumped from `5.5` to `7.4`
- - Bumped version requirements for React dependencies and switched DataLoader to return ExtendedPromiseInterfaces instead of PromiseInterfaces.
- - Fluent interfaces in `Dataloader::prime()`,`DataLoader::clear` and `DataLoader::clearAll()` were removed. So change usages like:
+ - ReactPHP dependencies have been bumped to their latest versions.
+ - DataloaderInterface now returns ExtendedPromiseInterfaces instead of PromiseInterfaces.
+ - Fluent interfaces from `Dataloader::prime()`,`DataLoader::clear()` and `DataLoader::clearAll()` were removed. So change usages like:
     ```php
     $dataloader->clear('A')->prime('A', 'Y');
     ```
@@ -12,4 +13,4 @@
     $dataloader->clear('A');
     $dataloader->prime('A', 'Y');
     ```
- - All classes in the library have been marked as final.
+ - All classes in the library have been marked as final.

README.md

@@ -172,20 +172,16 @@ $promises = \React\Promise\all([
 
 ### `clear($key)`
 
-Clears the value at `$key` from the cache, if it exists. Returns itself for
-method chaining.
+Clears the value at `$key` from the cache, if it exists.
 
 - `@param mixed key: An key value to clear.`
 
 ### `clearAll()`
 
-Clears the entire cache. Returns itself for method chaining.
+Clears the entire cache.
 
 ### `prime($key, $value)`
 
 Primes the cache with the provided key and value. If the key already exists, no
 change is made. (To forcefully prime the cache, clear the key first with
-`$loader->clear($key)->prime($key, $value)`. Returns itself for method chaining.
-
-
-
+`$loader->clear($key)->prime($key, $value)`.

src/CacheMap.php

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

src/CacheMapInterface.php

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

src/DataLoader.php

@@ -1,13 +1,15 @@
-<?php declare(strict_types=1);
+<?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\all;
 use function React\Promise\reject;
+use React\EventLoop\LoopInterface;
 use function React\Promise\resolve;
+use React\Promise\ExtendedPromiseInterface;
 
 final class DataLoader implements DataLoaderInterface
 {

src/DataLoaderException.php

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

src/DataLoaderInterface.php

@@ -1,10 +1,11 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace leinonen\DataLoader;
 
-use React\Promise\ExtendedPromiseInterface;
 use React\Promise\Promise;
-
+use React\Promise\ExtendedPromiseInterface;
 
 interface DataLoaderInterface
 {
@@ -36,7 +37,7 @@ public function load($key): ExtendedPromiseInterface;
     public function loadMany(array $keys): ExtendedPromiseInterface;
 
     /**
-     * Clears the value for the given key from the cache if it exists. Returns itself for method chaining.
+     * Clears the value for the given key from the cache if it exists.
      *
      * @param int|string $key
      *
@@ -45,15 +46,14 @@ public function loadMany(array $keys): ExtendedPromiseInterface;
     public function clear($key): void;
 
     /**
-     * Clears the entire cache. Returns itself for method chaining.
+     * Clears the entire cache.
      *
      * @return void
      */
     public function clearAll(): void;
 
     /**
      * Adds the given key and value to the cache. If the key already exists no change is made.
-     * Returns itself for method chaining.
      *
      * @param int|string $key
      * @param int|string $value

tests/Unit/CacheMapTest.php

@@ -2,8 +2,8 @@
 
 namespace leinonen\DataLoader\Tests\Unit;
 
-use leinonen\DataLoader\CacheMap;
 use PHPUnit\Framework\TestCase;
+use leinonen\DataLoader\CacheMap;
 
 class CacheMapTest extends TestCase
 {

tests/Unit/DataLoaderAbuseTest.php

@@ -4,12 +4,12 @@
 
 use React\Promise\Promise;
 use React\EventLoop\Factory;
+use PHPUnit\Framework\TestCase;
 use leinonen\DataLoader\CacheMap;
 use React\EventLoop\LoopInterface;
+use function React\Promise\resolve;
 use leinonen\DataLoader\DataLoader;
 use leinonen\DataLoader\DataLoaderException;
-use PHPUnit\Framework\TestCase;
-use function React\Promise\resolve;
 
 class DataLoaderAbuseTest extends TestCase
 {