Fix for "Json" type

Author: Caitlin Bales (MSFT)

Templates/PHP/Model/ComplexType.php.tt

@@ -96,12 +96,22 @@ class <#=complex.Name.ToUpperFirstChar()#>
     public function get<#=property.Name.ToCheckedCase()#>()
     {
         if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->propDict)) {
+<#
+	if (property.Type.GetTypeString() == "Json") {
+#>
+            return $this->_propDict["<#=property.Name.ToCamelize()#>"];
+<#	
+	} else {
+#>
             if (is_a($this->propDict["<#=property.Name.ToCamelize()#>"], '<#=property.Type.GetTypeString()#>')) {
                 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

@@ -75,12 +75,22 @@ class <#=entity.Name.ToCheckedCase()#>
     public function get<#=property.Name.ToCheckedCase()#>()
     {
         if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->_propDict)) {
+<#
+	if (property.Type.GetTypeString() == "Json") {
+#>
+            return $this->_propDict["<#=property.Name.ToCamelize()#>"];
+<#	
+	} else {
+#>
             if (is_a($this->_propDict["<#=property.Name.ToCamelize()#>"], '<#=property.Type.GetTypeString()#>')) {
                 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;
     }