Merge f7e6a44 into 53bd61e

prooph · May 4, 2020 · c4ccce0 · c4ccce0
2 parents 53bd61e + f7e6a44
commit c4ccce0
Show file tree

Hide file tree

Showing 67 changed files with 670 additions and 640 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,7 @@ before_script:
 
 script:
 - if [[ $TEST_COVERAGE == 'true' ]]; then php -dzend_extension=xdebug.so ./vendor/bin/phpunit --exclude-group=ignore --coverage-text --coverage-clover ./build/logs/clover.xml; else ./vendor/bin/phpunit --exclude-group=ignore; fi
+- ./vendor/bin/psalm
 - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run; fi
 
 after_success:

diff --git a/composer.json b/composer.json
@@ -19,16 +19,16 @@
   "require": {
     "php": "^7.4",
     "ext-json": "*",
-    "ramsey/uuid": "^3.8"
+    "ramsey/uuid": "^3.9.3"
   },
   "require-dev": {
-    "amphp/amp": "^2.1.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"
+    "amphp/amp": "^2.4.4",
+    "doctrine/instantiator": "^1.3",
+    "php-coveralls/php-coveralls": "^2.2",
+    "phpspec/prophecy": "^1.10.3",
+    "phpunit/phpunit": "^9.1",
+    "prooph/php-cs-fixer-config": "^0.3.1",
+    "vimeo/psalm": "^3.11.2"
   },
   "autoload": {
     "psr-4": {

diff --git a/psalm.xml b/psalm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="false"
+    errorLevel="1"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/src/AllEventsSlice.php b/src/AllEventsSlice.php
@@ -18,17 +18,14 @@ class AllEventsSlice
     private ReadDirection $readDirection;
     private Position $fromPosition;
     private Position $nextPosition;
-    /** @var ResolvedEvent[] */
+    /** @var list<ResolvedEvent> */
     private array $events;
     private bool $isEndOfStream;
 
     /**
      * @internal
      *
-     * @param ReadDirection $readDirection
-     * @param Position $fromPosition
-     * @param Position $nextPosition
-     * @param ResolvedEvent[] $events
+     * @param list<ResolvedEvent> $events
      */
     public function __construct(
         ReadDirection $readDirection,
@@ -58,7 +55,7 @@ public function nextPosition(): Position
         return $this->nextPosition;
     }
 
-    /** @return ResolvedEvent[] */
+    /** @return list<ResolvedEvent> */
     public function events(): array
     {
         return $this->events;

diff --git a/src/Async/CatchUpSubscriptionDropped.php b/src/Async/CatchUpSubscriptionDropped.php
diff --git a/src/Async/EventAppearedOnCatchupSubscription.php b/src/Async/EventAppearedOnCatchupSubscription.php
diff --git a/src/Async/EventAppearedOnPersistentSubscription.php b/src/Async/EventAppearedOnPersistentSubscription.php
diff --git a/src/Async/EventAppearedOnSubscription.php b/src/Async/EventAppearedOnSubscription.php
diff --git a/src/Async/EventStoreCatchUpSubscription.php b/src/Async/EventStoreCatchUpSubscription.php
@@ -14,7 +14,6 @@
 namespace Prooph\EventStore\Async;
 
 use Amp\Promise;
-use Throwable;
 
 interface EventStoreCatchUpSubscription
 {

diff --git a/src/Async/EventStoreConnection.php b/src/Async/EventStoreConnection.php
@@ -29,13 +29,15 @@
 use Prooph\EventStore\PersistentSubscriptionSettings;
 use Prooph\EventStore\Position;
 use Prooph\EventStore\RawStreamMetadataResult;
+use Prooph\EventStore\ResolvedEvent;
 use Prooph\EventStore\StreamEventsSlice;
 use Prooph\EventStore\StreamMetadata;
 use Prooph\EventStore\StreamMetadataResult;
-use Prooph\EventStore\SubscriptionDropped;
+use Prooph\EventStore\SubscriptionDropReason;
 use Prooph\EventStore\SystemSettings;
 use Prooph\EventStore\UserCredentials;
 use Prooph\EventStore\WriteResult;
+use Throwable;
 
 interface EventStoreConnection
 {
@@ -54,10 +56,7 @@ public function deleteStreamAsync(
     ): Promise;
 
     /**
-     * @param string $stream
-     * @param int $expectedVersion
-     * @param EventData[] $events
-     * @param UserCredentials|null $userCredentials
+     * @param list<EventData> $events
      * @return Promise<WriteResult>
      */
     public function appendToStreamAsync(
@@ -68,10 +67,7 @@ public function appendToStreamAsync(
     ): Promise;
 
     /**
-     * @param string $stream
-     * @param int $expectedVersion
-     * @param EventData[] $events
-     * @param UserCredentials|null $userCredentials
+     * @param list<EventData> $events
      * @return Promise<ConditionalWriteResult>
      */
     public function conditionalAppendToStreamAsync(
@@ -184,74 +180,106 @@ public function deletePersistentSubscriptionAsync(
     ): Promise;
 
     /**
+     * @param Closure(EventStoreSubscription, ResolvedEvent): Promise $eventAppeared
+     * @param null|Closure(EventStoreSubscription, SubscriptionDropReason, ?Throwable): void $subscriptionDropped
+     * @param null|UserCredentials $userCredentials
      * @return Promise<EventStoreSubscription>
      */
     public function subscribeToStreamAsync(
         string $stream,
         bool $resolveLinkTos,
-        EventAppearedOnSubscription $eventAppeared,
-        ?SubscriptionDropped $subscriptionDropped = null,
+        Closure $eventAppeared,
+        ?Closure $subscriptionDropped = null,
         ?UserCredentials $userCredentials = null
     ): Promise;
 
     /**
+     * @param Closure(EventStoreCatchUpSubscription, ResolvedEvent): Promise $eventAppeared
+     * @param null|Closure(EventStoreCatchUpSubscription): void $liveProcessingStarted
+     * @param null|Closure(EventStoreCatchUpSubscription, SubscriptionDropReason, ?Throwable): void $subscriptionDropped
      * @return Promise<EventStoreStreamCatchUpSubscription>
      */
     public function subscribeToStreamFromAsync(
         string $stream,
         ?int $lastCheckpoint,
         ?CatchUpSubscriptionSettings $settings,
-        EventAppearedOnCatchupSubscription $eventAppeared,
-        ?LiveProcessingStartedOnCatchUpSubscription $liveProcessingStarted = null,
-        ?CatchUpSubscriptionDropped $subscriptionDropped = null,
+        Closure $eventAppeared,
+        ?Closure $liveProcessingStarted = null,
+        ?Closure $subscriptionDropped = null,
         ?UserCredentials $userCredentials = null
     ): Promise;
 
     /**
+     * @param Closure(EventStoreSubscription, ResolvedEvent): Promise $eventAppeared
+     * @param null|Closure(EventStoreSubscription, SubscriptionDropReason, ?Throwable): void $subscriptionDropped
      * @return Promise<EventStoreSubscription>
      */
     public function subscribeToAllAsync(
         bool $resolveLinkTos,
-        EventAppearedOnSubscription $eventAppeared,
-        ?SubscriptionDropped $subscriptionDropped = null,
+        Closure $eventAppeared,
+        ?Closure $subscriptionDropped = null,
         ?UserCredentials $userCredentials = null
     ): Promise;
 
     /**
+     * @param Closure(EventStoreCatchUpSubscription, ResolvedEvent): Promise $eventAppeared
+     * @param null|Closure(EventStoreCatchUpSubscription): void $liveProcessingStarted
+     * @param null|Closure(EventStoreCatchUpSubscription, SubscriptionDropReason, ?Throwable): void $subscriptionDropped
      * @return Promise<EventStoreAllCatchUpSubscription>
      */
     public function subscribeToAllFromAsync(
         ?Position $lastCheckpoint,
         ?CatchUpSubscriptionSettings $settings,
-        EventAppearedOnCatchupSubscription $eventAppeared,
-        ?LiveProcessingStartedOnCatchUpSubscription $liveProcessingStarted = null,
-        ?CatchUpSubscriptionDropped $subscriptionDropped = null,
+        Closure $eventAppeared,
+        ?Closure $liveProcessingStarted = null,
+        ?Closure $subscriptionDropped = null,
         ?UserCredentials $userCredentials = null
     ): Promise;
 
     /**
+     * @param Closure(EventStorePersistentSubscription, ResolvedEvent, ?int): Promise $eventAppeared
+     * @param null|Closure(EventStorePersistentSubscription, SubscriptionDropReason, ?Throwable): void $subscriptionDropped
+     *
      * @return Promise<EventStorePersistentSubscription>
      */
     public function connectToPersistentSubscriptionAsync(
         string $stream,
         string $groupName,
-        EventAppearedOnPersistentSubscription $eventAppeared,
-        ?PersistentSubscriptionDropped $subscriptionDropped = null,
+        Closure $eventAppeared,
+        ?Closure $subscriptionDropped = null,
         int $bufferSize = 10,
         bool $autoAck = true,
         ?UserCredentials $userCredentials = null
     ): Promise;
 
+    /**
+     * @param Closure(ClientConnectionEventArgs): void $handler
+     */
     public function onConnected(Closure $handler): ListenerHandler;
 
+    /**
+     * @param Closure(ClientConnectionEventArgs): void $handler
+     */
     public function onDisconnected(Closure $handler): ListenerHandler;
 
+    /**
+     * @param Closure(ClientReconnectingEventArgs): void $handler
+     */
     public function onReconnecting(Closure $handler): ListenerHandler;
 
+    /**
+     * @param Closure(ClientClosedEventArgs): void $handler
+     */
     public function onClosed(Closure $handler): ListenerHandler;
 
+    /**
+     * @param Closure(ClientErrorEventArgs): void $handler
+     */
     public function onErrorOccurred(Closure $handler): ListenerHandler;
 
+    /**
+     * @param Closure(ClientAuthenticationFailedEventArgs): void $handler
+     */
     public function onAuthenticationFailed(Closure $handler): ListenerHandler;
 
     public function detach(ListenerHandler $handler): void;