Merge branch 'release/0.0.7'

WsdlToPhp · Jan 4, 2017 · aa88473 · aa88473
2 parents 5180d64 + 580fd57
commit aa88473
Show file tree

Hide file tree

Showing 38 changed files with 365 additions and 248 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.0.7
+- Update generated classes using latest generator version (base64Binary handling, composer-settings option)
+
 ## 0.0.6
 - Update generated classes using latest generator version (classmap, integer validations)
 

diff --git a/composer.json b/composer.json
@@ -4,12 +4,12 @@
     "require": {
         "php": ">=5.3.3",
         "ext-soap": "*",
-        "wsdltophp/packagebase": "dev-master"
+        "wsdltophp/packagebase": "~1.0"
     },
     "autoload": {
         "psr-4": {
             "Ews\\": "./src/",
             "SoapClient\\": "./SoapClient/"
         }
     }
-}
+}
diff --git a/generate.sh b/generate.sh
@@ -17,7 +17,8 @@ rm -rf  $DEST/src/ \
 php wsdltophp.phar generate:package \
     --urlorpath=$DEST"/wsdl/services.wsdl" \
     --destination=$DEST \
-    --composer-name="wsdltophp/package-ews" \
+    --composer-name="wsdltophp/package-ews365" \
+    --composer-settings="autoload.psr-4.SoapClient\:./SoapClient/" \
     --addcomments="author:WsdlToPhp <contact@wsdltophp.com>" \
     --soapclient="\SoapClient\SoapClientBase" \
     --prefix="Ews";
@@ -26,8 +27,9 @@ php wsdltophp.phar generate:package \
 php wsdltophp.phar generate:package \
     --urlorpath=$DEST"/wsdl/services.wsdl" \
     --destination=$DEST \
-    --composer-name="wsdltophp/package-ews" \
+    --composer-name="wsdltophp/package-ews365" \
+    --composer-settings="autoload.psr-4.SoapClient\:./SoapClient/" \
     --addcomments="author:WsdlToPhp <contact@wsdltophp.com>" \
     --soapclient="\SoapClient\SoapClientBase" \
     --prefix="Ews" \
-    --force;
+    --force;
diff --git a/src/ArrayType/EwsArrayOfAppManifestsType.php b/src/ArrayType/EwsArrayOfAppManifestsType.php
@@ -17,13 +17,13 @@ class EwsArrayOfAppManifestsType extends AbstractStructArrayBase
      * Meta informations extracted from the WSDL
      * - maxOccurs: unbounded
      * - minOccurs: 0
-     * @var base64Binary[]
+     * @var string[]
      */
     public $Manifest;
     /**
      * Constructor method for ArrayOfAppManifestsType
      * @uses EwsArrayOfAppManifestsType::setManifest()
-     * @param base64Binary[] $manifest
+     * @param string[] $manifest
      */
     public function __construct(array $manifest = array())
     {
@@ -32,7 +32,7 @@ public function __construct(array $manifest = array())
     }
     /**
      * Get Manifest value
-     * @return base64Binary[]|null
+     * @return string[]|null
      */
     public function getManifest()
     {
@@ -41,7 +41,7 @@ public function getManifest()
     /**
      * Set Manifest value
      * @throws \InvalidArgumentException
-     * @param base64Binary[] $manifest
+     * @param string[] $manifest
      * @return \Ews\ArrayType\EwsArrayOfAppManifestsType
      */
     public function setManifest(array $manifest = array())
@@ -58,10 +58,10 @@ public function setManifest(array $manifest = array())
     /**
      * Add item to Manifest value
      * @throws \InvalidArgumentException
-     * @param base64Binary $item
+     * @param string $item
      * @return \Ews\ArrayType\EwsArrayOfAppManifestsType
      */
-    public function addToManifest(base64Binary $item)
+    public function addToManifest($item)
     {
         // validation for constraint: itemType
         if (!is_string($item)) {
@@ -73,7 +73,7 @@ public function addToManifest(base64Binary $item)
     /**
      * Returns the current element
      * @see AbstractStructArrayBase::current()
-     * @return base64Binary|null
+     * @return string|null
      */
     public function current()
     {
@@ -83,7 +83,7 @@ public function current()
      * Returns the indexed element
      * @see AbstractStructArrayBase::item()
      * @param int $index
-     * @return base64Binary|null
+     * @return string|null
      */
     public function item($index)
     {
@@ -92,7 +92,7 @@ public function item($index)
     /**
      * Returns the first element
      * @see AbstractStructArrayBase::first()
-     * @return base64Binary|null
+     * @return string|null
      */
     public function first()
     {
@@ -101,7 +101,7 @@ public function first()
     /**
      * Returns the last element
      * @see AbstractStructArrayBase::last()
-     * @return base64Binary|null
+     * @return string|null
      */
     public function last()
     {
@@ -111,7 +111,7 @@ public function last()
      * Returns the element at the offset
      * @see AbstractStructArrayBase::offsetGet()
      * @param int $offset
-     * @return base64Binary|null
+     * @return string|null
      */
     public function offsetGet($offset)
     {

diff --git a/src/ArrayType/EwsArrayOfBinaryType.php b/src/ArrayType/EwsArrayOfBinaryType.php
@@ -17,13 +17,13 @@ class EwsArrayOfBinaryType extends AbstractStructArrayBase
      * Meta informations extracted from the WSDL
      * - maxOccurs: unbounded
      * - minOccurs: 0
-     * @var base64Binary[]
+     * @var string[]
      */
     public $Base64Binary;
     /**
      * Constructor method for ArrayOfBinaryType
      * @uses EwsArrayOfBinaryType::setBase64Binary()
-     * @param base64Binary[] $base64Binary
+     * @param string[] $base64Binary
      */
     public function __construct(array $base64Binary = array())
     {
@@ -32,7 +32,7 @@ public function __construct(array $base64Binary = array())
     }
     /**
      * Get Base64Binary value
-     * @return base64Binary[]|null
+     * @return string[]|null
      */
     public function getBase64Binary()
     {
@@ -41,7 +41,7 @@ public function getBase64Binary()
     /**
      * Set Base64Binary value
      * @throws \InvalidArgumentException
-     * @param base64Binary[] $base64Binary
+     * @param string[] $base64Binary
      * @return \Ews\ArrayType\EwsArrayOfBinaryType
      */
     public function setBase64Binary(array $base64Binary = array())
@@ -58,10 +58,10 @@ public function setBase64Binary(array $base64Binary = array())
     /**
      * Add item to Base64Binary value
      * @throws \InvalidArgumentException
-     * @param base64Binary $item
+     * @param string $item
      * @return \Ews\ArrayType\EwsArrayOfBinaryType
      */
-    public function addToBase64Binary(base64Binary $item)
+    public function addToBase64Binary($item)
     {
         // validation for constraint: itemType
         if (!is_string($item)) {
@@ -73,7 +73,7 @@ public function addToBase64Binary(base64Binary $item)
     /**
      * Returns the current element
      * @see AbstractStructArrayBase::current()
-     * @return base64Binary|null
+     * @return string|null
      */
     public function current()
     {
@@ -83,7 +83,7 @@ public function current()
      * Returns the indexed element
      * @see AbstractStructArrayBase::item()
      * @param int $index
-     * @return base64Binary|null
+     * @return string|null
      */
     public function item($index)
     {
@@ -92,7 +92,7 @@ public function item($index)
     /**
      * Returns the first element
      * @see AbstractStructArrayBase::first()
-     * @return base64Binary|null
+     * @return string|null
      */
     public function first()
     {
@@ -101,7 +101,7 @@ public function first()
     /**
      * Returns the last element
      * @see AbstractStructArrayBase::last()
-     * @return base64Binary|null
+     * @return string|null
      */
     public function last()
     {
@@ -111,7 +111,7 @@ public function last()
      * Returns the element at the offset
      * @see AbstractStructArrayBase::offsetGet()
      * @param int $offset
-     * @return base64Binary|null
+     * @return string|null
      */
     public function offsetGet($offset)
     {

diff --git a/src/StructType/EwsClientExtensionType.php b/src/StructType/EwsClientExtensionType.php
@@ -25,7 +25,7 @@ class EwsClientExtensionType extends AbstractStructBase
      * Meta informations extracted from the WSDL
      * - maxOccurs: 1
      * - minOccurs: 0
-     * @var base64Binary
+     * @var string
      */
     public $Manifest;
     /**
@@ -113,7 +113,7 @@ class EwsClientExtensionType extends AbstractStructBase
      * @uses EwsClientExtensionType::setAppStatus()
      * @uses EwsClientExtensionType::setEtoken()
      * @param \Ews\ArrayType\EwsArrayOfStringsType $specificUsers
-     * @param base64Binary $manifest
+     * @param string $manifest
      * @param bool $isAvailable
      * @param bool $isMandatory
      * @param bool $isEnabledByDefault
@@ -125,7 +125,7 @@ class EwsClientExtensionType extends AbstractStructBase
      * @param string $appStatus
      * @param string $etoken
      */
-    public function __construct(\Ews\ArrayType\EwsArrayOfStringsType $specificUsers = null, base64Binary $manifest = null, $isAvailable = null, $isMandatory = null, $isEnabledByDefault = null, $providedTo = null, $type = null, $scope = null, $marketplaceAssetId = null, $marketplaceContentMarket = null, $appStatus = null, $etoken = null)
+    public function __construct(\Ews\ArrayType\EwsArrayOfStringsType $specificUsers = null, $manifest = null, $isAvailable = null, $isMandatory = null, $isEnabledByDefault = null, $providedTo = null, $type = null, $scope = null, $marketplaceAssetId = null, $marketplaceContentMarket = null, $appStatus = null, $etoken = null)
     {
         $this
             ->setSpecificUsers($specificUsers)
@@ -161,19 +161,23 @@ public function setSpecificUsers(\Ews\ArrayType\EwsArrayOfStringsType $specificU
     }
     /**
      * Get Manifest value
-     * @return base64Binary|null
+     * @return string|null
      */
     public function getManifest()
     {
         return $this->Manifest;
     }
     /**
      * Set Manifest value
-     * @param base64Binary $manifest
+     * @param string $manifest
      * @return \Ews\StructType\EwsClientExtensionType
      */
-    public function setManifest(base64Binary $manifest = null)
+    public function setManifest($manifest = null)
     {
+        // validation for constraint: string
+        if (!is_null($manifest) && !is_string($manifest)) {
+            throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($manifest)), __LINE__);
+        }
         $this->Manifest = $manifest;
         return $this;
     }

diff --git a/src/StructType/EwsCompleteFindInGALSpeechRecognitionType.php b/src/StructType/EwsCompleteFindInGALSpeechRecognitionType.php
@@ -25,17 +25,17 @@ class EwsCompleteFindInGALSpeechRecognitionType extends EwsBaseRequestType
      * Meta informations extracted from the WSDL
      * - maxOccurs: 1
      * - minOccurs: 1
-     * @var base64Binary
+     * @var string
      */
     public $AudioData;
     /**
      * Constructor method for CompleteFindInGALSpeechRecognitionType
      * @uses EwsCompleteFindInGALSpeechRecognitionType::setRecognitionId()
      * @uses EwsCompleteFindInGALSpeechRecognitionType::setAudioData()
      * @param \Ews\StructType\EwsRecognitionIdType $recognitionId
-     * @param base64Binary $audioData
+     * @param string $audioData
      */
-    public function __construct(\Ews\StructType\EwsRecognitionIdType $recognitionId = null, base64Binary $audioData = null)
+    public function __construct(\Ews\StructType\EwsRecognitionIdType $recognitionId = null, $audioData = null)
     {
         $this
             ->setRecognitionId($recognitionId)
@@ -61,19 +61,23 @@ public function setRecognitionId(\Ews\StructType\EwsRecognitionIdType $recogniti
     }
     /**
      * Get AudioData value
-     * @return base64Binary
+     * @return string
      */
     public function getAudioData()
     {
         return $this->AudioData;
     }
     /**
      * Set AudioData value
-     * @param base64Binary $audioData
+     * @param string $audioData
      * @return \Ews\StructType\EwsCompleteFindInGALSpeechRecognitionType
      */
-    public function setAudioData(base64Binary $audioData = null)
+    public function setAudioData($audioData = null)
     {
+        // validation for constraint: string
+        if (!is_null($audioData) && !is_string($audioData)) {
+            throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($audioData)), __LINE__);
+        }
         $this->AudioData = $audioData;
         return $this;
     }

diff --git a/src/StructType/EwsContactItemType.php b/src/StructType/EwsContactItemType.php
@@ -275,7 +275,7 @@ class EwsContactItemType extends EwsItemType
      * The Photo
      * Meta informations extracted from the WSDL
      * - minOccurs: 0
-     * @var base64Binary
+     * @var string
      */
     public $Photo;
     /**
@@ -717,7 +717,7 @@ class EwsContactItemType extends EwsItemType
      * @param string $phoneticLastName
      * @param string $alias
      * @param string $notes
-     * @param base64Binary $photo
+     * @param string $photo
      * @param \Ews\ArrayType\EwsArrayOfBinaryType $userSMIMECertificate
      * @param \Ews\ArrayType\EwsArrayOfBinaryType $mSExchangeCertificate
      * @param string $directoryId
@@ -764,7 +764,7 @@ class EwsContactItemType extends EwsItemType
      * @param string $partnerNetworkProfilePhotoUrl
      * @param string $partnerNetworkThumbnailPhotoUrl
      */
-    public function __construct($fileAs = null, $fileAsMapping = null, $displayName = null, $givenName = null, $initials = null, $middleName = null, $nickname = null, \Ews\StructType\EwsCompleteNameType $completeName = null, $companyName = null, \Ews\StructType\EwsEmailAddressDictionaryType $emailAddresses = null, \Ews\StructType\EwsAbchEmailAddressDictionaryType $abchEmailAddresses = null, \Ews\StructType\EwsPhysicalAddressDictionaryType $physicalAddresses = null, \Ews\StructType\EwsPhoneNumberDictionaryType $phoneNumbers = null, $assistantName = null, $birthday = null, $businessHomePage = null, \Ews\ArrayType\EwsArrayOfStringsType $children = null, \Ews\ArrayType\EwsArrayOfStringsType $companies = null, $contactSource = null, $department = null, $generation = null, \Ews\StructType\EwsImAddressDictionaryType $imAddresses = null, $jobTitle = null, $manager = null, $mileage = null, $officeLocation = null, $postalAddressIndex = null, $profession = null, $spouseName = null, $surname = null, $weddingAnniversary = null, $hasPicture = null, $phoneticFullName = null, $phoneticFirstName = null, $phoneticLastName = null, $alias = null, $notes = null, base64Binary $photo = null, \Ews\ArrayType\EwsArrayOfBinaryType $userSMIMECertificate = null, \Ews\ArrayType\EwsArrayOfBinaryType $mSExchangeCertificate = null, $directoryId = null, \Ews\StructType\EwsSingleRecipientType $managerMailbox = null, \Ews\ArrayType\EwsArrayOfRecipientsType $directReports = null, $accountName = null, $isAutoUpdateDisabled = null, $isMessengerEnabled = null, $comment = null, $contactShortId = null, $contactType = null, $gender = null, $isHidden = null, $objectId = null, $passportId = null, $isPrivate = null, $sourceId = null, $trustLevel = null, $createdBy = null, \Ews\StructType\EwsContactUrlDictionaryType $urls = null, $cid = null, $skypeAuthCertificate = null, $skypeContext = null, $skypeId = null, $skypeRelationship = null, $yomiNickname = null, $xboxLiveTag = null, $inviteFree = null, $hidePresenceAndProfile = null, $isPendingOutbound = null, $supportGroupFeeds = null, $userTileHash = null, $unifiedInbox = null, \Ews\ArrayType\EwsArrayOfStringsType $mris = null, $wlid = null, $abchContactId = null, $notInBirthdayCalendar = null, $shellContactType = null, $imMri = null, $presenceTrustLevel = null, $otherMri = null, $profileLastChanged = null, $mobileIMEnabled = null, $partnerNetworkProfilePhotoUrl = null, $partnerNetworkThumbnailPhotoUrl = null)
+    public function __construct($fileAs = null, $fileAsMapping = null, $displayName = null, $givenName = null, $initials = null, $middleName = null, $nickname = null, \Ews\StructType\EwsCompleteNameType $completeName = null, $companyName = null, \Ews\StructType\EwsEmailAddressDictionaryType $emailAddresses = null, \Ews\StructType\EwsAbchEmailAddressDictionaryType $abchEmailAddresses = null, \Ews\StructType\EwsPhysicalAddressDictionaryType $physicalAddresses = null, \Ews\StructType\EwsPhoneNumberDictionaryType $phoneNumbers = null, $assistantName = null, $birthday = null, $businessHomePage = null, \Ews\ArrayType\EwsArrayOfStringsType $children = null, \Ews\ArrayType\EwsArrayOfStringsType $companies = null, $contactSource = null, $department = null, $generation = null, \Ews\StructType\EwsImAddressDictionaryType $imAddresses = null, $jobTitle = null, $manager = null, $mileage = null, $officeLocation = null, $postalAddressIndex = null, $profession = null, $spouseName = null, $surname = null, $weddingAnniversary = null, $hasPicture = null, $phoneticFullName = null, $phoneticFirstName = null, $phoneticLastName = null, $alias = null, $notes = null, $photo = null, \Ews\ArrayType\EwsArrayOfBinaryType $userSMIMECertificate = null, \Ews\ArrayType\EwsArrayOfBinaryType $mSExchangeCertificate = null, $directoryId = null, \Ews\StructType\EwsSingleRecipientType $managerMailbox = null, \Ews\ArrayType\EwsArrayOfRecipientsType $directReports = null, $accountName = null, $isAutoUpdateDisabled = null, $isMessengerEnabled = null, $comment = null, $contactShortId = null, $contactType = null, $gender = null, $isHidden = null, $objectId = null, $passportId = null, $isPrivate = null, $sourceId = null, $trustLevel = null, $createdBy = null, \Ews\StructType\EwsContactUrlDictionaryType $urls = null, $cid = null, $skypeAuthCertificate = null, $skypeContext = null, $skypeId = null, $skypeRelationship = null, $yomiNickname = null, $xboxLiveTag = null, $inviteFree = null, $hidePresenceAndProfile = null, $isPendingOutbound = null, $supportGroupFeeds = null, $userTileHash = null, $unifiedInbox = null, \Ews\ArrayType\EwsArrayOfStringsType $mris = null, $wlid = null, $abchContactId = null, $notInBirthdayCalendar = null, $shellContactType = null, $imMri = null, $presenceTrustLevel = null, $otherMri = null, $profileLastChanged = null, $mobileIMEnabled = null, $partnerNetworkProfilePhotoUrl = null, $partnerNetworkThumbnailPhotoUrl = null)
     {
         $this
             ->setFileAs($fileAs)
@@ -1640,19 +1640,23 @@ public function setNotes($notes = null)
     }
     /**
      * Get Photo value
-     * @return base64Binary|null
+     * @return string|null
      */
     public function getPhoto()
     {
         return $this->Photo;
     }
     /**
      * Set Photo value
-     * @param base64Binary $photo
+     * @param string $photo
      * @return \Ews\StructType\EwsContactItemType
      */
-    public function setPhoto(base64Binary $photo = null)
+    public function setPhoto($photo = null)
     {
+        // validation for constraint: string
+        if (!is_null($photo) && !is_string($photo)) {
+            throw new \InvalidArgumentException(sprintf('Invalid value, please provide a string, "%s" given', gettype($photo)), __LINE__);
+        }
         $this->Photo = $photo;
         return $this;
     }