Merge remote-tracking branch 'refs/remotes/origin/master' into cbales-working

# Conflicts:
#	Templates/PHP/Model/EntityType.php.tt

Author: Caitlin Bales (MSFT)

Templates/PHP/Model/ComplexType.php.tt

@@ -10,23 +10,23 @@ OdcmClass complex		= (OdcmClass)host.CurrentType;
 <#=writer.WriteHeader(writer.GetDocBlock(complex.Name.ToCheckedCase()))#>
 namespace Microsoft\Graph\Model;
 <#=writer.GetClassBlock(complex.Name.ToCheckedCase().ToString(), "Model")#>
+<#
+if (complex.Base != null) {
+#>
+class <#=complex.Name.ToCheckedCase()#> extends <#=complex.Base.Name.ToCheckedCase()#>
+<#
+} else {
+#>
 class <#=complex.Name.ToCheckedCase()#> extends Entity
+<#
+}
+#>
 {
-    /**
-    * Gets the property dictionary of the <#=complex.Name.ToCheckedCase()#>
-    *
-    * @return array The list of properties
-    */
-    public function getProperties()
-    {
-        return $this->_propDict;
-    }
 <# 
 foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString() != "bytes")){
     var propertyName = property.Name.ToUnderscore();
     if (!property.Type.IsComplex()) {
 #>
-    
     /**
     * Gets the <#=property.Name#>
 <# if (property.LongDescription != null) {
@@ -101,8 +101,13 @@ foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString
             if (is_a($this->_propDict["<#=property.Name.ToCamelize()#>"], "<#=property.Type.GetTypeString()#>")) {
                 return $this->_propDict["<#=property.Name.ToCamelize()#>"];
             } else {
+<# if (property.Type.GetTypeString() == "\\GuzzleHttp\\Psr7\\Stream") { #>
+                $this->_propDict["<#=property.Name.ToCamelize()#>"] = \GuzzleHttp\Psr7\stream_for($this->_propDict["<#=property.Name.ToCamelize()#>"]);
+                return $this->_propDict["<#=property.Name.ToCamelize()#>"];
+<# } else { #>
                 $this->_propDict["<#=property.Name.ToCamelize()#>"] = new <#=property.Type.GetTypeString()#>($this->_propDict["<#=property.Name.ToCamelize()#>"]);
                 return $this->_propDict["<#=property.Name.ToCamelize()#>"];
+<# } #>
             }
         }
         return null;

Templates/PHP/Model/EntityType.php.tt

@@ -16,11 +16,11 @@ namespace Microsoft\Graph\Model;
 <#
 if (entity.Name.ToCheckedCase() == "Entity") {
 #>
-class <#=entity.Name.ToCheckedCase()#>
+class <#=entity.Name.ToCheckedCase()#> implements \JsonSerializable
 <#
 } else {
 #>
-class <#=entity.Name.ToCheckedCase()#> extends Entity
+class <#=entity.Name.ToCheckedCase()#> extends <#=entity.Base.Name.ToCheckedCase() #>
 <# 
 }
 #>
@@ -45,9 +45,7 @@ if (entity.Name.ToCheckedCase() == "Entity") {
     {
 		$this->_propDict = $propDict;
     }
-<#
-}
-#>
+
     /**
     * Gets the property dictionary of the <#=entity.Name.ToUpperFirstChar()#>
     *
@@ -57,7 +55,9 @@ if (entity.Name.ToCheckedCase() == "Entity") {
     {
         return $this->_propDict;
     }
-<# 
+    
+<#
+}
 foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString() != "bytes")){
     var propertyName = property.Name.ToUnderscore();
     var propertyNameCap = property.Name.ToUpperFirstChar();
@@ -82,7 +82,7 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
             return null;
         }
     }
-	
+    
     /** 
     * Sets the <#=property.Name#>
 <# if (property.LongDescription != null) {
@@ -99,11 +99,10 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
 		$this->_propDict["<#=property.Name.ToCamelize()#>"] = $val;
         return $this;
     }
-
+    
 <#
    } else {
 #>
-
     /**
     * Gets the <#=property.Name#>
 <# if (property.LongDescription != null) {
@@ -119,13 +118,18 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
             if (is_a($this->_propDict["<#=property.Name.ToCamelize()#>"], "<#=property.Type.GetTypeString()#>")) {
                 return $this->_propDict["<#=property.Name.ToCamelize()#>"];
             } else {
+<# if (property.Type.GetTypeString() == "\\GuzzleHttp\\Psr7\\Stream") { #>
+                $this->_propDict["<#=property.Name.ToCamelize()#>"] = \GuzzleHttp\Psr7\stream_for($this->_propDict["<#=property.Name.ToCamelize()#>"]);
+                return $this->_propDict["<#=property.Name.ToCamelize()#>"];
+<# } else { #>
                 $this->_propDict["<#=property.Name.ToCamelize()#>"] = new <#=property.Type.GetTypeString()#>($this->_propDict["<#=property.Name.ToCamelize()#>"]);
                 return $this->_propDict["<#=property.Name.ToCamelize()#>"];
+<# } #>
             }
         }
         return null;
     }
-
+    
     /**
     * Sets the <#=property.Name#>
 <# if (property.LongDescription != null) {
@@ -148,11 +152,11 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
 <# } #>
         return $this;
     }
+    
 <#
             }
         } else {
 #>
-
     /**
     * Gets the <#=property.Name#>
 <# if (property.LongDescription != null) {
@@ -180,7 +184,7 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
             return null;
         }
     }
-
+    
     /**
     * Sets the <#=property.Name#>
 <# if (property.LongDescription != null) {
@@ -214,8 +218,44 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
 #>
         return $this;
     }
+    
 <#
 		}
 	}
+	if (entity.Name.ToCheckedCase() == "Entity") {
+#>
+    /**
+    * Gets the ODataType
+    *
+    * @return string The ODataType
+    */
+    public function getODataType()
+    {
+        return $this->_propDict["@odata.type"];
+    }
+    
+    /**
+    * Sets the ODataType
+    *
+    * @param string The ODataType
+    *
+    * @return Entity
+    */
+    public function setODataType($val)
+    {
+        $this->_propDict["@odata.type"] = $val;
+    }
+    
+    /**
+    * Serializes the object by property array
+    *
+    * @return array The list of properties
+    */
+    public function jsonSerialize()
+    {
+        return $this->getProperties();
+    }
+<#
+	}
 #>
 }