keep constructor backwards compatible

Author: Harry Bragg

src/Endpoint/Accounts.php

@@ -84,6 +84,6 @@ class Accounts extends Client
      */
     public function tfa()
     {
-        return $this->clientFactory(AccountsTfa::class);
+        return $this->endpointFactory(AccountsTfa::class);
     }
 }

src/Endpoint/Client.php

@@ -165,7 +165,7 @@ public function __call($method, $arguments)
      *
      * @return Client
      */
-    protected function clientFactory($className = self::class)
+    protected function endpointFactory($className = self::class)
     {
         return new $className(
             $this->client,

src/Endpoint/Saml.php

@@ -39,6 +39,6 @@ public function getMethodNamespace()
      */
     public function idp()
     {
-        return $this->clientFactory(SamlIdp::class);
+        return $this->endpointFactory(SamlIdp::class);
     }
 }

src/Gigya.php

@@ -91,18 +91,18 @@ class Gigya
     /**
      * @param string      $apiKey
      * @param string      $secretKey
+     * @param string|null $dataCenter
      * @param string|null $userKey
-     * @param array       $config    Gigya configuration:
-     *                               - dataCenter <string> (Default: DC_EU) Data Center to use
-     *                               - auth <string> (Default: gigya) Type of authentication, gigya (HttpsAuth) is the
-     *                               default
-     *                               - uidValidator <bool> (Default: true) Include Uid Signature Validation
-     *                               - factory <object> (Default: null) A ResponseFactoryInterface to use, if none is
-     *                               provided ResponseFactory will be used
-     *                               - guzzle <array> (Default: []) A configuration to pass to guzzle if required
-     *                               - options <array> (Default: []) A set of options to pass to each request
+     * @param array       $config     Gigya configuration:
+     *                                - auth <string> (Default: gigya) Type of authentication, gigya (HttpsAuth) is the
+     *                                default
+     *                                - uidValidator <bool> (Default: true) Include Uid Signature Validation
+     *                                - factory <object> (Default: null) A ResponseFactoryInterface to use, if none is
+     *                                provided ResponseFactory will be used
+     *                                - guzzle <array> (Default: []) A configuration to pass to guzzle if required
+     *                                - options <array> (Default: []) A set of options to pass to each request
      */
-    public function __construct($apiKey, $secretKey, $userKey = null, array $config = [])
+    public function __construct($apiKey, $secretKey, $dataCenter = null, $userKey = null, array $config = [])
     {
         $guzzleConfig = (isset($config['guzzle'])) ? $config['guzzle'] : [];
         $this->guzzle = new GuzzleClient($guzzleConfig);
@@ -126,7 +126,7 @@ public function __construct($apiKey, $secretKey, $userKey = null, array $config
         if (isset($config['factory'])) {
             $this->setFactory($config['factory']);
         }
-        $this->dataCenter = (isset($config['dataCenter'])) ? $config['dataCenter'] : self::DC_EU;
+        $this->dataCenter = $dataCenter ?: static::DC_EU;
     }
 
     /**
@@ -224,7 +224,7 @@ public function __call($method, array $arguments)
             throw new BadMethodCallException('No Arguments should be supplied for Gigya call');
         }
 
-        return $this->clientFactory($method);
+        return $this->endpointFactory($method);
     }
 
     /**
@@ -233,7 +233,7 @@ public function __call($method, array $arguments)
      *
      * @return Client
      */
-    private function clientFactory($namespace, $className = Client::class)
+    private function endpointFactory($namespace, $className = Client::class)
     {
         return new $className(
             $this->guzzle,
@@ -251,70 +251,70 @@ private function clientFactory($namespace, $className = Client::class)
      */
     public function accounts()
     {
-        return $this->clientFactory(static::NAMESPACE_ACCOUNTS, Accounts::class);
+        return $this->endpointFactory(static::NAMESPACE_ACCOUNTS, Accounts::class);
     }
 
     /**
      * @return Audit
      */
     public function audit()
     {
-        return $this->clientFactory(static::NAMESPACE_AUDIT, Audit::class);
+        return $this->endpointFactory(static::NAMESPACE_AUDIT, Audit::class);
     }
 
     /**
      * @return Socialize
      */
     public function socialize()
     {
-        return $this->clientFactory(static::NAMESPACE_SOCIALIZE, Socialize::class);
+        return $this->endpointFactory(static::NAMESPACE_SOCIALIZE, Socialize::class);
     }
 
     /**
      * @return Comments
      */
     public function comments()
     {
-        return $this->clientFactory(static::NAMESPACE_COMMENTS, Comments::class);
+        return $this->endpointFactory(static::NAMESPACE_COMMENTS, Comments::class);
     }
 
     /**
      * @return GameMechanics
      */
     public function gameMechanics()
     {
-        return $this->clientFactory(static::NAMESPACE_GAME_MECHANICS, GameMechanics::class);
+        return $this->endpointFactory(static::NAMESPACE_GAME_MECHANICS, GameMechanics::class);
     }
 
     /**
      * @return Reports
      */
     public function reports()
     {
-        return $this->clientFactory(static::NAMESPACE_REPORTS, Reports::class);
+        return $this->endpointFactory(static::NAMESPACE_REPORTS, Reports::class);
     }
 
     /**
      * @return DataStore
      */
     public function dataStore()
     {
-        return $this->clientFactory(static::NAMESPACE_DATA_STORE, DataStore::class);
+        return $this->endpointFactory(static::NAMESPACE_DATA_STORE, DataStore::class);
     }
 
     /**
      * @return IdentityStorage
      */
     public function identityStorage()
     {
-        return $this->clientFactory(static::NAMESPACE_IDENTITY_STORAGE, IdentityStorage::class);
+        return $this->endpointFactory(static::NAMESPACE_IDENTITY_STORAGE, IdentityStorage::class);
     }
 
     /**
      * @return Saml
      */
     public function saml()
     {
-        return $this->clientFactory(static::NAMESPACE_FIDM, Saml::class);
+        return $this->endpointFactory(static::NAMESPACE_FIDM, Saml::class);
     }
 }

tests/functional/GigyaTest.php

@@ -78,7 +78,7 @@ public function testAuthInjectsKeyAndSecretIntoParams()
 
     public function testAuthInjectsKeySecretAndUserKeyIntoParams()
     {
-        $client  = new Gigya('key', 'secret', 'userKey');
+        $client  = new Gigya('key', 'secret', null, 'userKey');
         $history = $this->setUpGigyaHistory($client);
 
         $response = $client->accounts()->getAccountInfo();

tests/performance/GigyaTest.php

@@ -70,7 +70,7 @@ public function createAccountInfoHandler()
             ];
         });
 
-        $this->gigya = new Gigya('key', 'secret', null, [
+        $this->gigya = new Gigya('key', 'secret', null, null, [
             'guzzle' => [
                 'handler' => $handler,
             ],

tests/unit/GigyaTest.php

@@ -67,12 +67,11 @@ public function tearDown()
     public function createClient($key = 'key', $secret = 'secret', $dc = Gigya::DC_EU, $userKey = null)
     {
         $options = [
-            'dataCenter'   => $dc,
             'uidValidator' => false,
             'factory'      => $this->factory,
         ];
 
-        return new Gigya($key, $secret, $userKey, $options);
+        return new Gigya($key, $secret, $dc, $userKey, $options);
     }
 
     /**
@@ -135,7 +134,6 @@ private function setupCall($fixtureName, $uri, $getOptions, $key, $secret, $user
 
     public function testConstructorConfig()
     {
-
         $this->guzzleClient->shouldReceive('__construct')
                            ->once()
                            ->with([
@@ -169,7 +167,6 @@ public function testConstructorConfig()
                       ->andReturn($gigyaResponse);
 
         $config = [
-            'dataCenter'   => Gigya::DC_AU,
             'auth'         => 'oauth',
             'uidValidator' => false,
             'factory'      => $this->factory,
@@ -180,7 +177,7 @@ public function testConstructorConfig()
                 'cert' => 'some_cert.pem',
             ],
         ];
-        $client = new Gigya('key', 'secret', null, $config);
+        $client = new Gigya('key', 'secret', Gigya::DC_AU, null, $config);
 
         static::assertSame($gigyaResponse, $client->accounts()->getAccountInfo());
     }