summaryrefslogtreecommitdiffstats
path: root/vendor/fguillot/picofeed/lib/PicoFeed/Reader
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/fguillot/picofeed/lib/PicoFeed/Reader')
-rw-r--r--vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php23
-rw-r--r--vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php23
2 files changed, 5 insertions, 41 deletions
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php
index 53c5cf7a4..09feb49e3 100644
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php
@@ -2,11 +2,11 @@
namespace PicoFeed\Reader;
-use DOMXpath;
+use DOMXPath;
+use PicoFeed\Base;
use PicoFeed\Client\Client;
use PicoFeed\Client\ClientException;
use PicoFeed\Client\Url;
-use PicoFeed\Config\Config;
use PicoFeed\Logging\Logger;
use PicoFeed\Parser\XmlParser;
@@ -17,7 +17,7 @@ use PicoFeed\Parser\XmlParser;
*
* @author Frederic Guillot
*/
-class Favicon
+class Favicon extends Base
{
/**
* Valid types for favicon (supported by browsers).
@@ -34,13 +34,6 @@ class Favicon
);
/**
- * Config class instance.
- *
- * @var \PicoFeed\Config\Config
- */
- private $config;
-
- /**
* Icon binary content.
*
* @var string
@@ -55,16 +48,6 @@ class Favicon
private $content_type = '';
/**
- * Constructor.
- *
- * @param \PicoFeed\Config\Config $config Config class instance
- */
- public function __construct(Config $config = null)
- {
- $this->config = $config ?: new Config();
- }
-
- /**
* Get the icon file content (available only after the download).
*
* @return string
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php
index cfe517146..7b26deaec 100644
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php
@@ -3,7 +3,7 @@
namespace PicoFeed\Reader;
use DOMXPath;
-use PicoFeed\Config\Config;
+use PicoFeed\Base;
use PicoFeed\Client\Client;
use PicoFeed\Client\Url;
use PicoFeed\Logging\Logger;
@@ -14,7 +14,7 @@ use PicoFeed\Parser\XmlParser;
*
* @author Frederic Guillot
*/
-class Reader
+class Reader extends Base
{
/**
* Feed formats for detection.
@@ -30,24 +30,6 @@ class Reader
);
/**
- * Config class instance.
- *
- * @var \PicoFeed\Config\Config
- */
- private $config;
-
- /**
- * Constructor.
- *
- * @param \PicoFeed\Config\Config $config Config class instance
- */
- public function __construct(Config $config = null)
- {
- $this->config = $config ?: new Config();
- Logger::setTimezone($this->config->getTimezone());
- }
-
- /**
* Download a feed (no discovery).
*
* @param string $url Feed url
@@ -163,7 +145,6 @@ class Reader
$parser = new $className($content, $encoding, $url);
$parser->setHashAlgo($this->config->getParserHashAlgo());
- $parser->setTimezone($this->config->getTimezone());
$parser->setConfig($this->config);
return $parser;