Merge pull request #1804 from splitbrain/simplepie

updated SimplePie and moved to composer based install. #1800

.gitignore

@@ -80,4 +80,4 @@ vendor/splitbrain/php-archive/generate-api.sh
 vendor/paragonie/random_compat/build-phar.sh
 vendor/paragonie/random_compat/dist/*
 vendor/paragonie/random_compat/other/*
-
+vendor/simplepie/simplepie/db.sql

composer.json

@@ -9,7 +9,8 @@
         "splitbrain/php-archive": "~1.0",
         "easybook/geshi": "~1.0",
         "phpseclib/phpseclib": "~2.0",
-        "paragonie/random_compat": "^2.0"
+        "paragonie/random_compat": "^2.0",
+        "simplepie/simplepie": "^1.4"
     },
     "suggest": {
         "squizlabs/php_codesniffer": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",

inc/FeedParser.php

@@ -41,14 +41,17 @@ class FeedParser_File extends SimplePie_File {
     var $headers = array();
     var $body;
     var $error;
+    /** @noinspection PhpMissingParentConstructorInspection */
 
     /**
      * Inititializes the HTTPClient
      *
      * We ignore all given parameters - they are set in DokuHTTPClient
+     *
+     * @inheritdoc
      */
     function __construct($url, $timeout=10, $redirects=5,
-                         $headers=null, $useragent=null, $force_fsockopen=false) {
+                         $headers=null, $useragent=null, $force_fsockopen=false, $curl_options = array()) {
         $this->http    = new DokuHTTPClient();
         $this->success = $this->http->sendRequest($url);
 
@@ -61,14 +64,17 @@ function __construct($url, $timeout=10, $redirects=5,
         return $this->success;
     }
 
+    /** @inheritdoc */
     function headers(){
         return $this->headers;
     }
 
+    /** @inheritdoc */
     function body(){
         return $this->body;
     }
 
+    /** @inheritdoc */
     function close(){
         return true;
     }