Merge fd30ee2 into 676f837

examples/demo-async-cluster.php

@@ -24,7 +24,7 @@
         new IpEndPoint('eventstore3', 2133),
     ]);
 
-    $connection = EventStoreConnectionBuilder::createAsyncFromSettings(
+    $connection = EventStoreAsyncConnectionBuilder::createFromSettings(
         null,
         $builder->build(),
         'cluster-connection'

examples/demo-async-dns-cluster.php

@@ -21,7 +21,7 @@
     $builder->setClusterDns('escluster.net');
     $builder->setClusterGossipPort(2113);
 
-    $connection = EventStoreConnectionBuilder::createAsyncFromSettings(
+    $connection = EventStoreAsyncConnectionBuilder::createFromSettings(
         null,
         $builder->build(),
         'dns-cluster-connection'

examples/demo-async-with-logger.php

@@ -21,7 +21,7 @@
     $builder->enableVerboseLogging();
     $builder->useConsoleLogger();
 
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113),
         $builder->build()
     );

examples/demo-async.php

@@ -17,7 +17,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Loop::run(function () {
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113)
     );
 

examples/demo-subscription-with-logger.php

@@ -25,7 +25,7 @@
     $builder->enableVerboseLogging();
     $builder->useConsoleLogger();
 
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113),
         $builder->build()
     );

examples/demo-subscription1.php

@@ -22,7 +22,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Loop::run(function () {
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113)
     );
 

examples/demo-subscription2.php

@@ -22,7 +22,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Loop::run(function () {
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113)
     );
 

examples/demo-subscription3.php

@@ -22,7 +22,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Loop::run(function () {
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113)
     );
 

examples/demo-subscription4.php

@@ -22,7 +22,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Loop::run(function () {
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113)
     );
 

examples/demo-subscription5.php

@@ -25,7 +25,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Loop::run(function () {
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113)
     );
 

examples/demo-subscription6.php

@@ -24,7 +24,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Loop::run(function () {
-    $connection = EventStoreConnectionBuilder::createAsyncFromIpEndPoint(
+    $connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
         new IpEndPoint('eventstore', 1113)
     );
 

examples/demo-sync.php

@@ -14,7 +14,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$connection = EventStoreConnectionBuilder::createFromIpEndPoint(
+$connection = EventStoreAsyncConnectionBuilder::createFromIpEndPoint(
     new IpEndPoint('eventstore', 1113)
 );
 

src/ClientOperations/StartAsyncTransactionOperation.php

@@ -72,6 +72,8 @@ protected function createRequestDto(): ProtobufMessage
         $message->setRequireMaster($this->requireMaster);
         $message->setEventStreamId($this->stream);
         $message->setExpectedVersion($this->expectedVersion);
+
+        return $message;
     }
 
     protected function inspectResponse(ProtobufMessage $response): InspectionResult

src/EventStoreAsyncConnection.php

@@ -122,6 +122,18 @@ public function getStreamMetadataAsync(string $stream, UserCredentials $userCred
     /** @return Promise<WriteResult> */
     public function setSystemSettingsAsync(SystemSettings $settings, UserCredentials $userCredentials = null): Promise;
 
+    /** @return Promise<EventStoreAsyncTransaction> */
+    public function startTransactionAsync(
+        string $stream,
+        int $expectedVersion,
+        UserCredentials $userCredentials = null
+    ): Promise;
+
+    public function continueTransaction(
+        int $transactionId,
+        UserCredentials $userCredentials = null
+    ): EventStoreAsyncTransaction;
+
     /** @return Promise<PersistentSubscriptionCreateResult> */
     public function createPersistentSubscriptionAsync(
         string $stream,

src/EventStoreConnectionBuilder.php → src/EventStoreAsyncConnectionBuilder.php

@@ -13,15 +13,13 @@
 namespace Prooph\EventStoreClient;
 
 use Prooph\EventStoreClient\EventStoreAsyncConnection as AsyncConnection;
-use Prooph\EventStoreClient\EventStoreSyncConnection as SyncConnection;
 use Prooph\EventStoreClient\Exception\InvalidArgumentException;
 use Prooph\EventStoreClient\Internal\ClusterDnsEndPointDiscoverer;
 use Prooph\EventStoreClient\Internal\EventStoreAsyncNodeConnection;
-use Prooph\EventStoreClient\Internal\EventStoreSyncNodeConnection;
 use Prooph\EventStoreClient\Internal\SingleEndpointDiscoverer;
 use Prooph\EventStoreClient\Internal\StaticEndPointDiscoverer;
 
-class EventStoreConnectionBuilder
+class EventStoreAsyncConnectionBuilder
 {
     /**
      * Sub-delimiters used in user info, query strings and fragments.
@@ -37,18 +35,18 @@ class EventStoreConnectionBuilder
     private const TCP_PORT_DEFAULT = 1113;
 
     /** @throws \Exception */
-    public static function createAsyncFromBuilder(
+    public static function createFromBuilder(
         string $connectionString = null,
         ConnectionSettingsBuilder $builder = null,
         string $connectionName = ''
     ): AsyncConnection {
         $builder = $builder ?? new ConnectionSettingsBuilder();
 
-        return self::createAsyncFromSettings($connectionString, $builder->build(), $connectionName);
+        return self::createFromSettings($connectionString, $builder->build(), $connectionName);
     }
 
     /** @throws \Exception */
-    public static function createAsyncFromSettings(
+    public static function createFromSettings(
         string $connectionString = null,
         ConnectionSettings $settings = null,
         string $connectionName = ''
@@ -113,7 +111,7 @@ public static function createAsyncFromSettings(
         throw new \Exception('Must specify uri, ClusterDNS or gossip seeds');
     }
 
-    public static function createAsyncFromIpEndPoint(
+    public static function createFromIpEndPoint(
         IpEndPoint $endPoint,
         ConnectionSettings $settings = null,
         string $connectionName = null
@@ -128,50 +126,6 @@ public static function createAsyncFromIpEndPoint(
         );
     }
 
-    /** @throws \Exception */
-    public static function createFromBuilder(
-        string $connectionString = null,
-        ConnectionSettingsBuilder $builder = null,
-        string $connectionName = ''
-    ): SyncConnection {
-        $connection = self::createAsyncFromBuilder(
-            $connectionString,
-            $builder,
-            $connectionName
-        );
-
-        return new EventStoreSyncNodeConnection($connection);
-    }
-
-    /** @throws \Exception */
-    public static function createFromSettings(
-        string $connectionString = null,
-        ConnectionSettings $settings = null,
-        string $connectionName = ''
-    ): SyncConnection {
-        $connection = self::createAsyncFromSettings(
-            $connectionString,
-            $settings,
-            $connectionName
-        );
-
-        return new EventStoreSyncNodeConnection($connection);
-    }
-
-    public static function createFromIpEndPoint(
-        IpEndPoint $endPoint,
-        ConnectionSettings $settings = null,
-        string $connectionName = null
-    ): SyncConnection {
-        $connection = self::createAsyncFromIpEndPoint(
-            $endPoint,
-            $settings,
-            $connectionName
-        );
-
-        return new EventStoreSyncNodeConnection($connection);
-    }
-
     private static function createWithClusterDnsEndPointDiscoverer(
         ConnectionSettings $settings,
         string $connectionName = null

src/EventStoreAsyncTransaction.php

@@ -44,7 +44,7 @@ public function transactionId(): int
     }
 
     /** @return Promise<WriteResult> */
-    public function commit(): Promise
+    public function commitAsync(): Promise
     {
         if ($this->isRolledBack) {
             throw new \RuntimeException('Cannot commit a rolledback transaction');

src/EventStoreSyncConnection.php

@@ -112,6 +112,17 @@ public function getStreamMetadata(string $stream, UserCredentials $userCredentia
 
     public function setSystemSettings(SystemSettings $settings, UserCredentials $userCredentials = null): WriteResult;
 
+    public function startTransaction(
+        string $stream,
+        int $expectedVersion,
+        UserCredentials $userCredentials = null
+    ): EventStoreSyncTransaction;
+
+    public function continueTransaction(
+        int $transactionId,
+        UserCredentials $userCredentials = null
+    ): EventStoreSyncTransaction;
+
     public function onConnected(callable $handler): ListenerHandler;
 
     public function onDisconnected(callable $handler): ListenerHandler;