Unify service plan creation interface with other operators

Author: sibprogrammer

src/Api/Operator/ServicePlan.php

@@ -8,48 +8,44 @@
 class ServicePlan extends \PleskX\Api\Operator
 {
     /**
-     * @param string $field
-     * @param int|string $value
-     *
+     * @param array $properties
      * @return Struct\Info
      */
-    public function get($field, $value)
+    public function create($properties)
     {
-        $items = $this->_get($field, $value);
-
-        return reset($items);
+        $response = $this->request(['add' => $properties]);
+        return new Struct\Info($response);
     }
 
     /**
-     * @return Struct\Info[]
+     * @param string $field
+     * @param int|string $value
+     * @return bool
      */
-    public function getAll()
+    public function delete($field, $value)
     {
-        return $this->_get();
+        return $this->_delete($field, $value);
     }
 
     /**
-     * @param string $planName
+     * @param string $field
+     * @param int|string $value
+     *
      * @return Struct\Info
      */
-    public function create($planName)
+    public function get($field, $value)
     {
-        $packet = $this->_client->getPacket();
-        $info = $packet->addChild($this->_wrapperTag)->addChild('add');
-        $info->addChild('name', $planName);
+        $items = $this->_get($field, $value);
 
-        $response = $this->_client->request($packet);
-        return new Struct\Info($response);
+        return reset($items);
     }
 
     /**
-     * @param string $field
-     * @param int|string $value
-     * @return bool
+     * @return Struct\Info[]
      */
-    public function delete($field, $value)
+    public function getAll()
     {
-        return $this->_delete($field, $value);
+        return $this->_get();
     }
 
     /**

tests/ServicePlanTest.php

@@ -43,38 +43,36 @@ public function testDelete()
         $this->assertTrue($result);
     }
 
-    public function testRequestCreateServicePlan()
+    public function testCreateComplexServicePlan()
     {
-        $request = [
-            'add' => [
-                'name' => 'Service Plan Full Test',
-                'limits' => [
-                    'overuse' => 'block',
+        $properties = [
+            'name' => 'Complex Service Plan',
+            'limits' => [
+                'overuse' => 'block',
+                'limit' => [
+                    'name' => 'disk_space',
+                    'value' => 1024*1024*1024, // 1 GB
                 ],
-                'preferences' => [
-                    'stat' => 6,
-                    'maillists' => 'true',
-                ],
-                'hosting' => [
-                    'property' => [
-                        [
-                            'name' => 'ftp_quota',
-                            'value' => '-1',
-                        ],
-                        [
-                            'name' => 'ssl',
-                            'value' => 'true',
-                        ],
+            ],
+            'preferences' => [
+                'stat' => 6,
+                'maillists' => 'true',
+            ],
+            'hosting' => [
+                'property' => [
+                    [
+                        'name' => 'ftp_quota',
+                        'value' => '-1',
+                    ],
+                    [
+                        'name' => 'ssl',
+                        'value' => 'true',
                     ],
-                ],
-                'performance' => [
-                    'bandwidth' => 1000,
-                    'max_connections' => 20,
                 ],
             ],
         ];
 
-        $servicePlan = static::$_client->servicePlan()->request($request);
+        $servicePlan = static::$_client->servicePlan()->create($properties);
         $this->assertGreaterThan(0, $servicePlan->id);
 
         static::$_client->servicePlan()->delete('id', $servicePlan->id);

tests/TestCase.php

@@ -86,7 +86,7 @@ protected static function _createWebspace()
     protected static function _createServicePlan()
     {
         $id = uniqid();
-        $servicePlan = static::$_client->servicePlan()->create("test{$id}plan");
+        $servicePlan = static::$_client->servicePlan()->create(['name' => "test{$id}plan"]);
 
         self::$servicePlans[] = $servicePlan;