Use correct method for fetching array params

imbo · Jan 28, 2023 · a2167fe · a2167fe
1 parent 5bd1f7d
commit a2167fe
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 1 deletion.
diff --git a/src/Http/Request/Request.php b/src/Http/Request/Request.php
@@ -87,7 +87,7 @@ public function getUser(): ?string
     public function getUsers()
     {
         $routeUser = $this->getUser();
-        $queryUsers = $this->query->get('users', []);
+        $queryUsers = $this->query->all('users');
 
         if (!$routeUser && !$queryUsers) {
             return [];

diff --git a/tests/Http/Request/RequestTest.php b/tests/Http/Request/RequestTest.php
@@ -147,6 +147,71 @@ public function testSetGetUser(): void
         $this->assertSame($user, $this->request->getUser());
     }
 
+    public function getUsers(): array
+    {
+        return [
+
+            'no user' => [
+                'routeUser' => null,
+                'queryUsers' => null,
+                'expectedUsers' => [],
+            ],
+            'user only in route' => [
+                'routeUser' => 'routeUser',
+                'queryUsers' => null,
+                'expectedUsers' => [
+                    'routeUser',
+                ],
+            ],
+            'user only in query' => [
+                'routeUser' => null,
+                'queryUsers' => [
+                    'user1',
+                    'user2',
+                ],
+                'expectedUsers' => [
+                    'user1',
+                    'user2',
+                ],
+            ],
+            'user in both route and query' => [
+                'routeUser' => 'routeUser',
+                'queryUsers' => [
+                    'user1',
+                    'user2',
+                ],
+                'expectedUsers' => [
+                    'routeUser',
+                    'user1',
+                    'user2',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getUsers
+     * @covers ::getUsers
+     */
+    public function testGetUsers(?string $routeUser, ?array $queryUsers, array $expectedUsers): void
+    {
+        $route = new Route();
+        if (null !== $routeUser) {
+            $route->set('user', $routeUser);
+        }
+
+
+        $this->request->setRoute($route);
+        if (null !== $queryUsers) {
+            $this->request->query->set('users', $queryUsers);
+        }
+
+        $this->assertSame(
+            $expectedUsers,
+            $this->request->getUsers(),
+        );
+    }
+
     /**
      * @covers ::getPublicKey
      */