From: Kevin Decherf <kevin@kdecherf.com>
Date: Wed, 24 Oct 2018 19:54:09 +0000 (+0200)
Subject: updateOriginUrl: rewrite some if, resolving feedbacks from PR
X-Git-Tag: 2.3.4~8^2~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5ba5e22a092068aeb12213578fd8fc4edb2399fe;p=github%2Fwallabag%2Fwallabag.git

updateOriginUrl: rewrite some if, resolving feedbacks from PR

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 2dc436f8..92351986 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -321,43 +321,46 @@ class ContentProxy
      */
     private function updateOriginUrl(Entry $entry, $url)
     {
-        if (!empty($url) && $entry->getUrl() !== $url) {
-            $parsed_entry_url = parse_url($entry->getUrl());
-            $parsed_content_url = parse_url($url);
+        if (empty($url) || $entry->getUrl() === $url) {
+            return false;
+        }
+
+        $parsed_entry_url = parse_url($entry->getUrl());
+        $parsed_content_url = parse_url($url);
 
-            $diff_ec = array_diff_assoc($parsed_entry_url, $parsed_content_url);
-            $diff_ce = array_diff_assoc($parsed_content_url, $parsed_entry_url);
+        $diff_ec = array_diff_assoc($parsed_entry_url, $parsed_content_url);
+        $diff_ce = array_diff_assoc($parsed_content_url, $parsed_entry_url);
 
-            $diff = array_merge($diff_ec, $diff_ce);
-            $diff_keys = array_keys($diff);
-            sort($diff_keys);
+        $diff = array_merge($diff_ec, $diff_ce);
+        $diff_keys = array_keys($diff);
+        sort($diff_keys);
+
+        if ($this->ignoreUrl($entry->getUrl())) {
+            $entry->setUrl($url);
+            return false;
+        }
 
-            if ($this->ignoreUrl($entry->getUrl())) {
+        switch ($diff_keys) {
+            case ['path']:
+                if (($parsed_entry_url['path'] . '/' === $parsed_content_url['path']) // diff is trailing slash, we only replace the url of the entry
+                    || ($url === urldecode($entry->getUrl()))) { // we update entry url if new url is a decoded version of it, see EntryRepository#findByUrlAndUserId
+                    $entry->setUrl($url);
+                }
+                break;
+            case ['scheme']:
                 $entry->setUrl($url);
-            } else {
-                switch ($diff_keys) {
-                    case ['path']:
-                        if (($parsed_entry_url['path'] . '/' === $parsed_content_url['path']) // diff is trailing slash, we only replace the url of the entry
-                            || ($url === urldecode($entry->getUrl()))) { // we update entry url if new url is a decoded version of it, see EntryRepository#findByUrlAndUserId
-                            $entry->setUrl($url);
-                        }
-                        break;
-                    case ['scheme']:
-                        $entry->setUrl($url);
-                        break;
-                    case ['fragment']:
-                    case ['query']:
-                    case ['fragment', 'query']:
-                        // noop
-                        break;
-                    default:
-                        if (empty($entry->getOriginUrl())) {
-                            $entry->setOriginUrl($entry->getUrl());
-                        }
-                        $entry->setUrl($url);
-                        break;
+                break;
+            case ['fragment']:
+            case ['query']:
+            case ['fragment', 'query']:
+                // noop
+                break;
+            default:
+                if (empty($entry->getOriginUrl())) {
+                    $entry->setOriginUrl($entry->getUrl());
                 }
-            }
+                $entry->setUrl($url);
+                break;
         }
     }