Update glpi inventory library, add test (#18958)

* Revert "Allow extra nodes in inventory file"

This reverts commit a8e8bdb.

* Update glpi inventory library

Author: trasher

composer.lock

@@ -9417,24 +9417,8 @@ public function testAdditionalProperty()
 
         //initial import
         $inventory = new \Glpi\Inventory\Inventory();
-        $this->assertFalse($inventory->isSchemaStrict());
         $inventory->setData($json);
         $inventory->doInventory();
         $this->assertTrue($computer->getFromDBByCrit(['name' => 'pc_with_additional_prop']));
-
-        //enable strict schema checks; an error is thrown
-        $inventory = new \Glpi\Inventory\Inventory();
-        $inventory->setStrictSchema();
-        $this->assertTrue($inventory->isSchemaStrict());
-        $inventory->setData($json);
-
-        $this->assertTrue($inventory->inError());
-        $this->assertSame(
-            ['JSON does not validate. Violations:
-Additional properties not allowed: unknown_property at #->properties:content
-'
-            ],
-            $inventory->getErrors()
-        );
     }
 }

phpunit/functional/Glpi/Inventory/InventoryTest.php

@@ -87,7 +87,6 @@ class Inventory
     private $request_query;
     /** @var bool */
     private bool $is_discovery = false;
-    private bool $strict_schema = false;
 
     /**
      * @param mixed   $data   Inventory data, optional
@@ -130,9 +129,6 @@ public function setData($data, $format = Request::JSON_MODE): bool
         $converter = new Converter();
 
         $schema = $converter->getSchema();
-        if (!$this->strict_schema) {
-            $schema->setFlexible(); //allow extra nodes in inventory file
-        }
 
         $schema->setExtraItemtypes($this->getExtraItemtypes());
 
@@ -1023,36 +1019,4 @@ protected function getExtraItemtypes(): array
         }
         return $itemtypes;
     }
-
-    /**
-     * Set schema validation strict (no additional properties allowed anywhere)
-     *
-     * @return self
-     */
-    public function setFlexibleSchema(): self
-    {
-        $this->strict_schema = false;
-        return $this;
-    }
-
-    /**
-     * Set schema validation strict (no additional properties allowed anywhere)
-     *
-     * @return self
-     */
-    public function setStrictSchema(): self
-    {
-        $this->strict_schema = true;
-        return $this;
-    }
-
-    /**
-     * Is scheam validation strict?
-     *
-     * @return bool
-     */
-    public function isSchemaStrict(): bool
-    {
-        return $this->strict_schema;
-    }
 }