chevere 4

chevere · Jan 11, 2024 · 581f985 · 581f985
1 parent bfc0ce8
commit 581f985
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -13,9 +13,9 @@
     ],
     "require": {
         "php": "^8.1",
-        "chevere/action": "^1.0.x-dev",
+        "chevere/action": "^1.0.0",
         "chevere/http": "^0.4.x-dev",
-        "chevere/parameter": "^1.0.x-dev",
+        "chevere/parameter": "^1.0.0",
         "chevere/router": "^0.6.x-dev",
         "chevere/schwager": "^0.2.x-dev",
         "chevere/standard": "^1.0.x-dev",

diff --git a/demo/Controllers/PetGetController.php b/demo/Controllers/PetGetController.php
@@ -24,8 +24,8 @@
 use function Chevere\Parameter\arrayp;
 use function Chevere\Parameter\arrayString;
 use function Chevere\Parameter\enum;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\string;
 use function Chevere\Parameter\union;
 
@@ -54,11 +54,11 @@ public static function return(): ParameterInterface
             name: string(),
             photoUrls: union(
                 arrayp(),
-                generic(string())
+                iterable(string())
             ),
             tags: union(
                 arrayp(),
-                generic(
+                iterable(
                     arrayp(
                         id: int(),
                         name: string(),

diff --git a/demo/Controllers/PetPutController.php b/demo/Controllers/PetPutController.php
@@ -22,8 +22,8 @@
 use Chevere\Parameter\Interfaces\ParameterInterface;
 use function Chevere\Parameter\arrayp;
 use function Chevere\Parameter\enum;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\null;
 use function Chevere\Parameter\string;
 use function Chevere\Parameter\union;
@@ -46,11 +46,11 @@ public static function acceptBody(): ArrayParameterInterface
             name: string(),
             photoUrls: union(
                 arrayp(),
-                generic(string())
+                iterable(string())
             ),
             tags: union(
                 arrayp(),
-                generic(
+                iterable(
                     arrayp(
                         id: int(),
                         name: string(),

diff --git a/demo/Controllers/PetsFindByStatusGetController.php b/demo/Controllers/PetsFindByStatusGetController.php
@@ -23,8 +23,8 @@
 use function Chevere\Parameter\arrayp;
 use function Chevere\Parameter\arrayString;
 use function Chevere\Parameter\enum;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\string;
 use function Chevere\Parameter\union;
 
@@ -46,7 +46,7 @@ public static function return(): ParameterInterface
     {
         return union(
             arrayp(),
-            generic(
+            iterable(
                 arrayp(
                     id: int(),
                     category: arrayp(
@@ -56,11 +56,11 @@ public static function return(): ParameterInterface
                     name: string(),
                     photoUrls: union(
                         arrayp(),
-                        generic(string())
+                        iterable(string())
                     ),
                     tags: union(
                         arrayp(),
-                        generic(
+                        iterable(
                             arrayp(
                                 id: int(),
                                 name: string(),

diff --git a/demo/Controllers/PetsFindByTagGetController.php b/demo/Controllers/PetsFindByTagGetController.php
@@ -23,8 +23,8 @@
 use function Chevere\Parameter\arrayp;
 use function Chevere\Parameter\arrayString;
 use function Chevere\Parameter\enum;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\string;
 use function Chevere\Parameter\union;
 
@@ -46,7 +46,7 @@ public static function return(): ParameterInterface
     {
         return union(
             arrayp(),
-            generic(
+            iterable(
                 arrayp(
                     id: int(),
                     category: arrayp(
@@ -56,11 +56,11 @@ public static function return(): ParameterInterface
                     name: string(),
                     photoUrls: union(
                         arrayp(),
-                        generic(string())
+                        iterable(string())
                     ),
                     tags: union(
                         arrayp(),
-                        generic(
+                        iterable(
                             arrayp(
                                 id: int(),
                                 name: string(),

diff --git a/demo/Controllers/PetsPostController.php b/demo/Controllers/PetsPostController.php
@@ -22,8 +22,8 @@
 use Chevere\Parameter\Interfaces\ParameterInterface;
 use function Chevere\Parameter\arrayp;
 use function Chevere\Parameter\enum;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\null;
 use function Chevere\Parameter\string;
 use function Chevere\Parameter\union;
@@ -46,11 +46,11 @@ public static function acceptBody(): ArrayParameterInterface
             name: string(),
             photoUrls: union(
                 arrayp(),
-                generic(string())
+                iterable(string())
             ),
             tags: union(
                 arrayp(),
-                generic(
+                iterable(
                     arrayp(
                         id: int(),
                         name: string(),

diff --git a/demo/Controllers/StoreInventoryGetController.php b/demo/Controllers/StoreInventoryGetController.php
@@ -19,8 +19,8 @@
 use Chevere\Http\Header;
 use Chevere\Http\Status;
 use Chevere\Parameter\Interfaces\ParameterInterface;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\string;
 
 #[Description('Returns pet inventories by status')]
@@ -32,7 +32,7 @@ final class StoreInventoryGetController extends Controller
 {
     public static function return(): ParameterInterface
     {
-        return generic(
+        return iterable(
             K: string(),
             V: int(),
         );

diff --git a/demo/Controllers/UserCreateWithArrayPostController.php b/demo/Controllers/UserCreateWithArrayPostController.php
@@ -21,8 +21,8 @@
 use Chevere\Parameter\Interfaces\ArrayParameterInterface;
 use Chevere\Parameter\Interfaces\ParameterInterface;
 use function Chevere\Parameter\arrayp;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\null;
 use function Chevere\Parameter\string;
 
@@ -36,7 +36,7 @@ final class UserCreateWithArrayPostController extends Controller
     public static function acceptBody(): ArrayParameterInterface
     {
         return arrayp(
-            input: generic(
+            input: iterable(
                 arrayp(
                     id: int(),
                     username: string(),

diff --git a/demo/Controllers/UserCreateWithListPostController.php b/demo/Controllers/UserCreateWithListPostController.php
@@ -21,8 +21,8 @@
 use Chevere\Parameter\Interfaces\ArrayParameterInterface;
 use Chevere\Parameter\Interfaces\ParameterInterface;
 use function Chevere\Parameter\arrayp;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\null;
 use function Chevere\Parameter\string;
 
@@ -36,7 +36,7 @@ final class UserCreateWithListPostController extends Controller
     public static function acceptBody(): ArrayParameterInterface
     {
         return arrayp(
-            input: generic(
+            input: iterable(
                 arrayp(
                     id: int(),
                     username: string(),

diff --git a/demo/output/schwager.html b/demo/output/schwager.html
@@ -306,7 +306,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-POST fs-5 me-2">POST</
       -
         type: 'array#map'
       -
-        type: generic
+        type: iterable
         parameters:
           K:
             type: int
@@ -319,7 +319,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-POST fs-5 me-2">POST</
       -
         type: 'array#map'
       -
-        type: generic
+        type: iterable
         parameters:
           K:
             type: int
@@ -405,7 +405,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-PUT fs-5 me-2">PUT</sp
       -
         type: 'array#map'
       -
-        type: generic
+        type: iterable
         parameters:
           K:
             type: int
@@ -418,7 +418,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-PUT fs-5 me-2">PUT</sp
       -
         type: 'array#map'
       -
-        type: generic
+        type: iterable
         parameters:
           K:
             type: int
@@ -553,7 +553,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
   -
     type: 'array#map'
   -
-    type: generic
+    type: iterable
     parameters:
       K:
         type: int
@@ -579,7 +579,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
               -
                 type: 'array#map'
               -
-                type: generic
+                type: iterable
                 parameters:
                   K:
                     type: int
@@ -592,7 +592,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
               -
                 type: 'array#map'
               -
-                type: generic
+                type: iterable
                 parameters:
                   K:
                     type: int
@@ -690,7 +690,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
   -
     type: 'array#map'
   -
-    type: generic
+    type: iterable
     parameters:
       K:
         type: int
@@ -716,7 +716,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
               -
                 type: 'array#map'
               -
-                type: generic
+                type: iterable
                 parameters:
                   K:
                     type: int
@@ -729,7 +729,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
               -
                 type: 'array#map'
               -
-                type: generic
+                type: iterable
                 parameters:
                   K:
                     type: int
@@ -930,7 +930,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
       -
         type: 'array#map'
       -
-        type: generic
+        type: iterable
         parameters:
           K:
             type: int
@@ -943,7 +943,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
       -
         type: 'array#map'
       -
-        type: generic
+        type: iterable
         parameters:
           K:
             type: int
@@ -1190,7 +1190,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-GET fs-5 me-2">GET</sp
 <dd class="col-sm-10">Content-Type: application/json</dd>
 
     <dt class="col-sm-2" title="Body">Body</dt>
-<dd class="col-sm-10"><pre><code class="language-yaml">type: generic
+<dd class="col-sm-10"><pre><code class="language-yaml">type: iterable
 parameters:
   K:
     type: string
@@ -1584,7 +1584,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-POST fs-5 me-2">POST</
 <dd class="col-sm-10"><pre><code class="language-yaml">type: 'array#map'
 parameters:
   input:
-    type: generic
+    type: iterable
     parameters:
       K:
         type: int
@@ -1679,7 +1679,7 @@ <h4 class="h4 mb-0"><span class="badge http-method method-POST fs-5 me-2">POST</
 <dd class="col-sm-10"><pre><code class="language-yaml">type: 'array#map'
 parameters:
   input:
-    type: generic
+    type: iterable
     parameters:
       K:
         type: int

diff --git a/tests/src/GetController.php b/tests/src/GetController.php
@@ -26,8 +26,8 @@
 use function Chevere\Parameter\arrayString;
 use function Chevere\Parameter\date;
 use function Chevere\Parameter\float;
-use function Chevere\Parameter\generic;
 use function Chevere\Parameter\int;
+use function Chevere\Parameter\iterable;
 use function Chevere\Parameter\null;
 use function Chevere\Parameter\string;
 use function Chevere\Parameter\time;
@@ -62,7 +62,7 @@ public static function acceptBody(): ArrayParameterInterface
             rate: float(min: 16.5),
             hours: int(min: 1, max: 8),
             union: union(null(), string()),
-            generic: generic(
+            iterable: iterable(
                 string(),
             )
         );