require php 7.4 (prooph#384)

* require php 7.4 * add missing nullables * update copyright * use closure instead of callable
kochen · Feb 10, 2020 · 1684da3 · 1684da3
1 parent 8efa651
commit 1684da3
Show file tree

Hide file tree

Showing 148 changed files with 570 additions and 792 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,19 +3,12 @@ language: php
 matrix:
   fast_finish: true
   include:
-  - php: 7.2
+  - php: 7.4
     env:
     - DEPENDENCIES=""
     - EXECUTE_CS_CHECK=true
     - TEST_COVERAGE=true
-  - php: 7.2
-    env:
-    - DEPENDENCIES="--prefer-lowest --prefer-stable"
-  - php: 7.3
-    env:
-    - DEPENDENCIES=""
-    - TEST_COVERAGE=true
-  - php: 7.3
+  - php: 7.4
     env:
     - DEPENDENCIES="--prefer-lowest --prefer-stable"
 

diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
-Copyright (c) 2018-2018, Alexander Miertsch
-Copyright (c) 2018-2018, Sascha-Oliver Prolic
+Copyright (c) 2014-2020, Alexander Miertsch
+Copyright (c) 2015-2020, Sascha-Oliver Prolic
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ To establish a consistent code quality, please provide unit tests for all your c
 | 5.x     | EOL         | >= 5.5      | EOL           |
 | 6.x     | Maintained  | >= 5.5      | 3 Dec 2017    |
 | 7.x     | Latest      | >= 7.1      | active        |
-| 8.x     | Development | >= 7.2      | active        |
+| 8.x     | Development | >= 7.4      | active        |
 
 ## License
 

diff --git a/composer.json b/composer.json
@@ -17,16 +17,16 @@
   ],
   "prefer-stable": true,
   "require": {
-    "php": "^7.2",
+    "php": "^7.4",
     "ext-json": "*",
     "ramsey/uuid": "^3.8"
   },
   "require-dev": {
     "amphp/amp": "^2.1.2",
-    "phpspec/prophecy": "^1.7.2",
-    "phpunit/phpunit": "^8.2.2",
     "doctrine/instantiator": "^1.1",
     "php-coveralls/php-coveralls": "^2.1",
+    "phpspec/prophecy": "^1.7.2",
+    "phpunit/phpunit": "^8.2.2",
     "prooph/php-cs-fixer-config": "^0.3",
     "sebastian/object-enumerator": "^3.0.3"
   },

diff --git a/src/AllCheckpoint.php b/src/AllCheckpoint.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/AllEventsSlice.php b/src/AllEventsSlice.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,16 +15,12 @@
 
 class AllEventsSlice
 {
-    /** @var ReadDirection */
-    private $readDirection;
-    /** @var Position */
-    private $fromPosition;
-    /** @var Position */
-    private $nextPosition;
+    private ReadDirection $readDirection;
+    private Position $fromPosition;
+    private Position $nextPosition;
     /** @var ResolvedEvent[] */
-    private $events;
-    /** @var bool */
-    private $isEndOfStream;
+    private array $events;
+    private bool $isEndOfStream;
 
     /**
      * @internal

diff --git a/src/Async/CatchUpSubscriptionDropped.php b/src/Async/CatchUpSubscriptionDropped.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/ClientAuthenticationFailedEventArgs.php b/src/Async/ClientAuthenticationFailedEventArgs.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,10 +17,8 @@
 
 class ClientAuthenticationFailedEventArgs implements EventArgs
 {
-    /** @var EventStoreConnection */
-    private $connection;
-    /** @var string */
-    private $reason;
+    private EventStoreConnection $connection;
+    private string $reason;
 
     public function __construct(EventStoreConnection $connection, string $reason)
     {

diff --git a/src/Async/ClientClosedEventArgs.php b/src/Async/ClientClosedEventArgs.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,10 +17,8 @@
 
 class ClientClosedEventArgs implements EventArgs
 {
-    /** @var EventStoreConnection */
-    private $connection;
-    /** @var string */
-    private $reason;
+    private EventStoreConnection $connection;
+    private string $reason;
 
     public function __construct(EventStoreConnection $connection, string $reason)
     {

diff --git a/src/Async/ClientConnectionEventArgs.php b/src/Async/ClientConnectionEventArgs.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,10 +18,8 @@
 
 class ClientConnectionEventArgs implements EventArgs
 {
-    /** @var EventStoreConnection */
-    private $connection;
-    /** @var EndPoint */
-    private $remoteEndPoint;
+    private EventStoreConnection $connection;
+    private EndPoint $remoteEndPoint;
 
     public function __construct(EventStoreConnection $connection, EndPoint $remoteEndPoint)
     {

diff --git a/src/Async/ClientErrorEventArgs.php b/src/Async/ClientErrorEventArgs.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,10 +18,8 @@
 
 class ClientErrorEventArgs implements EventArgs
 {
-    /** @var EventStoreConnection */
-    private $connection;
-    /** @var Throwable */
-    private $exception;
+    private EventStoreConnection $connection;
+    private Throwable $exception;
 
     public function __construct(EventStoreConnection $connection, Throwable $exception)
     {

diff --git a/src/Async/ClientReconnectingEventArgs.php b/src/Async/ClientReconnectingEventArgs.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,8 +17,7 @@
 
 class ClientReconnectingEventArgs implements EventArgs
 {
-    /** @var EventStoreConnection */
-    private $connection;
+    private EventStoreConnection $connection;
 
     public function __construct(EventStoreConnection $connection)
     {

diff --git a/src/Async/EventAppearedOnCatchupSubscription.php b/src/Async/EventAppearedOnCatchupSubscription.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/EventAppearedOnPersistentSubscription.php b/src/Async/EventAppearedOnPersistentSubscription.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/EventAppearedOnSubscription.php b/src/Async/EventAppearedOnSubscription.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/EventStoreAllCatchUpSubscription.php b/src/Async/EventStoreAllCatchUpSubscription.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/EventStoreCatchUpSubscription.php b/src/Async/EventStoreCatchUpSubscription.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/EventStoreConnection.php b/src/Async/EventStoreConnection.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,6 +14,7 @@
 namespace Prooph\EventStore\Async;
 
 use Amp\Promise;
+use Closure;
 use Prooph\EventStore\AllEventsSlice;
 use Prooph\EventStore\CatchUpSubscriptionSettings;
 use Prooph\EventStore\ConditionalWriteResult;
@@ -241,17 +242,17 @@ public function connectToPersistentSubscriptionAsync(
         ?UserCredentials $userCredentials = null
     ): Promise;
 
-    public function onConnected(callable $handler): ListenerHandler;
+    public function onConnected(Closure $handler): ListenerHandler;
 
-    public function onDisconnected(callable $handler): ListenerHandler;
+    public function onDisconnected(Closure $handler): ListenerHandler;
 
-    public function onReconnecting(callable $handler): ListenerHandler;
+    public function onReconnecting(Closure $handler): ListenerHandler;
 
-    public function onClosed(callable $handler): ListenerHandler;
+    public function onClosed(Closure $handler): ListenerHandler;
 
-    public function onErrorOccurred(callable $handler): ListenerHandler;
+    public function onErrorOccurred(Closure $handler): ListenerHandler;
 
-    public function onAuthenticationFailed(callable $handler): ListenerHandler;
+    public function onAuthenticationFailed(Closure $handler): ListenerHandler;
 
     public function detach(ListenerHandler $handler): void;
 }
diff --git a/src/Async/EventStorePersistentSubscription.php b/src/Async/EventStorePersistentSubscription.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/EventStoreStreamCatchUpSubscription.php b/src/Async/EventStoreStreamCatchUpSubscription.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Async/EventStoreTransaction.php b/src/Async/EventStoreTransaction.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2019 Alexander Miertsch <[email protected]>
- * (c) 2015-2019 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2020 Alexander Miertsch <[email protected]>
+ * (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,16 +21,11 @@
 
 class EventStoreTransaction
 {
-    /** @var int */
-    private $transactionId;
-    /** @var UserCredentials|null */
-    private $userCredentials;
-    /** @var EventStoreTransactionConnection */
-    private $connection;
-    /** @var bool */
-    private $isRolledBack;
-    /** @var bool */
-    private $isCommitted;
+    private int $transactionId;
+    private ?UserCredentials $userCredentials;
+    private EventStoreTransactionConnection $connection;
+    private bool $isRolledBack;
+    private bool $isCommitted;
 
     public function __construct(
         int $transactionId,