Merge pull request #22 from Fyntasia/develop

Changes in ApiCall
EffectConnect · Aug 23, 2018 · d4136fa · d4136fa
2 parents 94d3525 + 347df6c
commit d4136fa
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 25 deletions.
diff --git a/EffectConnectSDK/ApiCall.php b/EffectConnectSDK/ApiCall.php
@@ -149,7 +149,7 @@ public function call()
         /**
          * @return array
          */
-        final public function getCurlErrors()
+        public function getCurlErrors()
         {
             if ($this->_curlErrNo > 0)
             {
@@ -184,7 +184,7 @@ public function getCurlResponse()
         /**
          * @return bool
          */
-        final public function isSuccess()
+        public function isSuccess()
         {
             return (count($this->_curlErrors) === 0 && $this->_curlErrNo === 0 && $this->_curlResponse !== '');
         }
@@ -194,7 +194,7 @@ final public function isSuccess()
          *
          * @return ApiCall
          */
-        final public function setCallDate(\DateTime $callDate)
+        public function setCallDate(\DateTime $callDate)
         {
             $this->_callDate = $callDate;
 
@@ -206,7 +206,7 @@ final public function setCallDate(\DateTime $callDate)
          *
          * @return ApiCall
          */
-        final public function setCallVersion($callVersion)
+        public function setCallVersion($callVersion)
         {
             $this->_callVersion = $callVersion;
 
@@ -218,7 +218,7 @@ final public function setCallVersion($callVersion)
          *
          * @return ApiCall
          */
-        final public function setHeaders(array $headers)
+        public function setHeaders(array $headers)
         {
             $this->_headers = $headers;
 
@@ -230,7 +230,7 @@ final public function setHeaders(array $headers)
          *
          * @return ApiCall
          */
-        final public function setMethod($method)
+        public function setMethod($method)
         {
             $this->_method = $method;
 
@@ -243,7 +243,7 @@ final public function setMethod($method)
          * @return $this
          * @throws InvalidPropertyException
          */
-        final public function setPayload($payload=null)
+        public function setPayload($payload=null)
         {
             if ($payload instanceof ApiModel)
             {
@@ -261,7 +261,7 @@ final public function setPayload($payload=null)
          *
          * @return ApiCall
          */
-        final public function setPublicKey($publicKey)
+        public function setPublicKey($publicKey)
         {
             $this->_publicKey = $publicKey;
 
@@ -273,7 +273,7 @@ final public function setPublicKey($publicKey)
          *
          * @return ApiCall
          */
-        final public function setResponseLanguage($responseLanguage)
+        public function setResponseLanguage($responseLanguage)
         {
             $this->_responseLanguage = $responseLanguage;
 
@@ -285,7 +285,7 @@ final public function setResponseLanguage($responseLanguage)
          *
          * @return ApiCall
          */
-        final public function setResponseType($responseType)
+        public function setResponseType($responseType)
         {
             $this->_responseType = $responseType;
 
@@ -297,7 +297,7 @@ final public function setResponseType($responseType)
          *
          * @return ApiCall
          */
-        final public function setSecretKey($secretKey)
+        public function setSecretKey($secretKey)
         {
             $this->_secretKey = $secretKey;
 
@@ -309,7 +309,7 @@ final public function setSecretKey($secretKey)
          *
          * @return ApiCall
          */
-        final public function setUri($uri)
+        public function setUri($uri)
         {
             $this->_uri = $uri;
 
@@ -321,7 +321,7 @@ final public function setUri($uri)
          *
          * @return ApiCall
          */
-        final public function setTimeout($timeout)
+        public function setTimeout($timeout)
         {
             $this->_timeout = $timeout;
 
@@ -331,7 +331,7 @@ final public function setTimeout($timeout)
         /**
          * @return array
          */
-        private function _getHeaders()
+        protected function _getHeaders()
         {
             $headers = [
                 'KEY: '.$this->_publicKey,
@@ -356,7 +356,7 @@ private function _getHeaders()
         /**
          * @return string
          */
-        private function _signApiCall()
+        protected function _signApiCall()
         {
             if ($this->_payload instanceof \CURLFile)
             {

diff --git a/EffectConnectSDK/Core.php b/EffectConnectSDK/Core.php
@@ -35,20 +35,31 @@ final class Core
          */
         private $_keychain;
 
+        /**
+         * @var ApiCall $_callClass
+         */
+        private $_callClass;
+
         /**
          * Core constructor.
          *
          * @param Keychain $keychain
+         * @param ApiCall  $callClass
          *
          * @throws \Exception
          */
-        public function __construct($keychain)
+        public function __construct(Keychain $keychain, ApiCall $callClass=null)
         {
             if (!$keychain->_isValid())
             {
                 throw new \Exception('Invalid keychain.');
             }
-            $this->_keychain = $keychain;
+            if ($callClass === null)
+            {
+                $callClass = new ApiCall();
+            }
+            $this->_keychain  = $keychain;
+            $this->_callClass = $callClass;
         }
 
         /**
@@ -101,7 +112,7 @@ final public function __call($name, $arguments)
             {
                 $reflection = new \ReflectionClass('EffectConnect\PHPSdk\Core\CallType\\'.$name);
 
-                return $reflection->newInstanceArgs([$this->_keychain]);
+                return $reflection->newInstanceArgs([$this->_keychain, $this->_callClass]);
             } catch (\Exception $exception)
             {
                 throw new InvalidApiCallException($name);

diff --git a/EffectConnectSDK/Core/Abstracts/CallType.php b/EffectConnectSDK/Core/Abstracts/CallType.php
@@ -31,6 +31,13 @@ abstract class CallType
          */
         protected $action;
 
+        /**
+         * @var ApiCall $callClass
+         *
+         * The CURL base class
+         */
+        protected $callClass;
+
         /**
          * @var \DateTime $callDate
          *
@@ -83,14 +90,16 @@ abstract class CallType
          * AbstractCall constructor.
          *
          * @param Keychain $keychain
+         * @param ApiCall  $callClass
          *
          * @throws InvalidValidatorClassException
          * @throws MissingValidatorClassException
          */
-        public function __construct($keychain)
+        public function __construct(Keychain $keychain, ApiCall $callClass)
         {
-            $this->keychain = $keychain;
-            $this->callDate = new \DateTime('now', new \DateTimeZone('Europe/Amsterdam'));
+            $this->callClass = $callClass;
+            $this->keychain  = $keychain;
+            $this->callDate  = new \DateTime('now', new \DateTimeZone('Europe/Amsterdam'));
             if (!$this->validatorClass)
             {
                 throw new MissingValidatorClassException();
@@ -161,8 +170,7 @@ final public function setResponseType($responseType = CallTypeInterface::RESPONS
          */
         final public function prepareCall()
         {
-            $apiCall = new ApiCall();
-            $apiCall
+            $this->callClass
                 ->setResponseType($this->responseType)
                 ->setResponseLanguage($this->responseLanguage)
                 ->setCallDate($this->callDate)
@@ -172,7 +180,7 @@ final public function prepareCall()
                 ->setPayload($this->payload)
             ;
 
-            return $this->_prepareCall($apiCall);
+            return $this->_prepareCall($this->callClass);
         }
 
         /**

diff --git a/EffectConnectSDK/Core/Interfaces/CallTypeInterface.php b/EffectConnectSDK/Core/Interfaces/CallTypeInterface.php
@@ -25,9 +25,12 @@ interface CallTypeInterface
         const RESPONSE_TYPE_JSON    = 'json';
 
         /**
+         * CallTypeInterface constructor.
+         *
          * @param Keychain $keychain
+         * @param ApiCall  $callClass
          */
-        public function __construct($keychain);
+        public function __construct(Keychain $keychain, ApiCall $callClass);
 
         /**
          * @param string $responseType