Merge pull request #41 from php-api-clients/correctly-reference-schema-classes-from-webhook

WyriHaximus · web-flow · commit 6165f09dedeb · 2021-06-13T18:13:57.000+02:00
Correctly reference schema classes from webhook
diff --git a/src/Generator.php b/src/Generator.php
@@ -130,7 +130,7 @@ private function all(string $namespace): iterable
                     $this->basename($namespace . 'WebHook/' . $webHookClassName),
                     $pathItem,
                     $schemaClassNameMap,
-                    $namespace . 'WebHook'
+                    $namespace
                 );
             }
 
diff --git a/src/Generator/WebHook.php b/src/Generator/WebHook.php
@@ -62,7 +62,7 @@ public static function generate(string $path, string $namespace, string $baseNam
                                 new Node\Arg(new Node\Expr\StaticCall(new Node\Name('\cebe\openapi\Reader'), new Node\Name('readFromJson'), [new Node\Scalar\String_(json_encode($oneOfSchema->getSerializableData())), new Node\Scalar\String_('\cebe\openapi\spec\Schema')])),
                             ]
                         )),
-                        new Node\Stmt\Return_(new Node\Scalar\String_($rootNamespace . '\\' . $schemaClassNameMap[spl_object_hash($oneOfSchema)])),
+                        new Node\Stmt\Return_(new Node\Scalar\String_($rootNamespace . 'Schema\\' . $schemaClassNameMap[spl_object_hash($oneOfSchema)])),
                     ], [
                         new Node\Stmt\Catch_(
                             [new Node\Name('\\' . \Throwable::class)],

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private function all(string $namespace): iterable`
`130`	`130`	`$this->basename($namespace . 'WebHook/' . $webHookClassName),`
`131`	`131`	`$pathItem,`
`132`	`132`	`$schemaClassNameMap,`
`133`		`- $namespace . 'WebHook'`
	`133`	`+ $namespace`
`134`	`134`	`);`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static function generate(string $path, string $namespace, string $baseNam`
`62`	`62`	`new Node\Arg(new Node\Expr\StaticCall(new Node\Name('\cebe\openapi\Reader'), new Node\Name('readFromJson'), [new Node\Scalar\String_(json_encode($oneOfSchema->getSerializableData())), new Node\Scalar\String_('\cebe\openapi\spec\Schema')])),`
`63`	`63`	`]`
`64`	`64`	`)),`
`65`		`- new Node\Stmt\Return_(new Node\Scalar\String_($rootNamespace . '\\' . $schemaClassNameMap[spl_object_hash($oneOfSchema)])),`
	`65`	`+ new Node\Stmt\Return_(new Node\Scalar\String_($rootNamespace . 'Schema\\' . $schemaClassNameMap[spl_object_hash($oneOfSchema)])),`
`66`	`66`	`], [`
`67`	`67`	`new Node\Stmt\Catch_(`
`68`	`68`	`[new Node\Name('\\' . \Throwable::class)],`