Skip to content

Commit f651cc6

Browse files
mikaelcommikaelcom
committed
Merge branch 'release/0.0.2'
2 parents cff4e83 + 21fec24 commit f651cc6

17 files changed

+722
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# CHANGELOG
22

3+
## 0.0.2
4+
- Update generated classes using latest generator version, fixes broken code on parameter value test, fixes autocompletion
5+
36
## 0.0.1
47
- Initial version

‎src/ClassMap.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ final public static function get()
2525
'contents' => 'ColissimoPostage\StructType\Contents',
2626
'article' => 'ColissimoPostage\StructType\Article',
2727
'category' => 'ColissimoPostage\StructType\Category',
28+
'original' => 'ColissimoPostage\StructType\Original',
2829
'sender' => 'ColissimoPostage\StructType\Sender',
2930
'address' => 'ColissimoPostage\StructType\Address',
3031
'addressee' => 'ColissimoPostage\StructType\Addressee',
@@ -42,6 +43,7 @@ final public static function get()
4243
'belgiumLabel' => 'ColissimoPostage\StructType\BelgiumLabel',
4344
'codeVAS' => 'ColissimoPostage\StructType\CodeVAS',
4445
'returnAddressBelgium' => 'ColissimoPostage\StructType\ReturnAddressBelgium',
46+
'elementVisual' => 'ColissimoPostage\StructType\ElementVisual',
4547
'pickupLocation' => 'ColissimoPostage\StructType\PickupLocation',
4648
'addressPickupLocation' => 'ColissimoPostage\StructType\AddressPickupLocation',
4749
'routing' => 'ColissimoPostage\StructType\Routing',

‎src/StructType/Article.php‎

Lines changed: 98 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,27 @@ class Article extends AbstractStructBase
4747
* @var string
4848
*/
4949
public $originCountry;
50+
/**
51+
* The currency
52+
* Meta informations extracted from the WSDL
53+
* - minOccurs: 0
54+
* @var string
55+
*/
56+
public $currency;
57+
/**
58+
* The artref
59+
* Meta informations extracted from the WSDL
60+
* - minOccurs: 0
61+
* @var string
62+
*/
63+
public $artref;
64+
/**
65+
* The originalIdent
66+
* Meta informations extracted from the WSDL
67+
* - minOccurs: 0
68+
* @var string
69+
*/
70+
public $originalIdent;
5071
/**
5172
* Constructor method for article
5273
* @uses Article::setDescription()
@@ -55,22 +76,31 @@ class Article extends AbstractStructBase
5576
* @uses Article::setValue()
5677
* @uses Article::setHsCode()
5778
* @uses Article::setOriginCountry()
79+
* @uses Article::setCurrency()
80+
* @uses Article::setArtref()
81+
* @uses Article::setOriginalIdent()
5882
* @param string $description
5983
* @param int $quantity
6084
* @param float $weight
6185
* @param float $value
6286
* @param string $hsCode
6387
* @param string $originCountry
88+
* @param string $currency
89+
* @param string $artref
90+
* @param string $originalIdent
6491
*/
65-
public function __construct($description = null, $quantity = null, $weight = null, $value = null, $hsCode = null, $originCountry = null)
92+
public function __construct($description = null, $quantity = null, $weight = null, $value = null, $hsCode = null, $originCountry = null, $currency = null, $artref = null, $originalIdent = null)
6693
{
6794
$this
6895
->setDescription($description)
6996
->setQuantity($quantity)
7097
->setWeight($weight)
7198
->setValue($value)
7299
->setHsCode($hsCode)
73-
->setOriginCountry($originCountry);
100+
->setOriginCountry($originCountry)
101+
->setCurrency($currency)
102+
->setArtref($artref)
103+
->setOriginalIdent($originalIdent);
74104
}
75105
/**
76106
* Get description value
@@ -196,6 +226,72 @@ public function setOriginCountry($originCountry = null)
196226
$this->originCountry = $originCountry;
197227
return $this;
198228
}
229+
/**
230+
* Get currency value
231+
* @return string|null
232+
*/
233+
public function getCurrency()
234+
{
235+
return $this->currency;
236+
}
237+
/**
238+
* Set currency value
239+
* @param string $currency
240+
* @return \ColissimoPostage\StructType\Article
241+
*/
242+
public function setCurrency($currency = null)
243+
{
244+
// validation for constraint: string
245+
if (!is_null($currency) && !is_string($currency)) {
246+
throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($currency)), __LINE__);
247+
}
248+
$this->currency = $currency;
249+
return $this;
250+
}
251+
/**
252+
* Get artref value
253+
* @return string|null
254+
*/
255+
public function getArtref()
256+
{
257+
return $this->artref;
258+
}
259+
/**
260+
* Set artref value
261+
* @param string $artref
262+
* @return \ColissimoPostage\StructType\Article
263+
*/
264+
public function setArtref($artref = null)
265+
{
266+
// validation for constraint: string
267+
if (!is_null($artref) && !is_string($artref)) {
268+
throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($artref)), __LINE__);
269+
}
270+
$this->artref = $artref;
271+
return $this;
272+
}
273+
/**
274+
* Get originalIdent value
275+
* @return string|null
276+
*/
277+
public function getOriginalIdent()
278+
{
279+
return $this->originalIdent;
280+
}
281+
/**
282+
* Set originalIdent value
283+
* @param string $originalIdent
284+
* @return \ColissimoPostage\StructType\Article
285+
*/
286+
public function setOriginalIdent($originalIdent = null)
287+
{
288+
// validation for constraint: string
289+
if (!is_null($originalIdent) && !is_string($originalIdent)) {
290+
throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($originalIdent)), __LINE__);
291+
}
292+
$this->originalIdent = $originalIdent;
293+
return $this;
294+
}
199295
/**
200296
* Method called when an object has been exported with var_export() functions
201297
* It allows to return an object instantiated with the values

‎src/StructType/BaseResponse.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function setMessages(array $messages = array())
5757
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__);
5858
}
5959
}
60-
if (is_null($messages)) {
60+
if (is_null($messages) || (is_array($messages) && empty($messages))) {
6161
unset($this->messages);
6262
} else {
6363
$this->messages = $messages;

‎src/StructType/Contents.php‎

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,30 @@ class Contents extends AbstractStructBase
2727
* @var \ColissimoPostage\StructType\Category
2828
*/
2929
public $category;
30+
/**
31+
* The original
32+
* Meta informations extracted from the WSDL
33+
* - maxOccurs: unbounded
34+
* - minOccurs: 0
35+
* - nillable: true
36+
* @var \ColissimoPostage\StructType\Original[]
37+
*/
38+
public $original;
3039
/**
3140
* Constructor method for contents
3241
* @uses Contents::setArticle()
3342
* @uses Contents::setCategory()
43+
* @uses Contents::setOriginal()
3444
* @param \ColissimoPostage\StructType\Article[] $article
3545
* @param \ColissimoPostage\StructType\Category $category
46+
* @param \ColissimoPostage\StructType\Original[] $original
3647
*/
37-
public function __construct(array $article = array(), \ColissimoPostage\StructType\Category $category = null)
48+
public function __construct(array $article = array(), \ColissimoPostage\StructType\Category $category = null, array $original = array())
3849
{
3950
$this
4051
->setArticle($article)
41-
->setCategory($category);
52+
->setCategory($category)
53+
->setOriginal($original);
4254
}
4355
/**
4456
* Get article value
@@ -67,7 +79,7 @@ public function setArticle(array $article = array())
6779
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__);
6880
}
6981
}
70-
if (is_null($article)) {
82+
if (is_null($article) || (is_array($article) && empty($article))) {
7183
unset($this->article);
7284
} else {
7385
$this->article = $article;
@@ -107,6 +119,55 @@ public function setCategory(\ColissimoPostage\StructType\Category $category = nu
107119
$this->category = $category;
108120
return $this;
109121
}
122+
/**
123+
* Get original value
124+
* An additional test has been added (isset) before returning the property value as
125+
* this property may have been unset before, due to the fact that this property is
126+
* removable from the request (nillable=true+minOccurs=0)
127+
* @return \ColissimoPostage\StructType\Original[]|null
128+
*/
129+
public function getOriginal()
130+
{
131+
return isset($this->original) ? $this->original : null;
132+
}
133+
/**
134+
* Set original value
135+
* This property is removable from request (nillable=true+minOccurs=0), therefore
136+
* if the value assigned to this property is null, it is removed from this object
137+
* @throws \InvalidArgumentException
138+
* @param \ColissimoPostage\StructType\Original[] $original
139+
* @return \ColissimoPostage\StructType\Contents
140+
*/
141+
public function setOriginal(array $original = array())
142+
{
143+
foreach ($original as $contentsOriginalItem) {
144+
// validation for constraint: itemType
145+
if (!$contentsOriginalItem instanceof \ColissimoPostage\StructType\Original) {
146+
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__);
147+
}
148+
}
149+
if (is_null($original) || (is_array($original) && empty($original))) {
150+
unset($this->original);
151+
} else {
152+
$this->original = $original;
153+
}
154+
return $this;
155+
}
156+
/**
157+
* Add item to original value
158+
* @throws \InvalidArgumentException
159+
* @param \ColissimoPostage\StructType\Original $item
160+
* @return \ColissimoPostage\StructType\Contents
161+
*/
162+
public function addToOriginal(\ColissimoPostage\StructType\Original $item)
163+
{
164+
// validation for constraint: itemType
165+
if (!$item instanceof \ColissimoPostage\StructType\Original) {
166+
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__);
167+
}
168+
$this->original[] = $item;
169+
return $this;
170+
}
110171
/**
111172
* Method called when an object has been exported with var_export() functions
112173
* It allows to return an object instantiated with the values

0 commit comments

Comments
 (0)