Skip to content

Commit

Permalink
build(deps-dev): bump the dev-dependencies group with 2 updates (#571)
Browse files Browse the repository at this point in the history
* 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](phpstan/phpstan@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](PHPCSStandards/PHP_CodeSniffer@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] <[email protected]>

* Fix CS

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Johan Cwiklinski <[email protected]>
  • Loading branch information
dependabot[bot] and trasher authored Dec 2, 2024
1 parent 53d5f84 commit a4898ba
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 30 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion inc/communicationnetworkinventory.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 0 additions & 10 deletions inc/deploytask.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,6 @@ public function title()
*/
public function showActions($id)
{

//load extjs plugins library
echo "<script type='text/javascript'>";
require_once GLPI_ROOT . "/plugins/fusinvdeploy/lib/extjs/Spinner.js";
require_once GLPI_ROOT . "/plugins/fusinvdeploy/lib/extjs/SpinnerField.js";
echo "</script>";

$this->getFromDB($id);
if ($this->getField('is_active') == 1) {
echo "<div class='box' style='margin-bottom:20px;'>";
Expand All @@ -208,9 +201,6 @@ public function showActions($id)
</tr>
</tbody>
</table>";

// Include JS
require GLPI_ROOT . "/plugins/fusinvdeploy/js/task_job.front.php";
}


Expand Down
7 changes: 4 additions & 3 deletions inc/staticmisc.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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
*
Expand Down Expand Up @@ -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
*/
Expand Down
3 changes: 1 addition & 2 deletions inc/task.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [])
{
Expand Down

0 comments on commit a4898ba

Please sign in to comment.