New JSON to model mapper has been introduced

src/Discovery/DiscoveryClient.php

@@ -5,7 +5,7 @@
 use Office365\PHP\Client\Runtime\Auth\IAuthenticationContext;
 use Office365\PHP\Client\Runtime\ClientAction;
 use Office365\PHP\Client\Runtime\ClientRuntimeContext;
-use Office365\PHP\Client\Runtime\OData\JsonFormat;
+use Office365\PHP\Client\Runtime\OData\JsonSerializerContext;
 use Office365\PHP\Client\Runtime\OData\ODataMetadataLevel;
 use Office365\PHP\Client\Runtime\Office365Version;
 use Office365\PHP\Client\Runtime\ResourcePathEntity;
@@ -16,7 +16,7 @@ class DiscoveryClient extends ClientRuntimeContext
     public function __construct(IAuthenticationContext $authContext, $version = Office365Version::V1)
     {
         $serviceRootUrl = "https://api.office.com/discovery/$version/";
-        parent::__construct($serviceRootUrl, $authContext,new JsonFormat(ODataMetadataLevel::Verbose),$version);
+        parent::__construct($serviceRootUrl, $authContext,new JsonSerializerContext(ODataMetadataLevel::NoMetadata),$version);
     }
 
 

src/GraphClient/GraphServiceClient.php

@@ -6,7 +6,7 @@
 use Office365\PHP\Client\Runtime\Auth\IAuthenticationContext;
 use Office365\PHP\Client\Runtime\ClientAction;
 use Office365\PHP\Client\Runtime\ClientRuntimeContext;
-use Office365\PHP\Client\Runtime\OData\JsonFormat;
+use Office365\PHP\Client\Runtime\OData\JsonSerializerContext;
 use Office365\PHP\Client\Runtime\OData\ODataMetadataLevel;
 use Office365\PHP\Client\Runtime\Office365Version;
 use Office365\PHP\Client\Runtime\ResourcePathEntity;
@@ -17,7 +17,7 @@ class GraphServiceClient extends ClientRuntimeContext
     public function __construct(IAuthenticationContext $authContext)
     {
         $serviceRootUrl = "https://graph.microsoft.com/" . Office365Version::V1 . "/";
-        parent::__construct($serviceRootUrl, $authContext,new JsonFormat(ODataMetadataLevel::Verbose));
+        parent::__construct($serviceRootUrl, $authContext,new JsonSerializerContext(ODataMetadataLevel::Verbose));
     }
 
 

src/OneDrive/OneDriveClient.php

@@ -5,8 +5,7 @@
 use Office365\PHP\Client\Runtime\Auth\IAuthenticationContext;
 use Office365\PHP\Client\Runtime\ClientAction;
 use Office365\PHP\Client\Runtime\ClientRuntimeContext;
-use Office365\PHP\Client\Runtime\ContextWebInformation;
-use Office365\PHP\Client\Runtime\OData\JsonFormat;
+use Office365\PHP\Client\Runtime\OData\JsonSerializerContext;
 use Office365\PHP\Client\Runtime\OData\ODataMetadataLevel;
 use Office365\PHP\Client\Runtime\Office365Version;
 use Office365\PHP\Client\Runtime\ResourcePathEntity;
@@ -18,7 +17,7 @@ class OneDriveClient extends ClientRuntimeContext
     public function __construct($authorityUrl,IAuthenticationContext $authContext)
     {
         $serviceRootUrl = $authorityUrl . "/_api/" . Office365Version::V1 . "/";
-        parent::__construct($serviceRootUrl, $authContext,new JsonFormat(ODataMetadataLevel::Verbose));
+        parent::__construct($serviceRootUrl, $authContext,new JsonSerializerContext(ODataMetadataLevel::Verbose));
     }
 
 

src/OneNote/OneNoteClient.php

@@ -9,7 +9,7 @@
 use Office365\PHP\Client\Runtime\UpdateEntityQuery;
 use Office365\PHP\Client\Runtime\ClientRuntimeContext;
 use Office365\PHP\Client\Runtime\HttpMethod;
-use Office365\PHP\Client\Runtime\OData\JsonFormat;
+use Office365\PHP\Client\Runtime\OData\JsonSerializerContext;
 use Office365\PHP\Client\Runtime\OData\ODataMetadataLevel;
 use Office365\PHP\Client\Runtime\Office365Version;
 use Office365\PHP\Client\Runtime\ResourcePathEntity;
@@ -22,7 +22,7 @@ public function __construct(IAuthenticationContext $authContext, $version = Offi
     {
         $this->version = $version;
         $this->serviceRootUrl = $this->serviceRootUrl . $version . "/";
-        parent::__construct($this->serviceRootUrl, $authContext, new JsonFormat(ODataMetadataLevel::NoMetadata), $version);
+        parent::__construct($this->serviceRootUrl, $authContext, new JsonSerializerContext(ODataMetadataLevel::NoMetadata), $version);
     }
 
 

src/OutlookServices/OutlookClient.php

@@ -11,7 +11,7 @@
 use Office365\PHP\Client\Runtime\HttpMethod;
 use Office365\PHP\Client\Runtime\Office365Version;
 use Office365\PHP\Client\Runtime\ResourcePathEntity;
-use Office365\PHP\Client\Runtime\OData\JsonFormat;
+use Office365\PHP\Client\Runtime\OData\JsonSerializerContext;
 use Office365\PHP\Client\Runtime\OData\ODataMetadataLevel;
 use Office365\PHP\Client\Runtime\Utilities\RequestOptions;
 
@@ -25,7 +25,7 @@ public function __construct(IAuthenticationContext $authContext, $version = Offi
     {
         $this->version = $version;
         $this->serviceRootUrl = $this->serviceRootUrl . $version . "/";
-        parent::__construct($this->serviceRootUrl, $authContext, new JsonFormat(ODataMetadataLevel::Verbose), $version);
+        parent::__construct($this->serviceRootUrl, $authContext, new JsonSerializerContext(ODataMetadataLevel::Verbose), $version);
     }
 
 

src/Runtime/Auth/SamlTokenProvider.php

@@ -122,7 +122,7 @@ protected function acquireAuthenticationCookies($token)
             $headers['Authorization'] = 'BPOSIDCRL ' . $token;
             $headers['Content-Type'] = 'application/x-www-form-urlencoded';
 
-            $response = Requests::getHead($url,$headers,$token,true);
+            $response = Requests::head($url,$headers,true);
             $cookies = Requests::parseCookies($response);
             $this->SPOIDCRL = $cookies['SPOIDCRL'];
         }

src/Runtime/ClientObject.php

@@ -8,7 +8,7 @@
 /**
  * Represents OData base entity
  */
-class ClientObject implements ISchemaType
+class ClientObject implements IEntityType
 {
     /**
      * @var string

src/Runtime/ClientObjectCollection.php

@@ -8,7 +8,7 @@
 /**
  * Client objects collection (represents EntitySet in terms of OData)
  */
-class ClientObjectCollection extends ClientObject implements ISchemaTypeCollection
+class ClientObjectCollection extends ClientObject implements IEntityTypeCollection
 {
 
     /**

src/Runtime/ClientRequest.php

@@ -94,16 +94,14 @@ protected abstract function setRequestHeaders(RequestOptions $request);
 
     /**
      * @param string $response
-     * @param ClientObject|ClientResult $resultObject
      */
-    public abstract function processResponse($response, $resultObject);
+    public abstract function processResponse($response);
 
     /**
      * Build Client Request
-     * @param ClientAction $query
      * @return RequestOptions
      */
-    protected abstract function buildRequest(ClientAction $query);
+    protected abstract function buildRequest();
 
     /**
      * @param ClientObject $clientObject
@@ -129,4 +127,11 @@ public function executeQueryDirect(RequestOptions $request,&$responseInfo=array(
         return Requests::execute($request,$responseInfo);
     }
 
+    /**
+     * @return ClientAction[]
+     */
+    public function getActions(){
+        return $this->queries;
+    }
+
 }

src/Runtime/ClientResult.php

@@ -2,6 +2,7 @@
 
 
 namespace Office365\PHP\Client\Runtime;
+use Office365\PHP\Client\Runtime\OData\ODataSerializerContext;
 
 
 /**
@@ -10,9 +11,8 @@
 class ClientResult
 {
 
-    function __construct($functionName, $returnValue=null)
+    function __construct($returnValue=null)
     {
-        $this->FunctionName = $functionName;
         $this->Value = $returnValue;
     }
 
@@ -22,7 +22,7 @@ function __construct($functionName, $returnValue=null)
     public function getType(){
         if(!is_null($this->Value))
         {
-            if($this->Value instanceof ISchemaType)
+            if($this->Value instanceof IEntityType)
                 return $this->Value->getTypeName();
             return basename(get_class($this->Value));
         }
@@ -31,9 +31,13 @@ public function getType(){
 
 
     /**
-     * @var string $FunctionName
+     * @param $json
+     * @param ODataSerializerContext $serializationContext
      */
-    public $FunctionName;
+    public function fromJson($json, ODataSerializerContext $serializationContext)
+    {
+        $serializationContext->map($json, $this->Value);
+    }
 
     /**
      * @var mixed $Value

src/Runtime/ClientRuntimeContext.php

@@ -4,7 +4,7 @@
 
 use Office365\PHP\Client\Runtime\Auth\IAuthenticationContext;
 use Office365\PHP\Client\Runtime\OData\ODataRequest;
-use Office365\PHP\Client\Runtime\OData\ODataFormat;
+use Office365\PHP\Client\Runtime\OData\ODataSerializerContext;
 use Office365\PHP\Client\Runtime\OData\ODataQueryOptions;
 use Office365\PHP\Client\Runtime\Utilities\RequestOptions;
 use Office365\PHP\Client\Runtime\Utilities\Version;
@@ -38,9 +38,9 @@ class ClientRuntimeContext
     private $pendingRequest;
 
     /**
-     * @var ODataFormat
+     * @var ODataSerializerContext
      */
-    public $Format;
+    private $serializerContext;
 
 
     /**
@@ -52,15 +52,15 @@ class ClientRuntimeContext
      * REST client context ctor
      * @param string $serviceUrl
      * @param IAuthenticationContext $authContext
-     * @param ODataFormat $format
+     * @param ODataSerializerContext $serializationContext
      * @param string $version
      */
-    public function __construct($serviceUrl, IAuthenticationContext $authContext, ODataFormat $format, $version = Office365Version::V1)
+    public function __construct($serviceUrl, IAuthenticationContext $authContext, ODataSerializerContext $serializationContext, $version = Office365Version::V1)
     {
         $this->version = $version;
         $this->serviceRootUrl = $serviceUrl;
         $this->authContext = $authContext;
-        $this->Format = $format;
+        $this->serializerContext = $serializationContext;
     }
 
     /**
@@ -138,10 +138,21 @@ public  function loadQuery(ClientObject $clientObject,ODataQueryOptions $query =
      */
     public function executeQuery()
     {
-        $this->getPendingRequest()->executeQuery();
+        while ($this->hasPendingRequest()) {
+            $this->getPendingRequest()->executeQuery();
+        }
         return $this;
     }
 
+    /**
+     * @return bool
+     */
+    public function hasPendingRequest(){
+        $queries = $this->pendingRequest->getActions();
+        return !empty($queries);
+    }
+
+
     /**
      * @param RequestOptions $options
      * @return string
@@ -154,12 +165,11 @@ public function executeQueryDirect(RequestOptions $options)
 
     /**
      * @param string $response
-     * @param ClientObject|ClientResult $resultObject
      * @return self
      */
-    public function processResponse($response, $resultObject)
+    public function processResponse($response)
     {
-        $this->getPendingRequest()->processResponse($response, $resultObject);
+        $this->getPendingRequest()->processResponse($response);
         return $this;
     }
 
@@ -180,7 +190,7 @@ public function addQuery(ClientAction $query, $resultObject = null)
     public function getPendingRequest()
     {
         if (!isset($this->pendingRequest)) {
-            $this->pendingRequest = new ODataRequest($this, $this->Format);
+            $this->pendingRequest = new ODataRequest($this);
         }
         return $this->pendingRequest;
     }
@@ -192,4 +202,13 @@ public function getServerLibraryVersion(){
         return new Version();
     }
 
+
+    /**
+     * @return ODataSerializerContext
+     */
+    public function getSerializerContext()
+    {
+        return $this->serializerContext;
+    }
+
 }

src/Runtime/ClientValueObject.php

@@ -7,7 +7,7 @@
 /**
  * Represents OData complex type(property) of a server-side property value.
  */
-class ClientValueObject implements ISchemaType
+class ClientValueObject implements IEntityType
 {
 
     /**

src/Runtime/ClientValueObjectCollection.php

@@ -3,7 +3,7 @@
 namespace Office365\PHP\Client\Runtime;
 
 
-class ClientValueObjectCollection extends ClientValueObject implements ISchemaTypeCollection
+class ClientValueObjectCollection extends ClientValueObject implements IEntityTypeCollection
 {
 
     /**
@@ -70,17 +70,6 @@ function getProperties($flag=SCHEMA_ALL_PROPERTIES)
         }, $this->getData());
     }
 
-
-    /*function setProperty($name, $payload, $persistChanges = false)
-    {
-        foreach ($payload as $key => $value) {
-            $clientValueObject = $this->createTypedValueObject();
-            $clientValueObject->setProperty($key,$value,$persistChanges);
-            $this->addChild($clientValueObject);
-        }
-    }*/
-
-
     /**
      * @var array
      */

src/Runtime/ISchemaType.php → src/Runtime/IEntityType.php

@@ -6,7 +6,7 @@
 define ("SCHEMA_SERIALIZABLE_PROPERTIES", 2);
 
 
- interface ISchemaType
+ interface IEntityType
  {
      /**
       * @return string
@@ -29,7 +29,7 @@ public function getProperty($name);
 
      /**
       * @param string $name
-      * @param string $value
+      * @param mixed $value
       * @param bool $persistChanges
       */
      function setProperty($name, $value, $persistChanges = true);

src/Runtime/ISchemaTypeCollection.php → src/Runtime/IEntityTypeCollection.php

@@ -5,20 +5,20 @@
 
 
 
-interface ISchemaTypeCollection
+interface IEntityTypeCollection extends IEntityType
 {
 
     function clearData();
 
     /**
      * Instantiates an item
-     * @return ISchemaType
+     * @return IEntityType
      */
     function createType();
 
 
     /**
-     * @param ISchemaType $type
+     * @param IEntityType $type
      */
     function addChild($type);
 }

src/Runtime/InvokeMethodQuery.php

@@ -13,7 +13,7 @@ class InvokeMethodQuery extends ClientAction
      * InvokeMethodQuery constructor.
      * @param ResourcePath $resourcePath
      * @param string $methodName
-     * @param array|ISchemaType $methodParameters
+     * @param array|IEntityType $methodParameters
      */
     public function __construct(ResourcePath $resourcePath, $methodName=null, $methodParameters=null)
     {
@@ -56,7 +56,7 @@ protected function toXmlQuery(SimpleXMLElement $writer){
 
 
     /**
-     * @var $MethodParameters array|ISchemaType
+     * @var $MethodParameters array|IEntityType
      */
     public $MethodParameters;