fix(container): correct entity ID and add 'use Glpi\DBAL\QueryExpression'

JeremieMercier · JeremieMercier · commit 246a764af81c · 2025-10-10T22:26:29.000+02:00
diff --git a/inc/container.class.php b/inc/container.class.php
@@ -1709,13 +1709,13 @@ public static function findContainers($itemtype, $type = 'tab', $subtype = '', $
             return [];
         }
 
-        $entitiesIds = getAncestorsOf("glpi_entities", (string) $entityId);
+        $entitiesIds = getAncestorsOf("glpi_entities", (int) $entityId);
         $entitiesIds[] = $entityId; // Add entity active itself to the list
 
         $where = [
             'is_active' => 1,
             'type'      => $type,
-            new \QueryExpression("JSON_CONTAINS(itemtypes, " . $DB->quote('"' . $itemtype . '"') . ")"),
+            new QueryExpression("JSON_CONTAINS(itemtypes, " . $DB->quote('"' . $itemtype . '"') . ")"),
             'AND' => [
                 'OR' => [
                     [

Original file line number	Diff line number	Diff line change
`@@ -1709,13 +1709,13 @@ public static function findContainers($itemtype, $type = 'tab', $subtype = '', $`
`1709`	`1709`	`return [];`
`1710`	`1710`	`}`
`1711`	`1711`
`1712`		`- $entitiesIds = getAncestorsOf("glpi_entities", (string) $entityId);`
	`1712`	`+ $entitiesIds = getAncestorsOf("glpi_entities", (int) $entityId);`
`1713`	`1713`	`$entitiesIds[] = $entityId; // Add entity active itself to the list`
`1714`	`1714`
`1715`	`1715`	`$where = [`
`1716`	`1716`	`'is_active' => 1,`
`1717`	`1717`	`'type' => $type,`
`1718`		`- new \QueryExpression("JSON_CONTAINS(itemtypes, " . $DB->quote('"' . $itemtype . '"') . ")"),`
	`1718`	`+ new QueryExpression("JSON_CONTAINS(itemtypes, " . $DB->quote('"' . $itemtype . '"') . ")"),`
`1719`	`1719`	`'AND' => [`
`1720`	`1720`	`'OR' => [`
`1721`	`1721`	`[`