addresse keytype conflict (#1310)

Author: bshaffer

src/Google/Collection.php

@@ -91,11 +91,10 @@ public function offsetUnset($offset)
 
   private function coerceType($offset)
   {
-    $typeKey = $this->keyType($this->collection_key);
-    if (isset($this->$typeKey) && !is_object($this->{$this->collection_key}[$offset])) {
-      $type = $this->$typeKey;
+    $keyType = $this->keyType($this->collection_key);
+    if ($keyType && !is_object($this->{$this->collection_key}[$offset])) {
       $this->{$this->collection_key}[$offset] =
-          new $type($this->{$this->collection_key}[$offset]);
+          new $keyType($this->{$this->collection_key}[$offset]);
     }
   }
 }

src/Google/Model.php

@@ -53,32 +53,30 @@ final public function __construct()
    */
   public function __get($key)
   {
-    $keyTypeName = $this->keyType($key);
+    $keyType = $this->keyType($key);
     $keyDataType = $this->dataType($key);
-    if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
+    if ($keyType && !isset($this->processed[$key])) {
       if (isset($this->modelData[$key])) {
         $val = $this->modelData[$key];
-      } else if (isset($this->$keyDataType) &&
-          ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
+      } elseif ($keyDataType == 'array' || $keyDataType == 'map') {
         $val = array();
       } else {
         $val = null;
       }
 
       if ($this->isAssociativeArray($val)) {
-        if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
+        if ($keyDataType && 'map' == $keyDataType) {
           foreach ($val as $arrayKey => $arrayItem) {
               $this->modelData[$key][$arrayKey] =
-                $this->createObjectFromName($keyTypeName, $arrayItem);
+                new $keyType($arrayItem);
           }
         } else {
-          $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
+          $this->modelData[$key] = new $keyType($val);
         }
       } else if (is_array($val)) {
         $arrayObject = array();
         foreach ($val as $arrayIndex => $arrayItem) {
-          $arrayObject[$arrayIndex] =
-            $this->createObjectFromName($keyTypeName, $arrayItem);
+          $arrayObject[$arrayIndex] = new $keyType($arrayItem);
         }
         $this->modelData[$key] = $arrayObject;
       }
@@ -98,22 +96,21 @@ protected function mapTypes($array)
   {
     // Hard initialise simple types, lazy load more complex ones.
     foreach ($array as $key => $val) {
-      if (property_exists($this, $this->keyType($key))) {
-        $propertyClass = $this->{$this->keyType($key)};
-        $dataType = $this->{$this->dataType($key)};
+      if ($keyType = $this->keyType($key)) {
+        $dataType = $this->dataType($key);
         if ($dataType == 'array' || $dataType == 'map') {
           $this->$key = array();
           foreach ($val as $itemKey => $itemVal) {
-            if ($itemVal instanceof $propertyClass) {
+            if ($itemVal instanceof $keyType) {
               $this->{$key}[$itemKey] = $itemVal;
             } else {
-              $this->{$key}[$itemKey] = new $propertyClass($itemVal);
+              $this->{$key}[$itemKey] = new $keyType($itemVal);
             }
           }
-        } elseif ($val instanceof $propertyClass) {
+        } elseif ($val instanceof $keyType) {
           $this->$key = $val;
         } else {
-          $this->$key = new $propertyClass($val);
+          $this->$key = new $keyType($val);
         }
         unset($array[$key]);
       } elseif (property_exists($this, $key)) {
@@ -234,19 +231,6 @@ protected function isAssociativeArray($array)
     return false;
   }
 
-  /**
-   * Given a variable name, discover its type.
-   *
-   * @param $name
-   * @param $item
-   * @return object The object from the item.
-   */
-  private function createObjectFromName($name, $item)
-  {
-    $type = $this->$name;
-    return new $type($item);
-  }
-
   /**
    * Verify if $obj is an array.
    * @throws Google_Exception Thrown if $obj isn't an array.
@@ -291,12 +275,21 @@ public function offsetUnset($offset)
 
   protected function keyType($key)
   {
-    return $key . "Type";
+    $keyType = $key . "Type";
+
+    // ensure keyType is a valid class
+    if (property_exists($this, $keyType) && class_exists($this->$keyType)) {
+      return $this->$keyType;
+    }
   }
 
   protected function dataType($key)
   {
-    return $key . "DataType";
+    $dataType = $key . "DataType";
+
+    if (property_exists($this, $dataType)) {
+      return $this->$dataType;
+    }
   }
 
   public function __isset($key)

tests/Google/ModelTest.php

@@ -264,4 +264,18 @@ public function testPassingInstanceInConstructorForMap()
     $this->assertEquals('#FFF', $collection->calendar['regular']->getBackground());
     $this->assertEquals('#FFF', $collection->calendar['inverted']->getForeground());
   }
+
+  /**
+   * @see https://github.com/google/google-api-php-client/issues/1308
+   */
+  public function testKeyTypePropertyConflict()
+  {
+    $data = [
+        "duration" => 0,
+        "durationType" => "unknown",
+    ];
+    $creativeAsset = new Google_Service_Dfareporting_CreativeAsset($data);
+    $this->assertEquals(0, $creativeAsset->getDuration());
+    $this->assertEquals('unknown', $creativeAsset->getDurationType());
+  }
 }