Merge branch 'release/0.0.2'

WsdlToPhp · Apr 11, 2016 · f651cc6 · f651cc6
2 parents cff4e83 + 21fec24
commit f651cc6
Show file tree

Hide file tree

Showing 17 changed files with 722 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # CHANGELOG
 
+## 0.0.2
+- Update generated classes using latest generator version, fixes broken code on parameter value test, fixes autocompletion
+
 ## 0.0.1
 - Initial version
diff --git a/src/ClassMap.php b/src/ClassMap.php
@@ -25,6 +25,7 @@ final public static function get()
             'contents' => 'ColissimoPostage\StructType\Contents',
             'article' => 'ColissimoPostage\StructType\Article',
             'category' => 'ColissimoPostage\StructType\Category',
+            'original' => 'ColissimoPostage\StructType\Original',
             'sender' => 'ColissimoPostage\StructType\Sender',
             'address' => 'ColissimoPostage\StructType\Address',
             'addressee' => 'ColissimoPostage\StructType\Addressee',
@@ -42,6 +43,7 @@ final public static function get()
             'belgiumLabel' => 'ColissimoPostage\StructType\BelgiumLabel',
             'codeVAS' => 'ColissimoPostage\StructType\CodeVAS',
             'returnAddressBelgium' => 'ColissimoPostage\StructType\ReturnAddressBelgium',
+            'elementVisual' => 'ColissimoPostage\StructType\ElementVisual',
             'pickupLocation' => 'ColissimoPostage\StructType\PickupLocation',
             'addressPickupLocation' => 'ColissimoPostage\StructType\AddressPickupLocation',
             'routing' => 'ColissimoPostage\StructType\Routing',

diff --git a/src/StructType/Article.php b/src/StructType/Article.php
@@ -47,6 +47,27 @@ class Article extends AbstractStructBase
      * @var string
      */
     public $originCountry;
+    /**
+     * The currency
+     * Meta informations extracted from the WSDL
+     * - minOccurs: 0
+     * @var string
+     */
+    public $currency;
+    /**
+     * The artref
+     * Meta informations extracted from the WSDL
+     * - minOccurs: 0
+     * @var string
+     */
+    public $artref;
+    /**
+     * The originalIdent
+     * Meta informations extracted from the WSDL
+     * - minOccurs: 0
+     * @var string
+     */
+    public $originalIdent;
     /**
      * Constructor method for article
      * @uses Article::setDescription()
@@ -55,22 +76,31 @@ class Article extends AbstractStructBase
      * @uses Article::setValue()
      * @uses Article::setHsCode()
      * @uses Article::setOriginCountry()
+     * @uses Article::setCurrency()
+     * @uses Article::setArtref()
+     * @uses Article::setOriginalIdent()
      * @param string $description
      * @param int $quantity
      * @param float $weight
      * @param float $value
      * @param string $hsCode
      * @param string $originCountry
+     * @param string $currency
+     * @param string $artref
+     * @param string $originalIdent
      */
-    public function __construct($description = null, $quantity = null, $weight = null, $value = null, $hsCode = null, $originCountry = null)
+    public function __construct($description = null, $quantity = null, $weight = null, $value = null, $hsCode = null, $originCountry = null, $currency = null, $artref = null, $originalIdent = null)
     {
         $this
             ->setDescription($description)
             ->setQuantity($quantity)
             ->setWeight($weight)
             ->setValue($value)
             ->setHsCode($hsCode)
-            ->setOriginCountry($originCountry);
+            ->setOriginCountry($originCountry)
+            ->setCurrency($currency)
+            ->setArtref($artref)
+            ->setOriginalIdent($originalIdent);
     }
     /**
      * Get description value
@@ -196,6 +226,72 @@ public function setOriginCountry($originCountry = null)
         $this->originCountry = $originCountry;
         return $this;
     }
+    /**
+     * Get currency value
+     * @return string|null
+     */
+    public function getCurrency()
+    {
+        return $this->currency;
+    }
+    /**
+     * Set currency value
+     * @param string $currency
+     * @return \ColissimoPostage\StructType\Article
+     */
+    public function setCurrency($currency = null)
+    {
+        // validation for constraint: string
+        if (!is_null($currency) && !is_string($currency)) {
+            throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($currency)), __LINE__);
+        }
+        $this->currency = $currency;
+        return $this;
+    }
+    /**
+     * Get artref value
+     * @return string|null
+     */
+    public function getArtref()
+    {
+        return $this->artref;
+    }
+    /**
+     * Set artref value
+     * @param string $artref
+     * @return \ColissimoPostage\StructType\Article
+     */
+    public function setArtref($artref = null)
+    {
+        // validation for constraint: string
+        if (!is_null($artref) && !is_string($artref)) {
+            throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($artref)), __LINE__);
+        }
+        $this->artref = $artref;
+        return $this;
+    }
+    /**
+     * Get originalIdent value
+     * @return string|null
+     */
+    public function getOriginalIdent()
+    {
+        return $this->originalIdent;
+    }
+    /**
+     * Set originalIdent value
+     * @param string $originalIdent
+     * @return \ColissimoPostage\StructType\Article
+     */
+    public function setOriginalIdent($originalIdent = null)
+    {
+        // validation for constraint: string
+        if (!is_null($originalIdent) && !is_string($originalIdent)) {
+            throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($originalIdent)), __LINE__);
+        }
+        $this->originalIdent = $originalIdent;
+        return $this;
+    }
     /**
      * Method called when an object has been exported with var_export() functions
      * It allows to return an object instantiated with the values

diff --git a/src/StructType/BaseResponse.php b/src/StructType/BaseResponse.php
@@ -57,7 +57,7 @@ public function setMessages(array $messages = array())
                 throw new \InvalidArgumentException(sprintf('The messages property can only contain items of \ColissimoPostage\StructType\Message, "%s" given', is_object($baseResponseMessagesItem) ? get_class($baseResponseMessagesItem) : gettype($baseResponseMessagesItem)), __LINE__);
             }
         }
-        if (is_null($messages)) {
+        if (is_null($messages) || (is_array($messages) && empty($messages))) {
             unset($this->messages);
         } else {
             $this->messages = $messages;

diff --git a/src/StructType/Contents.php b/src/StructType/Contents.php
@@ -27,18 +27,30 @@ class Contents extends AbstractStructBase
      * @var \ColissimoPostage\StructType\Category
      */
     public $category;
+    /**
+     * The original
+     * Meta informations extracted from the WSDL
+     * - maxOccurs: unbounded
+     * - minOccurs: 0
+     * - nillable: true
+     * @var \ColissimoPostage\StructType\Original[]
+     */
+    public $original;
     /**
      * Constructor method for contents
      * @uses Contents::setArticle()
      * @uses Contents::setCategory()
+     * @uses Contents::setOriginal()
      * @param \ColissimoPostage\StructType\Article[] $article
      * @param \ColissimoPostage\StructType\Category $category
+     * @param \ColissimoPostage\StructType\Original[] $original
      */
-    public function __construct(array $article = array(), \ColissimoPostage\StructType\Category $category = null)
+    public function __construct(array $article = array(), \ColissimoPostage\StructType\Category $category = null, array $original = array())
     {
         $this
             ->setArticle($article)
-            ->setCategory($category);
+            ->setCategory($category)
+            ->setOriginal($original);
     }
     /**
      * Get article value
@@ -67,7 +79,7 @@ public function setArticle(array $article = array())
                 throw new \InvalidArgumentException(sprintf('The article property can only contain items of \ColissimoPostage\StructType\Article, "%s" given', is_object($contentsArticleItem) ? get_class($contentsArticleItem) : gettype($contentsArticleItem)), __LINE__);
             }
         }
-        if (is_null($article)) {
+        if (is_null($article) || (is_array($article) && empty($article))) {
             unset($this->article);
         } else {
             $this->article = $article;
@@ -107,6 +119,55 @@ public function setCategory(\ColissimoPostage\StructType\Category $category = nu
         $this->category = $category;
         return $this;
     }
+    /**
+     * Get original value
+     * An additional test has been added (isset) before returning the property value as
+     * this property may have been unset before, due to the fact that this property is
+     * removable from the request (nillable=true+minOccurs=0)
+     * @return \ColissimoPostage\StructType\Original[]|null
+     */
+    public function getOriginal()
+    {
+        return isset($this->original) ? $this->original : null;
+    }
+    /**
+     * Set original value
+     * This property is removable from request (nillable=true+minOccurs=0), therefore
+     * if the value assigned to this property is null, it is removed from this object
+     * @throws \InvalidArgumentException
+     * @param \ColissimoPostage\StructType\Original[] $original
+     * @return \ColissimoPostage\StructType\Contents
+     */
+    public function setOriginal(array $original = array())
+    {
+        foreach ($original as $contentsOriginalItem) {
+            // validation for constraint: itemType
+            if (!$contentsOriginalItem instanceof \ColissimoPostage\StructType\Original) {
+                throw new \InvalidArgumentException(sprintf('The original property can only contain items of \ColissimoPostage\StructType\Original, "%s" given', is_object($contentsOriginalItem) ? get_class($contentsOriginalItem) : gettype($contentsOriginalItem)), __LINE__);
+            }
+        }
+        if (is_null($original) || (is_array($original) && empty($original))) {
+            unset($this->original);
+        } else {
+            $this->original = $original;
+        }
+        return $this;
+    }
+    /**
+     * Add item to original value
+     * @throws \InvalidArgumentException
+     * @param \ColissimoPostage\StructType\Original $item
+     * @return \ColissimoPostage\StructType\Contents
+     */
+    public function addToOriginal(\ColissimoPostage\StructType\Original $item)
+    {
+        // validation for constraint: itemType
+        if (!$item instanceof \ColissimoPostage\StructType\Original) {
+            throw new \InvalidArgumentException(sprintf('The original property can only contain items of \ColissimoPostage\StructType\Original, "%s" given', is_object($item) ? get_class($item) : gettype($item)), __LINE__);
+        }
+        $this->original[] = $item;
+        return $this;
+    }
     /**
      * Method called when an object has been exported with var_export() functions
      * It allows to return an object instantiated with the values