Merge pull request #3417 from nextcloud/enh/noid/remove-json-validator

remove justinrainbow/json-schema again
nextcloud · Sep 27, 2023 · 1ff0328 · 1ff0328
2 parents a1abd8e + dbdefe2
commit 1ff0328
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 96 deletions.
diff --git a/php/composer.json b/php/composer.json
@@ -16,8 +16,7 @@
         "http-interop/http-factory-guzzle": "^1.2",
         "slim/twig-view": "^3.3",
         "slim/csrf": "^1.3",
-        "ext-apcu": "*",
-        "justinrainbow/json-schema": "^5.2"
+        "ext-apcu": "*"
     },
     "scripts": {
 		"psalm": "psalm --threads=1",

diff --git a/php/composer.lock b/php/composer.lock
diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php
@@ -12,7 +12,6 @@
 use AIO\Data\ConfigurationManager;
 use AIO\Data\DataConst;
 use AIO\Docker\DockerActionManager;
-use JsonSchema\Validator;
 
 class ContainerDefinitionFetcher
 {
@@ -41,27 +40,12 @@ public function GetContainerById(string $id): Container
         throw new \Exception("The provided id " . $id . " was not found in the container definition.");
     }
 
-    private function validateJson(object $data): void {
-        // Validate against json schema
-        $validator = new Validator;
-        $validator->validate($data, (object)[file_get_contents(__DIR__ . '/../containers-schema.json')]);
-        if (!$validator->isValid()) {
-            error_log("JSON does not validate. Violations:");
-            foreach ($validator->getErrors() as $error) {
-                error_log((string)printf("[%s] %s\n", $error['property'], $error['message']));
-            }
-        }
-    }
-
     /**
      * @return array
      */
     private function GetDefinition(bool $latest): array
     {
-        $rawData = file_get_contents(__DIR__ . '/../containers.json');
-        $objectData = json_decode($rawData, false);
-        $this->validateJson($objectData);
-        $data = json_decode($rawData, true);
+        $data = json_decode(file_get_contents(__DIR__ . '/../containers.json'), true);
 
         $containers = [];
         foreach ($data['aio_services_v1'] as $entry) {