Prefill object id for fetch operations

Author: sibprogrammer

src/Api/Operator.php

@@ -96,7 +96,11 @@ protected function _getItems($structClass, $infoTag, $field = null, $value = nul
             if (!isset($xmlResult->data) || !isset($xmlResult->data->$infoTag)) {
                 continue;
             }
-            $items[] = new $structClass($xmlResult->data->$infoTag);
+            $item = new $structClass($xmlResult->data->$infoTag);
+            if (isset($xmlResult->id) && property_exists($item, 'id')) {
+                $item->id = (int) $xmlResult->id;
+            }
+            $items[] = $item;
         }
 
         return $items;

src/Api/Struct/Customer/GeneralInfo.php

@@ -5,6 +5,9 @@
 
 class GeneralInfo extends \PleskX\Api\Struct
 {
+    /** @var int */
+    public $id;
+
     /** @var string */
     public $company;
 

src/Api/Struct/Site/GeneralInfo.php

@@ -5,6 +5,9 @@
 
 class GeneralInfo extends \PleskX\Api\Struct
 {
+    /** @var int */
+    public $id;
+
     /** @var string */
     public $creationDate;
 

src/Api/Struct/Webspace/GeneralInfo.php

@@ -5,6 +5,9 @@
 
 class GeneralInfo extends \PleskX\Api\Struct
 {
+    /** @var int */
+    public $id;
+
     /** @var string */
     public $creationDate;
 

tests/CustomerTest.php

@@ -49,6 +49,7 @@ public function testGet()
         $this->assertEquals('[email protected]', $customerInfo->email);
         $this->assertEquals('Good guy', $customerInfo->description);
         $this->assertEquals('link:12345', $customerInfo->externalId);
+        $this->assertEquals($customer->id, $customerInfo->id);
 
         static::$_client->customer()->delete('id', $customer->id);
     }

tests/MailTest.php

@@ -61,6 +61,7 @@ public function testGet()
 
         $mailnameInfo = static::$_client->mail()->get('test', static::$webspace->id);
         $this->assertEquals('test', $mailnameInfo->name);
+        $this->assertEquals($mailname->id, $mailnameInfo->id);
 
         static::$_client->mail()->delete('name', $mailname->name, static::$webspace->id);
     }

tests/ResellerTest.php

@@ -42,6 +42,7 @@ public function testGet()
         $this->assertEquals('John Reseller', $resellerInfo->personalName);
         $this->assertEquals('reseller-unit-test', $resellerInfo->login);
         $this->assertGreaterThan(0, count($resellerInfo->permissions));
+        $this->assertEquals($reseller->id, $resellerInfo->id);
 
         static::$_client->reseller()->delete('id', $reseller->id);
     }

tests/SiteTest.php

@@ -64,6 +64,10 @@ public function testGet()
         $this->assertMatchesRegularExpression("/^\d{4}-\d{2}-\d{2}$/", $siteInfo->creationDate);
         $this->assertEquals(36, strlen($siteInfo->guid));
 
+        $siteGuid = $siteInfo->guid;
+        $siteInfo = static::$_client->site()->get('guid', $siteGuid);
+        $this->assertEquals($site->id, $siteInfo->id);
+
         static::$_client->site()->delete('id', $site->id);
     }
 
@@ -102,6 +106,7 @@ public function testGetAll()
         $this->assertCount(2, $sitesInfo);
         $this->assertEquals('addon.dom', $sitesInfo[0]->name);
         $this->assertEquals('addon.dom', $sitesInfo[0]->asciiName);
+        $this->assertEquals($site->id, $sitesInfo[0]->id);
 
         static::$_client->site()->delete('id', $site->id);
         static::$_client->site()->delete('id', $site2->id);

tests/SubdomainTest.php

@@ -61,6 +61,7 @@ public function testGet()
         $subdomainInfo = static::$_client->subdomain()->get('id', $subdomain->id);
         $this->assertEquals($name.'.'.$subdomainInfo->parent, $subdomainInfo->name);
         $this->assertTrue(false !== strpos($subdomainInfo->properties['www_root'], $name));
+        $this->assertEquals($subdomain->id, $subdomainInfo->id);
 
         static::$_client->subdomain()->delete('id', $subdomain->id);
     }

tests/WebspaceTest.php

@@ -182,6 +182,8 @@ public function testGet()
         $this->assertEquals($webspaceInfo->name, $webspaceInfo->asciiName);
         $this->assertIsArray($webspaceInfo->ipAddresses);
         $this->assertEquals(36, strlen($webspaceInfo->guid));
+        $this->assertMatchesRegularExpression("/^\d{4}-\d{2}-\d{2}$/", $webspaceInfo->creationDate);
+        $this->assertEquals($webspace->id, $webspaceInfo->id);
 
         static::$_client->webspace()->delete('id', $webspace->id);
     }