Merge pull request #6 from shellrent/fix_client

svdigital-development · web-flow · commit 7cada750e2e5 · 2023-06-06T10:10:31.000+02:00
Fix namespaces for AbstractStruct
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@
 .idea
 /nbproject/
 /.phpunit.result.cache
-/coverage.xml
+/coverage.xml
+composer.phar
+
diff --git a/src/Api/Operator.php b/src/Api/Operator.php
@@ -112,8 +112,8 @@ protected function getItems($structClass, $infoTag, $field = null, $value = null
 	 */
 	protected function _getId( $field = null, $value = null ) 
 	{
-		$packet = $this->_client->getPacket();
-        $getTag = $packet->addChild($this->_wrapperTag)->addChild('get');
+		$packet = $this->client->getPacket();
+        $getTag = $packet->addChild($this->wrapperTag)->addChild('get');
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
@@ -122,7 +122,7 @@ protected function _getId( $field = null, $value = null )
 		
 		$getTag->addChild('dataset');
 		
-        $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
+        $response = $this->client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
 		
 		$ids = [];
         foreach ($response->xpath('//result') as $xmlResult) {
diff --git a/src/Api/Operator/Certificate.php b/src/Api/Operator/Certificate.php
@@ -30,13 +30,13 @@ public function generate(array $properties): Struct\Info
      */
     public function getAll($field, $value )
     {
-        $packet = $this->_client->getPacket();
-        $getTag = $packet->addChild($this->_wrapperTag)->addChild('get-pool');
+        $packet = $this->client->getPacket();
+        $getTag = $packet->addChild($this->wrapperTag)->addChild('get-pool');
 
 		$filterTag = $getTag->addChild('filter');
 		$filterTag->addChild($field, $value);
 		
-        $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
+        $response = $this->client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
 		
         $items = [];
         foreach ($response->xpath('//result/certificates') as $xmlResult) {
@@ -54,8 +54,8 @@ public function getAll($field, $value )
 	 */
 	public function install($properties)
 	{
-		$packet = $this->_client->getPacket();
-		$install = $packet->addChild($this->_wrapperTag)->addChild('install');
+		$packet = $this->client->getPacket();
+		$install = $packet->addChild($this->wrapperTag)->addChild('install');
 
 		foreach ($properties as $name => $value) {
 			if ($name == 'content') {
@@ -71,7 +71,7 @@ public function install($properties)
 			$install->addChild($name, $value);
 		}
 
-		$response = $this->_client->request($packet);
+		$response = $this->client->request($packet);
 		return new Struct\InstallInfo($response);
 	}
 	
@@ -82,8 +82,8 @@ public function install($properties)
 	 */
 	public function remove($properties)
 	{
-		$packet = $this->_client->getPacket();
-		$removeNode = $packet->addChild($this->_wrapperTag)->addChild('remove');
+		$packet = $this->client->getPacket();
+		$removeNode = $packet->addChild($this->wrapperTag)->addChild('remove');
 
 		foreach ($properties as $key => $value) {
 			if( $key == 'filter' ) {
@@ -99,7 +99,7 @@ public function remove($properties)
 			$removeNode->addChild($key, $value);
 		}
 
-		$response = $this->_client->request($packet);
+		$response = $this->client->request($packet);
 		
 		return new Struct\RemoveInfo( $response );
 	}
diff --git a/src/Api/Operator/FtpUser.php b/src/Api/Operator/FtpUser.php
@@ -14,15 +14,15 @@ class FtpUser extends \PleskX\Api\Operator {
      * @return \PleskX\Api\XmlResponse
      */
     private function _get($command, $field, $value) {
-        $packet = $this->_client->getPacket();
-        $getTag = $packet->addChild($this->_wrapperTag)->addChild($command);
+        $packet = $this->client->getPacket();
+        $getTag = $packet->addChild($this->wrapperTag)->addChild($command);
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
             $filterTag->addChild($field, $value);
         }
 
-        $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
+        $response = $this->client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
         return $response;
     }
 	
@@ -32,16 +32,16 @@ private function _get($command, $field, $value) {
 	 * @param string $newPassword
 	 */
 	public function updateFtpPassword( $ftpUser, $newPassword ) {
-		$packet = $this->_client->getPacket();
-		$set = $packet->addChild( $this->_wrapperTag )->addChild( 'set' );
+		$packet = $this->client->getPacket();
+		$set = $packet->addChild( $this->wrapperTag )->addChild( 'set' );
 		
 		$filter = $set->addChild( 'filter' );
 		$filter->addChild( 'name', $ftpUser );
 		
 		$values = $set->addChild( 'values' );
 		$values->addChild( 'password', $newPassword );
 		
-		$this->_client->request($packet);
+		$this->client->request($packet);
 	}
 	
 	
diff --git a/src/Api/Operator/PhpHandler.php b/src/Api/Operator/PhpHandler.php
@@ -63,12 +63,12 @@ public function getAll($field = null, $value = null): array
 	 * @return Struct\GeneralInfo[]
 	 */
 	public function getHandler( $handlerId ) {
-		$packet = $this->_client->getPacket();
-		$getTag = $packet->addChild($this->_wrapperTag)->addChild('get');
+		$packet = $this->client->getPacket();
+		$getTag = $packet->addChild($this->wrapperTag)->addChild('get');
 		
 		$filterTag = $getTag->addChild('filter');
 		$filterTag->addChild('id', $handlerId);
-		$response = $this->_client->request( $packet );
+		$response = $this->client->request( $packet );
 		
 		$item = [];
 		
diff --git a/src/Api/Operator/Server.php b/src/Api/Operator/Server.php
@@ -147,10 +147,10 @@ private function getInfo(string $operation): XmlResponse
      * @return Struct\LicenseInfo
 	 */
 	public function getLicenseInfo() {
-        $packet = $this->_client->getPacket();
-		$packet->addChild( $this->_wrapperTag )->addChild( 'get' )->addChild( 'key' );
+        $packet = $this->client->getPacket();
+		$packet->addChild( $this->wrapperTag )->addChild( 'get' )->addChild( 'key' );
 		
-		$response = $this->_client->request( $packet );
+		$response = $this->client->request( $packet );
 		
 		return new Struct\LicenseInfo( $response );
 	}
@@ -161,10 +161,10 @@ public function getLicenseInfo() {
      * @return Struct\LicenseAdditionalInfo
 	 */
 	public function getAdditionalLicensesInfo() {
-        $packet = $this->_client->getPacket();
-		$packet->addChild( $this->_wrapperTag )->addChild( 'get_additional_key' );
+        $packet = $this->client->getPacket();
+		$packet->addChild( $this->wrapperTag )->addChild( 'get_additional_key' );
 		
-		$response = new Struct\LicenseAdditionalInfo( $this->_client->request( $packet ) );
+		$response = new Struct\LicenseAdditionalInfo( $this->client->request( $packet ) );
 		
 		if( !is_null( $response->error_code ) or !empty( $response->error_message ) ) {
 			throw new Exception( $response->error_message, $response->error_code );
@@ -181,8 +181,8 @@ public function getAdditionalLicensesInfo() {
      * @return Struct\LicenseInstall
 	 */
 	public function installLicense( $activationCode, $isAdditionalLicense = false ) {
-        $packet = $this->_client->getPacket();
-		$server = $packet->addChild( $this->_wrapperTag );
+        $packet = $this->client->getPacket();
+		$server = $packet->addChild( $this->wrapperTag );
 		$licInstall = $server->addChild( 'lic_install' );
 		
 		$licInstall->addChild( 'activation-code', $activationCode );
@@ -191,7 +191,7 @@ public function installLicense( $activationCode, $isAdditionalLicense = false )
 			$licInstall->addChild( 'additional_key' );
 		}
 		
-		$response = new Struct\LicenseInstall( $this->_client->request( $packet ) );
+		$response = new Struct\LicenseInstall( $this->client->request( $packet ) );
 		
 		if( !is_null( $response->error_code ) or !empty( $response->error_message ) ) {
 			throw new Exception( $response->error_message, $response->error_code );
diff --git a/src/Api/Operator/Site.php b/src/Api/Operator/Site.php
@@ -97,6 +97,6 @@ public function getAll(): array
      */
     public function getAllWebspaceInfos()
     {
-        return $this->_getItems(Struct\CompleteGeneralInfo::class, 'gen_info');
+        return $this->getItems(Struct\CompleteGeneralInfo::class, 'gen_info');
     }
 }
diff --git a/src/Api/Struct/Certificate/InstallInfo.php b/src/Api/Struct/Certificate/InstallInfo.php
@@ -3,14 +3,16 @@
 
 namespace PleskX\Api\Struct\Certificate;
 
-class InstallInfo extends \PleskX\Api\Struct
+use PleskX\Api\AbstractStruct;
+
+class InstallInfo extends AbstractStruct
 {
 	/** @var string */
 	public $status;
 
 	public function __construct($apiResponse)
 	{
-		$this->_initScalarProperties($apiResponse, [
+		$this->initScalarProperties($apiResponse, [
 			'status',
 		]);
 	}
diff --git a/src/Api/Struct/Certificate/PoolInfo.php b/src/Api/Struct/Certificate/PoolInfo.php
@@ -3,14 +3,16 @@
 
 namespace PleskX\Api\Struct\Certificate;
 
-class PoolInfo extends \PleskX\Api\Struct
+use PleskX\Api\AbstractStruct;
+
+class PoolInfo extends AbstractStruct
 {
     /** @var string */
     public $name;
 
     public function __construct($apiResponse)
     {
-        $this->_initScalarProperties($apiResponse, [
+        $this->initScalarProperties($apiResponse, [
             ['name' => 'name'],
         ]);
     }
diff --git a/src/Api/Struct/Certificate/RemoveInfo.php b/src/Api/Struct/Certificate/RemoveInfo.php
@@ -3,14 +3,16 @@
 
 namespace PleskX\Api\Struct\Certificate;
 
-class RemoveInfo extends \PleskX\Api\Struct
+use PleskX\Api\AbstractStruct;
+
+class RemoveInfo extends AbstractStruct
 {
 	/** @var string */
 	public $status;
 
 	public function __construct($apiResponse)
 	{
-		$this->_initScalarProperties($apiResponse, [
+		$this->initScalarProperties($apiResponse, [
 			'status',
 		]);
 	}
diff --git a/src/Api/Struct/FtpUser/Info.php b/src/Api/Struct/FtpUser/Info.php
@@ -2,7 +2,9 @@
 
 namespace PleskX\Api\Struct\FtpUser;
 
-class Info extends \PleskX\Api\Struct
+use PleskX\Api\AbstractStruct;
+
+class Info extends AbstractStruct
 {
 
     /** @var integer */
@@ -19,7 +21,7 @@ class Info extends \PleskX\Api\Struct
 	
 	
     public function __construct( $apiResponse ) {
-        $this->_initScalarProperties($apiResponse, [
+        $this->initScalarProperties($apiResponse, [
             'id',
             'name',
             'home',
diff --git a/src/Api/Struct/Server/License/keyInfo.php b/src/Api/Struct/Server/License/keyInfo.php
@@ -2,13 +2,14 @@
 
 namespace PleskX\Api\Struct\Server\License;
 
+use PleskX\Api\AbstractStruct;
 use PleskX\Api\Struct\Server\LicensePropertyInfo;
 
 
 /**
  * Struttura dati per le informazioni su una licenza
  */
-class keyInfo extends \PleskX\Api\Struct {
+class keyInfo extends AbstractStruct {
 	
     /** @var \PleskX\Api\Struct\Server\LicensePropertyInfo[] Collezione di proprietà della licenza */
     public $properties;
diff --git a/src/Api/Struct/Server/LicenseAdditional/keyAdditionalInfo.php b/src/Api/Struct/Server/LicenseAdditional/keyAdditionalInfo.php
@@ -2,13 +2,14 @@
 
 namespace PleskX\Api\Struct\Server\LicenseAdditional;
 
+use PleskX\Api\AbstractStruct;
 use PleskX\Api\Struct\Server\LicensePropertyInfo;
 
 
 /**
  * Struttura dati per le informazioni su una licenza
  */
-class keyAdditionalInfo extends \PleskX\Api\Struct {
+class keyAdditionalInfo extends AbstractStruct {
 	
     /** @var string Numero completo della licenza */
     public $key_number;
@@ -30,7 +31,7 @@ class keyAdditionalInfo extends \PleskX\Api\Struct {
 	 * @param \SimpleXMLElement $apiResponse
 	 */
     public function __construct( $apiResponse ) {
-        $this->_initScalarProperties( $apiResponse, [
+        $this->initScalarProperties( $apiResponse, [
             ['number' => 'key_number'],
             ['name' => 'full_name'],
             ['active' => 'active'],
diff --git a/src/Api/Struct/Server/LicenseAdditionalInfo.php b/src/Api/Struct/Server/LicenseAdditionalInfo.php
@@ -2,13 +2,14 @@
 
 namespace PleskX\Api\Struct\Server;
 
+use PleskX\Api\AbstractStruct;
 use PleskX\Api\Struct\Server\LicenseAdditional\keyAdditionalInfo;
 
 
 /**
  * Struttura dati per le informazioni su una licenza aggiuntiva
  */
-class LicenseAdditionalInfo extends \PleskX\Api\Struct {
+class LicenseAdditionalInfo extends AbstractStruct {
 	
     /** @var string Stato della licenza */
     public $status;
@@ -19,15 +20,15 @@ class LicenseAdditionalInfo extends \PleskX\Api\Struct {
     /** @var string Messaggio di errore in caso di fallimento della richiesta */
     public $error_message;
 	
-    /** @var \PleskX\Api\Struct\Server\License\keyAdditionalInfo Licenza aggiuntiva */
+    /** @var $key \PleskX\Api\Struct\Server\LicenseAdditional\keyAdditionalInfo */
     public $key;
 
 	
 	/**
 	 * @param \SimpleXMLElement $apiResponse Oggetto xml a partire da <result>
 	 */
     public function __construct( $apiResponse ) {
-        $this->_initScalarProperties( $apiResponse, [
+        $this->initScalarProperties( $apiResponse, [
             'status',
         ]);
 		
diff --git a/src/Api/Struct/Server/LicenseInfo.php b/src/Api/Struct/Server/LicenseInfo.php
@@ -2,13 +2,14 @@
 
 namespace PleskX\Api\Struct\Server;
 
+use PleskX\Api\AbstractStruct;
 use PleskX\Api\Struct\Server\License\keyInfo;
 
 
 /**
  * Struttura dati per le informazioni sulla licenza installata
  */
-class LicenseInfo extends \PleskX\Api\Struct {
+class LicenseInfo extends AbstractStruct {
 	
     /** @var string Stato della licenza */
     public $status;
@@ -21,7 +22,7 @@ class LicenseInfo extends \PleskX\Api\Struct {
 	 * @param \SimpleXMLElement $apiResponse Oggetto xml a partire da <result>
 	 */
     public function __construct( $apiResponse ) {
-        $this->_initScalarProperties( $apiResponse, [
+        $this->initScalarProperties( $apiResponse, [
             'status',
         ]);
 		
diff --git a/src/Api/Struct/Server/LicenseInstall.php b/src/Api/Struct/Server/LicenseInstall.php
@@ -3,10 +3,12 @@
 namespace PleskX\Api\Struct\Server;
 
 
+use PleskX\Api\AbstractStruct;
+
 /**
  * Struttura dati per la response di installazione licenza principale o aggiuntiva
  */
-class LicenseInstall extends \PleskX\Api\Struct {
+class LicenseInstall extends AbstractStruct {
 	
     /** @var string Stato della licenza */
     public $status;
@@ -22,7 +24,7 @@ class LicenseInstall extends \PleskX\Api\Struct {
 	 * @param \SimpleXMLElement $apiResponse
 	 */
     public function __construct( $apiResponse ) {
-        $this->_initScalarProperties( $apiResponse, [
+        $this->initScalarProperties( $apiResponse, [
             [ 'status'  => 'status'],
         ]);
 		
diff --git a/src/Api/Struct/Server/LicensePropertyInfo.php b/src/Api/Struct/Server/LicensePropertyInfo.php
diff --git a/src/Api/Struct/Site/CompleteGeneralInfo.php b/src/Api/Struct/Site/CompleteGeneralInfo.php
diff --git a/src/Api/Struct/Webspace/CompleteGeneralInfo.php b/src/Api/Struct/Webspace/CompleteGeneralInfo.php
diff --git a/src/Api/Struct/Webspace/HostingSetting.php b/src/Api/Struct/Webspace/HostingSetting.php

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,6 @@ public function getAll(): array`
`97`	`97`	`*/`
`98`	`98`	`public function getAllWebspaceInfos()`
`99`	`99`	`{`
`100`		`- return $this->_getItems(Struct\CompleteGeneralInfo::class, 'gen_info');`
	`100`	`+ return $this->getItems(Struct\CompleteGeneralInfo::class, 'gen_info');`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,16 @@`
`3`	`3`
`4`	`4`	`namespace PleskX\Api\Struct\Certificate;`
`5`	`5`
`6`		`-class InstallInfo extends \PleskX\Api\Struct`
	`6`	`+use PleskX\Api\AbstractStruct;`
	`7`	`+`
	`8`	`+class InstallInfo extends AbstractStruct`
`7`	`9`	`{`
`8`	`10`	`/** @var string */`
`9`	`11`	`public $status;`
`10`	`12`
`11`	`13`	`public function __construct($apiResponse)`
`12`	`14`	`{`
`13`		`- $this->_initScalarProperties($apiResponse, [`
	`15`	`+ $this->initScalarProperties($apiResponse, [`
`14`	`16`	`'status',`
`15`	`17`	`]);`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,16 @@`
`3`	`3`
`4`	`4`	`namespace PleskX\Api\Struct\Certificate;`
`5`	`5`
`6`		`-class PoolInfo extends \PleskX\Api\Struct`
	`6`	`+use PleskX\Api\AbstractStruct;`
	`7`	`+`
	`8`	`+class PoolInfo extends AbstractStruct`
`7`	`9`	`{`
`8`	`10`	`/** @var string */`
`9`	`11`	`public $name;`
`10`	`12`
`11`	`13`	`public function __construct($apiResponse)`
`12`	`14`	`{`
`13`		`- $this->_initScalarProperties($apiResponse, [`
	`15`	`+ $this->initScalarProperties($apiResponse, [`
`14`	`16`	`['name' => 'name'],`
`15`	`17`	`]);`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,16 @@`
`3`	`3`
`4`	`4`	`namespace PleskX\Api\Struct\Certificate;`
`5`	`5`
`6`		`-class RemoveInfo extends \PleskX\Api\Struct`
	`6`	`+use PleskX\Api\AbstractStruct;`
	`7`	`+`
	`8`	`+class RemoveInfo extends AbstractStruct`
`7`	`9`	`{`
`8`	`10`	`/** @var string */`
`9`	`11`	`public $status;`
`10`	`12`
`11`	`13`	`public function __construct($apiResponse)`
`12`	`14`	`{`
`13`		`- $this->_initScalarProperties($apiResponse, [`
	`15`	`+ $this->initScalarProperties($apiResponse, [`
`14`	`16`	`'status',`
`15`	`17`	`]);`
`16`	`18`	`}`