Bump schema version; cleanup, add tests

inventory.schema.json

@@ -3,7 +3,7 @@
   "$id": "https://glpi-project.org/inventory.json",
   "type": "object",
   "title": "GLPI Inventory Schema",
-  "version": "0.1",
+  "version": 1.0,
   "definitions": {
     "datetime": {
       "type": "string",

lib/php/Converter.php

@@ -24,10 +24,8 @@
  */
 class Converter
 {
-    public const LAST_VERSION = 0.1;
-
-    /** @var ?float */
-    private ?float $target_version;
+    /** @var float */
+    private float $target_version;
 
     private Schema $schema;
     /** @var bool */
@@ -40,7 +38,7 @@ class Converter
 
     /** @var array<string, float> */
     private array $mapping = [
-        '01'   => 0.1
+        '01'   => 1.0
     ];
 
     /**
@@ -71,18 +69,10 @@ class Converter
      *
      * @param ?float $target_version JSON schema based version to target. Use last version if null.
      */
-    public function __construct($target_version = null)
+    public function __construct(?float $target_version = null)
     {
         $this->schema = new Schema();
-        if ($target_version === null) {
-            $target_version = self::LAST_VERSION;
-        }
-
-        if (!is_double($target_version)) {
-            throw new UnexpectedValueException('Version must be a double!');
-        }
-
-        $this->target_version = $target_version;
+        $this->target_version = $target_version ?? $this->schema->getVersion();
     }
 
     /**
@@ -92,7 +82,7 @@ public function __construct($target_version = null)
      */
     public function getTargetVersion(): float
     {
-        return $this->target_version ?? self::LAST_VERSION;
+        return $this->target_version;
     }
 
     /**
@@ -203,8 +193,13 @@ public function getMethods(): array
         return $methods;
     }
 
+    public function getMappings(): array
+    {
+        return $this->mapping;
+    }
+
     /**
-     * Converts to inventory format 0.1
+     * Converts to inventory format 1.0
      *
      * @param array<string, mixed> $data Contents
      *

lib/php/Schema.php

@@ -276,4 +276,14 @@ public function validate($json): bool
             );
         }
     }
+
+    /**
+     * Get current schema version
+     *
+     * @return float
+     */
+    public function getVersion(): float
+    {
+        return $this->build()->version;
+    }
 }

tests/Glpi/Inventory/tests/units/Converter.php

@@ -802,4 +802,13 @@ public function testConvertMemoryCapacity(string $orig, int $expected): void
         $instance = new \Glpi\Inventory\Converter();
         $this->assertSame($expected, $instance->convertMemory($orig));
     }
+
+    public function testHasLatestVersion(): void
+    {
+        $instance = new \Glpi\Inventory\Converter();
+        $this->assertContains(
+            $instance->getSchema()->getVersion(),
+            $instance->getMappings()
+        );
+    }
 }

tests/Glpi/Inventory/tests/units/Schema.php

@@ -186,4 +186,10 @@ public function testFlexibleSchema(): void
         $this->expectExceptionMessage('Additional properties not allowed: additional');
         $this->assertTrue($instance->validate($json_additionnal));
     }
+
+    public function testVersion(): void
+    {
+        $instance = new \Glpi\Inventory\Schema();
+        $this->assertIsFloat($instance->getVersion());
+    }
 }