Merge pull request plesk#22 from vbaranovskiy-plesk/master

Add property node to subdomain's creation

Author: sibprogrammer

src/PleskX/Api/Operator/Subdomain.php

@@ -16,6 +16,14 @@ public function create($properties)
         $info = $packet->addChild($this->_wrapperTag)->addChild('add');
 
         foreach ($properties as $name => $value) {
+            if (is_array($value)) {
+                foreach ($value as $propertyName => $propertyValue) {
+                    $property = $info->addChild($name);
+                    $property->addChild('name', $propertyName);
+                    $property->addChild('value', $propertyValue);
+                }
+                continue;
+            }
             $info->addChild($name, $value);
         }
 

tests/SubdomainTest.php

@@ -30,6 +30,9 @@ private function _createSubdomain($name)
         return static::$_client->subdomain()->create([
             'parent' => 'example.dom',
             'name' => $name,
+            'property' => [
+                'www_root' => $name,
+            ]
         ]);
     }
 
@@ -53,23 +56,29 @@ public function testDelete()
 
     public function testGet()
     {
-        $subdomain = $this->_createSubdomain('sub');
+        $name = 'sub';
+        $subdomain = $this->_createSubdomain($name);
 
         $subdomainInfo = static::$_client->subdomain()->get('id', $subdomain->id);
-        $this->assertEquals('sub.' . $subdomainInfo->parent, $subdomainInfo->name);
+        $this->assertEquals($name . '.' . $subdomainInfo->parent, $subdomainInfo->name);
+        $this->assertTrue(false !== strpos($subdomainInfo->properties['www_root'], $name));
 
         static::$_client->subdomain()->delete('id', $subdomain->id);
     }
 
     public function testGetAll()
     {
-        $subdomain = $this->_createSubdomain('sub');
-        $subdomain2 = $this->_createSubdomain('sub2');
+        $name = 'sub';
+        $name2 = 'sub2';
+        $subdomain = $this->_createSubdomain($name);
+        $subdomain2 = $this->_createSubdomain($name2);
 
         $subdomainsInfo = static::$_client->subdomain()->getAll();
         $this->assertCount(2, $subdomainsInfo);
-        $this->assertEquals('sub.' . $subdomainsInfo[0]->parent, $subdomainsInfo[0]->name);
-        $this->assertEquals('sub2.' . $subdomainsInfo[1]->parent, $subdomainsInfo[1]->name);
+        $this->assertEquals($name . '.' . $subdomainsInfo[0]->parent, $subdomainsInfo[0]->name);
+        $this->assertTrue(false !== strpos($subdomainsInfo[0]->properties['www_root'], $name));
+        $this->assertEquals($name2 . '.' . $subdomainsInfo[1]->parent, $subdomainsInfo[1]->name);
+        $this->assertTrue(false !== strpos($subdomainsInfo[1]->properties['www_root'], $name2));
 
         static::$_client->subdomain()->delete('id', $subdomain->id);
         static::$_client->subdomain()->delete('id', $subdomain2->id);

tests/TestCase.php

@@ -45,7 +45,7 @@ protected static function _createWebspace($name)
             'ip_address' => static::_getIpAddress(),
         ], [
             'ftp_login' => 'test-login',
-            'ftp_password' => 'test-password',
+            'ftp_password' => 'TEST-password',
         ]);
     }