[generator] fixed sorting path parameters before generating models

Author: ToshY

docs/shield-api.md

@@ -37,11 +37,11 @@ $bunnyHttpClient->request(
 );
 ```
 
-#### [List Shield Zone Pull Zone Mapping](https://docs.bunny.net/reference/get_shield-shield-zones-pullzone-mapping)
+#### [List Shield Zones Pull Zone Mapping](https://docs.bunny.net/reference/get_shield-shield-zones-pullzone-mapping)
 
 ```php
 $bunnyHttpClient->request(
-    new \ToshY\BunnyNet\Model\Api\Shield\ShieldZone\GetShieldZonesPullzoneMapping()
+    new \ToshY\BunnyNet\Model\Api\Shield\ShieldZone\ListShieldZonesPullzoneMapping()
 );
 ```
 
@@ -513,7 +513,7 @@ $bunnyHttpClient->request(
 );
 ```
 
-#### [Get WAF Rules Segmentation](https://docs.bunny.net/reference/get_shield-waf-rules-plan-segmentation)
+#### [Get WAF Rules Plan Segmentation](https://docs.bunny.net/reference/get_shield-waf-rules-plan-segmentation)
 
 ```php
 $bunnyHttpClient->request(

docs/stream-api.md

@@ -548,6 +548,10 @@ $bunnyHttpClient->request(
 );
 ```
 
+??? warning
+
+    This endpoint will return a `400` status code if premium encoding is there are no captions are available (or transcribing has not been triggered).
+
 #### [Get OEmbed](https://docs.bunny.net/reference/oembed_getoembed)
 
 ```php

generator/Generator/ModelGenerator.php

@@ -232,6 +232,7 @@ private function generateModel(
         $existingClassHeaders = $this->getExistingModelHeaders($endpointClass);
 
         $newSpecsPathParameters = $this->processParametersForPath(
+            path: $path,
             operation: $operation,
         );
 
@@ -908,6 +909,7 @@ private function processParametersForQuery(Operation $operation): array
      * @return array<mixed>
      */
     private function processParametersForPath(
+        string $path,
         Operation $operation,
     ): array {
         $parameters = [];
@@ -927,6 +929,18 @@ private function processParametersForPath(
             ];
         }
 
+        // Extract the path parameters from the path
+        $matches = [];
+        preg_match_all('/\{([a-zA-Z0-9_]+)\}/', $path, $matches);
+        /* @phpstan-ignore-next-line nullCoalesce.offset */
+        $pathParameters = $matches[1] ?? [];
+
+        usort($parameters, function ($a, $b) use ($pathParameters) {
+            $pos_a = array_search($a['name'], $pathParameters, true);
+            $pos_b = array_search($b['name'], $pathParameters, true);
+            return $pos_a <=> $pos_b;
+        });
+
         return $parameters;
     }
 

generator/Map/Shield.php

@@ -30,7 +30,7 @@
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\CreateShieldZone;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\GetShieldZone;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\GetShieldZoneByPullZoneId;
-use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\GetShieldZonesPullzoneMapping;
+use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\ListShieldZonesPullzoneMapping;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\ListShieldZones;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\UpdateShieldZone;
 use ToshY\BunnyNet\Model\Api\Shield\UploadScanning\CreateOrUpdateShieldZoneUploadScanning;
@@ -118,7 +118,7 @@ final class Shield
             'get' => ListShieldZones::class,
         ],
         '/shield/shield-zones/pullzone-mapping' => [
-            'get' => GetShieldZonesPullzoneMapping::class,
+            'get' => ListShieldZonesPullzoneMapping::class,
         ],
         '/shield/shield-zone/{shieldZoneId}' => [
             'get' => GetShieldZone::class,

src/Enum/Validation/Map/Shield.php

@@ -31,8 +31,8 @@
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\CreateShieldZone;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\GetShieldZone;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\GetShieldZoneByPullZoneId;
-use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\GetShieldZonesPullzoneMapping;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\ListShieldZones;
+use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\ListShieldZonesPullzoneMapping;
 use ToshY\BunnyNet\Model\Api\Shield\ShieldZone\UpdateShieldZone;
 use ToshY\BunnyNet\Model\Api\Shield\UploadScanning\CreateOrUpdateShieldZoneUploadScanning;
 use ToshY\BunnyNet\Model\Api\Shield\UploadScanning\GetShieldZoneUploadScanning;
@@ -79,7 +79,7 @@ final class Shield
         UpdateRateLimit::class => ModelValidationStrategy::STRICT_BODY,
         CreateRateLimit::class => ModelValidationStrategy::STRICT_BODY,
         ListShieldZones::class => ModelValidationStrategy::STRICT_QUERY,
-        GetShieldZonesPullzoneMapping::class => ModelValidationStrategy::NONE,
+        ListShieldZonesPullzoneMapping::class => ModelValidationStrategy::NONE,
         GetShieldZone::class => ModelValidationStrategy::NONE,
         GetShieldZoneByPullZoneId::class => ModelValidationStrategy::NONE,
         CreateShieldZone::class => ModelValidationStrategy::STRICT_BODY,

src/Enum/Validation/Map/Stream.php

@@ -26,8 +26,8 @@
 use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\ReEncodeVideo;
 use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\RepackageVideo;
 use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\SetThumbnail;
-use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\TriggerSmartActions;
 use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\TranscribeVideo;
+use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\TriggerSmartActions;
 use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\UpdateVideo;
 use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\UploadVideo;
 use ToshY\BunnyNet\Model\Api\Stream\ManageVideos\VideoResolutionsInfo;

src/Model/Api/Shield/AccessLists/DeleteShieldZoneAccessList.php

@@ -12,14 +12,14 @@
 class DeleteShieldZoneAccessList implements ModelInterface
 {
     /**
-     * @param int $id
      * @param int $shieldZoneId
+     * @param int $id
      */
     public function __construct(
-        #[PathProperty]
-        public readonly int $id,
         #[PathProperty]
         public readonly int $shieldZoneId,
+        #[PathProperty]
+        public readonly int $id,
     ) {
     }
 

src/Model/Api/Shield/AccessLists/GetShieldZoneAccessList.php

@@ -12,14 +12,14 @@
 class GetShieldZoneAccessList implements ModelInterface
 {
     /**
-     * @param int $id
      * @param int $shieldZoneId
+     * @param int $id
      */
     public function __construct(
-        #[PathProperty]
-        public readonly int $id,
         #[PathProperty]
         public readonly int $shieldZoneId,
+        #[PathProperty]
+        public readonly int $id,
     ) {
     }
 

src/Model/Api/Shield/AccessLists/UpdateShieldZoneAccessList.php

@@ -16,15 +16,15 @@
 class UpdateShieldZoneAccessList implements ModelInterface, BodyModelInterface
 {
     /**
-     * @param int $id
      * @param int $shieldZoneId
+     * @param int $id
      * @param array<string,mixed> $body
      */
     public function __construct(
-        #[PathProperty]
-        public readonly int $id,
         #[PathProperty]
         public readonly int $shieldZoneId,
+        #[PathProperty]
+        public readonly int $id,
         #[BodyProperty]
         public readonly array $body = [],
     ) {

src/Model/Api/Shield/AccessLists/UpdateShieldZoneCuratedThreatList.php

@@ -16,15 +16,15 @@
 class UpdateShieldZoneCuratedThreatList implements ModelInterface, BodyModelInterface
 {
     /**
-     * @param int $id
      * @param int $shieldZoneId
+     * @param int $id
      * @param array<string,mixed> $body
      */
     public function __construct(
-        #[PathProperty]
-        public readonly int $id,
         #[PathProperty]
         public readonly int $shieldZoneId,
+        #[PathProperty]
+        public readonly int $id,
         #[BodyProperty]
         public readonly array $body = [],
     ) {