From a1546ba08053663ee6c1fa3fe6d22dd032397207 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 13 Jan 2022 10:47:53 +0100 Subject: [PATCH] vc php8 review --- .../include/rest-api/models/VisualConsole/Item.php | 6 +++--- .../include/rest-api/models/VisualConsole/Items/Clock.php | 4 ++-- .../include/rest-api/models/VisualConsole/View.php | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php index 80b4a09e6e..506f4e6100 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Item.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php @@ -1837,7 +1837,7 @@ class Item extends CachedModel if (empty($data) === false) { if (empty($data['id']) === true) { // Insert. - $save = $this->encode($data); + $save = static::encode($data); $result = \db_process_sql_insert('tlayout_data', $save); if ($result !== false) { @@ -1846,8 +1846,8 @@ class Item extends CachedModel } } else { // Update. - $dataModelEncode = $this->encode($this->toArray()); - $dataEncode = $this->encode($data); + $dataModelEncode = static::encode($this->toArray()); + $dataEncode = static::encode($data); $save = array_merge($dataModelEncode, $dataEncode); diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php index b5863cfdf6..60bbbd27d2 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php @@ -27,7 +27,7 @@ final class Clock extends Item * * @return string Return color. */ - protected function encodeColor(array $data): ?string + protected static function encodeColor(array $data): ?string { $color = null; if (isset($data['color']) === true) { @@ -51,7 +51,7 @@ final class Clock extends Item * * @overrides Item->encode. */ - protected function encode(array $data): array + protected static function encode(array $data): array { $return = parent::encode($data); diff --git a/pandora_console/include/rest-api/models/VisualConsole/View.php b/pandora_console/include/rest-api/models/VisualConsole/View.php index f6c8310e9e..692845ae13 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/View.php +++ b/pandora_console/include/rest-api/models/VisualConsole/View.php @@ -655,6 +655,7 @@ class View extends \HTML * Returns a popup for networkLink viewer. * * @return void + * phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.Missing */ public function networkLinkPopup() {