Merge pull request #94 from j0k3r/reddit-broken-urls

Reddit broken urls
j0k3r · Sep 1, 2016 · f8ab761 · f8ab761
2 parents d1815a7 + 9dd83aa
commit f8ab761
Show file tree

Hide file tree

Showing 10 changed files with 329 additions and 52 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/FeedBundle/Content/Import.php b/src/FeedBundle/Content/Import.php
@@ -106,6 +106,8 @@ public function process($feeds)
                 $feedItem->setFeed($feed);
                 $this->dm->persist($feedItem);
 
+                $feed->addFeeditem($feedItem);
+
                 ++$cached;
             }
 

diff --git a/src/FeedBundle/DomDocument/XDOMDocument.php b/src/FeedBundle/DomDocument/XDOMDocument.php
@@ -12,8 +12,8 @@ class XDOMDocument extends \DOMDocument
     /**
      * Create a new XDOMDocument.
      *
-     * @param string|null $version  The version number of the document as part of the XML declaration.
-     * @param string|null $encoding The encoding of the document as part of the XML declaration.
+     * @param string|null $version  The version number of the document as part of the XML declaration
+     * @param string|null $encoding The encoding of the document as part of the XML declaration
      */
     public function __construct($version = null, $encoding = null)
     {
@@ -25,9 +25,9 @@ public function __construct($version = null, $encoding = null)
     /**
      * Create a new instance of XDOMElement.
      *
-     * @param string      $name         The tag name of the element.
-     * @param string|null $value        The value of the element.
-     * @param string|null $namespaceURI The namespace of the element.
+     * @param string      $name         The tag name of the element
+     * @param string|null $value        The value of the element
+     * @param string|null $namespaceURI The namespace of the element
      *
      * @return XDOMElement
      */

diff --git a/src/FeedBundle/DomDocument/XDOMElement.php b/src/FeedBundle/DomDocument/XDOMElement.php
@@ -12,9 +12,9 @@ class XDOMElement extends \DOMElement
     /**
      * Create a new instance of XDOMElement.
      *
-     * @param string      $name         The tag name of the element.
-     * @param string|null $value        The value of the element.
-     * @param string|null $namespaceURI The namespace of the element.
+     * @param string      $name         The tag name of the element
+     * @param string|null $value        The value of the element
+     * @param string|null $namespaceURI The namespace of the element
      */
     public function __construct($name, $value = null, $namespaceURI = null)
     {

diff --git a/src/FeedBundle/Improver/DefaultImprover.php b/src/FeedBundle/Improver/DefaultImprover.php
@@ -94,7 +94,9 @@ public function updateUrl($url)
         // remove utm parameters (utm_source, utm_medium, utm_campaign, etc ...)
         parse_str($query, $queryExploded);
 
-        $notUtmParameters = array_filter(array_keys($queryExploded), function ($k) { return strpos($k, 'utm') !== 0; });
+        $notUtmParameters = array_filter(array_keys($queryExploded), function ($k) {
+            return strpos($k, 'utm') !== 0;
+        });
         $newQuery = array_intersect_key($queryExploded, array_flip($notUtmParameters));
 
         // remove all parameters from url to re-add them later

diff --git a/src/FeedBundle/Improver/HackerNews.php b/src/FeedBundle/Improver/HackerNews.php
@@ -14,7 +14,7 @@ class HackerNews extends DefaultImprover
      */
     public function match($host)
     {
-        return 0 === strpos('news.ycombinator.com', $host) ? true : false;
+        return 0 === strpos('news.ycombinator.com', $host);
     }
 
     /**

diff --git a/src/FeedBundle/Improver/Reddit.php b/src/FeedBundle/Improver/Reddit.php
@@ -14,7 +14,7 @@ class Reddit extends DefaultImprover
      */
     public function match($host)
     {
-        return 0 === strpos('reddit.com', $host) ? true : false;
+        return 0 === strpos('reddit.com', $host);
     }
 
     /**
@@ -31,7 +31,7 @@ public function updateUrl($url)
             return $url;
         }
 
-        return $matches[2];
+        return str_replace('&amp;', '&', $matches[2]);
     }
 
     /**

diff --git a/src/FeedBundle/Xml/SimplePieProxy.php b/src/FeedBundle/Xml/SimplePieProxy.php
@@ -10,7 +10,7 @@ class SimplePieProxy
      * Create a new Proxy for SimplePie.
      *
      * @param string $cache        Path to cache folder
-     * @param int    $item_limit   The maximum number of items to return.
+     * @param int    $item_limit   The maximum number of items to return
      * @param bool   $enable_cache Enable caching
      */
     public function __construct($cache, $item_limit = 25, $enable_cache = true)