Merge pull request #28 from prooph/factories

refactor factories
prooph · Jan 26, 2019 · bca639d · bca639d
2 parents 25cf936 + 08aa106
commit bca639d
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 54 deletions.
diff --git a/src/EventStoreConnectionFactory.php b/src/EventStoreConnectionFactory.php
@@ -23,14 +23,14 @@
 class EventStoreConnectionFactory
 {
     public static function create(
+        ConnectionSettings $settings = null,
         ClientInterface $client = null,
-        RequestFactory $requestFactory = null,
-        ConnectionSettings $settings = null
+        RequestFactory $requestFactory = null
     ): EventStoreConnection {
         return new EventStoreHttpConnection(
+            $settings ?? ConnectionSettings::default(),
             $client ?? HttpClientDiscovery::find(),
-            $requestFactory ?? MessageFactoryDiscovery::find(),
-            $settings ?? ConnectionSettings::default()
+            $requestFactory ?? MessageFactoryDiscovery::find()
         );
     }
 }
diff --git a/src/Internal/EventStoreHttpConnection.php b/src/Internal/EventStoreHttpConnection.php
@@ -74,20 +74,20 @@
 /** @internal */
 class EventStoreHttpConnection implements EventStoreConnection
 {
-    /** @var HttpClient */
-    private $httpClient;
     /** @var ConnectionSettings */
     private $settings;
+    /** @var HttpClient */
+    private $httpClient;
     /** @var callable */
     private $onException;
     /** @var string */
     private $baseUri;
 
     /** @internal */
     public function __construct(
+        ConnectionSettings $settings,
         ClientInterface $httpClient,
-        RequestFactory $requestFactory,
-        ConnectionSettings $settings
+        RequestFactory $requestFactory
     ) {
         $this->baseUri = \sprintf(
             '%s://%s:%s',

diff --git a/src/PersistentSubscriptions/PersistentSubscriptionsManager.php b/src/PersistentSubscriptions/PersistentSubscriptionsManager.php
@@ -29,16 +29,16 @@
 
 class PersistentSubscriptionsManager implements SyncPersistentSubscriptionsManager
 {
-    /** @var HttpClient */
-    private $httpClient;
     /** @var ConnectionSettings */
     private $settings;
+    /** @var HttpClient */
+    private $httpClient;
 
     /** @internal */
     public function __construct(
+        ConnectionSettings $settings,
         ClientInterface $client,
-        RequestFactory $requestFactory,
-        ConnectionSettings $settings
+        RequestFactory $requestFactory
     ) {
         $this->settings = $settings;
 

diff --git a/src/PersistentSubscriptions/PersistentSubscriptionsManagerFactory.php b/src/PersistentSubscriptions/PersistentSubscriptionsManagerFactory.php
@@ -23,14 +23,14 @@
 class PersistentSubscriptionsManagerFactory
 {
     public static function create(
+        ConnectionSettings $settings = null,
         ClientInterface $client = null,
-        RequestFactory $requestFactory = null,
-        ConnectionSettings $settings = null
+        RequestFactory $requestFactory = null
     ): SyncPersistentSubscriptionsManager {
         return new PersistentSubscriptionsManager(
+            $settings ?? ConnectionSettings::default(),
             $client ?? HttpClientDiscovery::find(),
-            $requestFactory ?? MessageFactoryDiscovery::find(),
-            $settings ?? ConnectionSettings::default()
+            $requestFactory ?? MessageFactoryDiscovery::find()
         );
     }
 }
diff --git a/src/Projections/ProjectionsManager.php b/src/Projections/ProjectionsManager.php
@@ -31,16 +31,16 @@
 
 class ProjectionsManager implements SyncProjectionsManager
 {
-    /** @var HttpClient */
-    private $httpClient;
     /** @var ConnectionSettings */
     private $settings;
+    /** @var HttpClient */
+    private $httpClient;
 
     /** @internal */
     public function __construct(
+        ConnectionSettings $settings,
         ClientInterface $client,
-        RequestFactory $requestFactory,
-        ConnectionSettings $settings
+        RequestFactory $requestFactory
     ) {
         $this->settings = $settings;
 

diff --git a/src/Projections/ProjectionsManagerFactory.php b/src/Projections/ProjectionsManagerFactory.php
@@ -23,14 +23,14 @@
 class ProjectionsManagerFactory
 {
     public static function create(
+        ConnectionSettings $settings = null,
         ClientInterface $client = null,
-        RequestFactory $requestFactory = null,
-        ConnectionSettings $settings = null
+        RequestFactory $requestFactory = null
     ): SyncProjectionsManager {
         return new ProjectionsManager(
+            $settings ?? ConnectionSettings::default(),
             $client ?? HttpClientDiscovery::find(),
-            $requestFactory ?? MessageFactoryDiscovery::find(),
-            $settings ?? ConnectionSettings::default()
+            $requestFactory ?? MessageFactoryDiscovery::find()
         );
     }
 }
diff --git a/src/Projections/QueryManager.php b/src/Projections/QueryManager.php
@@ -32,14 +32,14 @@ class QueryManager implements SyncQueryManager
 
     /** @internal */
     public function __construct(
+        ConnectionSettings $settings,
         ClientInterface $client,
-        RequestFactory $requestFactory,
-        ConnectionSettings $settings
+        RequestFactory $requestFactory
     ) {
         $this->projectionsManager = new ProjectionsManager(
+            $settings,
             $client,
-            $requestFactory,
-            $settings
+            $requestFactory
         );
     }
 

diff --git a/src/Projections/QueryManagerFactory.php b/src/Projections/QueryManagerFactory.php
@@ -23,14 +23,14 @@
 class QueryManagerFactory
 {
     public static function create(
+        ConnectionSettings $settings = null,
         ClientInterface $client = null,
-        RequestFactory $requestFactory = null,
-        ConnectionSettings $settings = null
+        RequestFactory $requestFactory = null
     ): SyncQueryManager {
         return new QueryManager(
+            $settings ?? ConnectionSettings::default(),
             $client ?? HttpClientDiscovery::find(),
-            $requestFactory ?? MessageFactoryDiscovery::find(),
-            $settings ?? ConnectionSettings::default()
+            $requestFactory ?? MessageFactoryDiscovery::find()
         );
     }
 }
diff --git a/src/UserManagement/UsersManager.php b/src/UserManagement/UsersManager.php
@@ -35,16 +35,16 @@
 
 class UsersManager implements SyncUsersManager
 {
-    /** @var HttpClient */
-    private $httpClient;
     /** @var ConnectionSettings */
     private $settings;
+    /** @var HttpClient */
+    private $httpClient;
 
     /** @internal */
     public function __construct(
+        ConnectionSettings $settings,
         ClientInterface $client,
-        RequestFactory $requestFactory,
-        ConnectionSettings $settings
+        RequestFactory $requestFactory
     ) {
         $this->settings = $settings;
 

diff --git a/src/UserManagement/UsersManagerFactory.php b/src/UserManagement/UsersManagerFactory.php
@@ -23,14 +23,14 @@
 class UsersManagerFactory
 {
     public static function create(
+        ConnectionSettings $settings = null,
         ClientInterface $client = null,
-        RequestFactory $requestFactory = null,
-        ConnectionSettings $settings = null
+        RequestFactory $requestFactory = null
     ): SyncUsersManager {
         return new UsersManager(
+            $settings ?? ConnectionSettings::default(),
             $client ?? HttpClientDiscovery::find(),
-            $requestFactory ?? MessageFactoryDiscovery::find(),
-            $settings ?? ConnectionSettings::default()
+            $requestFactory ?? MessageFactoryDiscovery::find()
         );
     }
 }
diff --git a/tests/Helper/TestConnection.php b/tests/Helper/TestConnection.php
@@ -28,8 +28,6 @@ public static function create(?UserCredentials $userCredentials = null): EventSt
         self::checkRequiredEnvironmentSettings();
 
         return EventStoreConnectionFactory::create(
-            null,
-            null,
             self::settings($userCredentials)
         );
     }

diff --git a/tests/PersistentSubscriptionManagement/persistent_subscription_manager.php b/tests/PersistentSubscriptionManagement/persistent_subscription_manager.php
@@ -46,8 +46,6 @@ class persistent_subscription_manager extends TestCase
     protected function setUp(): void
     {
         $this->manager = PersistentSubscriptionsManagerFactory::create(
-            null,
-            null,
             TestConnection::settings()
         );
         $this->stream = Guid::generateAsHex();

diff --git a/tests/ProjectionSpecification.php b/tests/ProjectionSpecification.php
@@ -43,8 +43,6 @@ protected function execute(callable $test): void
         $this->connection = TestConnection::create();
 
         $this->projectionsManager = ProjectionsManagerFactory::create(
-            null,
-            null,
             TestConnection::settings()
         );
 

diff --git a/tests/UserManagement/TestWithNode.php b/tests/UserManagement/TestWithNode.php
@@ -26,8 +26,6 @@ abstract class TestWithNode extends TestCase
     protected function setUp(): void
     {
         $this->manager = UsersManagerFactory::create(
-            null,
-            null,
             TestConnection::settings()
         );
     }

diff --git a/tests/UserManagement/list_users.php b/tests/UserManagement/list_users.php
@@ -56,8 +56,6 @@ public function list_all_users_works(): void
     public function list_all_users_falls_back_to_default_credentials(): void
     {
         $manager = UsersManagerFactory::create(
-            null,
-            null,
             TestConnection::settings()
         );
 

diff --git a/tests/connection_factory_can.php b/tests/connection_factory_can.php
@@ -26,8 +26,6 @@ final class connection_factory_can extends TestCase
     public function create_from_settings_and_discover_client_and_request_factory(): void
     {
         $conn = Factory::create(
-            null,
-            null,
             ConnectionSettings::default()
         );
 
@@ -43,8 +41,6 @@ public function create_from_settings_and_discover_client_and_request_factory():
     public function create_from_connection_string(): void
     {
         $conn = Factory::create(
-            null,
-            null,
             ConnectionString::getConnectionSettings(
                 'endpoint=foo:21345'
             )
-Original file line number
+Diff line change
@@ Expand Up @@
             self::checkRequiredEnvironmentSettings();
             return EventStoreConnectionFactory::create(
-                null,
-                null,
                 self::settings($userCredentials)
             );
         }
@@ Expand Down @@