Update to types

Author: Caitlin Bales (MSFT)

Templates/PHP/Model/ComplexType.php.tt

@@ -57,7 +57,7 @@ foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString
     {
         if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->_propDict)) {
 <#
-            if (property.Type.GetTypeString() == "datetime") {
+            if (property.Type.GetTypeString() == "\\DateTime") {
 #>
             return new \DateTime($this->_propDict["<#=property.Name.ToCamelize()#>"]);
 <#
@@ -77,12 +77,12 @@ foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString
     *
     * @param <#=property.Type.GetTypeString()#> $val The value of the <#=property.Name#>
     *
-    * @return null
+    * @return <#=complex.Name.ToCheckedCase()#>
     */
     public function set<#=property.Name.ToCheckedCase()#>($val)
     {
 <#
-            if (property.Type.GetTypeString() == "datetime") {
+            if (property.Type.GetTypeString() == "\\DateTime") {
 #>
         $this->_propDict["<#=propertyName#>"] 
             = $val->format(\DateTime::ISO8601) . "Z";
@@ -122,7 +122,7 @@ foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString
     *
     * @param <#=property.Type.GetTypeString()#> $val The value to assign to the <#=property.Name#>
     *
-    * @return The <#=complex.Name.ToUpperFirstChar()#>
+    * @return <#=complex.Name.ToCheckedCase()#> The <#=complex.Name.ToUpperFirstChar()#>
     */
     public function set<#=property.Name.ToCheckedCase()#>($val)
     {

Templates/PHP/Model/EntityType.php.tt

@@ -42,7 +42,13 @@ class <#=entity.Name.ToCheckedCase()#> extends Entity
     */
     function __construct($propDict = array())
     {
+<#
+if (!(entity.Name.ToCheckedCase() == "Entity")) {
+#>
         parent::__construct();
+<#
+}
+#>
         $this->_propDict = $propDict;
     }
 
@@ -155,7 +161,7 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
     {
         if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->_propDict)) {
 <#
-            if (property.Type.GetTypeString() == "datetime") {
+            if (property.Type.GetTypeString() == "\\DateTime") {
 #>
             return new \DateTime($this->_propDict["<#=property.Name.ToCamelize()#>"]);
 <#
@@ -180,7 +186,7 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
     public function set<#=property.Name.ToCheckedCase()#>($val)
     {
 <#
-    if (property.Type.GetTypeString() == "datetime") {
+    if (property.Type.GetTypeString() == "\\DateTime") {
 #>
         $this->_propDict["<#=property.Name.ToCamelize()#>"] 
             = $val->format(\DateTime::ISO8601) . "Z";

src/GraphODataTemplateWriter/CodeHelpers/PHP/TypeHelperPHP.cs

@@ -42,6 +42,7 @@ public static string GetTypeString(this OdcmType @type)
             {
                 case "String":
                 case "Json":
+                case "Guid":
                     return "string";
                 case "Int8":
                 case "Int16":
@@ -50,16 +51,14 @@ public static string GetTypeString(this OdcmType @type)
                     return "int";
                 case "Double":
                     return "float";
-                case "Guid":
-                    return "UUID";
                 case "DateTimeOffset":
                 case "Date":
-                    return "datetime";
+                    return "\\DateTime";
                 case "Boolean":
                     return "bool";
                 case "Binary":
                 case "Stream":
-                    return "bytes";
+                    return "\\GuzzleHttp\\Psr7\\Stream";
                 default:
                     return @type.Name.ToUpperFirstChar();
             }