Merge pull request #97 from Menkveld-24/patch-1

Fix collection merging bug
andreaselia · May 6, 2024 · c4f0015 · c4f0015
2 parents 9a83411 + 9525103
commit c4f0015
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Processors/RouteProcessor.php b/src/Processors/RouteProcessor.php
@@ -167,8 +167,10 @@ protected function processRequest(string $method, Stringable $uri, Collection $r
  ]);
 
  if ($method === 'GET') {
- return $collection->put('url', [
- 'query' => $rules->map(fn ($value) => array_merge($value, ['disabled' => false])),
+ return $collection->mergeRecursive([
+ 'url' => [
+ 'query' => $rules->map(fn ($value) => array_merge($value, ['disabled' => false])),
+ ],
  ]);
  }
 

diff --git a/tests/Feature/ExportPostmanTest.php b/tests/Feature/ExportPostmanTest.php
@@ -181,6 +181,18 @@ public function test_rules_printing_get_export_works()
  ->where('name', 'example/getWithFormRequest')
  ->first();
 
+ $this->assertEqualsCanonicalizing([
+ 'raw' => '{{base_url}}/example/getWithFormRequest',
+ 'host' => [
+ '{{base_url}}',
+ ],
+ 'path' => [
+ 'example',
+ 'getWithFormRequest',
+ ],
+ 'variable' => [],
+ ], array_slice($targetRequest['request']['url'], 0, 4));
+
  $fields = collect($targetRequest['request']['url']['query']);
  $this->assertCount(1, $fields->where('key', 'field_1')->where('description', 'required'));
  $this->assertCount(1, $fields->where('key', 'field_2')->where('description', 'required, integer'));