Merge pull request #180 from php-api-clients/support-no-operation-grouping

Support no operation grouping

Author: WyriHaximus

composer.json

@@ -23,6 +23,7 @@
         "nikic/php-parser": "^4.15",
         "nunomaduro/termwind": "^1.15",
         "ondram/ci-detector": "^4.1",
+        "phpstan/phpdoc-parser": "^1.22",
         "pointybeard/reverse-regex": "1.0.0.3",
         "psr/http-message": "^1.1 || ^2 || ^3",
         "react/async": "^4.0",
@@ -53,7 +54,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "ApiClients\\Tests\\Tools\\OpenApiClientGenerator\\": "tests/"
+            "ApiClients\\Tests\\Tools\\OpenApiClientGenerator\\": "tests/unit/"
         }
     },
     "bin": [

etc/qa/phpunit.xml

@@ -2,7 +2,7 @@
 <phpunit bootstrap="../../vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="Test Suite">
-            <file>../../tests/GenerateTest.php</file>
+            <directory suffix=".php">../../tests/unit/</directory>
         </testsuite>
     </testsuites>
     <filter>

example/openapi-client-subsplit.yaml

@@ -3,8 +3,8 @@ state:
   additionalFiles:
     - composer.json
     - composer.lock
-spec: https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/api.github.com/api.github.com.yaml
-#spec: api.github.com.yaml
+#spec: https://raw.githubusercontent.com/github/rest-api-description/main/descriptions-next/api.github.com/api.github.com.yaml
+spec: api.github.com.yaml
 entryPoints:
   call: true
   operations: true

example/templates/composer.json

@@ -30,7 +30,7 @@
     "{{ require.name }}": "{{ require.version }}",
 {% endfor %}
 {% endif %}
-    "wyrihaximus/async-test-utilities": "^6.1"
+    "wyrihaximus/async-test-utilities": "^7"
   },
   "autoload": {
     "psr-4": {
@@ -42,6 +42,13 @@
       "{{ namespace|trim('\\', 'left')|replace({'\\': '\\\\'}) }}": "src/"
     }
   },
+{% if suggests is iterable and suggests|length > 0 %}
+"suggest": {
+{% for suggest in suggests %}
+"api-clients/{{ suggest.name }}": "{{ suggest.reason }}"{% if not loop.last %},{% endif %}
+{% endfor %}
+},
+{% endif %}
   "config": {
     "sort-packages": true,
     "platform": {
@@ -55,15 +62,5 @@
       "wyrihaximus/composer-update-bin-autoload-path": true,
       "infection/extension-installer": true
     }
-  },
-{% if suggests is iterable and suggests|length > 0 %}
-"sugest": {
-{% for suggest in suggests %}
-"api-clients/{{ suggest.name }}": "{{ suggest.reason }}"{% if not loop.last %},{% endif %}
-{% endfor %}
-},
-{% endif %}
-  "require-dev": {
-    "wyrihaximus/async-test-utilities": "^5.0"
   }
 }

src/Configuration.php

@@ -17,23 +17,21 @@
 
 final readonly class Configuration
 {
-    /**
-     * @param array<class-string<ContentType>>|null $contentType
-     */
+    /** @param array<class-string<ContentType>>|null $contentType */
     public function __construct(
         public State $state,
         public string $spec,
         #[MapFrom('entryPoints')]
         public EntryPoints $entryPoints,
-        public ?Templates $templates,
+        public Templates|null $templates,
         public Namespace_ $namespace,
         public Destination $destination,
         #[MapFrom('contentType')]
-        public ?array $contentType,
+        public array|null $contentType,
         #[MapFrom('subSplit')]
-        public ?SubSplit $subSplit,
-        public ?Schemas $schemas,
-        public ?Voter $voter,
+        public SubSplit|null $subSplit,
+        public Schemas|null $schemas,
+        public Voter|null $voter,
     ) {
     }
 }

src/Configuration/State.php

@@ -9,14 +9,12 @@
 
 final readonly class State
 {
-    /**
-     * @param array<string> $additionalFiles
-     */
+    /** @param array<string> $additionalFiles */
     public function __construct(
         public string $file,
         #[MapFrom('additionalFiles')]
         #[CastListToType('string')]
-        public ?array $additionalFiles,
+        public array|null $additionalFiles,
     ) {
     }
 }

src/Configuration/SubSplit.php

@@ -11,9 +11,7 @@
 
 final readonly class SubSplit
 {
-    /**
-     * @param array<class-string<SectionGenerator>>|null $sectionGenerator
-     */
+    /** @param array<class-string<SectionGenerator>>|null $sectionGenerator */
     public function __construct(
         #[MapFrom('subSplitsDestination')]
         public string $subSplitsDestination,
@@ -26,7 +24,7 @@ public function __construct(
         public string $fullName,
         public string $vendor,
         #[MapFrom('sectionGenerator')]
-        public ?array $sectionGenerator,
+        public array|null $sectionGenerator,
         #[MapFrom('rootPackage')]
         public RootPackage $rootPackage,
         #[MapFrom('sectionPackage')]

src/Configuration/Templates.php

@@ -6,12 +6,10 @@
 
 final readonly class Templates
 {
-    /**
-     * @param array<string, mixed>|null $variables
-     */
+    /** @param array<string, mixed>|null $variables */
     public function __construct(
         public string $dir,
-        public ?array $variables,
+        public array|null $variables,
     ) {
     }
 }

src/Configuration/Voter.php

@@ -15,9 +15,9 @@
      */
     public function __construct(
         #[MapFrom('listOperation')]
-        public ?array $listOperation,
+        public array|null $listOperation,
         #[MapFrom('streamOperation')]
-        public ?array $streamOperation,
+        public array|null $streamOperation,
     ) {
     }
 }

src/ContentType/Json.php

@@ -11,9 +11,7 @@
 
 final class Json implements ContentType
 {
-    /**
-     * @return iterable<string>
-     */
+    /** @return iterable<string> */
     public static function contentType(): iterable
     {
         yield 'application/json';