opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

PSR2 cleanup for the feedparser override 

It might be a good idea to namespace the FeedParser class itself in the
future
This commit is contained in:
Andreas Gohr 2019-02-24 09:27:58 +01:00
parent dd8af03888
commit c472ace45f
2 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
inc/FeedParser.php
View File

@ -1,10 +1,4 @@
<?php
/**
* Class used to parse RSS and ATOM feeds
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
/**
* We override some methods of the original SimplePie class here
*/
@ -16,12 +10,13 @@ class FeedParser extends SimplePie {
public function __construct(){
parent::__construct();
$this->enable_cache(false);
$this->set_file_class('FeedParser_File');
$this->set_file_class(\dokuwiki\FeedParserFile::class);
}
/**
* Backward compatibility for older plugins
*
* phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
* @param string $url
*/
public function feed_url($url){
@ -29,49 +24,4 @@ class FeedParser extends SimplePie {
}
}
/**
* Fetch an URL using our own HTTPClient
*
* Replaces SimplePie's own class
*/
class FeedParser_File extends SimplePie_File {
protected $http;
/** @noinspection PhpMissingParentConstructorInspection */
/**
* Inititializes the HTTPClient
*
* We ignore all given parameters - they are set in DokuHTTPClient
*
* @inheritdoc
*/
public function __construct($url, $timeout=10, $redirects=5,
$headers=null, $useragent=null, $force_fsockopen=false, $curl_options = array()) {
$this->http = new DokuHTTPClient();
$this->success = $this->http->sendRequest($url);
$this->headers = $this->http->resp_headers;
$this->body = $this->http->resp_body;
$this->error = $this->http->error;
$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
return $this->success;
}
/** @inheritdoc */
public function headers(){
return $this->headers;
}
/** @inheritdoc */
public function body(){
return $this->body;
}
/** @inheritdoc */
public function close(){
return true;
}
}

60
inc/FeedParserFile.php Normal file
View File

@ -0,0 +1,60 @@
<?php
namespace dokuwiki;
/**
* Fetch an URL using our own HTTPClient
*
* Replaces SimplePie's own class
*/
class FeedParserFile extends \SimplePie_File
{
protected $http;
/** @noinspection PhpMissingParentConstructorInspection */
/**
* Inititializes the HTTPClient
*
* We ignore all given parameters - they are set in DokuHTTPClient
*
* @inheritdoc
*/
public function __construct(
$url,
$timeout = 10,
$redirects = 5,
$headers = null,
$useragent = null,
$force_fsockopen = false,
$curl_options = array()
) {
$this->http = new \DokuHTTPClient();
$this->success = $this->http->sendRequest($url);
$this->headers = $this->http->resp_headers;
$this->body = $this->http->resp_body;
$this->error = $this->http->error;
$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
return $this->success;
}
/** @inheritdoc */
public function headers()
{
return $this->headers;
}
/** @inheritdoc */
public function body()
{
return $this->body;
}
/** @inheritdoc */
public function close()
{
return true;
}
}