Merge branch 'release/2.0.0'

.docker/Dockerfile

@@ -0,0 +1,8 @@
+FROM splitbrain/phpfarm:jessie
+
+RUN apt-get update && apt-get install -y wget zip
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+COPY . /var/www/
+
+WORKDIR /var/www/

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.0.0
+- Update generated classes following WSDL updates
+- Update generated classes thanks to PackageGenerator release [3.3.4](https://github.com/WsdlToPhp/PackageGenerator/releases/tag/3.3.4)
+- Add Docker image usage
+
 ## 1.0.0
 - Update generated classes following WSDL updates
 

composer.json

@@ -4,7 +4,8 @@
     "require": {
         "php": ">=5.3.3",
         "ext-soap": "*",
-        "wsdltophp/packagebase": "~1.0"
+        "ext-mbstring": "*",
+        "wsdltophp/packagebase": "~2.0"
     },
     "autoload": {
         "psr-4": {

docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.4'
+
+services:
+  php:
+    build:
+      context: .
+      dockerfile: .docker/Dockerfile
+    volumes:
+      - .:/var/www:rw
+    container_name: package_colissimo_postage

generate.sh

@@ -14,7 +14,7 @@ rm -rf  $DEST/src/ \
         $DEST/composer.lock;
 
 # package informations
-php wsdltophp.phar generate:package \
+php-7.3 wsdltophp.phar generate:package \
     --urlorpath="https://ws.colissimo.fr/sls-ws/SlsServiceWS?wsdl" \
     --destination=$DEST \
     --composer-name="wsdltophp/package-colissimo-postage" \
@@ -24,7 +24,7 @@ php wsdltophp.phar generate:package \
     --namespace="ColissimoPostage";
 
 # generate package
-php wsdltophp.phar generate:package \
+php-7.3 wsdltophp.phar generate:package \
     --urlorpath="https://ws.colissimo.fr/sls-ws/SlsServiceWS?wsdl" \
     --destination=$DEST \
     --composer-name="wsdltophp/package-colissimo-postage" \

src/ClassMap.php

@@ -31,16 +31,17 @@ final public static function get()
             'address' => '\\ColissimoPostage\\StructType\\Address',
             'addressee' => '\\ColissimoPostage\\StructType\\Addressee',
             'codSenderAddress' => '\\ColissimoPostage\\StructType\\CodSenderAddress',
+            'uploadDocument' => '\\ColissimoPostage\\StructType\\UploadDocument',
             'fields' => '\\ColissimoPostage\\StructType\\Fields',
             'field' => '\\ColissimoPostage\\StructType\\Field',
             'GenerateLabelRequestType' => '\\ColissimoPostage\\StructType\\GenerateLabelRequestType',
             'GetListMailBoxPickingDatesRetourRequestType' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDatesRetourRequestType',
             'GetProductInterRequestType' => '\\ColissimoPostage\\StructType\\GetProductInterRequestType',
             'planPickupRequestType' => '\\ColissimoPostage\\StructType\\PlanPickupRequestType',
-            'checkGenerateLabel' => '\\ColissimoPostage\\StructType\\CheckGenerateLabel',
-            'checkGenerateLabelRequest' => '\\ColissimoPostage\\StructType\\CheckGenerateLabelRequest',
-            'checkGenerateLabelResponse' => '\\ColissimoPostage\\StructType\\CheckGenerateLabelResponse',
-            'CheckGenerateLabelResponseType' => '\\ColissimoPostage\\StructType\\CheckGenerateLabelResponseType',
+            'getListMailBoxPickingDates' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDates',
+            'getListMailBoxPickingDatesRetourRequest' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDatesRetourRequest',
+            'getListMailBoxPickingDatesResponse' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDatesResponse',
+            'GetListMailBoxPickingDatesResponseType' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDatesResponseType',
             'baseResponse' => '\\ColissimoPostage\\StructType\\BaseResponse',
             'Message' => '\\ColissimoPostage\\StructType\\Message',
             'generateLabel' => '\\ColissimoPostage\\StructType\\GenerateLabel',
@@ -66,22 +67,22 @@ final public static function get()
             'planPickupRequest' => '\\ColissimoPostage\\StructType\\PlanPickupRequest',
             'planPickupResponse' => '\\ColissimoPostage\\StructType\\PlanPickupResponse',
             'planPickupResponseType' => '\\ColissimoPostage\\StructType\\PlanPickupResponseType',
-            'getBordereauByNumber' => '\\ColissimoPostage\\StructType\\GetBordereauByNumber',
-            'getBordereauByNumberResponse' => '\\ColissimoPostage\\StructType\\GetBordereauByNumberResponse',
-            'bordereauResponse' => '\\ColissimoPostage\\StructType\\BordereauResponse',
-            'bordereau' => '\\ColissimoPostage\\StructType\\Bordereau',
-            'bordereauHeader' => '\\ColissimoPostage\\StructType\\BordereauHeader',
-            'generateBordereauByParcelsNumbers' => '\\ColissimoPostage\\StructType\\GenerateBordereauByParcelsNumbers',
-            'generateBordereauParcelNumberList' => '\\ColissimoPostage\\StructType\\GenerateBordereauParcelNumberList',
-            'generateBordereauByParcelsNumbersResponse' => '\\ColissimoPostage\\StructType\\GenerateBordereauByParcelsNumbersResponse',
-            'getListMailBoxPickingDates' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDates',
-            'getListMailBoxPickingDatesRetourRequest' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDatesRetourRequest',
-            'getListMailBoxPickingDatesResponse' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDatesResponse',
-            'GetListMailBoxPickingDatesResponseType' => '\\ColissimoPostage\\StructType\\GetListMailBoxPickingDatesResponseType',
+            'checkGenerateLabel' => '\\ColissimoPostage\\StructType\\CheckGenerateLabel',
+            'checkGenerateLabelRequest' => '\\ColissimoPostage\\StructType\\CheckGenerateLabelRequest',
+            'checkGenerateLabelResponse' => '\\ColissimoPostage\\StructType\\CheckGenerateLabelResponse',
+            'CheckGenerateLabelResponseType' => '\\ColissimoPostage\\StructType\\CheckGenerateLabelResponseType',
             'getProductInter' => '\\ColissimoPostage\\StructType\\GetProductInter',
             'getProductInterRequest' => '\\ColissimoPostage\\StructType\\GetProductInterRequest',
             'getProductInterResponse' => '\\ColissimoPostage\\StructType\\GetProductInterResponse',
             'GetProductInterResponseType' => '\\ColissimoPostage\\StructType\\GetProductInterResponseType',
+            'generateBordereauByParcelsNumbers' => '\\ColissimoPostage\\StructType\\GenerateBordereauByParcelsNumbers',
+            'generateBordereauParcelNumberList' => '\\ColissimoPostage\\StructType\\GenerateBordereauParcelNumberList',
+            'generateBordereauByParcelsNumbersResponse' => '\\ColissimoPostage\\StructType\\GenerateBordereauByParcelsNumbersResponse',
+            'bordereauResponse' => '\\ColissimoPostage\\StructType\\BordereauResponse',
+            'bordereau' => '\\ColissimoPostage\\StructType\\Bordereau',
+            'bordereauHeader' => '\\ColissimoPostage\\StructType\\BordereauHeader',
+            'getBordereauByNumber' => '\\ColissimoPostage\\StructType\\GetBordereauByNumber',
+            'getBordereauByNumberResponse' => '\\ColissimoPostage\\StructType\\GetBordereauByNumberResponse',
         );
     }
 }

src/ServiceType/Check.php

@@ -23,7 +23,9 @@ class Check extends SoapClientBase
     public function checkGenerateLabel(\ColissimoPostage\StructType\CheckGenerateLabel $parameters)
     {
         try {
-            $this->setResult(self::getSoapClient()->checkGenerateLabel($parameters));
+            $this->setResult($this->getSoapClient()->__soapCall('checkGenerateLabel', array(
+                $parameters,
+            ), array(), array(), $this->outputHeaders));
             return $this->getResult();
         } catch (\SoapFault $soapFault) {
             $this->saveLastError(__METHOD__, $soapFault);
@@ -39,12 +41,4 @@ public function getResult()
     {
         return parent::getResult();
     }
-    /**
-     * Method returning the class name
-     * @return string __CLASS__
-     */
-    public function __toString()
-    {
-        return __CLASS__;
-    }
 }

src/ServiceType/Generate.php

@@ -23,7 +23,9 @@ class Generate extends SoapClientBase
     public function generateLabel(\ColissimoPostage\StructType\GenerateLabel $parameters)
     {
         try {
-            $this->setResult(self::getSoapClient()->generateLabel($parameters));
+            $this->setResult($this->getSoapClient()->__soapCall('generateLabel', array(
+                $parameters,
+            ), array(), array(), $this->outputHeaders));
             return $this->getResult();
         } catch (\SoapFault $soapFault) {
             $this->saveLastError(__METHOD__, $soapFault);
@@ -42,7 +44,9 @@ public function generateLabel(\ColissimoPostage\StructType\GenerateLabel $parame
     public function generateBordereauByParcelsNumbers(\ColissimoPostage\StructType\GenerateBordereauByParcelsNumbers $parameters)
     {
         try {
-            $this->setResult(self::getSoapClient()->generateBordereauByParcelsNumbers($parameters));
+            $this->setResult($this->getSoapClient()->__soapCall('generateBordereauByParcelsNumbers', array(
+                $parameters,
+            ), array(), array(), $this->outputHeaders));
             return $this->getResult();
         } catch (\SoapFault $soapFault) {
             $this->saveLastError(__METHOD__, $soapFault);
@@ -58,12 +62,4 @@ public function getResult()
     {
         return parent::getResult();
     }
-    /**
-     * Method returning the class name
-     * @return string __CLASS__
-     */
-    public function __toString()
-    {
-        return __CLASS__;
-    }
 }

src/ServiceType/Get.php

@@ -12,56 +12,62 @@
 class Get extends SoapClientBase
 {
     /**
-     * Method to call the operation originally named getBordereauByNumber
+     * Method to call the operation originally named getListMailBoxPickingDates
      * @uses SoapClientBase::getSoapClient()
      * @uses SoapClientBase::setResult()
      * @uses SoapClientBase::getResult()
      * @uses SoapClientBase::saveLastError()
-     * @param \ColissimoPostage\StructType\GetBordereauByNumber $parameters
-     * @return \ColissimoPostage\StructType\GetBordereauByNumberResponse|bool
+     * @param \ColissimoPostage\StructType\GetListMailBoxPickingDates $parameters
+     * @return \ColissimoPostage\StructType\GetListMailBoxPickingDatesResponse|bool
      */
-    public function getBordereauByNumber(\ColissimoPostage\StructType\GetBordereauByNumber $parameters)
+    public function getListMailBoxPickingDates(\ColissimoPostage\StructType\GetListMailBoxPickingDates $parameters)
     {
         try {
-            $this->setResult(self::getSoapClient()->getBordereauByNumber($parameters));
+            $this->setResult($this->getSoapClient()->__soapCall('getListMailBoxPickingDates', array(
+                $parameters,
+            ), array(), array(), $this->outputHeaders));
             return $this->getResult();
         } catch (\SoapFault $soapFault) {
             $this->saveLastError(__METHOD__, $soapFault);
             return false;
         }
     }
     /**
-     * Method to call the operation originally named getListMailBoxPickingDates
+     * Method to call the operation originally named getProductInter
      * @uses SoapClientBase::getSoapClient()
      * @uses SoapClientBase::setResult()
      * @uses SoapClientBase::getResult()
      * @uses SoapClientBase::saveLastError()
-     * @param \ColissimoPostage\StructType\GetListMailBoxPickingDates $parameters
-     * @return \ColissimoPostage\StructType\GetListMailBoxPickingDatesResponse|bool
+     * @param \ColissimoPostage\StructType\GetProductInter $parameters
+     * @return \ColissimoPostage\StructType\GetProductInterResponse|bool
      */
-    public function getListMailBoxPickingDates(\ColissimoPostage\StructType\GetListMailBoxPickingDates $parameters)
+    public function getProductInter(\ColissimoPostage\StructType\GetProductInter $parameters)
     {
         try {
-            $this->setResult(self::getSoapClient()->getListMailBoxPickingDates($parameters));
+            $this->setResult($this->getSoapClient()->__soapCall('getProductInter', array(
+                $parameters,
+            ), array(), array(), $this->outputHeaders));
             return $this->getResult();
         } catch (\SoapFault $soapFault) {
             $this->saveLastError(__METHOD__, $soapFault);
             return false;
         }
     }
     /**
-     * Method to call the operation originally named getProductInter
+     * Method to call the operation originally named getBordereauByNumber
      * @uses SoapClientBase::getSoapClient()
      * @uses SoapClientBase::setResult()
      * @uses SoapClientBase::getResult()
      * @uses SoapClientBase::saveLastError()
-     * @param \ColissimoPostage\StructType\GetProductInter $parameters
-     * @return \ColissimoPostage\StructType\GetProductInterResponse|bool
+     * @param \ColissimoPostage\StructType\GetBordereauByNumber $parameters
+     * @return \ColissimoPostage\StructType\GetBordereauByNumberResponse|bool
      */
-    public function getProductInter(\ColissimoPostage\StructType\GetProductInter $parameters)
+    public function getBordereauByNumber(\ColissimoPostage\StructType\GetBordereauByNumber $parameters)
     {
         try {
-            $this->setResult(self::getSoapClient()->getProductInter($parameters));
+            $this->setResult($this->getSoapClient()->__soapCall('getBordereauByNumber', array(
+                $parameters,
+            ), array(), array(), $this->outputHeaders));
             return $this->getResult();
         } catch (\SoapFault $soapFault) {
             $this->saveLastError(__METHOD__, $soapFault);
@@ -77,12 +83,4 @@ public function getResult()
     {
         return parent::getResult();
     }
-    /**
-     * Method returning the class name
-     * @return string __CLASS__
-     */
-    public function __toString()
-    {
-        return __CLASS__;
-    }
 }

src/ServiceType/Plan.php

@@ -23,7 +23,9 @@ class Plan extends SoapClientBase
     public function planPickup(\ColissimoPostage\StructType\PlanPickup $parameters)
     {
         try {
-            $this->setResult(self::getSoapClient()->planPickup($parameters));
+            $this->setResult($this->getSoapClient()->__soapCall('planPickup', array(
+                $parameters,
+            ), array(), array(), $this->outputHeaders));
             return $this->getResult();
         } catch (\SoapFault $soapFault) {
             $this->saveLastError(__METHOD__, $soapFault);
@@ -39,12 +41,4 @@ public function getResult()
     {
         return parent::getResult();
     }
-    /**
-     * Method returning the class name
-     * @return string __CLASS__
-     */
-    public function __toString()
-    {
-        return __CLASS__;
-    }
 }