Merge pull request #68 from PaylineByMonext/integration

Integration TBD
PaylineByMonext · Jan 15, 2021 · 86dd172 · 86dd172
2 parents e2b0861 + d459ded
commit 86dd172
Show file tree

Hide file tree

Showing 10 changed files with 1,590 additions and 7,670 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+* 4.64.1 (2020-01-06)
+  * wsdl upgrade and split wsdl in three files    
+  * new properties authorizedCurrency, authorizedAmount in Authorization
+  * new property challengeWindowSize in threeDSInfo
+  * new property challengeWindowSize in threeDSInfo
+  * support php 7.4 replace array_key_exists by property_exists on object
+  * allow to customize waiting time when connecting to Payline servers
+  * format request for UpdateWallet call
+  * fix phpdoc for logger
+
 * 4.59 (2019-07-28)
   * wsdl upgrade
   * new threeDSInfo parameter for manageWebWallet and doWebPayment

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Usage
     use Payline\PaylineSDK;
 
     // create an instance
-    $paylineSDK = new PaylineSDK($merchant_id, $access_key, $proxy_host, $proxy_port, $proxy_login, $proxy_password, $environment[, $pathLog= null[, $logLevel = Logger::INFO[, $externalLogger = null[, $defaultTimezone = "Europe/Paris"]]]]);
+    $paylineSDK = new PaylineSDK($merchant_id,$access_key, $proxy_host, $proxy_port, $proxy_login, $proxy_password, $environment[, $pathLog= null[, $logLevel = Logger::INFO[, $externalLogger = null[, $defaultTimezone = "Europe/Paris"]]]]);
     /*
     $merchant_id, the merchant identifier, has to be a string.
     $environment determines in which Payline environment your request are targeted.
@@ -21,6 +21,11 @@ Usage
 
     // call a web service, for example doWebPayment
     $doWebPaymentRequest = array();
+
+    $doWebPaymentRequest['cancelURL'] = 'https://Demo_Shop.com/cancelURL.php'; 
+    $doWebPaymentRequest['returnURL'] = 'https://Demo_Shop.com/returnURL.php';
+    $doWebPaymentRequest['notificationURL'] = 'https://Demo_Shop.com/notificationURL.php';
+
 
     // PAYMENT
 	$doWebPaymentRequest['payment']['amount'] = 1000; // this value has to be an integer amount is sent in cents

diff --git a/src/Payline/Authorization.php b/src/Payline/Authorization.php
@@ -11,8 +11,11 @@
 
 class Authorization
 {
-
     public $number;
 
     public $date;
+
+    public $authorizedAmount;
+
+    public $authorizedCurrency;
 }
diff --git a/src/Payline/PaylineSDK.php b/src/Payline/PaylineSDK.php
@@ -39,13 +39,9 @@ class PaylineSDK
 
     /**
      * Payline release corresponding to this version of the package
+     * @see https://docs.payline.com/display/DT/API+version+history
      */
-    const SDK_RELEASE = 'PHP SDK 4.59';
-
-    /**
-     * WSDL file name
-     */
-    const WSDL = 'v4.59.wsdl';
+    const SDK_RELEASE = 'PHP SDK 4.64.1';
 
     /**
      * development environment flag
@@ -309,7 +305,7 @@ class PaylineSDK
     const ERR_SHORT_MESSAGE = 'ERROR';
 
     /**
-     * Monolog\Logger instance
+     * @var Logger
      */
     private $logger;
 
@@ -370,9 +366,9 @@ class PaylineSDK
      * @param string $pathLog
      *            path to your custom log folder, must end by directory separator. If null, default logs folder is used. Default : null
      * @param int $logLevel
-     *            Monolog\Logger log level. Default : Logger::INFO
-     * @param  Monolog\Logger $externalLogger
-     *            Monolog\Logger instance, used by PaylineSDK but external to it
+     *            \Monolog\Logger log level. Default : Logger::INFO
+     * @param Logger $externalLogger
+     *            \Monolog\Logger instance, used by PaylineSDK but external to it
      */
     public function __construct($merchant_id, $access_key, $proxy_host, $proxy_port, $proxy_login, $proxy_password, $environment, $pathLog = null, $logLevel = Logger::INFO, $externalLogger = null, $defaultTimezone = "Europe/Paris")
     {
@@ -431,7 +427,7 @@ public function __construct($merchant_id, $access_key, $proxy_host, $proxy_port,
         }
         $this->soapclient_options['style'] = defined('SOAP_DOCUMENT') ? SOAP_DOCUMENT : 2;
         $this->soapclient_options['use'] = defined('SOAP_LITERAL') ? SOAP_LITERAL : 2;
-        $this->soapclient_options['connection_timeout'] = 5;
+        $this->soapclient_options['connection_timeout'] = defined('SOAP_CONNECTION_TIMEOUT') ? SOAP_CONNECTION_TIMEOUT : 5;
         $this->soapclient_options['trace'] = false;
         $this->soapclient_options['soap_client'] = false;
         if($plnInternal){
@@ -504,7 +500,7 @@ protected function order(array $array)
         $order = new Order();
         if ($array) {
             foreach ($array as $k => $v) {
-                if (array_key_exists($k, $order) && (strlen($v))) {
+                if (property_exists($order, $k) && (strlen($v))) {
                     $order->$k = $v;
                 }
             }
@@ -526,7 +522,7 @@ protected function card(array $array)
         $card = new Card();
         if ($array) {
             foreach ($array as $k => $v) {
-                if (array_key_exists($k, $card) && (strlen($v))) {
+                if (property_exists($card, $k) && (strlen($v))) {
                     $card->$k = $v;
                 }
             }
@@ -556,7 +552,7 @@ protected function buyer(array $array, array $shippingAdress, array $billingAddr
         $buyer = new Buyer();
         if ($array) {
             foreach ($array as $k => $v) {
-                if (array_key_exists($k, $buyer) && (strlen($v))) {
+                if (property_exists($buyer, $k) && (strlen($v))) {
                     $buyer->$k = $v;
                 }
             }
@@ -607,7 +603,7 @@ protected function owner(array $array, array $addressOwner)
             $owner = new Owner();
             if ($array) {
                 foreach ($array as $k => $v) {
-                    if (array_key_exists($k, $owner) && (strlen($v))) {
+                    if (property_exists($owner, $k) && (strlen($v))) {
                         $owner->$k = $v;
                     }
                 }
@@ -671,7 +667,7 @@ protected function wallet(array $inWallet, array $address, array $card)
         $wallet = new Wallet();
         if ($inWallet) {
             foreach ($inWallet as $k => $v) {
-                if (array_key_exists($k, $wallet) && (strlen($v))) {
+                if (property_exists($wallet, $k) && (strlen($v))) {
                     $wallet->$k = $v;
                 }
             }
@@ -755,11 +751,12 @@ protected function subMerchant(array $array)
      *      the array keys liste in Sdk CLASS.
      * @return  SoapVar representation of ThreeDSInfo instance
      */
-    protected function threeDSInfo(array $array, array $arrayBrowser, array $arraySdk) {
+    protected function threeDSInfo(array $array, array $arrayBrowser, array $arraySdk)
+    {
         $threeDSInfo = new ThreeDSInfo();
         if ($array) {
             foreach ($array as $k => $v) {
-                if (array_key_exists($k, $array) && (strlen($v))) {
+                if (property_exists($threeDSInfo, $k) && (strlen($v))) {
                     $threeDSInfo->$k = $v;
                 }
             }
@@ -966,6 +963,11 @@ private static function formatRequest(&$array)
         if (!isset($array['threeDSInfo'])) {
             $array['threeDSInfo'] = array();
         }
+        if (!isset($array['updatePersonalDetails'])) {
+            $array['updatePersonalDetails'] = null;
+        }
+
+
     }
 
     /**
@@ -993,7 +995,7 @@ protected function webServiceRequest(array $array, array $WSRequest, $PaylineAPI
             if ($this->soapclient_options['soap_client'] instanceof \SoapClient)  {
                 $client = $this->soapclient_options['soap_client'];
             } else {
-                $client = new SoapClient(__DIR__ . '/' . self::WSDL, $this->soapclient_options);
+                $client = new SoapClient(__DIR__ . '/wsdl/' . $PaylineAPI . '.wsdl', $this->soapclient_options);
             }
             $client->__setLocation($this->webServicesEndpoint . $PaylineAPI);
 
@@ -1356,7 +1358,7 @@ public function usedBy($toolName)
     }
 
     /**
-     * returns Monolog\Logger instance
+     * @return Logger \Monolog\Logger instance
      */
     public function getLogger()
     {
@@ -1374,7 +1376,7 @@ public function addOrderDetail(array $newOrderDetail)
         $orderDetail = new OrderDetail();
         if ($newOrderDetail) {
             foreach ($newOrderDetail as $k => $v) {
-                if (array_key_exists($k, $orderDetail) && (strlen($v))) {
+                if (property_exists($orderDetail, $k) && (strlen($v))) {
                     $orderDetail->$k = $v;
                 }
             }
@@ -1394,7 +1396,7 @@ public function addPrivateData(array $array)
         $private = new PrivateData();
         if ($array) {
             foreach ($array as $k => $v) {
-                if (array_key_exists($k, $private) && (strlen($v))) {
+                if (property_exists($private, $k) && (strlen($v))) {
                     $private->$k = $v;
                 }
             }
@@ -2470,7 +2472,7 @@ protected function buildSoapObject(array $array, $object, $typeName)
     {
         if ($array) {
             foreach ($array as $k => $v) {
-                if (array_key_exists($k, $object) && (strlen($v))) {
+                if (property_exists($object, $k) && (strlen($v))) {
                     $object->$k = $v;
                 }
             }

diff --git a/src/Payline/ThreeDSInfo.php b/src/Payline/ThreeDSInfo.php
@@ -25,5 +25,7 @@ class ThreeDSInfo {
     public $threeDSMethodNotificationURL;
 
     public $threeDSMethodResult;
+
+    public $challengeWindowSize;
 }