Merge pull request #133 from php-api-clients/allow-duplicated-schemas

Allow duplicated schemas

Author: WyriHaximus

bin/openapi-client-generator.source

@@ -17,7 +17,7 @@ use Symfony\Component\Yaml\Yaml;
      */
     exit((function (string $configuration): int {
         $yaml = Yaml::parseFile($configuration);
-        (new Generator($yaml['spec']))->generate($yaml['namespace'] . '\\', dirname($configuration) . DIRECTORY_SEPARATOR . $yaml['destination'], $yaml['voter'] ?? []);
+        (new Generator($yaml['spec']))->generate($yaml['namespace'] . '\\', dirname($configuration) . DIRECTORY_SEPARATOR . $yaml['destination'], $yaml['schemas'] ?? [], $yaml['voter'] ?? []);
 
         return 0;
     })($configuration));

openapi-client.yaml

@@ -2,6 +2,8 @@
 spec: file:///home/wyrihaximus/Projects/PHPAPIClients/openapi-client-generator/api.github.com.yaml
 namespace: ApiClients\Client\Github
 destination: generated
+schemas:
+  allowDuplication: true
 voter:
   listOperation:
     - ApiClients\Tools\OpenApiClientGenerator\Voter\ListOperation\PageAndPerPageInQuery

src/Generator.php

@@ -30,13 +30,13 @@ public function __construct(string $specUrl)
         $this->spec = Reader::readFromYamlFile($specUrl);
     }
 
-    public function generate(string $namespace, string $destinationPath, array $voters)
+    public function generate(string $namespace, string $destinationPath, array $schemas, array $voters)
     {
         $existingFiles = iterator_to_array(Files::listExistingFiles($destinationPath . DIRECTORY_SEPARATOR));
         $namespace = Utils::cleanUpNamespace($namespace);
         $codePrinter = new Standard();
 
-        foreach ($this->all($namespace, $destinationPath . DIRECTORY_SEPARATOR, $voters) as $file) {
+        foreach ($this->all($namespace, $destinationPath . DIRECTORY_SEPARATOR, $schemas, $voters) as $file) {
             $fileName = $destinationPath . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, substr($file->fqcn, strlen($namespace))) . '.php';
             if ($file->contents instanceof Node\Stmt\Namespace_) {
                 array_unshift($file->contents->stmts, ...[
@@ -100,14 +100,15 @@ public function generate(string $namespace, string $destinationPath, array $vote
     }
 
     /**
-     * @param string $namespace
-     * @param string $destinationPath
      * @return iterable<File>
      */
-    private function all(string $namespace, string $rootPath, array $voters): iterable
+    private function all(string $namespace, string $rootPath, array $schemas, array $voters): iterable
     {
-        $schemas = [];
         $schemaRegistry = new SchemaRegistry();
+        if (array_key_exists('allowDuplication', $schemas)) {
+            $schemaRegistry->setAllowDuplicatedSchemas($schemas['allowDuplication']);
+        }
+        $schemas = [];
         $throwableSchemaRegistry = new ThrowableSchema();
         if (count($this->spec->components->schemas ?? []) > 0) {
             foreach ($this->spec->components->schemas as $name => $schema) {

src/Registry/Schema.php

@@ -26,6 +26,13 @@ final class Schema
      */
     private array $unknownSchemasJson = [];
 
+    private bool $allowDuplicatedSchemas = false;
+
+    public function setAllowDuplicatedSchemas(bool $allow): void
+    {
+        $this->allowDuplicatedSchemas = $allow;
+    }
+
     public function addClassName(string $className, openAPISchema $schema): void
     {
         if ($schema->type === 'array') {
@@ -47,10 +54,10 @@ public function get(openAPISchema $schema, string $fallbackName): string
         }
 
         $json = json_encode($schema->getSerializableData());
-        if (array_key_exists($json, $this->json)) {
+        if (!$this->allowDuplicatedSchemas && array_key_exists($json, $this->json)) {
             return $this->json[$json];
         }
-        if (array_key_exists($json, $this->unknownSchemasJson)) {
+        if (!$this->allowDuplicatedSchemas && array_key_exists($json, $this->unknownSchemasJson)) {
             return $this->unknownSchemasJson[$json];
         }