Add entity inheritance

Author: Caitlin Bales (MSFT)

Templates/PHP/Model/ComplexType.php.tt

@@ -10,7 +10,7 @@ OdcmClass complex		= (OdcmClass)host.CurrentType;
 <#=writer.WriteHeader(writer.GetDocBlock(complex.Name.ToCheckedCase()))#>
 namespace Microsoft\Graph\Model;
 <#=writer.GetClassBlock(complex.Name.ToCheckedCase().ToString(), "Model")#>
-class <#=complex.Name.ToUpperFirstChar()#>
+class <#=complex.Name.ToUpperFirstChar()#> extends Entity
 {
     /**
     * The array of properties available 
@@ -31,6 +31,16 @@ class <#=complex.Name.ToUpperFirstChar()#>
     {
         $this->_propDict = $propDict;
     }
+
+	/**
+    * 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();
@@ -44,15 +54,15 @@ foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString
     */
     public function get<#=property.Name.ToCheckedCase()#>()
     {
-        if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->propDict)) {
+        if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->_propDict)) {
 <#
             if (property.Type.GetTypeString() == "datetime") {
 #>
             return new \DateTime($this->_propDict["<#=property.Name.ToCamelize()#>"]);
 <#
             } else {
 #>
-            return $this->propDict["<#=property.Name.ToCamelize()#>"];
+            return $this->_propDict["<#=property.Name.ToCamelize()#>"];
 <#
             }
 #>
@@ -95,12 +105,12 @@ foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString
     */
     public function get<#=property.Name.ToCheckedCase()#>()
     {
-        if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->propDict)) {
-            if (is_a($this->propDict["<#=property.Name.ToCamelize()#>"], '<#=property.Type.GetTypeString()#>')) {
-                return $this->propDict["<#=property.Name.ToCamelize()#>"];
+        if (array_key_exists("<#=property.Name.ToCamelize()#>", $this->_propDict)) {
+            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()#>"];
+                $this->_propDict["<#=property.Name.ToCamelize()#>"] = new <#=property.Type.GetTypeString()#>($this->_propDict["<#=property.Name.ToCamelize()#>"]);
+                return $this->_propDict["<#=property.Name.ToCamelize()#>"];
             }
         }
         return null;
@@ -116,11 +126,11 @@ foreach(var property in complex.Properties.Where(prop => prop.Type.GetTypeString
     public function set<#=property.Name.ToCheckedCase()#>($val)
     {
 <#  if (property.Type.GetTypeString() == "bool") { #>
-        $this->propDict["<#=property.Name#>"] = boolval($val);
+        $this->_propDict["<#=property.Name#>"] = boolval($val);
 <#  } else if (property.Type.GetTypeString() == "int") { #>
-        $this->propDict["<#=property.Name#>"] = intval($val);
+        $this->_propDict["<#=property.Name#>"] = intval($val);
 <# } else { #>
-        $this->propDict["<#=property.Name#>"] = $val;
+        $this->_propDict["<#=property.Name#>"] = $val;
 <# } #>
          return $this;
     }

Templates/PHP/Model/EntityType.php.tt

@@ -13,7 +13,17 @@ TemplateWriterSettings settings = ConfigurationService.Settings;
 namespace Microsoft\Graph\Model;
 
 <#=writer.GetClassBlock(entity.Name.ToCheckedCase().ToString(), "Model")#>
+<#
+if (entity.Name.ToCheckedCase() == "Entity") {
+#>
 class <#=entity.Name.ToCheckedCase()#>
+<#
+} else {
+#>
+class <#=entity.Name.ToCheckedCase()#> extends Entity
+<# 
+}
+#>
 {
     /**
     * The array of properties available
@@ -110,11 +120,11 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
     public function set<#=property.Name.ToCheckedCase()#>($val)
     {
 <#  if (property.Type.GetTypeString() == "bool") { #>
-        $this->propDict["<#=property.Name#>"] = boolval($val);
+        $this->_propDict["<#=property.Name#>"] = boolval($val);
 <#  } else if (property.Type.GetTypeString() == "int") { #>
-        $this->propDict["<#=property.Name#>"] = intval($val);
+        $this->_propDict["<#=property.Name#>"] = intval($val);
 <# } else { #>
-        $this->propDict["<#=property.Name#>"] = $val;
+        $this->_propDict["<#=property.Name#>"] = $val;
 <# } #>
         return $this;
     }
@@ -165,11 +175,11 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
       } else {
 #>
 <#  if (property.Type.GetTypeString() == "bool") { #>
-        $this->propDict["<#=property.Name#>"] = boolval($val);
+        $this->_propDict["<#=property.Name#>"] = boolval($val);
 <#  } else if (property.Type.GetTypeString() == "int") { #>
-        $this->propDict["<#=property.Name#>"] = intval($val);
+        $this->_propDict["<#=property.Name#>"] = intval($val);
 <# } else { #>
-        $this->propDict["<#=property.Name#>"] = $val;
+        $this->_propDict["<#=property.Name#>"] = $val;
 <# } #>
 <#
             }