Fix filter url when using filter attribute multiple times

Author: nohponex

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.2.2
+- Fix filter url when using filter attribute multiple times
+- Add unit test for FilterTest->getUrl
+
 # 2.2.1
 - Fix RelationshipsData->append behaviour with to-many relationships, to store data in jsonapi normalized specification form
 

src/Directive/Filter.php

@@ -132,6 +132,8 @@ public function __construct(
 
     /**
      * @return string
+     * @throws \Exception when unknown filter attribute class
+     * @version 2.2.2
      */
     public function getURL(): string
     {
@@ -160,19 +162,19 @@ public function getURL(): string
             switch (get_class($attribute)) {
                 case FilterAttribute::class:
                     $parts[] = sprintf(
-                        'filter[%s]=%s%s',
+                        'filter[%s][]=%s%s',
                         urlencode($attribute->getAttribute()),
                         urlencode($attribute->getOperator()),
-                        urlencode($attribute->getOperand())
+                        urlencode((string) $attribute->getOperand())
                     );
                     break;
                 case FilterJSONAttribute::class:
                     $parts[] = sprintf(
-                        'filter[%s.%s]=%s%s',
+                        'filter[%s.%s][]=%s%s',
                         urlencode($attribute->getAttribute()),
                         urlencode($attribute->getKey()),
                         urlencode($attribute->getOperator()),
-                        urlencode($attribute->getOperand())
+                        urlencode((string) $attribute->getOperand())
                     );
                     break;
                 default:

tests/src/Directive/FilterTest.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Phramework\JSONAPI\Client\Directive;
+
+use Phramework\JSONAPI\Directive\FilterAttribute;
+use Phramework\Operator\Operator;
+
+/**
+ * @since 2.2.2
+ * @author Xenofon Spafaridis <[email protected]>
+ * @coversDefaultClass \Phramework\JSONAPI\Client\Directive\Filter(
+ */
+class FilterTest extends \PHPUnit_Framework_TestCase
+{
+    public function provider() : array
+    {
+        return [
+            [
+                new Filter(
+                    'user',
+                    ['1', '2']
+                ),
+                'filter[user]=1,2'
+            ],
+            [
+                new Filter(
+                    'article',
+                    ['1', '2'],
+                    (object) [
+                        'author' => ['1']
+                    ]
+                ),
+                'filter[article]=1,2&filter[author]=1'
+            ],
+            [
+                new Filter(
+                    '',
+                    [],
+                    (object) [
+                        'author' => ['1', '2']
+                    ],
+                    [
+                        new FilterAttribute(
+                            'created',
+                            Operator::GREATER_EQUAL,
+                            100
+                        ),
+                        new FilterAttribute(
+                            'created',
+                            Operator::LESS,
+                            100000
+                        )
+                    ]
+                ),
+                sprintf(
+                    'filter[author]=1,2&filter[created][]=%s100&filter[created][]=%s100000',
+                    urlencode('>='),
+                    urlencode('<')
+                )
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider provider
+     */
+    public function testGetUrl(Filter $filter, string $expected)
+    {
+        $this->assertSame(
+            $filter->getURL(),
+            $expected
+        );
+    }
+}