Add support for namespaced representation

With this the namespacing is done in one central location instead of every generator out there when required.

Author: WyriHaximus

.gitignore

@@ -1,4 +1,5 @@
 var/*
 !var/.gitkeep
 vendor/
+etc/qa/.phpcs.cache
 etc/qa/.phpunit.result.cache

Makefile

@@ -26,6 +26,12 @@ else
 		"ghcr.io/wyrihaximusnet/php:${PHP_VERSION}-nts-alpine-slim-dev"
 endif
 
+ifneq (,$(findstring icrosoft,$(shell cat /proc/version)))
+    THREADS=1
+else
+    THREADS=$(shell nproc)
+endif
+
 all: ## Runs everything ###
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "###" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs --open-tty $(MAKE)
 
@@ -44,6 +50,20 @@ stan: ## Run static analysis (PHPStan)
 psalm: ## Run static analysis (Psalm)
 	$(DOCKER_RUN) vendor/bin/psalm --threads=$(shell nproc) --shepherd --stats --config=./etc/qa/psalm.xml
 
+unit-testing: ## Run tests
+	$(DOCKER_RUN) vendor/bin/phpunit --colors=always -c ./etc/qa/phpunit.xml --coverage-text --coverage-html ./var/tests-unit-coverage-html --coverage-clover ./var/tests-unit-clover-coverage.xml
+	$(DOCKER_RUN) test -n "$(COVERALLS_REPO_TOKEN)" && test -n "$(COVERALLS_RUN_LOCALLY)" && test -f ./var/tests-unit-clover-coverage.xml && vendor/bin/php-coveralls -v --coverage_clover ./build/logs/clover.xml --json_path ./var/tests-unit-clover-coverage-upload.json || true
+
+unit-testing-raw: ## Run tests ###
+	php vendor/phpunit/phpunit/phpunit --colors=always -c ./etc/qa/phpunit.xml --coverage-text --coverage-html ./var/tests-unit-coverage-html --coverage-clover ./var/tests-unit-clover-coverage.xml
+	test -n "$(COVERALLS_REPO_TOKEN)" && test -n "$(COVERALLS_RUN_LOCALLY)" && test -f ./var/tests-unit-clover-coverage.xml && ./vendor/bin/php-coveralls -v --coverage_clover ./build/logs/clover.xml --json_path ./var/tests-unit-clover-coverage-upload.json || true
+
+mutation-testing: ## Run mutation testing
+	$(DOCKER_RUN) vendor/bin/roave-infection-static-analysis-plugin --ansi --log-verbosity=all --threads=$(THREADS) --psalm-config etc/qa/psalm.xml || (cat ./var/infection.log && false)
+
+mutation-testing-raw: ## Run mutation testing ###
+	php vendor/roave/infection-static-analysis-plugin/bin/roave-infection-static-analysis-plugin --ansi --log-verbosity=all --threads=$(THREADS) --psalm-config etc/qa/psalm.xml || (cat ./var/infection.log && false)
+
 backward-compatibility-check: ## Check code for backwards incompatible changes
 	$(DOCKER_RUN) vendor/bin/roave-backward-compatibility-check || true
 
@@ -56,17 +76,3 @@ task-list-ci: ## CI: Generate a JSON array of jobs to run, matches the commands
 help: ## Show this help ###
 	@printf "\033[33mUsage:\033[0m\n  make [target]\n\n\033[33mTargets:\033[0m\n"
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[32m%-32s\033[0m %s\n", $$1, $$2}' | tr -d '#'
-
-generate-example-clients: generate-example-client-one generate-example-client-subsplit generate-example-client-miele
-
-generate-example-client-one:
-	$(DOCKER_RUN) php ./bin/openapi-client-generator ./example/openapi-client-one.yaml
-
-generate-example-client-subsplit:
-	$(DOCKER_RUN) php ./bin/openapi-client-generator ./example/openapi-client-subsplit.yaml
-
-generate-example-client-miele:
-	$(DOCKER_RUN) php ./bin/openapi-client-generator ./example/openapi-client-miele.yaml
-
-generate-test-client:
-	$(DOCKER_RUN) php ./bin/openapi-client-generator ./tests/openapi-client-petstore.yaml

etc/qa/.phpcs.cache

@@ -1,6 +1,2 @@
-parameters:
-	ignoreErrors:
-		- '#Call to function in_array\(\) requires parameter \#3 to be true.#'
-
 includes:
 	- ../../vendor/wyrihaximus/test-utilities/rules.neon

etc/qa/phpstan.neon

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="../../vendor/autoload.php" colors="true">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory suffix=".php">../../tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../../src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="../../vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">../../src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory suffix=".php">../../tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

etc/qa/phpunit.xml

@@ -4,6 +4,10 @@
 
 namespace OpenAPITools\Representation;
 
+use OpenAPITools\Utils\Namespace_;
+
+use function array_map;
+
 final class Client
 {
     /** @param array<Path> $paths */
@@ -13,4 +17,12 @@ public function __construct( /** @phpstan-ignore-line */
         public readonly array $paths,
     ) {
     }
+
+    public function namespace(Namespace_ $namespace): Namespaced\Client
+    {
+        return new Namespaced\Client(
+            $this->baseUrl,
+            array_map(static fn (Path $path): Namespaced\Path => $path->namespace($namespace), $this->paths),
+        );
+    }
 }

src/Client.php

@@ -4,6 +4,11 @@
 
 namespace OpenAPITools\Representation;
 
+use OpenAPITools\Utils\ClassString;
+use OpenAPITools\Utils\Namespace_;
+
+use function array_map;
+
 final class Contract
 {
     /** @param array<Property> $properties */
@@ -13,4 +18,12 @@ public function __construct(
         public readonly array $properties,
     ) {
     }
+
+    public function namespace(Namespace_ $namespace): Namespaced\Contract
+    {
+        return new Namespaced\Contract(
+            ClassString::factory($namespace, $this->className),
+            array_map(static fn (Property $property): Namespaced\Property => $property->namespace($namespace), $this->properties),
+        );
+    }
 }

src/Contract.php

@@ -4,6 +4,8 @@
 
 namespace OpenAPITools\Representation;
 
+use OpenAPITools\Utils\Namespace_;
+
 final class Header
 {
     public function __construct(
@@ -12,4 +14,13 @@ public function __construct(
         public readonly ExampleData $example,
     ) {
     }
+
+    public function namespace(Namespace_ $namespace): Namespaced\Header
+    {
+        return new Namespaced\Header(
+            $this->name,
+            $this->schema->namespace($namespace),
+            $this->example,
+        );
+    }
 }

src/Header.php

@@ -4,6 +4,11 @@
 
 namespace OpenAPITools\Representation;
 
+use OpenAPITools\Utils\ClassString;
+use OpenAPITools\Utils\Namespace_;
+
+use function array_map;
+
 final class Hydrator
 {
     /** @param array<Schema> $schemas */
@@ -14,4 +19,13 @@ public function __construct(
         public readonly array $schemas,
     ) {
     }
+
+    public function namespace(Namespace_ $namespace): Namespaced\Hydrator
+    {
+        return new Namespaced\Hydrator(
+            ClassString::factory($namespace, $this->className),
+            $this->methodName,
+            array_map(static fn (Schema $schema): Namespaced\Schema => $schema->namespace($namespace), $this->schemas),
+        );
+    }
 }

src/Hydrator.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenAPITools\Representation\Namespaced;
+
+final class Client
+{
+    /** @param array<Path> $paths */
+    public function __construct( /** @phpstan-ignore-line */
+        public readonly string|null $baseUrl,
+        /** @var array<Path> $paths */
+        public readonly array $paths,
+    ) {
+    }
+}