Merge pull request #2 from biigle/mzur-patch-1

mzur · web-flow · commit 531ba5a19a99 · 2024-04-24T09:05:47.000+02:00
Fix schema path and strict flag forwarding
diff --git a/src/Ifdo.php b/src/Ifdo.php
@@ -19,7 +19,7 @@ public static function fromFile($path, $strict = false): Ifdo
 
     public static function fromString($data, $strict = false): Ifdo
     {
-        return new Ifdo($data, true);
+        return new Ifdo($data, $strict);
     }
 
     public function __construct($json, $strict = false)
@@ -49,7 +49,7 @@ public function revalidate(): void
         $this->validator = new \JsonSchema\Validator;
         $version         = $this->getIfdoVersion();
         $decoded         = json_decode($this->toString());
-        $this->validator->validate($decoded, (object) ['$ref' => 'file://' . realpath("assets/ifdo-$version.json")]);
+        $this->validator->validate($decoded, (object) ['$ref' => 'file://'.__DIR__."/../assets/ifdo-$version.json"]);
 
         if ($this->getDebug() && ! empty($this->getErrors()))
         {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static function fromFile($path, $strict = false): Ifdo`
`19`	`19`
`20`	`20`	`public static function fromString($data, $strict = false): Ifdo`
`21`	`21`	`{`
`22`		`- return new Ifdo($data, true);`
	`22`	`+ return new Ifdo($data, $strict);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function __construct($json, $strict = false)`
`@@ -49,7 +49,7 @@ public function revalidate(): void`
`49`	`49`	`$this->validator = new \JsonSchema\Validator;`
`50`	`50`	`$version = $this->getIfdoVersion();`
`51`	`51`	`$decoded = json_decode($this->toString());`
`52`		`- $this->validator->validate($decoded, (object) ['$ref' => 'file://' . realpath("assets/ifdo-$version.json")]);`
	`52`	`+ $this->validator->validate($decoded, (object) ['$ref' => 'file://'.__DIR__."/../assets/ifdo-$version.json"]);`
`53`	`53`
`54`	`54`	`if ($this->getDebug() && ! empty($this->getErrors()))`
`55`	`55`	`{`