From a4898baf9028e8806caeb9504f17abe8810d3621 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:41:10 +0100 Subject: [PATCH] build(deps-dev): bump the dev-dependencies group with 2 updates (#571) * build(deps-dev): bump the dev-dependencies group with 2 updates Bumps the dev-dependencies group with 2 updates: [phpstan/phpstan](https://github.com/phpstan/phpstan) and [squizlabs/php_codesniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer). Updates `phpstan/phpstan` from 1.12.7 to 2.0.3 - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/2.0.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.12.7...2.0.3) Updates `squizlabs/php_codesniffer` from 3.10.3 to 3.11.1 - [Release notes](https://github.com/PHPCSStandards/PHP_CodeSniffer/releases) - [Changelog](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.10.3...3.11.1) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-major dependency-group: dev-dependencies - dependency-name: squizlabs/php_codesniffer dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] * Fix CS --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Cwiklinski --- composer.json | 4 ++-- composer.lock | 24 ++++++++++----------- inc/communicationnetworkinventory.class.php | 1 - inc/deploytask.class.php | 10 --------- inc/staticmisc.class.php | 7 +++--- inc/task.class.php | 3 +-- 6 files changed, 19 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 9e82e29bd4..6a41f6e9a2 100644 --- a/composer.json +++ b/composer.json @@ -4,9 +4,9 @@ }, "require-dev": { "glpi-project/tools": "^0.7", - "phpstan/phpstan": "^1.12", + "phpstan/phpstan": "^2.0", "phpunit/phpunit": "^9.6", - "squizlabs/php_codesniffer": "^3.10" + "squizlabs/php_codesniffer": "^3.11" }, "conflict": { "psr/container": "^2.0" diff --git a/composer.lock b/composer.lock index 51ce82f3d6..93a2a0cd4d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2521c5c0ff9f150c5d514e7e6fbdaacf", + "content-hash": "e0311bc8a30b940ae6094bf1e7db39d2", "packages": [], "packages-dev": [ { @@ -370,20 +370,20 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.7", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" + "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46b4d3529b12178112d9008337beda0cc2a1a6b4", + "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4", "shasum": "" }, "require": { - "php": "^7.2|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -424,7 +424,7 @@ "type": "github" } ], - "time": "2024-10-18T11:12:07+00:00" + "time": "2024-11-28T22:19:37+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1861,16 +1861,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.3", + "version": "3.11.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", "shasum": "" }, "require": { @@ -1937,7 +1937,7 @@ "type": "open_collective" } ], - "time": "2024-09-18T10:38:58+00:00" + "time": "2024-11-16T12:02:36+00:00" }, { "name": "symfony/console", diff --git a/inc/communicationnetworkinventory.class.php b/inc/communicationnetworkinventory.class.php index d5147b4985..fd80a0cbcd 100644 --- a/inc/communicationnetworkinventory.class.php +++ b/inc/communicationnetworkinventory.class.php @@ -90,7 +90,6 @@ public function import($p_DEVICEID, $a_CONTENT, Inventory $inventory) if (!isset($a_CONTENT->jobid)) { if (isset($a_CONTENT->content->processnumber)) { - // @phpstan-ignore-next-line $a_CONTENT->jobid = $a_CONTENT->content->processnumber; } else { $a_CONTENT->jobid = 1; diff --git a/inc/deploytask.class.php b/inc/deploytask.class.php index 74ed7797e3..107b7893d1 100644 --- a/inc/deploytask.class.php +++ b/inc/deploytask.class.php @@ -179,13 +179,6 @@ public function title() */ public function showActions($id) { - - //load extjs plugins library - echo ""; - $this->getFromDB($id); if ($this->getField('is_active') == 1) { echo "
"; @@ -208,9 +201,6 @@ public function showActions($id) "; - - // Include JS - require GLPI_ROOT . "/plugins/fusinvdeploy/js/task_job.front.php"; } diff --git a/inc/staticmisc.class.php b/inc/staticmisc.class.php index 5bb1ece020..dfd6f6bf88 100644 --- a/inc/staticmisc.class.php +++ b/inc/staticmisc.class.php @@ -43,7 +43,7 @@ class PluginGlpiinventoryStaticmisc /** * Get task methods of this plugin * - * @return array('module'=>'value', 'method'=>'value') + * @return array an array of the form ('module'=>'value', 'method'=>'value') * module value name of plugin * method value name of method */ @@ -128,7 +128,7 @@ public static function getModulesMethods() /** * Get all methods of this plugin * - * @return array('module'=>'value', 'method'=>'value') + * @return array an array of the form('module'=>'value', 'method'=>'value') * module value name of plugin * method value name of method * @@ -166,7 +166,8 @@ public static function getStaticMiscClass($module) * Get types of datas available to select for taskjob definition for ESX method * * @param array $a_itemtype array types yet added for definitions - * @return array('itemtype'=>'value', 'itemtype'=>'value'...) + * + * @return array an array of the form ('itemtype'=>'value', 'itemtype'=>'value'...) * itemtype itemtype of object * value name of the itemtype */ diff --git a/inc/task.class.php b/inc/task.class.php index 10ad6a0051..0ba50e5029 100644 --- a/inc/task.class.php +++ b/inc/task.class.php @@ -1306,8 +1306,7 @@ public function getJoblogs($task_ids = [], $with_logs = true, $only_active = fal * - refresh: the value of "refresh interval" list * - display: true for direct display of JSON result else returns a JSON encoded string * - * @return depends on @param $options['display']. - * @return string, empty if JSON results are displayed + * @return string empty if JSON results are displayed */ public function ajaxGetJobLogs($options = []) {