Merge pull request #131 from plesk/dependabot/composer/vimeo/psalm-5.…

…15.0 TECH Bump vimeo/psalm from 5.14.1 to 5.15.0
plesk · Aug 29, 2023 · 32563ff · 32563ff
2 parents 4a2ec7c + 5c6317f
commit 32563ff
Show file tree

Hide file tree

Showing 30 changed files with 101 additions and 65 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Api/AbstractStruct.php b/src/Api/AbstractStruct.php
@@ -24,7 +24,7 @@ public function __set(string $property, $value)
      *
      * @throws \Exception
      */
-    protected function initScalarProperties($apiResponse, array $properties): void
+    protected function initScalarProperties(\SimpleXMLElement $apiResponse, array $properties): void
     {
         foreach ($properties as $property) {
             if (is_array($property)) {

diff --git a/src/Api/Operator/DatabaseServer.php b/src/Api/Operator/DatabaseServer.php
@@ -60,9 +60,11 @@ private function getBy($field = null, $value = null): array
             if (!$xmlResult) {
                 continue;
             }
-            $item = new Struct\Info($xmlResult->data);
-            $item->id = (int) $xmlResult->id;
-            $items[] = $item;
+            if (!is_null($xmlResult->data)) {
+                $item = new Struct\Info($xmlResult->data);
+                $item->id = (int) $xmlResult->id;
+                $items[] = $item;
+            }
         }
 
         return $items;

diff --git a/src/Api/Operator/Dns.php b/src/Api/Operator/Dns.php
@@ -82,9 +82,11 @@ public function getAll(string $field, $value): array
             if (!$xmlResult) {
                 continue;
             }
-            $item = new Struct\Info($xmlResult->data);
-            $item->id = (int) $xmlResult->id;
-            $items[] = $item;
+            if (!is_null($xmlResult->data)) {
+                $item = new Struct\Info($xmlResult->data);
+                $item->id = (int) $xmlResult->id;
+                $items[] = $item;
+            }
         }
 
         return $items;

diff --git a/src/Api/Operator/DnsTemplate.php b/src/Api/Operator/DnsTemplate.php
@@ -63,9 +63,11 @@ public function getAll($field = null, $value = null): array
             if (!$xmlResult) {
                 continue;
             }
-            $item = new Struct\Info($xmlResult->data);
-            $item->id = (int) $xmlResult->id;
-            $items[] = $item;
+            if (!is_null($xmlResult->data)) {
+                $item = new Struct\Info($xmlResult->data);
+                $item->id = (int) $xmlResult->id;
+                $items[] = $item;
+            }
         }
 
         return $items;

diff --git a/src/Api/Operator/EventLog.php b/src/Api/Operator/EventLog.php
@@ -17,7 +17,7 @@ public function get(): array
         $records = [];
         $response = $this->request('get');
 
-        foreach ($response->event as $eventInfo) {
+        foreach ($response->event ?? [] as $eventInfo) {
             $records[] = new Struct\Event($eventInfo);
         }
 
@@ -32,7 +32,7 @@ public function getDetailedLog(): array
         $records = [];
         $response = $this->request('get_events');
 
-        foreach ($response->event as $eventInfo) {
+        foreach ($response->event ?? [] as $eventInfo) {
             $records[] = new Struct\DetailedEvent($eventInfo);
         }
 

diff --git a/src/Api/Operator/Ip.php b/src/Api/Operator/Ip.php
@@ -17,7 +17,7 @@ public function get(): array
         $packet->addChild($this->wrapperTag)->addChild('get');
         $response = $this->client->request($packet);
 
-        foreach ($response->addresses->ip_info as $ipInfo) {
+        foreach ($response->addresses->ip_info ?? [] as $ipInfo) {
             $ips[] = new Struct\Info($ipInfo);
         }
 

diff --git a/src/Api/Operator/Locale.php b/src/Api/Operator/Locale.php
@@ -24,8 +24,10 @@ public function get($id = null)
 
         $response = $this->client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
 
-        foreach ($response->locale->get->result as $localeInfo) {
-            $locales[(string) $localeInfo->info->id] = new Struct\Info($localeInfo->info);
+        foreach ($response->locale->get->result ?? [] as $localeInfo) {
+            if (!is_null($localeInfo->info)) {
+                $locales[(string) $localeInfo->info->id] = new Struct\Info($localeInfo->info);
+            }
         }
 
         return !is_null($id) ? reset($locales) : $locales;

diff --git a/src/Api/Operator/Mail.php b/src/Api/Operator/Mail.php
@@ -22,11 +22,13 @@ public function create(string $name, int $siteId, bool $mailbox = false, string
             $mailname->addChild('mailbox')->addChild('enabled', 'true');
         }
         if (!empty($password)) {
+            /** @psalm-suppress UndefinedPropertyAssignment */
             $mailname->addChild('password')->value = $password;
         }
 
         $response = $this->client->request($packet);
 
+        /** @psalm-suppress PossiblyNullArgument */
         return new Struct\Info($response->mailname);
     }
 

diff --git a/src/Api/Operator/ProtectedDirectory.php b/src/Api/Operator/ProtectedDirectory.php
@@ -73,6 +73,7 @@ public function getAll(string $field, $value): array
      * @param string $password
      *
      * @return Struct\UserInfo
+     * @psalm-suppress UndefinedPropertyAssignment
      */
     public function addUser($protectedDirectory, $login, $password)
     {

diff --git a/src/Api/Operator/Server.php b/src/Api/Operator/Server.php
@@ -14,6 +14,7 @@ public function getProtos(): array
         $packet->addChild($this->wrapperTag)->addChild('get_protos');
         $response = $this->client->request($packet);
 
+        /** @psalm-suppress PossiblyNullPropertyFetch */
         return (array) $response->protos->proto;
     }
 
@@ -37,7 +38,7 @@ public function getKeyInfo(): array
         $keyInfo = [];
         $keyInfoXml = $this->getInfo('key');
 
-        foreach ($keyInfoXml->property as $property) {
+        foreach ($keyInfoXml->property ?? [] as $property) {
             $keyInfo[(string) $property->name] = (string) $property->value;
         }
 
@@ -49,7 +50,7 @@ public function getComponents(): array
         $components = [];
         $componentsXml = $this->getInfo('components');
 
-        foreach ($componentsXml->component as $component) {
+        foreach ($componentsXml->component ?? [] as $component) {
             $components[(string) $component->name] = (string) $component->version;
         }
 
@@ -61,7 +62,7 @@ public function getServiceStates(): array
         $states = [];
         $statesXml = $this->getInfo('services_state');
 
-        foreach ($statesXml->srv as $service) {
+        foreach ($statesXml->srv ?? [] as $service) {
             $states[(string) $service->id] = [
                 'id' => (string) $service->id,
                 'title' => (string) $service->title,
@@ -82,7 +83,7 @@ public function getShells(): array
         $shells = [];
         $shellsXml = $this->getInfo('shells');
 
-        foreach ($shellsXml->shell as $shell) {
+        foreach ($shellsXml->shell ?? [] as $shell) {
             $shells[(string) $shell->name] = (string) $shell->path;
         }
 
@@ -106,7 +107,7 @@ public function getSiteIsolationConfig(): array
         $config = [];
         $configXml = $this->getInfo('site-isolation-config');
 
-        foreach ($configXml->property as $property) {
+        foreach ($configXml->property ?? [] as $property) {
             $config[(string) $property->name] = (string) $property->value;
         }
 

diff --git a/src/Api/Operator/Session.php b/src/Api/Operator/Session.php
@@ -31,7 +31,7 @@ public function get(): array
         $sessions = [];
         $response = $this->request('get');
 
-        foreach ($response->session as $sessionInfo) {
+        foreach ($response->session ?? [] as $sessionInfo) {
             $sessions[(string) $sessionInfo->id] = new Struct\Info($sessionInfo);
         }
 

diff --git a/src/Api/Operator/Site.php b/src/Api/Operator/Site.php
@@ -27,7 +27,9 @@ public function create(array $properties): Struct\Info
             $hostingNode = $info->addChild('hosting')->addChild('vrt_hst');
             foreach ($properties[static::PROPERTIES_HOSTING] as $name => $value) {
                 $propertyNode = $hostingNode->addChild('property');
+                /** @psalm-suppress UndefinedPropertyAssignment */
                 $propertyNode->name = $name;
+                /** @psalm-suppress UndefinedPropertyAssignment */
                 $propertyNode->value = $value;
             }
         }

diff --git a/src/Api/Operator/SiteAlias.php b/src/Api/Operator/SiteAlias.php
@@ -74,8 +74,10 @@ public function getAll($field = null, $value = null): array
             if (!$xmlResult) {
                 continue;
             }
-            $item = new Struct\GeneralInfo($xmlResult->info);
-            $items[] = $item;
+            if (!is_null($xmlResult->info)) {
+                $item = new Struct\GeneralInfo($xmlResult->info);
+                $items[] = $item;
+            }
         }
 
         return $items;

diff --git a/src/Api/Operator/Subdomain.php b/src/Api/Operator/Subdomain.php
@@ -16,7 +16,9 @@ public function create(array $properties): Struct\Info
             if (is_array($value)) {
                 foreach ($value as $propertyName => $propertyValue) {
                     $property = $info->addChild($name);
+                    /** @psalm-suppress UndefinedPropertyAssignment */
                     $property->name = $propertyName;
+                    /** @psalm-suppress UndefinedPropertyAssignment */
                     $property->value = $propertyValue;
                 }
                 continue;

diff --git a/src/Api/Operator/Ui.php b/src/Api/Operator/Ui.php
@@ -11,6 +11,7 @@ public function getNavigation(): array
     {
         $response = $this->request('get-navigation');
 
+        /** @psalm-suppress ImplicitToStringCast, PossiblyNullArgument */
         return unserialize(base64_decode($response->navigation));
     }
 

diff --git a/src/Api/Operator/Webspace.php b/src/Api/Operator/Webspace.php
@@ -86,7 +86,9 @@ public function create(array $properties, array $hostingProperties = null, strin
             $infoHosting = $info->addChild('hosting')->addChild('vrt_hst');
             foreach ($hostingProperties as $name => $value) {
                 $property = $infoHosting->addChild('property');
+                /** @psalm-suppress UndefinedPropertyAssignment */
                 $property->name = $name;
+                /** @psalm-suppress UndefinedPropertyAssignment */
                 $property->value = $value;
             }
 

diff --git a/src/Api/Struct/Reseller/GeneralInfo.php b/src/Api/Struct/Reseller/GeneralInfo.php
@@ -14,13 +14,15 @@ class GeneralInfo extends AbstractStruct
 
     public function __construct(\SimpleXMLElement $apiResponse)
     {
-        $this->initScalarProperties($apiResponse->{'gen-info'}, [
-            ['pname' => 'personalName'],
-            'login',
-        ]);
+        if (!is_null($apiResponse->{'gen-info'})) {
+            $this->initScalarProperties($apiResponse->{'gen-info'}, [
+                ['pname' => 'personalName'],
+                'login',
+            ]);
+        }
 
         $this->permissions = [];
-        foreach ($apiResponse->permissions->permission as $permissionInfo) {
+        foreach ($apiResponse->permissions->permission ?? [] as $permissionInfo) {
             $this->permissions[(string) $permissionInfo->name] = (string) $permissionInfo->value;
         }
     }

diff --git a/src/Api/Struct/Server/Statistics.php b/src/Api/Struct/Server/Statistics.php
@@ -28,6 +28,10 @@ class Statistics extends AbstractStruct
     /** @var Statistics\DiskSpace[] */
     public $diskSpace;
 
+    /**
+     * @param \SimpleXMLElement $apiResponse
+     * @psalm-suppress PossiblyNullArgument
+     */
     public function __construct(\SimpleXMLElement $apiResponse)
     {
         $this->objects = new Statistics\Objects($apiResponse->objects);
@@ -38,7 +42,7 @@ public function __construct(\SimpleXMLElement $apiResponse)
         $this->swap = new Statistics\Swap($apiResponse->swap);
 
         $this->diskSpace = [];
-        foreach ($apiResponse->diskspace as $disk) {
+        foreach ($apiResponse->diskspace ?? [] as $disk) {
             $this->diskSpace[(string) $disk->device->name] = new Statistics\DiskSpace($disk->device);
         }
     }

diff --git a/src/Api/Struct/Server/Statistics/LoadAverage.php b/src/Api/Struct/Server/Statistics/LoadAverage.php
@@ -13,8 +13,8 @@ class LoadAverage extends AbstractStruct
 
     public function __construct(\SimpleXMLElement $apiResponse)
     {
-        $this->load1min = $apiResponse->l1 / 100.0;
-        $this->load5min = $apiResponse->l5 / 100.0;
-        $this->load15min = $apiResponse->l15 / 100.0;
+        $this->load1min = (float) $apiResponse->l1 / 100.0;
+        $this->load5min = (float) $apiResponse->l5 / 100.0;
+        $this->load15min = (float) $apiResponse->l15 / 100.0;
     }
 }
diff --git a/src/Api/Struct/Site/GeneralInfo.php b/src/Api/Struct/Site/GeneralInfo.php
@@ -33,7 +33,7 @@ public function __construct(\SimpleXMLElement $apiResponse)
             'webspace-id',
         ]);
 
-        foreach ($apiResponse->dns_ip_address as $ip) {
+        foreach ($apiResponse->dns_ip_address ?? [] as $ip) {
             $this->ipAddresses[] = (string) $ip;
         }
     }

diff --git a/src/Api/Struct/Site/HostingInfo.php b/src/Api/Struct/Site/HostingInfo.php
@@ -12,11 +12,14 @@ class HostingInfo extends AbstractStruct
 
     public function __construct(\SimpleXMLElement $apiResponse)
     {
-        foreach ($apiResponse->vrt_hst->property as $property) {
+        foreach ($apiResponse->vrt_hst->property ?? [] as $property) {
             $this->properties[(string) $property->name] = (string) $property->value;
         }
-        $this->initScalarProperties($apiResponse->vrt_hst, [
-            'ip_address',
-        ]);
+
+        if (!is_null($apiResponse->vrt_hst)) {
+            $this->initScalarProperties($apiResponse->vrt_hst, [
+                'ip_address',
+            ]);
+        }
     }
 }
diff --git a/src/Api/Struct/Subdomain/Info.php b/src/Api/Struct/Subdomain/Info.php
@@ -20,7 +20,7 @@ public function __construct(\SimpleXMLElement $apiResponse)
             'parent',
             'name',
         ]);
-        foreach ($apiResponse->property as $propertyInfo) {
+        foreach ($apiResponse->property ?? [] as $propertyInfo) {
             $this->properties[(string) $propertyInfo->name] = (string) $propertyInfo->value;
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ public function getNavigation(): array @@
         {
             $response = $this->request('get-navigation');
+            /** @psalm-suppress ImplicitToStringCast, PossiblyNullArgument */
             return unserialize(base64_decode($response->navigation));
         }
@@ Expand Down @@