Made a simple way to send mail. Fixed add() function. Fixed EmailAddress class.

Garethp · Garethp · commit 74b019d0d1a8 · 2015-08-24T16:49:20.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.5.1 - 2015-08-24
+ * Added an example for sending mail
+
 ## 0.5.0 - 2015-08-24
  * Massive Breaking Change
  * Some basic mail fetching functions
diff --git a/Resources/wsdl/types.xsd b/Resources/wsdl/types.xsd
@@ -100,7 +100,7 @@
     </xs:anyAttribute>
   </xs:complexType>
   <xs:element name="OpenAsAdminOrSystemService" type="t:OpenAsAdminOrSystemServiceType" />
-  
+
   <!-- External sharing security header for person-to-person sharing relationships -->
   <xs:element name="SharingSecurity" type="t:EncryptedDataContainerType"/>
 
@@ -470,7 +470,7 @@
       <xs:enumeration value="contacts:WeddingAnniversary" />
       <xs:enumeration value="contacts:UserSMIMECertificate" />
       <xs:enumeration value="contacts:HasPicture" />
-      
+
       <xs:enumeration value="distributionlist:Members" />
 
       <!-- Post item -->
@@ -1240,25 +1240,25 @@
       <xs:element name="DistinguishedFolderId" type="t:DistinguishedFolderIdType"/>
     </xs:choice>
   </xs:complexType>
-    
+
     <!-- UploadItems types -->
     <xs:complexType name="NonEmptyArrayOfUploadItemsType">
         <xs:sequence>
             <xs:element name="Item" type="t:UploadItemType" maxOccurs="unbounded" minOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
-    
+
     <!-- UploadItemType-->
     <xs:complexType name="UploadItemType">
         <xs:sequence>
             <xs:element name="ParentFolderId" type="t:FolderIdType" maxOccurs ="1" minOccurs ="1"/>
             <xs:element name="ItemId" type="t:ItemIdType" maxOccurs ="1" minOccurs="0"/>
-            <xs:element name="Data" type="xs:base64Binary" maxOccurs ="1" minOccurs ="1"/> 
+            <xs:element name="Data" type="xs:base64Binary" maxOccurs ="1" minOccurs ="1"/>
         </xs:sequence>
         <xs:attribute name="CreateAction" type="t:CreateActionType" use="required"/>
         <xs:attribute name="IsAssociated" type="xs:boolean" use="optional"/>
     </xs:complexType>
-    
+
     <!-- CreateActionType -->
     <xs:simpleType name="CreateActionType">
         <xs:restriction base="xs:string">
@@ -1446,7 +1446,7 @@
     <xs:complexType name="NonEmptyArrayOfItemIdsType">
         <xs:sequence>
             <xs:element name="ItemId" type="t:ItemIdType" maxOccurs ="unbounded" minOccurs ="1"/>
-        </xs:sequence> 
+        </xs:sequence>
     </xs:complexType>
 
   <!-- Item classes -->
@@ -1699,7 +1699,7 @@
       <xs:enumeration value="SetReadState" />
     </xs:restriction>
   </xs:simpleType>
-  
+
   <xs:complexType name="ConversationActionType">
     <xs:sequence>
       <xs:element name="Action" type="t:ConversationActionTypeType" minOccurs="1" maxOccurs="1" />
@@ -3603,7 +3603,7 @@
         <xs:element name="MovedEvent" type="t:MovedCopiedEventType"/>
         <xs:element name="NewMailEvent" type="t:BaseObjectChangedEventType"/>
         <xs:element name="StatusEvent" type="t:BaseNotificationEventType"/>
-        <xs:element name="FreeBusyChangedEvent" type="t:BaseObjectChangedEventType"/>        
+        <xs:element name="FreeBusyChangedEvent" type="t:BaseObjectChangedEventType"/>
       </xs:choice>
     </xs:sequence>
   </xs:complexType>
@@ -3682,14 +3682,14 @@
       <xs:enumeration value="Unsubscribe" />
     </xs:restriction>
   </xs:simpleType>
-  
+
   <xs:complexType name="NonEmptyArrayOfSubscriptionIdsType">
     <xs:sequence>
       <xs:element name="SubscriptionId" type="t:SubscriptionIdType" minOccurs="1"
                   maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="NonEmptyArrayOfNotificationsType">
     <xs:sequence>
       <xs:element name="Notification" type="t:NotificationType" minOccurs="0"
@@ -4854,7 +4854,7 @@
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="ArrayOfTrackingPropertiesType" type="t:ArrayOfTrackingPropertiesType" />
     </xs:choice>
-  </xs:complexType>  
+  </xs:complexType>
 
   <xs:complexType name="ArrayOfRecipientTrackingEventType">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
diff --git a/examples/mail/sendMail.php b/examples/mail/sendMail.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once "vendor/autoload.php";
+
+use jamesiarmes\PEWS\API\Type;
+
+$api = new \jamesiarmes\PEWS\Mail\MailAPI();
+$api->buildClient('server', 'username', 'password');
+
+
+$message = new Type\MessageType();
+$message->setBody('Some Text');
+$message->setSubject('Test Subject');
+$message->setToRecipients('Test.User-True@multrix.com');
+
+$return = $api->sendMail($message);
diff --git a/src/API/ClassMap.php b/src/API/ClassMap.php
@@ -240,7 +240,7 @@ class ClassMap
         'Duration' => '\\jamesiarmes\\PEWS\\API\\Type\\DurationType',
         'EffectiveRightsType' => '\\jamesiarmes\\PEWS\\API\\Type\\EffectiveRightsType',
         'EmailAddressDictionaryEntryType' => '\\jamesiarmes\\PEWS\\API\\Type\\EmailAddressDictionaryEntryType',
-        'EmailAddress' => '\\jamesiarmes\\PEWS\\API\\Type\\Mailbox',
+        'EmailAddressType' => '\\jamesiarmes\\PEWS\\API\\Type\\EmailAddressType',
         'EncryptedDataContainerType' => '\\jamesiarmes\\PEWS\\API\\Type\\SharingSecurity',
         'EncryptedSharedFolderDataType' => '\\jamesiarmes\\PEWS\\API\\Type\\EncryptedSharedFolderDataType',
         'EndDateRecurrenceRangeType' => '\\jamesiarmes\\PEWS\\API\\Type\\EndDateRecurrenceRangeType',
@@ -292,6 +292,7 @@ class ClassMap
         'KeywordStatisticsSearchResultType' => '\\jamesiarmes\\PEWS\\API\\Type\\KeywordStatisticsSearchResultType',
         'MailTipsServiceConfiguration' => '\\jamesiarmes\\PEWS\\API\\Type\\MailTipsServiceConfigurationType',
         'MailTips' => '\\jamesiarmes\\PEWS\\API\\Type\\MailTipsType',
+        'EmailAddress' => '\\jamesiarmes\\PEWS\\API\\Type\\Mailbox',
         'MailboxCultureType' => '\\jamesiarmes\\PEWS\\API\\Type\\MailboxCultureType',
         'MailboxData' => '\\jamesiarmes\\PEWS\\API\\Type\\MailboxDataType',
         'MailboxStatisticsSearchResultType' => '\\jamesiarmes\\PEWS\\API\\Type\\MailboxStatisticsSearchResultType',
diff --git a/src/API/Message/GetUserOofSettingsRequestType.php b/src/API/Message/GetUserOofSettingsRequestType.php
@@ -8,14 +8,14 @@
  *
  * XSD Type: GetUserOofSettingsRequest
  *
- * @method \jamesiarmes\PEWS\API\Type\Mailbox getMailbox()
- * @method GetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\Mailbox $mailbox)
+ * @method \jamesiarmes\PEWS\API\Type\EmailAddressType getMailbox()
+ * @method GetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\EmailAddressType $mailbox)
  */
 class GetUserOofSettingsRequestType extends BaseRequestType
 {
 
     /**
-     * @var \jamesiarmes\PEWS\API\Type\Mailbox
+     * @var \jamesiarmes\PEWS\API\Type\EmailAddressType
      */
     protected $mailbox = null;
 }
diff --git a/src/API/Message/SetUserOofSettingsRequestType.php b/src/API/Message/SetUserOofSettingsRequestType.php
@@ -8,16 +8,16 @@
  *
  * XSD Type: SetUserOofSettingsRequest
  *
- * @method \jamesiarmes\PEWS\API\Type\Mailbox getMailbox()
- * @method SetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\Mailbox $mailbox)
+ * @method \jamesiarmes\PEWS\API\Type\EmailAddressType getMailbox()
+ * @method SetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\EmailAddressType $mailbox)
  * @method \jamesiarmes\PEWS\API\Type\UserOofSettings getUserOofSettings()
  * @method SetUserOofSettingsRequestType setUserOofSettings(\jamesiarmes\PEWS\API\Type\UserOofSettings $userOofSettings)
  */
 class SetUserOofSettingsRequestType extends BaseRequestType
 {
 
     /**
-     * @var \jamesiarmes\PEWS\API\Type\Mailbox
+     * @var \jamesiarmes\PEWS\API\Type\EmailAddressType
      */
     protected $mailbox = null;
 
diff --git a/src/API/Type.php b/src/API/Type.php
@@ -33,7 +33,7 @@ public function __call($name, $arguments)
         }
 
         if ($callType == "add" && count($arguments) == 1) {
-            return $this->add($propertyName, $arguments);
+            return $this->add($propertyName, $arguments[0]);
         }
 
         if ($callType == "is" && count($arguments) == 0) {
diff --git a/src/API/Type/BodyType.php b/src/API/Type/BodyType.php
@@ -20,4 +20,10 @@ class BodyType extends Type
      * @var string
      */
     protected $bodyType = null;
+
+    public function __construct($text, $type = 'HTML')
+    {
+        $this->_ = $text;
+        $this->bodyType = $type;
+    }
 }
diff --git a/src/API/Type/EmailAddressType.php b/src/API/Type/EmailAddressType.php
@@ -2,22 +2,24 @@
 
 namespace jamesiarmes\PEWS\API\Type;
 
-use jamesiarmes\PEWS\API\Type;
-
 /**
  * Class representing EmailAddressType
  *
- *
- * XSD Type: EmailAddress
+ * Identifier for a fully resolved email address
+ * XSD Type: EmailAddressType
  *
  * @method string getName()
  * @method EmailAddressType setName(string $name)
- * @method string getAddress()
- * @method EmailAddressType setAddress(string $address)
+ * @method string getEmailAddress()
+ * @method EmailAddressType setEmailAddress(string $emailAddress)
  * @method string getRoutingType()
  * @method EmailAddressType setRoutingType(string $routingType)
+ * @method string getMailboxType()
+ * @method EmailAddressType setMailboxType(string $mailboxType)
+ * @method ItemIdType getItemId()
+ * @method EmailAddressType setItemId(ItemIdType $itemId)
  */
-class EmailAddressType extends Type
+class EmailAddressType extends BaseEmailAddressType
 {
 
     /**
@@ -28,10 +30,20 @@ class EmailAddressType extends Type
     /**
      * @var string
      */
-    protected $address = null;
+    protected $emailAddress = null;
 
     /**
      * @var string
      */
     protected $routingType = null;
+
+    /**
+     * @var string
+     */
+    protected $mailboxType = null;
+
+    /**
+     * @var \jamesiarmes\PEWS\API\Type\ItemIdType
+     */
+    protected $itemId = null;
 }
diff --git a/src/API/Type/ExchangeImpersonationType.php b/src/API/Type/ExchangeImpersonationType.php
@@ -15,18 +15,19 @@
  */
 class ExchangeImpersonationType extends Type
 {
+
+    /**
+     * @var \jamesiarmes\PEWS\API\Type\ConnectingSIDType
+     */
+    protected $connectingSID = null;
+
     public static function fromEmailAddress($emailAddress)
     {
-        $impersonation = new static();
+        $impersonation = new self();
         $connectingSID = new ConnectingSIDType();
         $connectingSID->setPrimarySmtpAddress($emailAddress);
 
         $impersonation->setConnectingSID($connectingSID);
         return $impersonation;
     }
-
-    /**
-     * @var \jamesiarmes\PEWS\API\Type\ConnectingSIDType
-     */
-    protected $connectingSID = null;
 }
diff --git a/src/API/Type/MessageType.php b/src/API/Type/MessageType.php
@@ -10,9 +10,7 @@
  *
  * @method SingleRecipientType getSender()
  * @method MessageType setSender(SingleRecipientType $sender)
- * @method MessageType addToRecipients(EmailAddressType $toRecipients)
  * @method EmailAddressType[] getToRecipients()
- * @method MessageType setToRecipients(array $toRecipients)
  * @method MessageType addCcRecipients(EmailAddressType $ccRecipients)
  * @method EmailAddressType[] getCcRecipients()
  * @method MessageType setCcRecipients(array $ccRecipients)
@@ -139,4 +137,43 @@ public function isAReply()
     {
         return ($this->exists('inReplyTo') && $this->getInReplyTo() !== null);
     }
+
+    /**
+     * @param BodyType|string $body
+     * @return MessageType
+     */
+    public function setBody($body)
+    {
+        if (is_string($body)) {
+            $body = new BodyType($body);
+        }
+
+        return parent::setBody($body);
+    }
+
+    public function addToRecipients($recipient)
+    {
+        if (is_string($recipient)) {
+            $address = new Mailbox();
+            $address->setEmailAddress($recipient);
+            $recipient = $address;
+        }
+
+        return parent::addToRecipients($recipient);
+    }
+
+    public function setToRecipients($recipients)
+    {
+        $this->toRecipients = [ ];
+
+        if (!is_array($recipients)) {
+            $recipients = array($recipients);
+        }
+
+        foreach ($recipients as $recipient) {
+            $this->addToRecipients($recipient);
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Generator/ConvertToPHP.php b/src/Generator/ConvertToPHP.php
@@ -104,6 +104,14 @@ function ($type) use ($schemas) {
             }
         );
 
+        $converter->addAliasMap(
+            'http://schemas.microsoft.com/exchange/services/2006/types',
+            'EmailAddress',
+            function ($type) use ($schemas) {
+                return "jamesiarmes\\PEWS\\API\\Type\\EmailAddressType";
+            }
+        );
+
         $items = $converter->convert($schemas);
         $progress->start($output, count($items));
         $classMap = [];
diff --git a/src/Generator/PhpConverter.php b/src/Generator/PhpConverter.php
@@ -38,27 +38,27 @@ public function __construct(NamingStrategy $namingStrategy)
         parent::__construct($namingStrategy);
 
         $this->addAliasMap("http://www.w3.org/2001/XMLSchema", "dateTime", function (Type $type) {
-        
+
             return "DateTime";
         });
         $this->addAliasMap("http://www.w3.org/2001/XMLSchema", "time", function (Type $type) {
-        
+
             return "DateTime";
         });
         $this->addAliasMap("http://www.w3.org/2001/XMLSchema", "date", function (Type $type) {
-        
+
             return "DateTime";
         });
         $this->addAliasMap("http://www.w3.org/2001/XMLSchema", "anySimpleType", function (Type $type) {
-        
+
             return "mixed";
         });
         $this->addAliasMap("http://www.w3.org/2001/XMLSchema", "anyType", function (Type $type) {
-        
+
             return "mixed";
         });
         $this->addAliasMap("http://www.w3.org/2001/XMLSchema", "base64Binary", function (Type $type) {
-        
+
             return "string";
         });
     }
@@ -82,7 +82,7 @@ public function convert(array $schemas)
     private function getTypes()
     {
         uasort($this->classes, function ($a, $b) {
-        
+
             return strcmp($a["class"]->getFullName(), $b["class"]->getFullName());
         });
         $ret = array();
diff --git a/src/Mail/MailAPI.php b/src/Mail/MailAPI.php

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@`
`8`	`8`	`*`
`9`	`9`	`* XSD Type: GetUserOofSettingsRequest`
`10`	`10`	`*`
`11`		`- * @method \jamesiarmes\PEWS\API\Type\Mailbox getMailbox()`
`12`		`- * @method GetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\Mailbox $mailbox)`
	`11`	`+ * @method \jamesiarmes\PEWS\API\Type\EmailAddressType getMailbox()`
	`12`	`+ * @method GetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\EmailAddressType $mailbox)`
`13`	`13`	`*/`
`14`	`14`	`class GetUserOofSettingsRequestType extends BaseRequestType`
`15`	`15`	`{`
`16`	`16`
`17`	`17`	`/**`
`18`		`- * @var \jamesiarmes\PEWS\API\Type\Mailbox`
	`18`	`+ * @var \jamesiarmes\PEWS\API\Type\EmailAddressType`
`19`	`19`	`*/`
`20`	`20`	`protected $mailbox = null;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,16 @@`
`8`	`8`	`*`
`9`	`9`	`* XSD Type: SetUserOofSettingsRequest`
`10`	`10`	`*`
`11`		`- * @method \jamesiarmes\PEWS\API\Type\Mailbox getMailbox()`
`12`		`- * @method SetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\Mailbox $mailbox)`
	`11`	`+ * @method \jamesiarmes\PEWS\API\Type\EmailAddressType getMailbox()`
	`12`	`+ * @method SetUserOofSettingsRequestType setMailbox(\jamesiarmes\PEWS\API\Type\EmailAddressType $mailbox)`
`13`	`13`	`* @method \jamesiarmes\PEWS\API\Type\UserOofSettings getUserOofSettings()`
`14`	`14`	`* @method SetUserOofSettingsRequestType setUserOofSettings(\jamesiarmes\PEWS\API\Type\UserOofSettings $userOofSettings)`
`15`	`15`	`*/`
`16`	`16`	`class SetUserOofSettingsRequestType extends BaseRequestType`
`17`	`17`	`{`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * @var \jamesiarmes\PEWS\API\Type\Mailbox`
	`20`	`+ * @var \jamesiarmes\PEWS\API\Type\EmailAddressType`
`21`	`21`	`*/`
`22`	`22`	`protected $mailbox = null;`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __call($name, $arguments)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if ($callType == "add" && count($arguments) == 1) {`
`36`		`- return $this->add($propertyName, $arguments);`
	`36`	`+ return $this->add($propertyName, $arguments[0]);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if ($callType == "is" && count($arguments) == 0) {`