From: Kevin Decherf <kevin@kdecherf.com>
Date: Wed, 24 Oct 2018 20:27:27 +0000 (+0200)
Subject: updateOriginUrl: remove 'query string' case from ignore list
X-Git-Tag: 2.3.4~8^2~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=60599679519e819301ce36185c3dd5ca7aa7f4ec;p=github%2Fwallabag%2Fwallabag.git

updateOriginUrl: remove 'query string' case from ignore list

Two urls with a different query string may refer to two different pages
so keep them both.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
---

diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index a93f4a2d..74130be8 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -374,8 +374,6 @@ class ContentProxy
                 $entry->setUrl($url);
                 break;
             case ['fragment']:
-            case ['query']:
-            case ['fragment', 'query']:
                 // noop
                 break;
             default:
diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index a60aec5b..3dd9273c 100644
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -777,20 +777,12 @@ class ContentProxyTest extends TestCase
                 null,
                 'example.com',
             ],
-            'no query string in fetched content' => [
-                'https://example.org/hello?world=1',
-                null,
-                'https://example.org/hello',
-                'https://example.org/hello?world=1',
-                null,
-                'example.org',
-            ],
             'query string in fetched content' => [
                 'https://example.org/hello',
                 null,
                 'https://example.org/hello?world=1',
+                'https://example.org/hello?world=1',
                 'https://example.org/hello',
-                null,
                 'example.org',
             ],
             'fragment in fetched content' => [
@@ -805,8 +797,8 @@ class ContentProxyTest extends TestCase
                 'https://example.org/hello',
                 null,
                 'https://example.org/hello?foo#world',
+                'https://example.org/hello?foo#world',
                 'https://example.org/hello',
-                null,
                 'example.org',
             ],
             'different path and query string in fetch content' => [