Skip to content

Phpstan level 5 #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 7, 2025
Merged

Phpstan level 5 #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3d3ddc5
Phpstan level 5
Lainow Jan 20, 2025
75bcb04
Fix PGP-CS-Fixer error
Lainow Jan 22, 2025
e6f48a6
Update phpstan config (lvl 5)
Lainow Jan 22, 2025
3161ea2
Update inc/container.class.php
Lainow Feb 5, 2025
1e633f5
implement suggestions
Lainow Feb 6, 2025
51aee41
update composer
Lainow Feb 6, 2025
036a2bb
implement suggestions
Lainow Feb 6, 2025
3597ceb
Update inc/inventory.class.php
Lainow Feb 6, 2025
3e73280
Fix phpstan error
Lainow Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions composer.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion front/container.form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
Html::redirect(PLUGINFIELDS_WEB_DIR . '/front/container.php');
} elseif (isset($_REQUEST['purge'])) {
$container->check($_REQUEST['id'], PURGE);
$container->delete($_REQUEST, 1);
$container->delete($_REQUEST, true);
Html::redirect(PLUGINFIELDS_WEB_DIR . '/front/container.php');
} elseif (isset($_POST['update'])) {
$container->check($_POST['id'], UPDATE);
Expand Down
2 changes: 1 addition & 1 deletion front/field.form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
Html::back();
} elseif (isset($_REQUEST['purge'])) {
$field->check($_REQUEST['id'], PURGE);
$field->delete($_REQUEST, 1);
$field->delete($_REQUEST, true);
$field->redirectToList();
} elseif (isset($_POST['update'])) {
$field->check($_POST['id'], UPDATE);
Expand Down
73 changes: 35 additions & 38 deletions hook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,49 +254,46 @@ function plugin_fields_rule_matched($params = [])

$container = new PluginFieldsContainer();

switch ($params['sub_type']) {
case 'PluginFusioninventoryTaskpostactionRule':
/** @phpstan-ignore-next-line */
$agent = new PluginFusioninventoryAgent();

if (isset($params['input']['plugin_fusioninventory_agents_id'])) {
foreach ($params['output'] as $field => $value) {
// check if current field is in a tab container
$iterator = $DB->request([
'SELECT' => 'glpi_plugin_fields_containers.id',
'FROM' => 'glpi_plugin_fields_containers',
'LEFT JOIN' => [
'glpi_plugin_fields_fields' => [
'FKEY' => [
'glpi_plugin_fields_containers' => 'id',
'glpi_plugin_fields_fields' => 'plugin_fields_containers_id',
],
if (class_exists('PluginFusioninventoryAgent') && $params['sub_type'] == 'PluginFusioninventoryTaskpostactionRule') {
$agent = new PluginFusioninventoryAgent();

if (isset($params['input']['plugin_fusioninventory_agents_id'])) {
foreach ($params['output'] as $field => $value) {
// check if current field is in a tab container
$iterator = $DB->request([
'SELECT' => 'glpi_plugin_fields_containers.id',
'FROM' => 'glpi_plugin_fields_containers',
'LEFT JOIN' => [
'glpi_plugin_fields_fields' => [
'FKEY' => [
'glpi_plugin_fields_containers' => 'id',
'glpi_plugin_fields_fields' => 'plugin_fields_containers_id',
],
],
'WHERE' => [
'glpi_plugin_fields_fields.name' => $field,
],
'WHERE' => [
'glpi_plugin_fields_fields.name' => $field,
],
]);
if (count($iterator) > 0) {
$data = $iterator->current();

//retrieve computer
$agents_id = $params['input']['plugin_fusioninventory_agents_id'];
$agent->getFromDB($agents_id);

// update current field
$container->updateFieldsValues(
[
'plugin_fields_containers_id' => $data['id'],
$field => $value,
'items_id' => $agent->fields['computers_id'],
],
]);
if (count($iterator) > 0) {
$data = $iterator->current();

//retrieve computer
$agents_id = $params['input']['plugin_fusioninventory_agents_id'];
$agent->getFromDB($agents_id);

// update current field
$container->updateFieldsValues(
[
'plugin_fields_containers_id' => $data['id'],
$field => $value,
'items_id' => $agent->fields['computers_id'],
],
Computer::getType(),
);
}
Computer::getType(),
);
}
}
break;
}
}
}

Expand Down
Loading