New methods have been introduced for Web object

examples/Settings.php

@@ -1,14 +1,14 @@
 <?php
 
 $Settings = array(
-	'Url' => "https://mediadev23.sharepoint.com",
-    'OneDriveUrl' => "https://mediadev23-my.SharePoint.com",
+	'Url' => "https://mediadev88.sharepoint.com",
+    'OneDriveUrl' => "https://mediadev88-my.SharePoint.com",
 	'Password' => "P@ssw0rd",
-	'UserName' => "mattim@mediadev23.onmicrosoft.com"
+	'UserName' => "mattim@mediadev88.onmicrosoft.com"
 );
 
 $AppSettings = array(
-	'TenantName' => "mediadev23.onmicrosoft.com",
+	'TenantName' => "mediadev88.onmicrosoft.com",
 	'ClientId' => "d426369e-c84b-47db-b6b1-b9c824ac2ea2",
 	'ClientSecret' => "wrizJBW41]|=@govNEDR059",
 	'Title' => "Office365 Graph explorer",

src/OutlookServices/Message.php

@@ -21,7 +21,7 @@ public function reply($comment)
     {
         $parameter = new ClientValueObject();
         $parameter->setProperty("Comment",$comment);
-        $qry = new InvokePostMethodQuery($this,"Reply",null,$parameter);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),"Reply",null,$parameter);
         $this->getContext()->addQuery($qry);
     }
 
@@ -34,7 +34,7 @@ public function replyAll($comment)
     {
         $parameter = new ClientValueObject();
         $parameter->setProperty("Comment",$comment);
-        $qry = new InvokePostMethodQuery($this,"ReplyAll",null,$parameter);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),"ReplyAll",null,$parameter);
         $this->getContext()->addQuery($qry);
     }
 
@@ -49,7 +49,7 @@ public function forward($comment,$toRecipients)
         $parameter = new ClientValueObject();
         $parameter->setProperty("Comment",$comment);
         $parameter->setProperty("ToRecipients",$toRecipients);
-        $qry = new InvokePostMethodQuery($this,"Forward",null,$parameter);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),"Forward",null,$parameter);
         $this->getContext()->addQuery($qry);
     }
 
@@ -62,7 +62,7 @@ public function forward($comment,$toRecipients)
     public function move($destinationId){
         $parameter = new ClientValueObject();
         $parameter->setProperty("DestinationId",$destinationId);
-        $qry = new InvokePostMethodQuery($this,"Move",null,$parameter);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),"Move",null,$parameter);
         $this->getContext()->addQuery($qry);
     }
 

src/OutlookServices/User.php

@@ -75,7 +75,7 @@ public function sendEmail(Message $message, $saveToSentItems)
         $payload = new ClientValueObject();
         $payload->setProperty("Message", $message);
         $payload->setProperty("SaveToSentItems", $saveToSentItems);
-        $action = new InvokePostMethodQuery($this, "SendMail",null,$payload);
+        $action = new InvokePostMethodQuery($this->getResourcePath(), "SendMail",null,$payload);
         $this->getContext()->addQuery($action);
     }
 

src/Runtime/Auth/SamlTokenProvider.php

@@ -53,8 +53,11 @@ public function getAuthenticationCookie()
         return 'FedAuth=' . $this->FedAuth . '; rtFa=' . $this->rtFa;
     }
 
-
 
+    /**
+     * @param $parameters
+     * @throws Exception
+     */
     public function acquireToken($parameters)
     {
         $token = $this->acquireSecurityToken($parameters['username'], $parameters['password']);

src/Runtime/ContextResourcePath.php

@@ -0,0 +1,23 @@
+<?php
+
+
+namespace Office365\PHP\Client\Runtime;
+
+
+class ContextResourcePath extends ResourcePath
+{
+
+    public function __construct(ClientRuntimeContext $context)
+    {
+        parent::__construct($context);
+    }
+
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return null;
+    }
+}

src/Runtime/CreateEntityQuery.php

@@ -12,7 +12,7 @@ class CreateEntityQuery extends InvokePostMethodQuery
      */
     public function __construct(ClientObject $entityCollection, ClientObject $entity)
     {
-        parent::__construct($entityCollection,null,null,$entity);
+        parent::__construct($entityCollection->getResourcePath(),null,null,$entity);
     }
 
 }

src/Runtime/DeleteEntityQuery.php

@@ -13,6 +13,6 @@ class DeleteEntityQuery extends InvokePostMethodQuery
      */
     public function __construct(ClientObject $clientObject)
     {
-        parent::__construct($clientObject);
+        parent::__construct($clientObject->getResourcePath());
     }
 }

src/Runtime/InvokeMethodQuery.php

@@ -11,16 +11,16 @@ class InvokeMethodQuery extends ClientAction
 
     /**
      * InvokeMethodQuery constructor.
-     * @param ClientObject $parentClientObject
+     * @param ResourcePath $resourcePath
      * @param string $methodName
      * @param array|ISchemaType $methodParameters
      */
-    public function __construct(ClientObject $parentClientObject, $methodName=null, $methodParameters=null)
+    public function __construct(ResourcePath $resourcePath, $methodName=null, $methodParameters=null)
     {
 
         $path = new ResourcePathServiceOperation(
-            $parentClientObject->getContext(),
-            $parentClientObject->getResourcePath(),
+            $resourcePath->getContext(),
+            $resourcePath,
             $methodName,
             $methodParameters
         );

src/Runtime/InvokePostMethodQuery.php

@@ -7,18 +7,17 @@
 class InvokePostMethodQuery extends InvokeMethodQuery
 {
 
-
     /**
      * ClientActionUpdateMethod constructor.
-     * @param ClientObject $parentClientObject
+     * @param ResourcePath $resourcePath
      * @param string $methodName
      * @param array $methodParameters
      * @param string|ISchemaType $methodPayload
      */
-    public function __construct(ClientObject $parentClientObject, $methodName = null,$methodParameters=null,$methodPayload=null)
+    public function __construct(ResourcePath $resourcePath, $methodName = null,$methodParameters=null,$methodPayload=null)
     {
         $this->MethodPayload = $methodPayload;
-        parent::__construct($parentClientObject,$methodName, $methodParameters);
+        parent::__construct($resourcePath,$methodName, $methodParameters);
     }
 
 

src/Runtime/OData/ODataRequest.php

@@ -260,6 +260,8 @@ public function buildRequest(ClientAction $query)
             $request->Method = HttpMethod::Post;
             if (is_string($query->MethodPayload))
                 $request->Data = $query->MethodPayload;
+            if (is_array($query->MethodPayload))
+                $request->Data = json_encode($query->MethodPayload);
             else if ($query->MethodPayload instanceof ISchemaType) {
                 //build request payload
                 $payload = $this->normalizePayload($query->MethodPayload);

src/Runtime/ResourcePath.php

@@ -43,7 +43,8 @@ public function toUrl()
         $paths = array();
         $current = clone $this;
         while (isset($current)) {
-            array_unshift($paths, $current->toString());
+            if(!is_null($current->toString()))
+                array_unshift($paths, $current->toString());
             $current = $current->parent;
         }
         return implode("/", $paths);

src/Runtime/ResourcePathServiceOperation.php

@@ -13,11 +13,11 @@ class ResourcePathServiceOperation extends ResourcePath implements ICSOMCallable
     /**
      * ResourcePathMethod constructor.
      * @param ClientRuntimeContext $context
-     * @param ResourcePath $parent
+     * @param ResourcePath|null $parent
      * @param string $methodName
      * @param array $methodParameters
      */
-    public function __construct(ClientRuntimeContext $context, ResourcePath $parent, $methodName, $methodParameters = null)
+    public function __construct(ClientRuntimeContext $context, ResourcePath $parent=null, $methodName, $methodParameters = null)
     {
         parent::__construct($context, $parent);
         $this->methodName = $methodName;

src/Runtime/UpdateEntityQuery.php

@@ -13,7 +13,7 @@ class UpdateEntityQuery extends InvokePostMethodQuery
      */
     public function __construct(ClientObject $entity)
     {
-        parent::__construct($entity,null,null,$entity);
+        parent::__construct($entity->getResourcePath(),null,null,$entity);
     }
 
 

src/SharePoint/AttachmentCollection.php

@@ -18,7 +18,7 @@ public function add(AttachmentCreationInformation $information)
     {
         $attachment = new Attachment($this->getContext(),$this->getResourcePath());
         $qry = new InvokePostMethodQuery(
-            $this,
+            $this->getResourcePath(),
             "add",
             array("FileName" =>rawurlencode($information->FileName)),
             $information->ContentStream);

src/SharePoint/ContentTypeCollection.php

@@ -33,7 +33,7 @@ public function getById($id)
     public function add(ContentTypeCreationInformation $information)
     {
         $contentType = new ContentType($this->getContext());
-        $qry = new InvokePostMethodQuery($this,null,null,$information);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),null,null,$information);
         $this->getContext()->addQuery($qry,$contentType);
         $this->addChild($contentType);
         return $contentType;

src/SharePoint/Field.php

@@ -31,7 +31,7 @@ public function deleteObject()
      */
     public function setShowInDisplayForm($value){
         $qry = new InvokePostMethodQuery(
-            $this,
+            $this->getResourcePath(),
             "setShowInDisplayForm",
             array($value)
         );

src/SharePoint/FieldCollection.php

@@ -20,7 +20,7 @@ class FieldCollection extends ClientObjectCollection
     public function add(FieldCreationInformation $parameters)
     {
         $field = new Field($this->getContext(),$this->getResourcePath());
-        $qry = new InvokePostMethodQuery($this,null,null,$parameters);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),null,null,$parameters);
         $this->getContext()->addQuery($qry,$field);
         $this->addChild($field);
         return $field;

src/SharePoint/File.php

@@ -21,7 +21,7 @@ class File extends SecurableObject
       * Checks out the file from a document library based on the check-out type.
       */
      public function checkOut(){
-          $qry = new InvokePostMethodQuery($this,"checkout");
+          $qry = new InvokePostMethodQuery($this->getResourcePath(),"checkout");
           $this->getContext()->addQuery($qry);
      }
 
@@ -30,7 +30,7 @@ public function checkOut(){
       * Reverts an existing checkout for the file.
       */
      public function undoCheckout(){
-          $qry = new InvokePostMethodQuery($this,"undocheckout");
+          $qry = new InvokePostMethodQuery($this->getResourcePath(),"undocheckout");
           $this->getContext()->addQuery($qry);
      }
 
@@ -40,7 +40,7 @@ public function undoCheckout(){
       * @param string $comment A comment for the check-in. Its length must be <= 1023.
       */
      public function checkIn($comment){
-          $qry = new InvokePostMethodQuery($this,"checkIn",array(
+          $qry = new InvokePostMethodQuery($this->getResourcePath(),"checkIn",array(
               "comment" =>$comment,
               "checkintype" =>0
           ));
@@ -53,7 +53,7 @@ public function checkIn($comment){
       * @param string $comment The comment for the approval.
       */
      public function approve($comment){
-          $qry = new InvokePostMethodQuery($this,"approve",array(
+          $qry = new InvokePostMethodQuery($this->getResourcePath(),"approve",array(
               "comment" =>$comment
           ));
           $this->getContext()->addQuery($qry);
@@ -64,7 +64,7 @@ public function approve($comment){
       * @param string $comment The comment for the denial.
       */
      public function deny($comment){
-          $qry = new InvokePostMethodQuery($this, "deny",array(
+          $qry = new InvokePostMethodQuery($this->getResourcePath(), "deny",array(
               "comment" =>$comment
           ));
           $this->getContext()->addQuery($qry);
@@ -75,7 +75,7 @@ public function deny($comment){
       * @param string $comment The comment for the published file. Its length must be <= 1023.
       */
      public function publish($comment){
-          $qry = new InvokePostMethodQuery($this, "publish",array(
+          $qry = new InvokePostMethodQuery($this->getResourcePath(), "publish",array(
               "comment" =>$comment
           ));
           $this->getContext()->addQuery($qry);
@@ -87,7 +87,7 @@ public function publish($comment){
       * @param string $comment The comment for the unpublish operation. Its length must be <= 1023.
       */
      public function unpublish($comment){
-          $qry = new InvokePostMethodQuery($this,"unpublish", array(
+          $qry = new InvokePostMethodQuery($this->getResourcePath(),"unpublish", array(
               "comment" => $comment
           ));
           $this->getContext()->addQuery($qry);
@@ -100,7 +100,7 @@ public function unpublish($comment){
       * @param bool $bOverWrite true to overwrite a file with the same name in the same location; otherwise false.
       */
      public function copyTo($strNewUrl,$bOverWrite){
-          $qry = new InvokePostMethodQuery($this, "copyto", array(
+          $qry = new InvokePostMethodQuery($this->getResourcePath(), "copyto", array(
               "strnewurl"=>$strNewUrl,
               "boverwrite"=>$bOverWrite
           ));
@@ -113,7 +113,7 @@ public function copyTo($strNewUrl,$bOverWrite){
       * @param int $flags The bitwise SP.MoveOperations value for how to move the file. Overwrite = 1; AllowBrokenThickets (move even if supporting files are separated from the file) = 8.
       */
      public function moveTo($newUrl,$flags){
-          $qry = new InvokePostMethodQuery($this, "moveto", array(
+          $qry = new InvokePostMethodQuery($this->getResourcePath(), "moveto", array(
               "newurl"=>$newUrl,
               "flags"=>$flags
           ));
@@ -125,7 +125,7 @@ public function moveTo($newUrl,$flags){
       * Moves the file to the Recycle Bin and returns the identifier of the new Recycle Bin item.
       */
      public function recycle(){
-          $qry = new InvokePostMethodQuery($this, "recycle");
+          $qry = new InvokePostMethodQuery($this->getResourcePath(), "recycle");
           $this->getContext()->addQuery($qry);
      }
 

src/SharePoint/FileCollection.php

@@ -22,7 +22,7 @@ public function add(FileCreationInformation $fileCreationInformation)
     {
         $file = new File($this->getContext(),$this->getResourcePath());
         $qry = new InvokePostMethodQuery(
-            $this,
+            $this->getResourcePath(),
             "add",
             array("overwrite"=>$fileCreationInformation->Overwrite,"url"=>rawurlencode($fileCreationInformation->Url)),
             $fileCreationInformation->Content
@@ -43,7 +43,7 @@ public function addTemplateFile($urlOfFile,$templateFileType)
     {
         $file = new File($this->getContext(),$this->getResourcePath());
         $qry = new InvokePostMethodQuery(
-            $this,
+            $this->getResourcePath(),
             "addTemplateFile",
             array(
                 "urlOfFile" => $urlOfFile,

src/SharePoint/Folder.php

@@ -39,7 +39,7 @@ public function rename($name){
      * Moves the list folder to the Recycle Bin and returns the identifier of the new Recycle Bin item.
      */
     public function recycle(){
-        $qry = new InvokePostMethodQuery($this,"recycle");
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),"recycle");
         $this->getContext()->addQuery($qry);
     }
 

src/SharePoint/GroupCollection.php

@@ -23,7 +23,7 @@ class GroupCollection extends ClientObjectCollection
     public function add(GroupCreationInformation $parameters)
     {
         $group = new Group($this->getContext(), $this->getResourcePath());
-        $qry = new InvokePostMethodQuery($this,null,null, $parameters);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),null,null, $parameters);
         $this->getContext()->addQuery($qry, $group);
         $this->addChild($group);
         return $group;
@@ -66,7 +66,7 @@ public function getByName($name)
      */
     public function removeById($id)
     {
-        $qry = new InvokePostMethodQuery($this, "removebyid", array($id));
+        $qry = new InvokePostMethodQuery($this->getResourcePath(), "removebyid", array($id));
         $this->getContext()->addQuery($qry);
     }
 
@@ -77,7 +77,7 @@ public function removeById($id)
      */
     public function removeByLoginName($groupName)
     {
-        $qry = new InvokePostMethodQuery($this, "removeByLoginName", array($groupName));
+        $qry = new InvokePostMethodQuery($this->getResourcePath(), "removeByLoginName", array($groupName));
         $this->getContext()->addQuery($qry);
     }
 }

src/SharePoint/ListCollection.php

@@ -46,7 +46,7 @@ public function getById($id)
     public function add(ListCreationInformation $properties)
     {
         $list = new SPList($this->getContext());
-        $qry = new InvokePostMethodQuery($this,null,null,$properties);
+        $qry = new InvokePostMethodQuery($this->getResourcePath(),null,null,$properties);
         $this->getContext()->addQuery($qry,$list);
         $this->addChild($list);
         return $list;