diff --git a/composer.json b/composer.json index d622c0c..3075f5e 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "fguillot/simple-validator": "v1.0.0", "fguillot/json-rpc": "v1.0.2", "fguillot/picodb": "v1.0.2", - "fguillot/picofeed": "v0.1.12" + "fguillot/picofeed": "v0.1.13" }, "require-dev": { "phpunit/phpunit": "4.8.3", diff --git a/vendor/autoload.php b/vendor/autoload.php index 578d32b..e8c72c3 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit8f528b09bdfd7d4a627bbcebe3b2eef5::getLoader(); +return ComposerAutoloaderInitb324395d2df28954aca677ed0d0d2268::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index ac466fe..473bf29 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit8f528b09bdfd7d4a627bbcebe3b2eef5 +class ComposerAutoloaderInitb324395d2df28954aca677ed0d0d2268 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInit8f528b09bdfd7d4a627bbcebe3b2eef5 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit8f528b09bdfd7d4a627bbcebe3b2eef5', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb324395d2df28954aca677ed0d0d2268', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit8f528b09bdfd7d4a627bbcebe3b2eef5', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb324395d2df28954aca677ed0d0d2268', 'loadClassLoader')); $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -42,14 +42,14 @@ class ComposerAutoloaderInit8f528b09bdfd7d4a627bbcebe3b2eef5 $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequire8f528b09bdfd7d4a627bbcebe3b2eef5($file); + composerRequireb324395d2df28954aca677ed0d0d2268($file); } return $loader; } } -function composerRequire8f528b09bdfd7d4a627bbcebe3b2eef5($file) +function composerRequireb324395d2df28954aca677ed0d0d2268($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 9d27cb1..005fbfd 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -116,17 +116,17 @@ }, { "name": "fguillot/picofeed", - "version": "v0.1.12", - "version_normalized": "0.1.12.0", + "version": "v0.1.13", + "version_normalized": "0.1.13.0", "source": { "type": "git", "url": "https://github.com/fguillot/picoFeed.git", - "reference": "f7f5e792baf09e6e795f4dd9bb56d7d588d67735" + "reference": "84d9ee64df8596153ba080bd2436b333507aadba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/f7f5e792baf09e6e795f4dd9bb56d7d588d67735", - "reference": "f7f5e792baf09e6e795f4dd9bb56d7d588d67735", + "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/84d9ee64df8596153ba080bd2436b333507aadba", + "reference": "84d9ee64df8596153ba080bd2436b333507aadba", "shasum": "" }, "require": { @@ -140,7 +140,7 @@ "suggest": { "ext-curl": "PicoFeed will use cURL if present" }, - "time": "2015-10-18 21:22:40", + "time": "2015-10-20 01:48:56", "bin": [ "picofeed" ], diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Client.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Client.php index ae93f3e..a3bb896 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Client.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Client.php @@ -4,218 +4,197 @@ namespace PicoFeed\Client; use LogicException; use PicoFeed\Logging\Logger; +use PicoFeed\Config\Config; /** - * Client class + * Client class. * * @author Frederic Guillot - * @package client */ abstract class Client { /** - * Flag that say if the resource have been modified + * Flag that say if the resource have been modified. * - * @access private * @var bool */ private $is_modified = true; /** - * HTTP Content-Type + * HTTP Content-Type. * - * @access private * @var string */ private $content_type = ''; /** - * HTTP encoding + * HTTP encoding. * - * @access private * @var string */ private $encoding = ''; /** - * HTTP request headers + * HTTP request headers. * - * @access protected * @var array */ protected $request_headers = array(); /** - * HTTP Etag header + * HTTP Etag header. * - * @access protected * @var string */ protected $etag = ''; /** - * HTTP Last-Modified header + * HTTP Last-Modified header. * - * @access protected * @var string */ protected $last_modified = ''; /** - * Proxy hostname + * Proxy hostname. * - * @access protected * @var string */ protected $proxy_hostname = ''; /** - * Proxy port + * Proxy port. * - * @access protected - * @var integer + * @var int */ protected $proxy_port = 3128; /** - * Proxy username + * Proxy username. * - * @access protected * @var string */ protected $proxy_username = ''; /** - * Proxy password + * Proxy password. * - * @access protected * @var string */ protected $proxy_password = ''; /** - * Basic auth username + * Basic auth username. * - * @access protected * @var string */ protected $username = ''; /** - * Basic auth password + * Basic auth password. * - * @access protected * @var string */ protected $password = ''; /** - * Client connection timeout + * Client connection timeout. * - * @access protected - * @var integer + * @var int */ protected $timeout = 10; /** - * User-agent + * User-agent. * - * @access protected * @var string */ protected $user_agent = 'PicoFeed (https://github.com/fguillot/picoFeed)'; /** - * Real URL used (can be changed after a HTTP redirect) + * Real URL used (can be changed after a HTTP redirect). * - * @access protected * @var string */ protected $url = ''; /** - * Page/Feed content + * Page/Feed content. * - * @access protected * @var string */ protected $content = ''; /** - * Number maximum of HTTP redirections to avoid infinite loops + * Number maximum of HTTP redirections to avoid infinite loops. * - * @access protected - * @var integer + * @var int */ protected $max_redirects = 5; /** - * Maximum size of the HTTP body response + * Maximum size of the HTTP body response. * - * @access protected - * @var integer + * @var int */ protected $max_body_size = 2097152; // 2MB /** - * HTTP response status code + * HTTP response status code. * - * @access protected - * @var integer + * @var int */ protected $status_code = 0; /** - * Enables direct passthrough to requesting client + * Enables direct passthrough to requesting client. * - * @access protected * @var bool */ protected $passthrough = false; /** - * Do the HTTP request + * Do the HTTP request. * * @abstract - * @access public + * * @return array */ abstract public function doRequest(); /** - * Get client instance: curl or stream driver + * Get client instance: curl or stream driver. * * @static - * @access public + * * @return \PicoFeed\Client\Client */ public static function getInstance() { if (function_exists('curl_init')) { - return new Curl; - } - else if (ini_get('allow_url_fopen')) { - return new Stream; + return new Curl(); + } elseif (ini_get('allow_url_fopen')) { + return new Stream(); } throw new LogicException('You must have "allow_url_fopen=1" or curl extension installed'); } /** - * Add HTTP Header to the request + * Add HTTP Header to the request. * - * @access public * @param array $headers */ - public function setHeaders($headers) { + public function setHeaders($headers) + { $this->request_headers = $headers; } /** - * Perform the HTTP request + * Perform the HTTP request. + * + * @param string $url URL * - * @access public - * @param string $url URL * @return Client */ public function execute($url = '') @@ -239,17 +218,15 @@ abstract class Client } /** - * Handle not modified response + * Handle not modified response. * - * @access public - * @param array $response Client response + * @param array $response Client response */ public function handleNotModifiedResponse(array $response) { if ($response['status'] == 304) { $this->is_modified = false; - } - else if ($response['status'] == 200) { + } elseif ($response['status'] == 200) { $this->is_modified = $this->hasBeenModified($response, $this->etag, $this->last_modified); $this->etag = $this->getHeader($response, 'ETag'); $this->last_modified = $this->getHeader($response, 'Last-Modified'); @@ -261,10 +238,9 @@ abstract class Client } /** - * Handle not found response + * Handle not found response. * - * @access public - * @param array $response Client response + * @param array $response Client response */ public function handleNotFoundResponse(array $response) { @@ -274,10 +250,9 @@ abstract class Client } /** - * Handle normal response + * Handle normal response. * - * @access public - * @param array $response Client response + * @param array $response Client response */ public function handleNormalResponse(array $response) { @@ -289,19 +264,19 @@ abstract class Client } /** - * Check if a request has been modified according to the parameters + * Check if a request has been modified according to the parameters. * - * @access public - * @param array $response - * @param string $etag - * @param string $lastModified - * @return boolean + * @param array $response + * @param string $etag + * @param string $lastModified + * + * @return bool */ private function hasBeenModified($response, $etag, $lastModified) { $headers = array( 'Etag' => $etag, - 'Last-Modified' => $lastModified + 'Last-Modified' => $lastModified, ); // Compare the values for each header that is present @@ -311,7 +286,7 @@ abstract class Client if ($response['headers'][$key] !== $value) { return true; } - $presentCacheHeaderCount++; + ++$presentCacheHeaderCount; } } @@ -325,10 +300,10 @@ abstract class Client } /** - * Find content type from response headers + * Find content type from response headers. + * + * @param array $response Client response * - * @access public - * @param array $response Client response * @return string */ public function findContentType(array $response) @@ -337,23 +312,23 @@ abstract class Client } /** - * Find charset from response headers + * Find charset from response headers. * - * @access public * @return string */ public function findCharset() { $result = explode('charset=', $this->content_type); + return isset($result[1]) ? $result[1] : ''; } /** - * Get header value from a client response + * Get header value from a client response. + * + * @param array $response Client response + * @param string $header Header name * - * @access public - * @param array $response Client response - * @param string $header Header name * @return string */ public function getHeader(array $response, $header) @@ -362,22 +337,22 @@ abstract class Client } /** - * Set the Last-Modified HTTP header + * Set the Last-Modified HTTP header. + * + * @param string $last_modified Header value * - * @access public - * @param string $last_modified Header value * @return \PicoFeed\Client\Client */ public function setLastModified($last_modified) { $this->last_modified = $last_modified; + return $this; } /** - * Get the value of the Last-Modified HTTP header + * Get the value of the Last-Modified HTTP header. * - * @access public * @return string */ public function getLastModified() @@ -386,22 +361,22 @@ abstract class Client } /** - * Set the value of the Etag HTTP header + * Set the value of the Etag HTTP header. + * + * @param string $etag Etag HTTP header value * - * @access public - * @param string $etag Etag HTTP header value * @return \PicoFeed\Client\Client */ public function setEtag($etag) { $this->etag = $etag; + return $this; } /** - * Get the Etag HTTP header value + * Get the Etag HTTP header value. * - * @access public * @return string */ public function getEtag() @@ -410,9 +385,8 @@ abstract class Client } /** - * Get the final url value + * Get the final url value. * - * @access public * @return string */ public function getUrl() @@ -421,23 +395,22 @@ abstract class Client } /** - * Set the url + * Set the url. * - * @access public * @return string * @return \PicoFeed\Client\Client */ public function setUrl($url) { $this->url = $url; + return $this; } /** - * Get the HTTP response status code + * Get the HTTP response status code. * - * @access public - * @return integer + * @return int */ public function getStatusCode() { @@ -445,9 +418,8 @@ abstract class Client } /** - * Get the body of the HTTP response + * Get the body of the HTTP response. * - * @access public * @return string */ public function getContent() @@ -456,9 +428,8 @@ abstract class Client } /** - * Get the content type value from HTTP headers + * Get the content type value from HTTP headers. * - * @access public * @return string */ public function getContentType() @@ -467,9 +438,8 @@ abstract class Client } /** - * Get the encoding value from HTTP headers + * Get the encoding value from HTTP headers. * - * @access public * @return string */ public function getEncoding() @@ -478,9 +448,8 @@ abstract class Client } /** - * Return true if the remote resource has changed + * Return true if the remote resource has changed. * - * @access public * @return bool */ public function isModified() @@ -489,9 +458,8 @@ abstract class Client } /** - * return true if passthrough mode is enabled + * return true if passthrough mode is enabled. * - * @access public * @return bool */ public function isPassthroughEnabled() @@ -500,167 +468,177 @@ abstract class Client } /** - * Set connection timeout + * Set connection timeout. + * + * @param int $timeout Connection timeout * - * @access public - * @param integer $timeout Connection timeout * @return \PicoFeed\Client\Client */ public function setTimeout($timeout) { $this->timeout = $timeout ?: $this->timeout; + return $this; } /** - * Set a custom user agent + * Set a custom user agent. + * + * @param string $user_agent User Agent * - * @access public - * @param string $user_agent User Agent * @return \PicoFeed\Client\Client */ public function setUserAgent($user_agent) { $this->user_agent = $user_agent ?: $this->user_agent; + return $this; } /** - * Set the mximum number of HTTP redirections + * Set the mximum number of HTTP redirections. + * + * @param int $max Maximum * - * @access public - * @param integer $max Maximum * @return \PicoFeed\Client\Client */ public function setMaxRedirections($max) { $this->max_redirects = $max ?: $this->max_redirects; + return $this; } /** - * Set the maximum size of the HTTP body + * Set the maximum size of the HTTP body. + * + * @param int $max Maximum * - * @access public - * @param integer $max Maximum * @return \PicoFeed\Client\Client */ public function setMaxBodySize($max) { $this->max_body_size = $max ?: $this->max_body_size; + return $this; } /** - * Set the proxy hostname + * Set the proxy hostname. + * + * @param string $hostname Proxy hostname * - * @access public - * @param string $hostname Proxy hostname * @return \PicoFeed\Client\Client */ public function setProxyHostname($hostname) { $this->proxy_hostname = $hostname ?: $this->proxy_hostname; + return $this; } /** - * Set the proxy port + * Set the proxy port. + * + * @param int $port Proxy port * - * @access public - * @param integer $port Proxy port * @return \PicoFeed\Client\Client */ public function setProxyPort($port) { $this->proxy_port = $port ?: $this->proxy_port; + return $this; } /** - * Set the proxy username + * Set the proxy username. + * + * @param string $username Proxy username * - * @access public - * @param string $username Proxy username * @return \PicoFeed\Client\Client */ public function setProxyUsername($username) { $this->proxy_username = $username ?: $this->proxy_username; + return $this; } /** - * Set the proxy password + * Set the proxy password. + * + * @param string $password Password * - * @access public - * @param string $password Password * @return \PicoFeed\Client\Client */ public function setProxyPassword($password) { $this->proxy_password = $password ?: $this->proxy_password; + return $this; } /** - * Set the username + * Set the username. + * + * @param string $username Basic Auth username * - * @access public - * @param string $username Basic Auth username * @return \PicoFeed\Client\Client */ public function setUsername($username) { $this->username = $username ?: $this->username; + return $this; } /** - * Set the password + * Set the password. + * + * @param string $password Basic Auth Password * - * @access public - * @param string $password Basic Auth Password * @return \PicoFeed\Client\Client */ public function setPassword($password) { $this->password = $password ?: $this->password; + return $this; } /** - * Enable the passthrough mode + * Enable the passthrough mode. * - * @access public * @return \PicoFeed\Client\Client */ public function enablePassthroughMode() { $this->passthrough = true; + return $this; } /** - * Disable the passthrough mode + * Disable the passthrough mode. * - * @access public * @return \PicoFeed\Client\Client */ public function disablePassthroughMode() { $this->passthrough = false; + return $this; } /** - * Set config object + * Set config object. + * + * @param \PicoFeed\Config\Config $config Config instance * - * @access public - * @param \PicoFeed\Config\Config $config Config instance * @return \PicoFeed\Client\Client */ - public function setConfig($config) + public function setConfig(Config $config) { if ($config !== null) { $this->setTimeout($config->getClientTimeout()); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/ClientException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/ClientException.php index 0e27452..b3a95c9 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/ClientException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/ClientException.php @@ -4,12 +4,10 @@ namespace PicoFeed\Client; use PicoFeed\PicoFeedException; - /** - * ClientException Exception + * ClientException Exception. * * @author Frederic Guillot - * @package Client */ abstract class ClientException extends PicoFeedException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php index 3e408b6..2063761 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php @@ -5,54 +5,49 @@ namespace PicoFeed\Client; use PicoFeed\Logging\Logger; /** - * cURL HTTP client + * cURL HTTP client. * * @author Frederic Guillot - * @package Client */ class Curl extends Client { /** - * HTTP response body + * HTTP response body. * - * @access private * @var string */ private $body = ''; /** - * Body size + * Body size. * - * @access private - * @var integer + * @var int */ private $body_length = 0; /** - * HTTP response headers + * HTTP response headers. * - * @access private * @var array */ private $response_headers = array(); /** - * Counter on the number of header received + * Counter on the number of header received. * - * @access private - * @var integer + * @var int */ private $response_headers_count = 0; /** - * cURL callback to read the HTTP body + * cURL callback to read the HTTP body. * * If the function return -1, curl stop to read the HTTP response * - * @access public - * @param resource $ch cURL handler - * @param string $buffer Chunk of data - * @return integer Length of the buffer + * @param resource $ch cURL handler + * @param string $buffer Chunk of data + * + * @return int Length of the buffer */ public function readBody($ch, $buffer) { @@ -69,23 +64,21 @@ class Curl extends Client } /** - * cURL callback to read HTTP headers + * cURL callback to read HTTP headers. * - * @access public - * @param resource $ch cURL handler - * @param string $buffer Header line - * @return integer Length of the buffer + * @param resource $ch cURL handler + * @param string $buffer Header line + * + * @return int Length of the buffer */ public function readHeaders($ch, $buffer) { $length = strlen($buffer); if ($buffer === "\r\n" || $buffer === "\n") { - $this->response_headers_count++; - } - else { - - if (! isset($this->response_headers[$this->response_headers_count])) { + ++$this->response_headers_count; + } else { + if (!isset($this->response_headers[$this->response_headers_count])) { $this->response_headers[$this->response_headers_count] = ''; } @@ -96,12 +89,12 @@ class Curl extends Client } /** - * cURL callback to passthrough the HTTP status header to the client + * cURL callback to passthrough the HTTP status header to the client. * - * @access public - * @param resource $ch cURL handler - * @param string $buffer Header line - * @return integer Length of the buffer + * @param resource $ch cURL handler + * @param string $buffer Header line + * + * @return int Length of the buffer */ public function passthroughHeaders($ch, $buffer) { @@ -109,8 +102,7 @@ class Curl extends Client if ($status !== 0) { header(':', true, $status); - } - elseif (isset($headers['Content-Type'])) { + } elseif (isset($headers['Content-Type'])) { header($buffer); } @@ -118,25 +110,25 @@ class Curl extends Client } /** - * cURL callback to passthrough the HTTP body to the client + * cURL callback to passthrough the HTTP body to the client. * * If the function return -1, curl stop to read the HTTP response * - * @access public - * @param resource $ch cURL handler - * @param string $buffer Chunk of data - * @return integer Length of the buffer + * @param resource $ch cURL handler + * @param string $buffer Chunk of data + * + * @return int Length of the buffer */ public function passthroughBody($ch, $buffer) { echo $buffer; + return strlen($buffer); } /** - * Prepare HTTP headers + * Prepare HTTP headers. * - * @access private * @return string[] */ private function prepareHeaders() @@ -159,16 +151,15 @@ class Curl extends Client } /** - * Prepare curl proxy context + * Prepare curl proxy context. + * + * @param resource $ch * - * @access private - * @param resource $ch * @return resource $ch */ private function prepareProxyContext($ch) { if ($this->proxy_hostname) { - Logger::setMessage(get_called_class().' Proxy: '.$this->proxy_hostname.':'.$this->proxy_port); curl_setopt($ch, CURLOPT_PROXYPORT, $this->proxy_port); @@ -178,8 +169,7 @@ class Curl extends Client if ($this->proxy_username) { Logger::setMessage(get_called_class().' Proxy credentials: Yes'); curl_setopt($ch, CURLOPT_PROXYUSERPWD, $this->proxy_username.':'.$this->proxy_password); - } - else { + } else { Logger::setMessage(get_called_class().' Proxy credentials: No'); } } @@ -188,10 +178,10 @@ class Curl extends Client } /** - * Prepare curl auth context + * Prepare curl auth context. + * + * @param resource $ch * - * @access private - * @param resource $ch * @return resource $ch */ private function prepareAuthContext($ch) @@ -204,10 +194,10 @@ class Curl extends Client } /** - * Set write/header functions + * Set write/header functions. + * + * @param resource $ch * - * @access private - * @param resource $ch * @return resource $ch */ private function prepareDownloadMode($ch) @@ -218,7 +208,6 @@ class Curl extends Client if ($this->isPassthroughEnabled()) { $write_function = 'passthroughBody'; $header_function = 'passthroughHeaders'; - } curl_setopt($ch, CURLOPT_WRITEFUNCTION, array($this, $write_function)); @@ -228,9 +217,8 @@ class Curl extends Client } /** - * Prepare curl context + * Prepare curl context. * - * @access private * @return resource */ private function prepareContext() @@ -266,9 +254,7 @@ class Curl extends Client } /** - * Execute curl context - * - * @access private + * Execute curl context. */ private function executeContext() { @@ -297,11 +283,11 @@ class Curl extends Client } /** - * Do the HTTP request + * Do the HTTP request. * - * @access public - * @param bool $follow_location Flag used when there is an open_basedir restriction - * @return array HTTP response ['body' => ..., 'status' => ..., 'headers' => ...] + * @param bool $follow_location Flag used when there is an open_basedir restriction + * + * @return array HTTP response ['body' => ..., 'status' => ..., 'headers' => ...] */ public function doRequest($follow_location = true) { @@ -316,15 +302,15 @@ class Curl extends Client return array( 'status' => $status, 'body' => $this->body, - 'headers' => $headers + 'headers' => $headers, ); } /** - * Handle manually redirections when there is an open base dir restriction + * Handle manually redirections when there is an open base dir restriction. + * + * @param string $location Redirected URL * - * @access private - * @param string $location Redirected URL * @return array */ private function handleRedirection($location) @@ -338,8 +324,7 @@ class Curl extends Client $this->response_headers_count = 0; while (true) { - - $nb_redirects++; + ++$nb_redirects; if ($nb_redirects >= $this->max_redirects) { throw new MaxRedirectException('Maximum number of redirections reached'); @@ -353,8 +338,7 @@ class Curl extends Client $this->body_length = 0; $this->response_headers = array(); $this->response_headers_count = 0; - } - else { + } else { break; } } @@ -363,14 +347,14 @@ class Curl extends Client } /** - * Handle cURL errors (throw individual exceptions) + * Handle cURL errors (throw individual exceptions). * * We don't use constants because they are not necessary always available * (depends of the version of libcurl linked to php) * * @see http://curl.haxx.se/libcurl/c/libcurl-errors.html - * @access private - * @param integer $errno cURL error code + * + * @param int $errno cURL error code */ private function handleError($errno) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/HttpHeaders.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/HttpHeaders.php index e37819f..5fdbfab 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/HttpHeaders.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/HttpHeaders.php @@ -6,11 +6,10 @@ use ArrayAccess; use PicoFeed\Logging\Logger; /** - * Class to handle HTTP headers case insensitivity + * Class to handle HTTP headers case insensitivity. * * @author Bernhard Posselt * @author Frederic Guillot - * @package Client */ class HttpHeaders implements ArrayAccess { @@ -44,11 +43,12 @@ class HttpHeaders implements ArrayAccess } /** - * Parse HTTP headers + * Parse HTTP headers. * * @static - * @access public - * @param array $lines List of headers + * + * @param array $lines List of headers + * * @return array */ public static function parse(array $lines) @@ -57,15 +57,14 @@ class HttpHeaders implements ArrayAccess $headers = array(); foreach ($lines as $line) { - if (strpos($line, 'HTTP/1') === 0) { $headers = array(); $status = (int) substr($line, 9, 3); - } - else if (strpos($line, ':') !== false) { - - @list($name, $value) = explode(': ', $line); - if ($value) $headers[trim($name)] = trim($value); + } elseif (strpos($line, ':') !== false) { + list($name, $value) = explode(': ', $line); + if ($value) { + $headers[trim($name)] = trim($value); + } } } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidCertificateException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidCertificateException.php index ece3f30..8d25d7e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidCertificateException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidCertificateException.php @@ -3,10 +3,9 @@ namespace PicoFeed\Client; /** - * InvalidCertificateException Exception + * InvalidCertificateException Exception. * * @author Frederic Guillot - * @package Client */ class InvalidCertificateException extends ClientException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidUrlException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidUrlException.php index 0298f0d..15534d9 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidUrlException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidUrlException.php @@ -3,10 +3,9 @@ namespace PicoFeed\Client; /** - * InvalidUrlException Exception + * InvalidUrlException Exception. * * @author Frederic Guillot - * @package Client */ class InvalidUrlException extends ClientException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxRedirectException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxRedirectException.php index 1651d7f..0a221af 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxRedirectException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxRedirectException.php @@ -3,10 +3,9 @@ namespace PicoFeed\Client; /** - * MaxRedirectException Exception + * MaxRedirectException Exception. * * @author Frederic Guillot - * @package Client */ class MaxRedirectException extends ClientException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxSizeException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxSizeException.php index 60bb9f1..201b22a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxSizeException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxSizeException.php @@ -3,10 +3,9 @@ namespace PicoFeed\Client; /** - * MaxSizeException Exception + * MaxSizeException Exception. * * @author Frederic Guillot - * @package Client */ class MaxSizeException extends ClientException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Stream.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Stream.php index 36c5ca6..75a0122 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Stream.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Stream.php @@ -5,17 +5,15 @@ namespace PicoFeed\Client; use PicoFeed\Logging\Logger; /** - * Stream context HTTP client + * Stream context HTTP client. * * @author Frederic Guillot - * @package Client */ class Stream extends Client { /** - * Prepare HTTP headers + * Prepare HTTP headers. * - * @access private * @return string[] */ private function prepareHeaders() @@ -27,7 +25,7 @@ class Stream extends Client // disable compression in passthrough mode. It could result in double // compressed content which isn't decodeable by browsers - if (function_exists('gzdecode') && ! $this->isPassthroughEnabled()) { + if (function_exists('gzdecode') && !$this->isPassthroughEnabled()) { $headers[] = 'Accept-Encoding: gzip'; } @@ -53,14 +51,13 @@ class Stream extends Client } /** - * Construct the final URL from location headers + * Construct the final URL from location headers. * - * @access private - * @param array $headers List of HTTP response header + * @param array $headers List of HTTP response header */ private function setEffectiveUrl($headers) { - foreach($headers as $header) { + foreach ($headers as $header) { if (stripos($header, 'Location') === 0) { list(, $value) = explode(': ', $header); @@ -70,9 +67,8 @@ class Stream extends Client } /** - * Prepare stream context + * Prepare stream context. * - * @access private * @return array */ private function prepareContext() @@ -83,11 +79,10 @@ class Stream extends Client 'protocol_version' => 1.1, 'timeout' => $this->timeout, 'max_redirects' => $this->max_redirects, - ) + ), ); if ($this->proxy_hostname) { - Logger::setMessage(get_called_class().' Proxy: '.$this->proxy_hostname.':'.$this->proxy_port); $context['http']['proxy'] = 'tcp://'.$this->proxy_hostname.':'.$this->proxy_port; @@ -95,8 +90,7 @@ class Stream extends Client if ($this->proxy_username) { Logger::setMessage(get_called_class().' Proxy credentials: Yes'); - } - else { + } else { Logger::setMessage(get_called_class().' Proxy credentials: No'); } } @@ -107,10 +101,9 @@ class Stream extends Client } /** - * Do the HTTP request + * Do the HTTP request. * - * @access public - * @return array HTTP response ['body' => ..., 'status' => ..., 'headers' => ...] + * @return array HTTP response ['body' => ..., 'status' => ..., 'headers' => ...] */ public function doRequest() { @@ -121,7 +114,7 @@ class Stream extends Client // Make HTTP request $stream = @fopen($this->url, 'r', false, $context); - if (! is_resource($stream)) { + if (!is_resource($stream)) { throw new InvalidUrlException('Unable to establish a connection'); } @@ -137,8 +130,7 @@ class Stream extends Client } fpassthru($stream); - } - else { + } else { // Get the entire body until the max size $body = stream_get_contents($stream, $this->max_body_size + 1); @@ -159,16 +151,16 @@ class Stream extends Client return array( 'status' => $status, 'body' => $this->decodeBody($body, $headers), - 'headers' => $headers + 'headers' => $headers, ); } /** - * Decode body response according to the HTTP headers + * Decode body response according to the HTTP headers. + * + * @param string $body Raw body + * @param HttpHeaders $headers HTTP headers * - * @access public - * @param string $body Raw body - * @param HttpHeaders $headers HTTP headers * @return string */ public function decodeBody($body, HttpHeaders $headers) @@ -178,22 +170,22 @@ class Stream extends Client } if (isset($headers['Content-Encoding']) && $headers['Content-Encoding'] === 'gzip') { - $body = @gzdecode($body); + $body = gzdecode($body); } return $body; } /** - * Decode a chunked body + * Decode a chunked body. * - * @access public - * @param string $str Raw body - * @return string Decoded body + * @param string $str Raw body + * + * @return string Decoded body */ public function decodeChunked($str) { - for ($result = ''; ! empty($str); $str = trim($str)) { + for ($result = ''; !empty($str); $str = trim($str)) { // Get the chunk length $pos = strpos($str, "\r\n"); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/TimeoutException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/TimeoutException.php index 6ba5cbe..da98da1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/TimeoutException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/TimeoutException.php @@ -3,10 +3,9 @@ namespace PicoFeed\Client; /** - * TimeoutException Exception + * TimeoutException Exception. * * @author Frederic Guillot - * @package Client */ class TimeoutException extends ClientException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Url.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Url.php index 396a108..a933798 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Url.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Url.php @@ -3,34 +3,30 @@ namespace PicoFeed\Client; /** - * URL class + * URL class. * * @author Frederic Guillot - * @package Client */ class Url { /** - * URL + * URL. * - * @access private * @var string */ private $url = ''; /** - * URL components + * URL components. * - * @access private * @var array */ private $components = array(); /** - * Constructor + * Constructor. * - * @access public - * @param string $url URL + * @param string $url URL */ public function __construct($url) { @@ -51,28 +47,27 @@ class Url } /** - * Shortcut method to get an absolute url from relative url + * Shortcut method to get an absolute url from relative url. * * @static - * @access public - * @param mixed $item_url Unknown url (can be relative or not) - * @param mixed $website_url Website url + * + * @param mixed $item_url Unknown url (can be relative or not) + * @param mixed $website_url Website url + * * @return string */ public static function resolve($item_url, $website_url) { - $link = is_string($item_url) ? new Url($item_url) : $item_url; - $website = is_string($website_url) ? new Url($website_url) : $website_url; + $link = is_string($item_url) ? new self($item_url) : $item_url; + $website = is_string($website_url) ? new self($website_url) : $website_url; if ($link->isRelativeUrl()) { - if ($link->isRelativePath()) { return $link->getAbsoluteUrl($website->getBaseUrl($website->getBasePath())); } return $link->getAbsoluteUrl($website->getBaseUrl()); - } - else if ($link->isProtocolRelative()) { + } elseif ($link->isProtocolRelative()) { $link->setScheme($website->getScheme()); } @@ -80,24 +75,26 @@ class Url } /** - * Shortcut method to get a base url + * Shortcut method to get a base url. * * @static - * @access public - * @param string $url + * + * @param string $url + * * @return string */ public static function base($url) { - $link = new Url($url); + $link = new self($url); + return $link->getBaseUrl(); } /** - * Get the base URL + * Get the base URL. + * + * @param string $suffix Add a suffix to the url * - * @access public - * @param string $suffix Add a suffix to the url * @return string */ public function getBaseUrl($suffix = '') @@ -106,19 +103,18 @@ class Url } /** - * Get the absolute URL + * Get the absolute URL. + * + * @param string $base_url Use this url as base url * - * @access public - * @param string $base_url Use this url as base url * @return string */ public function getAbsoluteUrl($base_url = '') { if ($base_url) { - $base = new Url($base_url); + $base = new self($base_url); $url = $base->getAbsoluteUrl().substr($this->getFullPath(), 1); - } - else { + } else { $url = $this->hasHost() ? $this->getBaseUrl().$this->getFullPath() : ''; } @@ -126,50 +122,49 @@ class Url } /** - * Return true if the url is relative + * Return true if the url is relative. * - * @access public - * @return boolean + * @return bool */ public function isRelativeUrl() { - return ! $this->hasScheme() && ! $this->isProtocolRelative(); + return !$this->hasScheme() && !$this->isProtocolRelative(); } /** - * Return true if the path is relative + * Return true if the path is relative. * - * @access public - * @return boolean + * @return bool */ public function isRelativePath() { $path = $this->getPath(); - return empty($path) || $path{0} !== '/'; + + return empty($path) || $path{0} + !== '/'; } /** - * Filters the path of a URI + * Filters the path of a URI. * * Imported from Guzzle library: https://github.com/guzzle/psr7/blob/master/src/Uri.php#L568-L582 * - * @access public * @param $path + * * @return string */ public function filterPath($path, $charUnreserved = 'a-zA-Z0-9_\-\.~', $charSubDelims = '!\$&\'\(\)\*\+,;=') { return preg_replace_callback( - '/(?:[^' . $charUnreserved . $charSubDelims . ':@\/%]+|%(?![A-Fa-f0-9]{2}))/', + '/(?:[^'.$charUnreserved.$charSubDelims.':@\/%]+|%(?![A-Fa-f0-9]{2}))/', function (array $matches) { return rawurlencode($matches[0]); }, $path ); } /** - * Get the path + * Get the path. * - * @access public * @return string */ public function getPath() @@ -178,9 +173,8 @@ class Url } /** - * Get the base path + * Get the base path. * - * @access public * @return string */ public function getBasePath() @@ -194,9 +188,8 @@ class Url } /** - * Get the full path (path + querystring + fragment) + * Get the full path (path + querystring + fragment). * - * @access public * @return string */ public function getFullPath() @@ -210,9 +203,8 @@ class Url } /** - * Get the hostname + * Get the hostname. * - * @access public * @return string */ public function getHost() @@ -221,21 +213,20 @@ class Url } /** - * Return true if the url has a hostname + * Return true if the url has a hostname. * - * @access public - * @return boolean + * @return bool */ public function hasHost() { - return ! empty($this->components['host']); + return !empty($this->components['host']); } /** - * Get the scheme + * Get the scheme. + * + * @param string $suffix Suffix to add when there is a scheme * - * @access public - * @param string $suffix Suffix to add when there is a scheme * @return string */ public function getScheme($suffix = '') @@ -244,10 +235,10 @@ class Url } /** - * Set the scheme + * Set the scheme. + * + * @param string $scheme Set a scheme * - * @access public - * @param string $scheme Set a scheme * @return string */ public function setScheme($scheme) @@ -256,21 +247,20 @@ class Url } /** - * Return true if the url has a scheme + * Return true if the url has a scheme. * - * @access public - * @return boolean + * @return bool */ public function hasScheme() { - return ! empty($this->components['scheme']); + return !empty($this->components['scheme']); } /** - * Get the port + * Get the port. + * + * @param string $prefix Prefix to add when there is a port * - * @access public - * @param string $prefix Prefix to add when there is a port * @return string */ public function getPort($prefix = '') @@ -279,21 +269,19 @@ class Url } /** - * Return true if the url has a port + * Return true if the url has a port. * - * @access public - * @return boolean + * @return bool */ public function hasPort() { - return ! empty($this->components['port']); + return !empty($this->components['port']); } /** - * Return true if the url is protocol relative (start with //) + * Return true if the url is protocol relative (start with //). * - * @access public - * @return boolean + * @return bool */ public function isProtocolRelative() { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Config/Config.php b/vendor/fguillot/picofeed/lib/PicoFeed/Config/Config.php index 1eaaeef..127968c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Config/Config.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Config/Config.php @@ -3,10 +3,9 @@ namespace PicoFeed\Config; /** - * Config class + * Config class. * * @author Frederic Guillot - * @package picofeed * * @method \PicoFeed\Config\Config setClientTimeout(integer $value) * @method \PicoFeed\Config\Config setClientUserAgent(string $value) @@ -34,7 +33,6 @@ namespace PicoFeed\Config; * @method \PicoFeed\Config\Config setFilterImageProxyUrl($value) * @method \PicoFeed\Config\Config setFilterImageProxyCallback($closure) * @method \PicoFeed\Config\Config setFilterImageProxyProtocol($value) - * * @method integer getClientTimeout() * @method string getClientUserAgent() * @method integer getMaxRedirections() @@ -65,22 +63,21 @@ namespace PicoFeed\Config; class Config { /** - * Contains all parameters + * Contains all parameters. * - * @access private * @var array */ private $container = array(); /** - * Magic method to have any kind of setters or getters + * Magic method to have any kind of setters or getters. + * + * @param string $name Getter/Setter name + * @param array $arguments Method arguments * - * @access public - * @param string $name Getter/Setter name - * @param array $arguments Method arguments * @return mixed */ - public function __call($name , array $arguments) + public function __call($name, array $arguments) { $name = strtolower($name); $prefix = substr($name, 0, 3); @@ -88,10 +85,11 @@ class Config if ($prefix === 'set' && isset($arguments[0])) { $this->container[$parameter] = $arguments[0]; + return $this; - } - else if ($prefix === 'get') { + } elseif ($prefix === 'get') { $default_value = isset($arguments[0]) ? $arguments[0] : null; + return isset($this->container[$parameter]) ? $this->container[$parameter] : $default_value; } } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Encoding/Encoding.php b/vendor/fguillot/picofeed/lib/PicoFeed/Encoding/Encoding.php index 5821dd4..fa0917e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Encoding/Encoding.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Encoding/Encoding.php @@ -3,9 +3,7 @@ namespace PicoFeed\Encoding; /** - * Encoding class - * - * @package Encoding + * Encoding class. */ class Encoding { @@ -17,7 +15,7 @@ class Encoding // suppress all notices since it isn't possible to silence only the // notice "Wrong charset, conversion from $in_encoding to $out_encoding is not allowed" - set_error_handler(function() {}, E_NOTICE); + set_error_handler(function () {}, E_NOTICE); // convert input to utf-8 and strip invalid characters $value = iconv($encoding, 'UTF-8//IGNORE', $input); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php index 684dbf7..51f7e9e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php @@ -5,41 +5,36 @@ namespace PicoFeed\Filter; use PicoFeed\Client\Url; /** - * Attribute Filter class + * Attribute Filter class. * * @author Frederic Guillot - * @package Filter */ class Attribute { /** - * Image proxy url + * Image proxy url. * - * @access private * @var string */ private $image_proxy_url = ''; /** - * Image proxy callback + * Image proxy callback. * - * @access private * @var \Closure|null */ private $image_proxy_callback = null; /** - * limits the image proxy usage to this protocol + * limits the image proxy usage to this protocol. * - * @access private * @var string */ private $image_proxy_limit_protocol = ''; /** - * Tags and attribute whitelist + * Tags and attribute whitelist. * - * @access private * @var array */ private $attribute_whitelist = array( @@ -80,15 +75,14 @@ class Attribute 'time' => array('datetime'), 'abbr' => array('title'), 'iframe' => array('width', 'height', 'frameborder', 'src', 'allowfullscreen'), - 'q' => array('cite') + 'q' => array('cite'), ); /** - * Scheme whitelist + * Scheme whitelist. * * For a complete list go to http://en.wikipedia.org/wiki/URI_scheme * - * @access private * @var array */ private $scheme_whitelist = array( @@ -124,9 +118,8 @@ class Attribute ); /** - * Iframe source whitelist, everything else is ignored + * Iframe source whitelist, everything else is ignored. * - * @access private * @var array */ private $iframe_whitelist = array( @@ -139,9 +132,8 @@ class Attribute ); /** - * Blacklisted resources + * Blacklisted resources. * - * @access private * @var array */ private $media_blacklist = array( @@ -172,9 +164,8 @@ class Attribute ); /** - * Attributes used for external resources + * Attributes used for external resources. * - * @access private * @var array */ private $media_attributes = array( @@ -184,9 +175,8 @@ class Attribute ); /** - * Attributes that must be integer + * Attributes that must be integer. * - * @access private * @var array */ private $integer_attributes = array( @@ -196,9 +186,8 @@ class Attribute ); /** - * Mandatory attributes for specified tags + * Mandatory attributes for specified tags. * - * @access private * @var array */ private $required_attributes = array( @@ -210,9 +199,8 @@ class Attribute ); /** - * Add attributes to specified tags + * Add attributes to specified tags. * - * @access private * @var array */ private $add_attributes = array( @@ -221,9 +209,8 @@ class Attribute ); /** - * List of filters to apply + * List of filters to apply. * - * @access private * @var array */ private $filters = array( @@ -235,22 +222,20 @@ class Attribute 'filterProtocolUrlAttribute', 'rewriteImageProxyUrl', 'secureIframeSrc', - 'removeYouTubeAutoplay' + 'removeYouTubeAutoplay', ); /** - * Add attributes to specified tags + * Add attributes to specified tags. * - * @access private * @var \PicoFeed\Client\Url */ private $website; /** - * Constructor + * Constructor. * - * @access public - * @param \PicoFeed\Client\Url $website Website url instance + * @param \PicoFeed\Client\Url $website Website url instance */ public function __construct(Url $website) { @@ -258,18 +243,18 @@ class Attribute } /** - * Apply filters to the attributes list + * Apply filters to the attributes list. * - * @access public - * @param string $tag Tag name - * @param array $attributes Attributes dictionary - * @return array Filtered attributes + * @param string $tag Tag name + * @param array $attributes Attributes dictionary + * + * @return array Filtered attributes */ public function filter($tag, array $attributes) { foreach ($attributes as $attribute => &$value) { foreach ($this->filters as $filter) { - if (! $this->$filter($tag, $attribute, $value)) { + if (!$this->$filter($tag, $attribute, $value)) { unset($attributes[$attribute]); break; } @@ -280,13 +265,13 @@ class Attribute } /** - * Return true if the value is allowed (remove not allowed attributes) + * Return true if the value is allowed (remove not allowed attributes). * - * @access public - * @param string $tag Tag name - * @param string $attribute Attribute name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param string $attribute Attribute name + * @param string $value Attribute value + * + * @return bool */ public function filterAllowedAttribute($tag, $attribute, $value) { @@ -294,13 +279,13 @@ class Attribute } /** - * Return true if the value is not integer (remove attributes that should have an integer value) + * Return true if the value is not integer (remove attributes that should have an integer value). * - * @access public - * @param string $tag Tag name - * @param string $attribute Attribute name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param string $attribute Attribute name + * @param string $value Attribute value + * + * @return bool */ public function filterIntegerAttribute($tag, $attribute, $value) { @@ -312,18 +297,17 @@ class Attribute } /** - * Return true if the iframe source is allowed (remove not allowed iframe) + * Return true if the iframe source is allowed (remove not allowed iframe). * - * @access public - * @param string $tag Tag name - * @param string $attribute Attribute name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param string $attribute Attribute name + * @param string $value Attribute value + * + * @return bool */ public function filterIframeAttribute($tag, $attribute, $value) { if ($tag === 'iframe' && $attribute === 'src') { - foreach ($this->iframe_whitelist as $url) { if (strpos($value, $url) === 0) { return true; @@ -337,13 +321,13 @@ class Attribute } /** - * Return true if the resource is not blacklisted (remove blacklisted resource attributes) + * Return true if the resource is not blacklisted (remove blacklisted resource attributes). * - * @access public - * @param string $tag Tag name - * @param string $attribute Attribute name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param string $attribute Attribute name + * @param string $value Attribute value + * + * @return bool */ public function filterBlacklistResourceAttribute($tag, $attribute, $value) { @@ -355,13 +339,13 @@ class Attribute } /** - * Convert all relative links to absolute url + * Convert all relative links to absolute url. * - * @access public - * @param string $tag Tag name - * @param string $attribute Attribute name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param string $attribute Attribute name + * @param string $value Attribute value + * + * @return bool */ public function rewriteAbsoluteUrl($tag, $attribute, &$value) { @@ -374,13 +358,13 @@ class Attribute /** * Turns iframes' src attribute from http to https to prevent - * mixed active content + * mixed active content. * - * @access public - * @param string $tag Tag name - * @param array $attribute Atttributes name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param array $attribute Atttributes name + * @param string $value Attribute value + * + * @return bool */ public function secureIframeSrc($tag, $attribute, &$value) { @@ -392,13 +376,13 @@ class Attribute } /** - * Removes YouTube autoplay from iframes + * Removes YouTube autoplay from iframes. * - * @access public - * @param string $tag Tag name - * @param array $attribute Atttributes name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param array $attribute Atttributes name + * @param string $value Attribute value + * + * @return bool */ public function removeYouTubeAutoplay($tag, $attribute, &$value) { @@ -411,23 +395,21 @@ class Attribute } /** - * Rewrite image url to use with a proxy + * Rewrite image url to use with a proxy. * - * @access public - * @param string $tag Tag name - * @param string $attribute Attribute name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param string $attribute Attribute name + * @param string $value Attribute value + * + * @return bool */ public function rewriteImageProxyUrl($tag, $attribute, &$value) { if ($tag === 'img' && $attribute === 'src' - && ! ($this->image_proxy_limit_protocol !== '' && stripos($value, $this->image_proxy_limit_protocol.':') !== 0)) { - + && !($this->image_proxy_limit_protocol !== '' && stripos($value, $this->image_proxy_limit_protocol.':') !== 0)) { if ($this->image_proxy_url) { $value = sprintf($this->image_proxy_url, rawurlencode($value)); - } - else if (is_callable($this->image_proxy_callback)) { + } elseif (is_callable($this->image_proxy_callback)) { $value = call_user_func($this->image_proxy_callback, $value); } } @@ -436,17 +418,17 @@ class Attribute } /** - * Return true if the scheme is authorized + * Return true if the scheme is authorized. * - * @access public - * @param string $tag Tag name - * @param string $attribute Attribute name - * @param string $value Attribute value - * @return boolean + * @param string $tag Tag name + * @param string $attribute Attribute name + * @param string $value Attribute value + * + * @return bool */ public function filterProtocolUrlAttribute($tag, $attribute, $value) { - if ($this->isResource($attribute) && ! $this->isAllowedProtocol($value)) { + if ($this->isResource($attribute) && !$this->isAllowedProtocol($value)) { return false; } @@ -454,11 +436,11 @@ class Attribute } /** - * Automatically add/override some attributes for specific tags + * Automatically add/override some attributes for specific tags. + * + * @param string $tag Tag name + * @param array $attributes Attributes list * - * @access public - * @param string $tag Tag name - * @param array $attributes Attributes list * @return array */ public function addAttributes($tag, array $attributes) @@ -471,19 +453,18 @@ class Attribute } /** - * Return true if all required attributes are present + * Return true if all required attributes are present. * - * @access public - * @param string $tag Tag name - * @param array $attributes Attributes list - * @return boolean + * @param string $tag Tag name + * @param array $attributes Attributes list + * + * @return bool */ public function hasRequiredAttributes($tag, array $attributes) { if (isset($this->required_attributes[$tag])) { - foreach ($this->required_attributes[$tag] as $attribute) { - if (! isset($attributes[$attribute])) { + if (!isset($attributes[$attribute])) { return false; } } @@ -493,11 +474,11 @@ class Attribute } /** - * Check if an attribute name is an external resource + * Check if an attribute name is an external resource. * - * @access public - * @param string $attribute Attribute name - * @return boolean + * @param string $attribute Attribute name + * + * @return bool */ public function isResource($attribute) { @@ -505,16 +486,15 @@ class Attribute } /** - * Detect if the protocol is allowed or not + * Detect if the protocol is allowed or not. * - * @access public - * @param string $value Attribute value - * @return boolean + * @param string $value Attribute value + * + * @return bool */ public function isAllowedProtocol($value) { foreach ($this->scheme_whitelist as $protocol) { - if (strpos($value, $protocol) === 0) { return true; } @@ -524,16 +504,15 @@ class Attribute } /** - * Detect if an url is blacklisted + * Detect if an url is blacklisted. * - * @access public - * @param string $resource Attribute value (URL) - * @return boolean + * @param string $resource Attribute value (URL) + * + * @return bool */ public function isBlacklistedMedia($resource) { foreach ($this->media_blacklist as $name) { - if (strpos($resource, $name) !== false) { return true; } @@ -543,10 +522,10 @@ class Attribute } /** - * Convert the attribute list to html + * Convert the attribute list to html. + * + * @param array $attributes Attributes * - * @access public - * @param array $attributes Attributes * @return string */ public function toHtml(array $attributes) @@ -561,147 +540,158 @@ class Attribute } /** - * Set whitelisted tags and attributes for each tag + * Set whitelisted tags and attributes for each tag. + * + * @param array $values List of tags: ['video' => ['src', 'cover'], 'img' => ['src']] * - * @access public - * @param array $values List of tags: ['video' => ['src', 'cover'], 'img' => ['src']] * @return Attribute */ public function setWhitelistedAttributes(array $values) { $this->attribute_whitelist = $values ?: $this->attribute_whitelist; + return $this; } /** - * Set scheme whitelist + * Set scheme whitelist. + * + * @param array $values List of scheme: ['http://', 'ftp://'] * - * @access public - * @param array $values List of scheme: ['http://', 'ftp://'] * @return Attribute */ public function setSchemeWhitelist(array $values) { $this->scheme_whitelist = $values ?: $this->scheme_whitelist; + return $this; } /** - * Set media attributes (used to load external resources) + * Set media attributes (used to load external resources). + * + * @param array $values List of values: ['src', 'href'] * - * @access public - * @param array $values List of values: ['src', 'href'] * @return Attribute */ public function setMediaAttributes(array $values) { $this->media_attributes = $values ?: $this->media_attributes; + return $this; } /** - * Set blacklisted external resources + * Set blacklisted external resources. + * + * @param array $values List of tags: ['http://google.com/', '...'] * - * @access public - * @param array $values List of tags: ['http://google.com/', '...'] * @return Attribute */ public function setMediaBlacklist(array $values) { $this->media_blacklist = $values ?: $this->media_blacklist; + return $this; } /** - * Set mandatory attributes for whitelisted tags + * Set mandatory attributes for whitelisted tags. + * + * @param array $values List of tags: ['img' => 'src'] * - * @access public - * @param array $values List of tags: ['img' => 'src'] * @return Attribute */ public function setRequiredAttributes(array $values) { $this->required_attributes = $values ?: $this->required_attributes; + return $this; } /** - * Set attributes to automatically to specific tags + * Set attributes to automatically to specific tags. + * + * @param array $values List of tags: ['a' => 'target="_blank"'] * - * @access public - * @param array $values List of tags: ['a' => 'target="_blank"'] * @return Attribute */ public function setAttributeOverrides(array $values) { $this->add_attributes = $values ?: $this->add_attributes; + return $this; } /** - * Set attributes that must be an integer + * Set attributes that must be an integer. + * + * @param array $values List of tags: ['width', 'height'] * - * @access public - * @param array $values List of tags: ['width', 'height'] * @return Attribute */ public function setIntegerAttributes(array $values) { $this->integer_attributes = $values ?: $this->integer_attributes; + return $this; } /** - * Set allowed iframe resources + * Set allowed iframe resources. + * + * @param array $values List of tags: ['http://www.youtube.com'] * - * @access public - * @param array $values List of tags: ['http://www.youtube.com'] * @return Attribute */ public function setIframeWhitelist(array $values) { $this->iframe_whitelist = $values ?: $this->iframe_whitelist; + return $this; } /** - * Set image proxy URL + * Set image proxy URL. * * The original image url will be urlencoded * - * @access public - * @param string $url Proxy URL + * @param string $url Proxy URL + * * @return Attribute */ public function setImageProxyUrl($url) { $this->image_proxy_url = $url ?: $this->image_proxy_url; + return $this; } /** - * Set image proxy callback + * Set image proxy callback. + * + * @param \Closure $callback * - * @access public - * @param \Closure $callback * @return Attribute */ public function setImageProxyCallback($callback) { $this->image_proxy_callback = $callback ?: $this->image_proxy_callback; + return $this; } /** - * Set image proxy protocol restriction + * Set image proxy protocol restriction. + * + * @param string $value * - * @access public - * @param string $value * @return Attribute */ public function setImageProxyProtocol($value) { $this->image_proxy_limit_protocol = $value ?: $this->image_proxy_limit_protocol; + return $this; } } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php index e3e4ad3..bae2aff 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php @@ -3,45 +3,46 @@ namespace PicoFeed\Filter; /** - * Filter class + * Filter class. * * @author Frederic Guillot - * @package Filter */ class Filter { /** - * Get the Html filter instance + * Get the Html filter instance. * * @static - * @access public - * @param string $html HTML content - * @param string $website Site URL (used to build absolute URL) + * + * @param string $html HTML content + * @param string $website Site URL (used to build absolute URL) + * * @return Html */ public static function html($html, $website) { $filter = new Html($html, $website); + return $filter; } /** - * Escape HTML content + * Escape HTML content. * * @static - * @access public + * * @return string */ public static function escape($content) { - return @htmlspecialchars($content, ENT_QUOTES, 'UTF-8', false); + return htmlspecialchars($content, ENT_QUOTES, 'UTF-8', false); } /** - * Remove HTML tags + * Remove HTML tags. + * + * @param string $data Input data * - * @access public - * @param string $data Input data * @return string */ public function removeHTMLTags($data) @@ -50,11 +51,12 @@ class Filter } /** - * Remove the XML tag from a document + * Remove the XML tag from a document. * * @static - * @access public - * @param string $data Input data + * + * @param string $data Input data + * * @return string */ public static function stripXmlTag($data) @@ -64,38 +66,38 @@ class Filter } do { - $pos = strpos($data, '') + 2)); } - } while ($pos !== false && $pos < 200); return $data; } /** - * Strip head tag from the HTML content + * Strip head tag from the HTML content. * * @static - * @access public - * @param string $data Input data + * + * @param string $data Input data + * * @return string */ public static function stripHeadTags($data) { - return preg_replace('@]*?>.*?@siu','', $data ); + return preg_replace('@]*?>.*?@siu', '', $data); } /** - * Trim whitespace from the begining, the end and inside a string and don't break utf-8 string + * Trim whitespace from the begining, the end and inside a string and don't break utf-8 string. * * @static - * @access public - * @param string $value Raw data - * @return string Normalized data + * + * @param string $value Raw data + * + * @return string Normalized data */ public static function stripWhiteSpace($value) { @@ -107,12 +109,13 @@ class Filter } /** - * Fixes before XML parsing + * Fixes before XML parsing. * * @static - * @access public - * @param string $data Raw data - * @return string Normalized data + * + * @param string $data Raw data + * + * @return string Normalized data */ public static function normalizeData($data) { @@ -122,7 +125,7 @@ class Filter ); // strip invalid XML 1.0 characters which are encoded as entities - $data = preg_replace_callback($entities, function($matches) { + $data = preg_replace_callback($entities, function ($matches) { $code_point = $matches[2]; // convert hex entity to decimal diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php index c380a46..0ccc192 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php @@ -8,88 +8,78 @@ use PicoFeed\Scraper\RuleLoader; use PicoFeed\Parser\XmlParser; /** - * HTML Filter class + * HTML Filter class. * * @author Frederic Guillot - * @package Filter */ class Html { /** - * Config object + * Config object. * - * @access private * @var \PicoFeed\Config\Config */ private $config; /** - * Unfiltered XML data + * Unfiltered XML data. * - * @access private * @var string */ private $input = ''; /** - * Filtered XML data + * Filtered XML data. * - * @access private * @var string */ private $output = ''; /** - * List of empty tags + * List of empty tags. * - * @access private * @var array */ private $empty_tags = array(); /** - * Empty flag + * Empty flag. * - * @access private - * @var boolean + * @var bool */ private $empty = true; /** - * Tag instance + * Tag instance. * - * @access public * @var \PicoFeed\Filter\Tag */ public $tag = ''; /** - * Attribute instance + * Attribute instance. * - * @access public * @var \PicoFeed\Filter\Attribute */ public $attribute = ''; /** - * The website to filter + * The website to filter. * - * @access private * @var string */ private $website; /** - * Initialize the filter, all inputs data must be encoded in UTF-8 before + * Initialize the filter, all inputs data must be encoded in UTF-8 before. * - * @access public - * @param string $html HTML content - * @param string $website Site URL (used to build absolute URL) + * @param string $html HTML content + * @param string $website Site URL (used to build absolute URL) */ public function __construct($html, $website) { - $this->config = new Config; - $this->input = XmlParser::HtmlToXml($html); + $this->config = new Config(); + $this->input = XmlParser::htmlToXml($html); $this->output = ''; $this->tag = new Tag($this->config); $this->website = $website; @@ -97,10 +87,10 @@ class Html } /** - * Set config object + * Set config object. + * + * @param \PicoFeed\Config\Config $config Config instance * - * @access public - * @param \PicoFeed\Config\Config $config Config instance * @return \PicoFeed\Filter\Html */ public function setConfig($config) @@ -126,9 +116,8 @@ class Html } /** - * Run tags/attributes filtering + * Run tags/attributes filtering. * - * @access public * @return string */ public function execute() @@ -150,9 +139,7 @@ class Html } /** - * Called before XML parsing - * - * @access public + * Called before XML parsing. */ public function preFilter() { @@ -160,9 +147,7 @@ class Html } /** - * Called after XML parsing - * - * @access public + * Called after XML parsing. */ public function postFilter() { @@ -173,16 +158,15 @@ class Html } /** - * Called after XML parsing - * @param string $content the content that should be filtered + * Called after XML parsing. * - * @access public + * @param string $content the content that should be filtered */ public function filterRules($content) { // the constructor should require a config, then this if can be removed if ($this->config === null) { - $config = new Config; + $config = new Config(); } else { $config = $this->config; } @@ -196,7 +180,7 @@ class Html if (isset($rules['filter'])) { foreach ($rules['filter'] as $pattern => $rule) { if (preg_match($pattern, $sub_url)) { - foreach($rule as $search => $replace) { + foreach ($rule as $search => $replace) { $content = preg_replace($search, $replace, $content); } } @@ -207,23 +191,20 @@ class Html } /** - * Parse opening tag + * Parse opening tag. * - * @access public - * @param resource $parser XML parser - * @param string $tag Tag name - * @param array $attributes Tag attributes + * @param resource $parser XML parser + * @param string $tag Tag name + * @param array $attributes Tag attributes */ public function startTag($parser, $tag, array $attributes) { $this->empty = true; if ($this->tag->isAllowed($tag, $attributes)) { - $attributes = $this->attribute->filter($tag, $attributes); if ($this->attribute->hasRequiredAttributes($tag, $attributes)) { - $attributes = $this->attribute->addAttributes($tag, $attributes); $this->output .= $this->tag->openHtmlTag($tag, $this->attribute->toHtml($attributes)); @@ -235,25 +216,23 @@ class Html } /** - * Parse closing tag + * Parse closing tag. * - * @access public - * @param resource $parser XML parser - * @param string $tag Tag name + * @param resource $parser XML parser + * @param string $tag Tag name */ public function endTag($parser, $tag) { - if (! array_pop($this->empty_tags) && $this->tag->isAllowedTag($tag)) { + if (!array_pop($this->empty_tags) && $this->tag->isAllowedTag($tag)) { $this->output .= $this->tag->closeHtmlTag($tag); } } /** - * Parse tag content + * Parse tag content. * - * @access public - * @param resource $parser XML parser - * @param string $content Tag content + * @param resource $parser XML parser + * @param string $content Tag content */ public function dataTag($parser, $content) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php index 6347054..34e21dc 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php @@ -3,30 +3,26 @@ namespace PicoFeed\Filter; use DOMXpath; - use PicoFeed\Parser\XmlParser; use PicoFeed\Config\Config; /** - * Tag Filter class + * Tag Filter class. * * @author Frederic Guillot - * @package Filter */ class Tag { /** - * Config object + * Config object. * - * @access private * @var \PicoFeed\Config\Config */ private $config; /** - * Tags blacklist (Xpath expressions) + * Tags blacklist (Xpath expressions). * - * @access private * @var array */ private $tag_blacklist = array( @@ -35,9 +31,8 @@ class Tag ); /** - * Tags whitelist + * Tags whitelist. * - * @access private * @var array */ private $tag_whitelist = array( @@ -87,24 +82,24 @@ class Tag } /** - * Check if the tag is allowed and is not a pixel tracker + * Check if the tag is allowed and is not a pixel tracker. * - * @access public - * @param string $tag Tag name - * @param array $attributes Attributes dictionary - * @return boolean + * @param string $tag Tag name + * @param array $attributes Attributes dictionary + * + * @return bool */ public function isAllowed($tag, array $attributes) { - return $this->isAllowedTag($tag) && ! $this->isPixelTracker($tag, $attributes); + return $this->isAllowedTag($tag) && !$this->isPixelTracker($tag, $attributes); } /** - * Return the HTML opening tag + * Return the HTML opening tag. + * + * @param string $tag Tag name + * @param string $attributes Attributes converted in html * - * @access public - * @param string $tag Tag name - * @param string $attributes Attributes converted in html * @return string */ public function openHtmlTag($tag, $attributes = '') @@ -113,10 +108,10 @@ class Tag } /** - * Return the HTML closing tag + * Return the HTML closing tag. + * + * @param string $tag Tag name * - * @access public - * @param string $tag Tag name * @return string */ public function closeHtmlTag($tag) @@ -125,11 +120,11 @@ class Tag } /** - * Return true is the tag is self-closing + * Return true is the tag is self-closing. * - * @access public - * @param string $tag Tag name - * @return boolean + * @param string $tag Tag name + * + * @return bool */ public function isSelfClosingTag($tag) { @@ -137,11 +132,11 @@ class Tag } /** - * Check if a tag is on the whitelist + * Check if a tag is on the whitelist. * - * @access public - * @param string $tag Tag name - * @return boolean + * @param string $tag Tag name + * + * @return bool */ public function isAllowedTag($tag) { @@ -152,12 +147,12 @@ class Tag } /** - * Detect if an image tag is a pixel tracker + * Detect if an image tag is a pixel tracker. * - * @access public - * @param string $tag Tag name - * @param array $attributes Tag attributes - * @return boolean + * @param string $tag Tag name + * @param array $attributes Tag attributes + * + * @return bool */ public function isPixelTracker($tag, array $attributes) { @@ -167,10 +162,10 @@ class Tag } /** - * Remove script tags + * Remove script tags. + * + * @param string $data Input data * - * @access public - * @param string $data Input data * @return string */ public function removeBlacklistedTags($data) @@ -192,12 +187,11 @@ class Tag return $dom->saveXML(); } - /** - * Remove empty tags + * Remove empty tags. + * + * @param string $data Input data * - * @access public - * @param string $data Input data * @return string */ public function removeEmptyTags($data) @@ -206,27 +200,28 @@ class Tag } /** - * Replace

by only one + * Replace

by only one. + * + * @param string $data Input data * - * @access public - * @param string $data Input data * @return string */ public function removeMultipleBreakTags($data) { - return preg_replace("/(\s*)+/", "
", $data); + return preg_replace("/(\s*)+/", '
', $data); } /** - * Set whitelisted tags adn attributes for each tag + * Set whitelisted tags adn attributes for each tag. + * + * @param array $values List of tags: ['video' => ['src', 'cover'], 'img' => ['src']] * - * @access public - * @param array $values List of tags: ['video' => ['src', 'cover'], 'img' => ['src']] * @return Tag */ public function setWhitelistedTags(array $values) { $this->tag_whitelist = $values ?: $this->tag_whitelist; + return $this; } } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Logging/Logger.php b/vendor/fguillot/picofeed/lib/PicoFeed/Logging/Logger.php index fe52953..caec463 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Logging/Logger.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Logging/Logger.php @@ -6,45 +6,43 @@ use DateTime; use DateTimeZone; /** - * Logging class + * Logging class. * * @author Frederic Guillot - * @package Logging */ class Logger { /** - * List of messages + * List of messages. * * @static - * @access private + * * @var array */ private static $messages = array(); /** - * Default timezone + * Default timezone. * * @static - * @access private + * * @var string */ private static $timezone = 'UTC'; /** - * Enable or disable logging + * Enable or disable logging. * * @static - * @access public - * @var boolean + * + * @var bool */ public static $enable = false; /** - * Enable logging + * Enable logging. * * @static - * @access public */ public static function enable() { @@ -52,11 +50,11 @@ class Logger } /** - * Add a new message + * Add a new message. * * @static - * @access public - * @param string $message Message + * + * @param string $message Message */ public static function setMessage($message) { @@ -67,10 +65,10 @@ class Logger } /** - * Get all logged messages + * Get all logged messages. * * @static - * @access public + * * @return array */ public static function getMessages() @@ -79,10 +77,9 @@ class Logger } /** - * Remove all logged messages + * Remove all logged messages. * * @static - * @access public */ public static function deleteMessages() { @@ -90,12 +87,13 @@ class Logger } /** - * Set a different timezone + * Set a different timezone. * * @static + * * @see http://php.net/manual/en/timezones.php - * @access public - * @param string $timezone Timezone + * + * @param string $timezone Timezone */ public static function setTimeZone($timezone) { @@ -103,10 +101,10 @@ class Logger } /** - * Get all messages serialized into a string + * Get all messages serialized into a string. * * @static - * @access public + * * @return string */ public static function toString() diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php index 6950d9a..356453c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php @@ -7,25 +7,24 @@ use PicoFeed\Filter\Filter; use PicoFeed\Client\Url; /** - * Atom parser + * Atom parser. * * @author Frederic Guillot - * @package Parser */ class Atom extends Parser { /** - * Supported namespaces + * Supported namespaces. */ protected $namespaces = array( 'atom' => 'http://www.w3.org/2005/Atom', ); /** - * Get the path to the items XML tree + * Get the path to the items XML tree. + * + * @param SimpleXMLElement $xml Feed xml * - * @access public - * @param SimpleXMLElement $xml Feed xml * @return SimpleXMLElement */ public function getItemsTree(SimpleXMLElement $xml) @@ -35,11 +34,10 @@ class Atom extends Parser } /** - * Find the feed url + * Find the feed url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedUrl(SimpleXMLElement $xml, Feed $feed) { @@ -47,11 +45,10 @@ class Atom extends Parser } /** - * Find the site url + * Find the site url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findSiteUrl(SimpleXMLElement $xml, Feed $feed) { @@ -59,11 +56,10 @@ class Atom extends Parser } /** - * Find the feed description + * Find the feed description. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedDescription(SimpleXMLElement $xml, Feed $feed) { @@ -74,11 +70,10 @@ class Atom extends Parser } /** - * Find the feed logo url + * Find the feed logo url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedLogo(SimpleXMLElement $xml, Feed $feed) { @@ -89,11 +84,10 @@ class Atom extends Parser } /** - * Find the feed icon + * Find the feed icon. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedIcon(SimpleXMLElement $xml, Feed $feed) { @@ -104,11 +98,10 @@ class Atom extends Parser } /** - * Find the feed title + * Find the feed title. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedTitle(SimpleXMLElement $xml, Feed $feed) { @@ -119,11 +112,10 @@ class Atom extends Parser } /** - * Find the feed language + * Find the feed language. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedLanguage(SimpleXMLElement $xml, Feed $feed) { @@ -134,11 +126,10 @@ class Atom extends Parser } /** - * Find the feed id + * Find the feed id. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedId(SimpleXMLElement $xml, Feed $feed) { @@ -149,11 +140,10 @@ class Atom extends Parser } /** - * Find the feed date + * Find the feed date. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedDate(SimpleXMLElement $xml, Feed $feed) { @@ -164,12 +154,11 @@ class Atom extends Parser } /** - * Find the item date + * Find the item date. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemDate(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -179,26 +168,23 @@ class Atom extends Parser $updated = XmlParser::getXPathResult($entry, 'atom:updated', $this->namespaces) ?: XmlParser::getXPathResult($entry, 'updated'); - $published = ! empty($published) ? $this->date->getDateTime((string) current($published)) : null; - $updated = ! empty($updated) ? $this->date->getDateTime((string) current($updated)) : null; + $published = !empty($published) ? $this->date->getDateTime((string) current($published)) : null; + $updated = !empty($updated) ? $this->date->getDateTime((string) current($updated)) : null; if ($published === null && $updated === null) { $item->date = $feed->getDate(); // We use the feed date if there is no date for the item - } - else if ($published !== null && $updated !== null) { + } elseif ($published !== null && $updated !== null) { $item->date = max($published, $updated); // We use the most recent date between published and updated - } - else { + } else { $item->date = $updated ?: $published; } } /** - * Find the item title + * Find the item title. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param Item $item Item object */ public function findItemTitle(SimpleXMLElement $entry, Item $item) { @@ -209,12 +195,11 @@ class Atom extends Parser } /** - * Find the item author + * Find the item author. * - * @access public - * @param SimpleXMLElement $xml Feed - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $xml Feed + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemAuthor(SimpleXMLElement $xml, SimpleXMLElement $entry, Item $item) { @@ -227,11 +212,10 @@ class Atom extends Parser } /** - * Find the item content + * Find the item content. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemContent(SimpleXMLElement $entry, Item $item) { @@ -239,11 +223,10 @@ class Atom extends Parser } /** - * Find the item URL + * Find the item URL. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemUrl(SimpleXMLElement $entry, Item $item) { @@ -251,22 +234,20 @@ class Atom extends Parser } /** - * Genereate the item id + * Genereate the item id. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemId(SimpleXMLElement $entry, Item $item, Feed $feed) { $id = XmlParser::getXPathResult($entry, 'atom:id', $this->namespaces) ?: XmlParser::getXPathResult($entry, 'id'); - if (! empty($id)) { + if (!empty($id)) { $item->id = $this->generateId((string) current($id)); - } - else { + } else { $item->id = $this->generateId( $item->getTitle(), $item->getUrl(), $item->getContent() ); @@ -274,12 +255,11 @@ class Atom extends Parser } /** - * Find the item enclosure + * Find the item enclosure. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemEnclosure(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -292,12 +272,11 @@ class Atom extends Parser } /** - * Find the item language + * Find the item language. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemLanguage(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -307,11 +286,11 @@ class Atom extends Parser } /** - * Get the URL from a link tag + * Get the URL from a link tag. + * + * @param SimpleXMLElement $xml XML tag + * @param string $rel Link relationship: alternate, enclosure, related, self, via * - * @access private - * @param SimpleXMLElement $xml XML tag - * @param string $rel Link relationship: alternate, enclosure, related, self, via * @return string */ private function getUrl(SimpleXMLElement $xml, $rel, $fallback = false) @@ -324,6 +303,7 @@ class Atom extends Parser if ($fallback) { $link = $this->findLink($xml, ''); + return $link ? (string) $link['href'] : ''; } @@ -331,11 +311,11 @@ class Atom extends Parser } /** - * Get a link tag that match a relationship + * Get a link tag that match a relationship. + * + * @param SimpleXMLElement $xml XML tag + * @param string $rel Link relationship: alternate, enclosure, related, self, via * - * @access private - * @param SimpleXMLElement $xml XML tag - * @param string $rel Link relationship: alternate, enclosure, related, self, via * @return SimpleXMLElement|null */ private function findLink(SimpleXMLElement $xml, $rel) @@ -349,14 +329,14 @@ class Atom extends Parser } } - return null; + return; } /** - * Get the entry content + * Get the entry content. + * + * @param SimpleXMLElement $entry XML Entry * - * @access private - * @param SimpleXMLElement $entry XML Entry * @return string */ private function getContent(SimpleXMLElement $entry) @@ -366,16 +346,15 @@ class Atom extends Parser ?: XmlParser::getXPathResult($entry, 'content') ); - if (! empty($content) && count($content->children())) { + if (!empty($content) && count($content->children())) { $xml_string = ''; - foreach($content->children() as $child) { + foreach ($content->children() as $child) { $xml_string .= $child->asXML(); } return $xml_string; - } - else if (trim((string) $content) !== '') { + } elseif (trim((string) $content) !== '') { return (string) $content; } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/DateParser.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/DateParser.php index 4612a86..e4d08b5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/DateParser.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/DateParser.php @@ -6,25 +6,22 @@ use DateTime; use DateTimeZone; /** - * Date Parser + * Date Parser. * * @author Frederic Guillot - * @package Parser */ class DateParser { /** - * Timezone used to parse feed dates + * Timezone used to parse feed dates. * - * @access public * @var string */ public $timezone = 'UTC'; /** - * Supported formats [ 'format' => length ] + * Supported formats [ 'format' => length ]. * - * @access public * @var array */ public $formats = array( @@ -56,10 +53,10 @@ class DateParser ); /** - * Try to parse all date format for broken feeds + * Try to parse all date format for broken feeds. + * + * @param string $value Original date format * - * @access public - * @param string $value Original date format * @return DateTime */ public function getDateTime($value) @@ -67,7 +64,6 @@ class DateParser $value = trim($value); foreach ($this->formats as $format => $length) { - $truncated_value = $value; if ($length !== null) { $truncated_value = substr($truncated_value, 0, $length); @@ -83,19 +79,18 @@ class DateParser } /** - * Get a valid date from a given format + * Get a valid date from a given format. * - * @access public - * @param string $format Date format - * @param string $value Original date value - * @return DateTime|boolean + * @param string $format Date format + * @param string $value Original date value + * + * @return DateTime|bool */ public function getValidDate($format, $value) { $date = DateTime::createFromFormat($format, $value, new DateTimeZone($this->timezone)); if ($date !== false) { - $errors = DateTime::getLastErrors(); if ($errors['error_count'] === 0 && $errors['warning_count'] === 0) { @@ -107,9 +102,8 @@ class DateParser } /** - * Get the current datetime + * Get the current datetime. * - * @access public * @return DateTime */ public function getCurrentDateTime() diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Feed.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Feed.php index 93831e7..bf2bacf 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Feed.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Feed.php @@ -3,98 +3,84 @@ namespace PicoFeed\Parser; /** - * Feed + * Feed. * * @author Frederic Guillot - * @package Parser */ class Feed { /** - * Feed items + * Feed items. * - * @access public * @var array */ public $items = array(); /** - * Feed id + * Feed id. * - * @access public * @var string */ public $id = ''; /** - * Feed title + * Feed title. * - * @access public * @var string */ public $title = ''; /** - * Feed description + * Feed description. * - * @access public * @var string */ public $description = ''; /** - * Feed url + * Feed url. * - * @access public * @var string */ public $feed_url = ''; /** - * Site url + * Site url. * - * @access public * @var string */ public $site_url = ''; /** - * Feed date + * Feed date. * - * @access public * @var \DateTime */ public $date = null; /** - * Feed language + * Feed language. * - * @access public * @var string */ public $language = ''; /** - * Feed logo URL + * Feed logo URL. * - * @access public * @var string */ public $logo = ''; /** - * Feed icon URL + * Feed icon URL. * - * @access public * @var string */ public $icon = ''; /** - * Return feed information - * - * @access public - * $return string + * Return feed information. */ public function __toString() { @@ -117,10 +103,7 @@ class Feed } /** - * Get title - * - * @access public - * $return string + * Get title. */ public function getTitle() { @@ -128,10 +111,7 @@ class Feed } /** - * Get description - * - * @access public - * $return string + * Get description. */ public function getDescription() { @@ -139,10 +119,7 @@ class Feed } /** - * Get the logo url - * - * @access public - * $return string + * Get the logo url. */ public function getLogo() { @@ -150,10 +127,7 @@ class Feed } /** - * Get the icon url - * - * @access public - * $return string + * Get the icon url. */ public function getIcon() { @@ -161,10 +135,7 @@ class Feed } /** - * Get feed url - * - * @access public - * $return string + * Get feed url. */ public function getFeedUrl() { @@ -172,10 +143,7 @@ class Feed } /** - * Get site url - * - * @access public - * $return string + * Get site url. */ public function getSiteUrl() { @@ -183,10 +151,7 @@ class Feed } /** - * Get date - * - * @access public - * $return integer + * Get date. */ public function getDate() { @@ -194,10 +159,7 @@ class Feed } /** - * Get language - * - * @access public - * $return string + * Get language. */ public function getLanguage() { @@ -205,10 +167,7 @@ class Feed } /** - * Get id - * - * @access public - * $return string + * Get id. */ public function getId() { @@ -216,10 +175,7 @@ class Feed } /** - * Get feed items - * - * @access public - * $return array + * Get feed items. */ public function getItems() { @@ -227,9 +183,8 @@ class Feed } /** - * Return true if the feed is "Right to Left" + * Return true if the feed is "Right to Left". * - * @access public * @return bool */ public function isRTL() diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Item.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Item.php index c9dff5a..22d7c59 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Item.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Item.php @@ -3,17 +3,15 @@ namespace PicoFeed\Parser; /** - * Feed Item + * Feed Item. * * @author Frederic Guillot - * @package Parser */ class Item { /** - * List of known RTL languages + * List of known RTL languages. * - * @access public * @var public */ public $rtl = array( @@ -28,100 +26,89 @@ class Item ); /** - * Item id + * Item id. * - * @access public * @var string */ public $id = ''; /** - * Item title + * Item title. * - * @access public * @var string */ public $title = ''; /** - * Item url + * Item url. * - * @access public * @var string */ public $url = ''; /** - * Item author + * Item author. * - * @access public * @var string */ - public $author= ''; + public $author = ''; /** - * Item date + * Item date. * - * @access public * @var \DateTime */ public $date = null; /** - * Item content + * Item content. * - * @access public * @var string */ public $content = ''; /** - * Item enclosure url + * Item enclosure url. * - * @access public * @var string */ public $enclosure_url = ''; /** - * Item enclusure type + * Item enclusure type. * - * @access public * @var string */ public $enclosure_type = ''; /** - * Item language + * Item language. * - * @access public * @var string */ public $language = ''; /** - * Raw XML + * Raw XML. * - * @access public * @var \SimpleXMLElement */ public $xml; /** - * List of namespaces + * List of namespaces. * - * @access public * @var array */ public $namespaces = array(); /** - * Get specific XML tag or attribute value + * Get specific XML tag or attribute value. * - * @access public - * @param string $tag Tag name (examples: guid, media:content) - * @param string $attribute Tag attribute - * @return array|false Tag values or error + * @param string $tag Tag name (examples: guid, media:content) + * @param string $attribute Tag attribute + * + * @return array|false Tag values or error */ public function getTag($tag, $attribute = '') { @@ -142,10 +129,7 @@ class Item } /** - * Return item information - * - * @access public - * $return string + * Return item information. */ public function __toString() { @@ -163,10 +147,7 @@ class Item } /** - * Get title - * - * @access public - * $return string + * Get title. */ public function getTitle() { @@ -174,10 +155,7 @@ class Item } /** - * Get url - * - * @access public - * $return string + * Get url. */ public function getUrl() { @@ -185,10 +163,7 @@ class Item } /** - * Get id - * - * @access public - * $return string + * Get id. */ public function getId() { @@ -196,10 +171,7 @@ class Item } /** - * Get date - * - * @access public - * $return \DateTime + * Get date. */ public function getDate() { @@ -207,10 +179,7 @@ class Item } /** - * Get content - * - * @access public - * $return string + * Get content. */ public function getContent() { @@ -218,10 +187,7 @@ class Item } /** - * Get enclosure url - * - * @access public - * $return string + * Get enclosure url. */ public function getEnclosureUrl() { @@ -229,10 +195,7 @@ class Item } /** - * Get enclosure type - * - * @access public - * $return string + * Get enclosure type. */ public function getEnclosureType() { @@ -240,10 +203,7 @@ class Item } /** - * Get language - * - * @access public - * $return string + * Get language. */ public function getLanguage() { @@ -251,10 +211,7 @@ class Item } /** - * Get author - * - * @access public - * $return string + * Get author. */ public function getAuthor() { @@ -262,9 +219,8 @@ class Item } /** - * Return true if the item is "Right to Left" + * Return true if the item is "Right to Left". * - * @access public * @return bool */ public function isRTL() diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/MalformedXmlException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/MalformedXmlException.php index 8464e9c..05b0387 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/MalformedXmlException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/MalformedXmlException.php @@ -3,11 +3,10 @@ namespace PicoFeed\Parser; /** - * MalformedXmlException Exception + * MalformedXmlException Exception. * * @author Frederic Guillot - * @package Parser */ class MalformedXmlException extends ParserException { -} \ No newline at end of file +} diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Parser.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Parser.php index 918cdef..5130b68 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Parser.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Parser.php @@ -10,112 +10,99 @@ use PicoFeed\Logging\Logger; use PicoFeed\Scraper\Scraper; /** - * Base parser class + * Base parser class. * * @author Frederic Guillot - * @package Parser */ abstract class Parser { /** - * Config object + * Config object. * - * @access private * @var \PicoFeed\Config\Config */ private $config; /** - * DateParser object + * DateParser object. * - * @access protected * @var \PicoFeed\Parser\DateParser */ protected $date; /** - * Hash algorithm used to generate item id, any value supported by PHP, see hash_algos() + * Hash algorithm used to generate item id, any value supported by PHP, see hash_algos(). * - * @access private * @var string */ private $hash_algo = 'sha256'; /** - * Feed content (XML data) + * Feed content (XML data). * - * @access protected * @var string */ protected $content = ''; /** - * Fallback url + * Fallback url. * - * @access protected * @var string */ protected $fallback_url = ''; /** - * XML namespaces supported by parser + * XML namespaces supported by parser. * - * @access protected * @var array */ protected $namespaces = array(); /** - * XML namespaces used in document + * XML namespaces used in document. * - * @access protected * @var array */ protected $used_namespaces = array(); /** - * Enable the content filtering + * Enable the content filtering. * - * @access private * @var bool */ private $enable_filter = true; /** - * Enable the content grabber + * Enable the content grabber. * - * @access private * @var bool */ private $enable_grabber = false; /** - * Enable the content grabber on all pages + * Enable the content grabber on all pages. * - * @access private * @var bool */ private $grabber_needs_rule_file = false; /** - * Ignore those urls for the content scraper + * Ignore those urls for the content scraper. * - * @access private * @var array */ private $grabber_ignore_urls = array(); /** - * Constructor + * Constructor. * - * @access public - * @param string $content Feed content - * @param string $http_encoding HTTP encoding (headers) - * @param string $fallback_url Fallback url when the feed provide relative or broken url + * @param string $content Feed content + * @param string $http_encoding HTTP encoding (headers) + * @param string $fallback_url Fallback url when the feed provide relative or broken url */ public function __construct($content, $http_encoding = '', $fallback_url = '') { - $this->date = new DateParser; + $this->date = new DateParser(); $this->fallback_url = $fallback_url; $xml_encoding = XmlParser::getEncodingFromXmlTag($content); @@ -128,9 +115,8 @@ abstract class Parser } /** - * Parse the document + * Parse the document. * - * @access public * @return \PicoFeed\Parser\Feed */ public function execute() @@ -154,7 +140,7 @@ abstract class Parser $this->used_namespaces = $xml->getNamespaces(true); $xml = $this->registerSupportedNamespaces($xml); - $feed = new Feed; + $feed = new Feed(); $this->findFeedUrl($xml, $feed); $this->checkFeedUrl($feed); @@ -171,10 +157,9 @@ abstract class Parser $this->findFeedIcon($xml, $feed); foreach ($this->getItemsTree($xml) as $entry) { - $entry = $this->registerSupportedNamespaces($entry); - $item = new Item; + $item = new Item(); $item->xml = $entry; $item->namespaces = $this->used_namespaces; @@ -206,43 +191,38 @@ abstract class Parser } /** - * Check if the feed url is correct + * Check if the feed url is correct. * - * @access public - * @param Feed $feed Feed object + * @param Feed $feed Feed object */ public function checkFeedUrl(Feed $feed) { if ($feed->getFeedUrl() === '') { $feed->feed_url = $this->fallback_url; - } - else { + } else { $feed->feed_url = Url::resolve($feed->getFeedUrl(), $this->fallback_url); } } /** - * Check if the site url is correct + * Check if the site url is correct. * - * @access public - * @param Feed $feed Feed object + * @param Feed $feed Feed object */ public function checkSiteUrl(Feed $feed) { if ($feed->getSiteUrl() === '') { $feed->site_url = Url::base($feed->getFeedUrl()); - } - else { + } else { $feed->site_url = Url::resolve($feed->getSiteUrl(), $this->fallback_url); } } /** - * Check if the item url is correct + * Check if the item url is correct. * - * @access public - * @param Feed $feed Feed object - * @param Item $item Item object + * @param Feed $feed Feed object + * @param Item $item Item object */ public function checkItemUrl(Feed $feed, Item $item) { @@ -250,15 +230,13 @@ abstract class Parser } /** - * Fetch item content with the content grabber + * Fetch item content with the content grabber. * - * @access public - * @param Item $item Item object + * @param Item $item Item object */ public function scrapWebsite(Item $item) { - if ($this->enable_grabber && ! in_array($item->getUrl(), $this->grabber_ignore_urls)) { - + if ($this->enable_grabber && !in_array($item->getUrl(), $this->grabber_ignore_urls)) { $grabber = new Scraper($this->config); $grabber->setUrl($item->getUrl()); @@ -275,11 +253,10 @@ abstract class Parser } /** - * Filter HTML for entry content + * Filter HTML for entry content. * - * @access public - * @param Feed $feed Feed object - * @param Item $item Item object + * @param Feed $feed Feed object + * @param Item $item Item object */ public function filterItemContent(Feed $feed, Item $item) { @@ -287,16 +264,14 @@ abstract class Parser $filter = Filter::html($item->getContent(), $feed->getSiteUrl()); $filter->setConfig($this->config); $item->content = $filter->execute(); - } - else { + } else { Logger::setMessage(get_called_class().': Content filtering disabled'); } } /** - * Generate a unique id for an entry (hash all arguments) + * Generate a unique id for an entry (hash all arguments). * - * @access public * @return string */ public function generateId() @@ -305,11 +280,12 @@ abstract class Parser } /** - * Return true if the given language is "Right to Left" + * Return true if the given language is "Right to Left". * * @static - * @access public - * @param string $language Language: fr-FR, en-US + * + * @param string $language Language: fr-FR, en-US + * * @return bool */ public static function isLanguageRTL($language) @@ -337,24 +313,26 @@ abstract class Parser } /** - * Set Hash algorithm used for id generation + * Set Hash algorithm used for id generation. + * + * @param string $algo Algorithm name * - * @access public - * @param string $algo Algorithm name * @return \PicoFeed\Parser\Parser */ public function setHashAlgo($algo) { $this->hash_algo = $algo ?: $this->hash_algo; + return $this; } /** - * Set a different timezone + * Set a different timezone. * * @see http://php.net/manual/en/timezones.php - * @access public - * @param string $timezone Timezone + * + * @param string $timezone Timezone + * * @return \PicoFeed\Parser\Parser */ public function setTimezone($timezone) @@ -367,22 +345,22 @@ abstract class Parser } /** - * Set config object + * Set config object. + * + * @param \PicoFeed\Config\Config $config Config instance * - * @access public - * @param \PicoFeed\Config\Config $config Config instance * @return \PicoFeed\Parser\Parser */ public function setConfig($config) { $this->config = $config; + return $this; } /** - * Enable the content grabber + * Enable the content grabber. * - * @access public * @return \PicoFeed\Parser\Parser */ public function disableContentFiltering() @@ -391,10 +369,9 @@ abstract class Parser } /** - * Return true if the content filtering is enabled + * Return true if the content filtering is enabled. * - * @access public - * @return boolean + * @return bool */ public function isFilteringEnabled() { @@ -406,11 +383,11 @@ abstract class Parser } /** - * Enable the content grabber + * Enable the content grabber. * - * @access public * @param bool $needs_rule_file true if only pages with rule files should be - * scraped + * scraped + * * @return \PicoFeed\Parser\Parser */ public function enableContentGrabber($needs_rule_file = false) @@ -420,10 +397,10 @@ abstract class Parser } /** - * Set ignored URLs for the content grabber + * Set ignored URLs for the content grabber. + * + * @param array $urls URLs * - * @access public - * @param array $urls URLs * @return \PicoFeed\Parser\Parser */ public function setGrabberIgnoreUrls(array $urls) @@ -432,10 +409,10 @@ abstract class Parser } /** - * Register all supported namespaces to be used within an xpath query + * Register all supported namespaces to be used within an xpath query. + * + * @param SimpleXMLElement $xml Feed xml * - * @access public - * @param SimpleXMLElement $xml Feed xml * @return SimpleXMLElement */ public function registerSupportedNamespaces(SimpleXMLElement $xml) @@ -448,169 +425,152 @@ abstract class Parser } /** - * Find the feed url + * Find the feed url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedUrl(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedUrl(SimpleXMLElement $xml, Feed $feed); /** - * Find the site url + * Find the site url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findSiteUrl(SimpleXMLElement $xml, Feed $feed); + abstract public function findSiteUrl(SimpleXMLElement $xml, Feed $feed); /** - * Find the feed title + * Find the feed title. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedTitle(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedTitle(SimpleXMLElement $xml, Feed $feed); /** - * Find the feed description + * Find the feed description. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedDescription(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedDescription(SimpleXMLElement $xml, Feed $feed); /** - * Find the feed language + * Find the feed language. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedLanguage(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedLanguage(SimpleXMLElement $xml, Feed $feed); /** - * Find the feed id + * Find the feed id. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedId(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedId(SimpleXMLElement $xml, Feed $feed); /** - * Find the feed date + * Find the feed date. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedDate(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedDate(SimpleXMLElement $xml, Feed $feed); /** - * Find the feed logo url + * Find the feed logo url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedLogo(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedLogo(SimpleXMLElement $xml, Feed $feed); /** - * Find the feed icon + * Find the feed icon. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findFeedIcon(SimpleXMLElement $xml, Feed $feed); + abstract public function findFeedIcon(SimpleXMLElement $xml, Feed $feed); /** - * Get the path to the items XML tree + * Get the path to the items XML tree. + * + * @param SimpleXMLElement $xml Feed xml * - * @access public - * @param SimpleXMLElement $xml Feed xml * @return SimpleXMLElement */ - public abstract function getItemsTree(SimpleXMLElement $xml); + abstract public function getItemsTree(SimpleXMLElement $xml); /** - * Find the item author + * Find the item author. * - * @access public - * @param SimpleXMLElement $xml Feed - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $xml Feed + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ - public abstract function findItemAuthor(SimpleXMLElement $xml, SimpleXMLElement $entry, Item $item); + abstract public function findItemAuthor(SimpleXMLElement $xml, SimpleXMLElement $entry, Item $item); /** - * Find the item URL + * Find the item URL. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ - public abstract function findItemUrl(SimpleXMLElement $entry, Item $item); + abstract public function findItemUrl(SimpleXMLElement $entry, Item $item); /** - * Find the item title + * Find the item title. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ - public abstract function findItemTitle(SimpleXMLElement $entry, Item $item); + abstract public function findItemTitle(SimpleXMLElement $entry, Item $item); /** - * Genereate the item id + * Genereate the item id. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findItemId(SimpleXMLElement $entry, Item $item, Feed $feed); + abstract public function findItemId(SimpleXMLElement $entry, Item $item, Feed $feed); /** - * Find the item date + * Find the item date. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findItemDate(SimpleXMLElement $entry, Item $item, Feed $feed); + abstract public function findItemDate(SimpleXMLElement $entry, Item $item, Feed $feed); /** - * Find the item content + * Find the item content. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ - public abstract function findItemContent(SimpleXMLElement $entry, Item $item); + abstract public function findItemContent(SimpleXMLElement $entry, Item $item); /** - * Find the item enclosure + * Find the item enclosure. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findItemEnclosure(SimpleXMLElement $entry, Item $item, Feed $feed); + abstract public function findItemEnclosure(SimpleXMLElement $entry, Item $item, Feed $feed); /** - * Find the item language + * Find the item language. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ - public abstract function findItemLanguage(SimpleXMLElement $entry, Item $item, Feed $feed); + abstract public function findItemLanguage(SimpleXMLElement $entry, Item $item, Feed $feed); } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/ParserException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/ParserException.php index 40e48ab..cfd102b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/ParserException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/ParserException.php @@ -4,13 +4,11 @@ namespace PicoFeed\Parser; use PicoFeed\PicoFeedException; - /** - * ParserException Exception + * ParserException Exception. * * @author Frederic Guillot - * @package Parser */ abstract class ParserException extends PicoFeedException { -} \ No newline at end of file +} diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss10.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss10.php index 32fc54e..dd2aa7a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss10.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss10.php @@ -6,15 +6,14 @@ use SimpleXMLElement; use PicoFeed\Filter\Filter; /** - * RSS 1.0 parser + * RSS 1.0 parser. * * @author Frederic Guillot - * @package Parser */ class Rss10 extends Parser { /** - * Supported namespaces + * Supported namespaces. */ protected $namespaces = array( 'rss' => 'http://purl.org/rss/1.0/', @@ -24,10 +23,10 @@ class Rss10 extends Parser ); /** - * Get the path to the items XML tree + * Get the path to the items XML tree. + * + * @param SimpleXMLElement $xml Feed xml * - * @access public - * @param SimpleXMLElement $xml Feed xml * @return SimpleXMLElement */ public function getItemsTree(SimpleXMLElement $xml) @@ -37,11 +36,10 @@ class Rss10 extends Parser } /** - * Find the feed url + * Find the feed url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedUrl(SimpleXMLElement $xml, Feed $feed) { @@ -49,11 +47,10 @@ class Rss10 extends Parser } /** - * Find the site url + * Find the site url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findSiteUrl(SimpleXMLElement $xml, Feed $feed) { @@ -64,11 +61,10 @@ class Rss10 extends Parser } /** - * Find the feed description + * Find the feed description. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedDescription(SimpleXMLElement $xml, Feed $feed) { @@ -79,11 +75,10 @@ class Rss10 extends Parser } /** - * Find the feed logo url + * Find the feed logo url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedLogo(SimpleXMLElement $xml, Feed $feed) { @@ -94,11 +89,10 @@ class Rss10 extends Parser } /** - * Find the feed icon + * Find the feed icon. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedIcon(SimpleXMLElement $xml, Feed $feed) { @@ -106,11 +100,10 @@ class Rss10 extends Parser } /** - * Find the feed title + * Find the feed title. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedTitle(SimpleXMLElement $xml, Feed $feed) { @@ -121,11 +114,10 @@ class Rss10 extends Parser } /** - * Find the feed language + * Find the feed language. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedLanguage(SimpleXMLElement $xml, Feed $feed) { @@ -136,11 +128,10 @@ class Rss10 extends Parser } /** - * Find the feed id + * Find the feed id. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedId(SimpleXMLElement $xml, Feed $feed) { @@ -148,11 +139,10 @@ class Rss10 extends Parser } /** - * Find the feed date + * Find the feed date. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedDate(SimpleXMLElement $xml, Feed $feed) { @@ -163,12 +153,11 @@ class Rss10 extends Parser } /** - * Find the item date + * Find the item date. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemDate(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -178,11 +167,10 @@ class Rss10 extends Parser } /** - * Find the item title + * Find the item title. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemTitle(SimpleXMLElement $entry, Item $item) { @@ -193,12 +181,11 @@ class Rss10 extends Parser } /** - * Find the item author + * Find the item author. * - * @access public - * @param SimpleXMLElement $xml Feed - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $xml Feed + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemAuthor(SimpleXMLElement $xml, SimpleXMLElement $entry, Item $item) { @@ -210,11 +197,10 @@ class Rss10 extends Parser } /** - * Find the item content + * Find the item content. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemContent(SimpleXMLElement $entry, Item $item) { @@ -229,11 +215,10 @@ class Rss10 extends Parser } /** - * Find the item URL + * Find the item URL. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemUrl(SimpleXMLElement $entry, Item $item) { @@ -245,12 +230,11 @@ class Rss10 extends Parser } /** - * Genereate the item id + * Genereate the item id. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemId(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -260,24 +244,22 @@ class Rss10 extends Parser } /** - * Find the item enclosure + * Find the item enclosure. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemEnclosure(SimpleXMLElement $entry, Item $item, Feed $feed) { } /** - * Find the item language + * Find the item language. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemLanguage(SimpleXMLElement $entry, Item $item, Feed $feed) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss20.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss20.php index f4c5ae3..005691f 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss20.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss20.php @@ -7,28 +7,27 @@ use PicoFeed\Filter\Filter; use PicoFeed\Client\Url; /** - * RSS 2.0 Parser + * RSS 2.0 Parser. * * @author Frederic Guillot - * @package Parser */ class Rss20 extends Parser { /** - * Supported namespaces + * Supported namespaces. */ protected $namespaces = array( 'dc' => 'http://purl.org/dc/elements/1.1/', 'content' => 'http://purl.org/rss/1.0/modules/content/', 'feedburner' => 'http://rssnamespace.org/feedburner/ext/1.0', - 'atom' => 'http://www.w3.org/2005/Atom' + 'atom' => 'http://www.w3.org/2005/Atom', ); /** - * Get the path to the items XML tree + * Get the path to the items XML tree. + * + * @param SimpleXMLElement $xml Feed xml * - * @access public - * @param SimpleXMLElement $xml Feed xml * @return SimpleXMLElement */ public function getItemsTree(SimpleXMLElement $xml) @@ -37,11 +36,10 @@ class Rss20 extends Parser } /** - * Find the feed url + * Find the feed url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedUrl(SimpleXMLElement $xml, Feed $feed) { @@ -49,11 +47,10 @@ class Rss20 extends Parser } /** - * Find the site url + * Find the site url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findSiteUrl(SimpleXMLElement $xml, Feed $feed) { @@ -62,11 +59,10 @@ class Rss20 extends Parser } /** - * Find the feed description + * Find the feed description. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedDescription(SimpleXMLElement $xml, Feed $feed) { @@ -75,11 +71,10 @@ class Rss20 extends Parser } /** - * Find the feed logo url + * Find the feed logo url. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedLogo(SimpleXMLElement $xml, Feed $feed) { @@ -88,11 +83,10 @@ class Rss20 extends Parser } /** - * Find the feed icon + * Find the feed icon. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedIcon(SimpleXMLElement $xml, Feed $feed) { @@ -100,11 +94,10 @@ class Rss20 extends Parser } /** - * Find the feed title + * Find the feed title. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedTitle(SimpleXMLElement $xml, Feed $feed) { @@ -113,11 +106,10 @@ class Rss20 extends Parser } /** - * Find the feed language + * Find the feed language. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedLanguage(SimpleXMLElement $xml, Feed $feed) { @@ -126,11 +118,10 @@ class Rss20 extends Parser } /** - * Find the feed id + * Find the feed id. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedId(SimpleXMLElement $xml, Feed $feed) { @@ -138,38 +129,34 @@ class Rss20 extends Parser } /** - * Find the feed date + * Find the feed date. * - * @access public - * @param SimpleXMLElement $xml Feed xml - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $xml Feed xml + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findFeedDate(SimpleXMLElement $xml, Feed $feed) { $publish_date = XmlParser::getXPathResult($xml, 'channel/pubDate'); $update_date = XmlParser::getXPathResult($xml, 'channel/lastBuildDate'); - $published = ! empty($publish_date) ? $this->date->getDateTime((string) current($publish_date)) : null; - $updated = ! empty($update_date) ? $this->date->getDateTime((string) current($update_date)) : null; + $published = !empty($publish_date) ? $this->date->getDateTime((string) current($publish_date)) : null; + $updated = !empty($update_date) ? $this->date->getDateTime((string) current($update_date)) : null; if ($published === null && $updated === null) { $feed->date = $this->date->getCurrentDateTime(); // We use the current date if there is no date for the feed - } - else if ($published !== null && $updated !== null) { + } elseif ($published !== null && $updated !== null) { $feed->date = max($published, $updated); // We use the most recent date between published and updated - } - else { + } else { $feed->date = $updated ?: $published; } } /** - * Find the item date + * Find the item date. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemDate(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -179,11 +166,10 @@ class Rss20 extends Parser } /** - * Find the item title + * Find the item title. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemTitle(SimpleXMLElement $entry, Item $item) { @@ -192,12 +178,11 @@ class Rss20 extends Parser } /** - * Find the item author + * Find the item author. * - * @access public - * @param SimpleXMLElement $xml Feed - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $xml Feed + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemAuthor(SimpleXMLElement $xml, SimpleXMLElement $entry, Item $item) { @@ -210,11 +195,10 @@ class Rss20 extends Parser } /** - * Find the item content + * Find the item content. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemContent(SimpleXMLElement $entry, Item $item) { @@ -228,11 +212,10 @@ class Rss20 extends Parser } /** - * Find the item URL + * Find the item URL. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object */ public function findItemUrl(SimpleXMLElement $entry, Item $item) { @@ -240,10 +223,9 @@ class Rss20 extends Parser ?: XmlParser::getXPathResult($entry, 'link') ?: XmlParser::getXPathResult($entry, 'atom:link/@href', $this->namespaces); - if (! empty($link)) { + if (!empty($link)) { $item->url = trim((string) current($link)); - } - else { + } else { $link = XmlParser::getXPathResult($entry, 'guid'); $link = trim((string) current($link)); @@ -254,12 +236,11 @@ class Rss20 extends Parser } /** - * Genereate the item id + * Genereate the item id. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemId(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -267,8 +248,7 @@ class Rss20 extends Parser if ($id) { $item->id = $this->generateId($id); - } - else { + } else { $item->id = $this->generateId( $item->getTitle(), $item->getUrl(), $item->getContent() ); @@ -276,12 +256,11 @@ class Rss20 extends Parser } /** - * Find the item enclosure + * Find the item enclosure. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemEnclosure(SimpleXMLElement $entry, Item $item, Feed $feed) { @@ -291,19 +270,17 @@ class Rss20 extends Parser $enclosure_type = XmlParser::getXPathResult($entry, 'enclosure/@type'); - $item->enclosure_url = Url::resolve((string) current($enclosure_url), $feed->getSiteUrl()); $item->enclosure_type = (string) current($enclosure_type); } } /** - * Find the item language + * Find the item language. * - * @access public - * @param SimpleXMLElement $entry Feed item - * @param \PicoFeed\Parser\Item $item Item object - * @param \PicoFeed\Parser\Feed $feed Feed object + * @param SimpleXMLElement $entry Feed item + * @param \PicoFeed\Parser\Item $item Item object + * @param \PicoFeed\Parser\Feed $feed Feed object */ public function findItemLanguage(SimpleXMLElement $entry, Item $item, Feed $feed) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss91.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss91.php index 69f1753..fe195e8 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss91.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss91.php @@ -3,10 +3,9 @@ namespace PicoFeed\Parser; /** - * RSS 0.91 Parser + * RSS 0.91 Parser. * * @author Frederic Guillot - * @package Parser */ class Rss91 extends Rss20 { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss92.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss92.php index e808473..0999bc0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss92.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss92.php @@ -3,10 +3,9 @@ namespace PicoFeed\Parser; /** - * RSS 0.92 Parser + * RSS 0.92 Parser. * * @author Frederic Guillot - * @package Parser */ class Rss92 extends Rss20 { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php index 15cbe77..ea04a47 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php @@ -4,25 +4,24 @@ namespace PicoFeed\Parser; use Closure; use DomDocument; -use DOMXPath; use SimpleXmlElement; /** - * XML parser class + * XML parser class. * * Checks for XML eXternal Entity (XXE) and XML Entity Expansion (XEE) attacks on XML documents * * @author Frederic Guillot - * @package Parser */ class XmlParser { /** - * Get a SimpleXmlElement instance or return false + * Get a SimpleXmlElement instance or return false. * * @static - * @access public - * @param string $input XML content + * + * @param string $input XML content + * * @return mixed */ public static function getSimpleXml($input) @@ -30,10 +29,9 @@ class XmlParser $dom = self::getDomDocument($input); if ($dom !== false) { - $simplexml = simplexml_import_dom($dom); - if (! $simplexml instanceof SimpleXmlElement) { + if (!$simplexml instanceof SimpleXmlElement) { return false; } @@ -44,14 +42,14 @@ class XmlParser } /** - * Scan the input for XXE attacks + * Scan the input for XXE attacks. * - * @param string $input Unsafe input - * @param Closure $callback Callback called to build the dom. - * Must be an instance of DomDocument and receives the input as argument + * @param string $input Unsafe input + * @param Closure $callback Callback called to build the dom. + * Must be an instance of DomDocument and receives the input as argument * - * @return bool|DomDocument False if an XXE attack was discovered, - * otherwise the return of the callback + * @return bool|DomDocument False if an XXE attack was discovered, + * otherwise the return of the callback */ private static function scanInput($input, Closure $callback) { @@ -64,8 +62,7 @@ class XmlParser if (strpos($input, 'loadXml($in, LIBXML_NONET); + return $dom; }); @@ -118,30 +117,32 @@ class XmlParser } /** - * Load HTML document by using a DomDocument instance or return false on failure + * Load HTML document by using a DomDocument instance or return false on failure. * * @static - * @access public - * @param string $input XML content + * + * @param string $input XML content + * * @return \DOMDocument */ public static function getHtmlDocument($input) { if (empty($input)) { - return new DomDocument; + return new DomDocument(); } if (version_compare(PHP_VERSION, '5.4.0', '>=')) { $callback = function ($in) { - $dom = new DomDocument; + $dom = new DomDocument(); $dom->loadHTML($in, LIBXML_NONET); + return $dom; }; - } - else { + } else { $callback = function ($in) { - $dom = new DomDocument; + $dom = new DomDocument(); $dom->loadHTML($in); + return $dom; }; } @@ -150,32 +151,33 @@ class XmlParser } /** - * Convert a HTML document to XML + * Convert a HTML document to XML. * * @static - * @access public - * @param string $html HTML document + * + * @param string $html HTML document + * * @return string */ - public static function HtmlToXml($html) + public static function htmlToXml($html) { $dom = self::getHtmlDocument(''.$html); + return $dom->saveXML($dom->getElementsByTagName('body')->item(0)); } /** - * Get XML parser errors + * Get XML parser errors. * * @static - * @access public + * * @return string */ public static function getErrors() { $errors = array(); - foreach(libxml_get_errors() as $error) { - + foreach (libxml_get_errors() as $error) { $errors[] = sprintf('XML error: %s (Line: %d - Column: %d - Code: %d)', $error->message, $error->line, @@ -188,11 +190,12 @@ class XmlParser } /** - * Get the encoding from a xml tag + * Get the encoding from a xml tag. * * @static - * @access public - * @param string $data Input data + * + * @param string $data Input data + * * @return string */ public static function getEncodingFromXmlTag($data) @@ -200,7 +203,6 @@ class XmlParser $encoding = ''; if (strpos($data, '')); $data = str_replace("'", '"', $data); @@ -217,11 +219,12 @@ class XmlParser } /** - * Get the charset from a meta tag + * Get the charset from a meta tag. * * @static - * @access public - * @param string $data Input data + * + * @param string $data Input data + * * @return string */ public static function getEncodingFromMetaTag($data) @@ -236,14 +239,16 @@ class XmlParser } /** - * Rewrite XPath query to use namespace-uri and local-name derived from prefix + * Rewrite XPath query to use namespace-uri and local-name derived from prefix. + * + * @param string $query XPath query + * @param array $ns Prefix to namespace URI mapping * - * @param string $query XPath query - * @param array $ns Prefix to namespace URI mapping * @return string */ - public static function replaceXPathPrefixWithNamespaceURI($query, array $ns) { - return preg_replace_callback('/([A-Z0-9]+):([A-Z0-9]+)/iu', function($matches) use($ns) { + public static function replaceXPathPrefixWithNamespaceURI($query, array $ns) + { + return preg_replace_callback('/([A-Z0-9]+):([A-Z0-9]+)/iu', function ($matches) use ($ns) { // don't try to map the special prefix XML if (strtolower($matches[1]) === 'xml') { return $matches[0]; @@ -255,16 +260,17 @@ class XmlParser } /** - * Get the result elements of a XPath query + * Get the result elements of a XPath query. + * + * @param \SimpleXMLElement $xml XML element + * @param string $query XPath query + * @param array $ns Prefix to namespace URI mapping * - * @param \SimpleXMLElement $xml XML element - * @param string $query XPath query - * @param array $ns Prefix to namespace URI mapping * @return \SimpleXMLElement */ public static function getXPathResult(SimpleXMLElement $xml, $query, array $ns = array()) { - if (! empty($ns)) { + if (!empty($ns)) { $query = static::replaceXPathPrefixWithNamespaceURI($query, $ns); } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/PicoFeedException.php b/vendor/fguillot/picofeed/lib/PicoFeed/PicoFeedException.php index 11f8986..2de9e4b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/PicoFeedException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/PicoFeedException.php @@ -5,10 +5,9 @@ namespace PicoFeed; use Exception; /** - * PicoFeedException Exception + * PicoFeedException Exception. * * @author Frederic Guillot - * @package exception */ abstract class PicoFeedException extends Exception { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php index 6b26400..cab74b6 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php @@ -11,19 +11,17 @@ use PicoFeed\Logging\Logger; use PicoFeed\Parser\XmlParser; /** - * Favicon class + * Favicon class. * * https://en.wikipedia.org/wiki/Favicon * * @author Frederic Guillot - * @package Reader */ class Favicon { /** - * Valid types for favicon (supported by browsers) + * Valid types for favicon (supported by browsers). * - * @access private * @var array */ private $types = array( @@ -35,44 +33,39 @@ class Favicon ); /** - * Config class instance + * Config class instance. * - * @access private * @var \PicoFeed\Config\Config */ private $config; /** - * Icon binary content + * Icon binary content. * - * @access private * @var string */ private $content = ''; /** - * Icon content type + * Icon content type. * - * @access private * @var string */ private $content_type = ''; /** - * Constructor + * Constructor. * - * @access public - * @param \PicoFeed\Config\Config $config Config class instance + * @param \PicoFeed\Config\Config $config Config class instance */ public function __construct(Config $config = null) { - $this->config = $config ?: new Config; + $this->config = $config ?: new Config(); } /** - * Get the icon file content (available only after the download) + * Get the icon file content (available only after the download). * - * @access public * @return string */ public function getContent() @@ -81,9 +74,8 @@ class Favicon } /** - * Get the icon file type (available only after the download) + * Get the icon file type (available only after the download). * - * @access public * @return string */ public function getType() @@ -98,9 +90,8 @@ class Favicon } /** - * Get data URI (http://en.wikipedia.org/wiki/Data_URI_scheme) + * Get data URI (http://en.wikipedia.org/wiki/Data_URI_scheme). * - * @access public * @return string */ public function getDataUri() @@ -117,11 +108,11 @@ class Favicon } /** - * Download and check if a resource exists + * Download and check if a resource exists. * - * @access public - * @param string $url URL - * @return \PicoFeed\Client Client instance + * @param string $url URL + * + * @return \PicoFeed\Client Client instance */ public function download($url) { @@ -132,8 +123,7 @@ class Favicon try { $client->execute($url); - } - catch (ClientException $e) { + } catch (ClientException $e) { Logger::setMessage(get_called_class().' Download Failed => '.$e->getMessage()); } @@ -141,11 +131,11 @@ class Favicon } /** - * Check if a remote file exists + * Check if a remote file exists. * - * @access public - * @param string $url URL - * @return boolean + * @param string $url URL + * + * @return bool */ public function exists($url) { @@ -153,11 +143,11 @@ class Favicon } /** - * Get the icon link for a website + * Get the icon link for a website. + * + * @param string $website_link URL + * @param string $favicon_link optional URL * - * @access public - * @param string $website_link URL - * @param string $favicon_link optional URL * @return string */ public function find($website_link, $favicon_link = '') @@ -188,10 +178,10 @@ class Favicon } /** - * Extract the icon links from the HTML + * Extract the icon links from the HTML. + * + * @param string $html HTML * - * @access public - * @param string $html HTML * @return array */ public function extract($html) @@ -207,7 +197,7 @@ class Favicon $xpath = new DOMXpath($dom); $elements = $xpath->query("//link[contains(@rel, 'icon') and not(contains(@rel, 'apple'))]"); - for ($i = 0; $i < $elements->length; $i++) { + for ($i = 0; $i < $elements->length; ++$i) { $icons[] = $elements->item($i)->getAttribute('href'); } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php index ea3c4f2..cfe5171 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php @@ -10,17 +10,15 @@ use PicoFeed\Logging\Logger; use PicoFeed\Parser\XmlParser; /** - * Reader class + * Reader class. * * @author Frederic Guillot - * @package Reader */ class Reader { /** - * Feed formats for detection + * Feed formats for detection. * - * @access private * @var array */ private $formats = array( @@ -32,34 +30,32 @@ class Reader ); /** - * Config class instance + * Config class instance. * - * @access private * @var \PicoFeed\Config\Config */ private $config; /** - * Constructor + * Constructor. * - * @access public - * @param \PicoFeed\Config\Config $config Config class instance + * @param \PicoFeed\Config\Config $config Config class instance */ public function __construct(Config $config = null) { - $this->config = $config ?: new Config; + $this->config = $config ?: new Config(); Logger::setTimezone($this->config->getTimezone()); } /** - * Download a feed (no discovery) + * Download a feed (no discovery). + * + * @param string $url Feed url + * @param string $last_modified Last modified HTTP header + * @param string $etag Etag HTTP header + * @param string $username HTTP basic auth username + * @param string $password HTTP basic auth password * - * @access public - * @param string $url Feed url - * @param string $last_modified Last modified HTTP header - * @param string $etag Etag HTTP header - * @param string $username HTTP basic auth username - * @param string $password HTTP basic auth password * @return \PicoFeed\Client\Client */ public function download($url, $last_modified = '', $etag = '', $username = '', $password = '') @@ -76,14 +72,14 @@ class Reader } /** - * Discover and download a feed + * Discover and download a feed. + * + * @param string $url Feed or website url + * @param string $last_modified Last modified HTTP header + * @param string $etag Etag HTTP header + * @param string $username HTTP basic auth username + * @param string $password HTTP basic auth password * - * @access public - * @param string $url Feed or website url - * @param string $last_modified Last modified HTTP header - * @param string $etag Etag HTTP header - * @param string $username HTTP basic auth username - * @param string $password HTTP basic auth password * @return \PicoFeed\Client\Client */ public function discover($url, $last_modified = '', $etag = '', $username = '', $password = '') @@ -91,7 +87,7 @@ class Reader $client = $this->download($url, $last_modified, $etag, $username, $password); // It's already a feed or the feed was not modified - if (! $client->isModified() || $this->detectFormat($client->getContent())) { + if (!$client->isModified() || $this->detectFormat($client->getContent())) { return $client; } @@ -106,12 +102,12 @@ class Reader } /** - * Find feed urls inside a HTML document + * Find feed urls inside a HTML document. * - * @access public - * @param string $url Website url - * @param string $html HTML content - * @return array List of feed links + * @param string $url Website url + * @param string $html HTML content + * + * @return array List of feed links */ public function find($url, $html) { @@ -127,15 +123,12 @@ class Reader ); foreach ($queries as $query) { - $nodes = $xpath->query($query); foreach ($nodes as $node) { - $link = $node->getAttribute('href'); - if (! empty($link)) { - + if (!empty($link)) { $feedUrl = new Url($link); $siteUrl = new Url($url); @@ -150,12 +143,12 @@ class Reader } /** - * Get a parser instance + * Get a parser instance. + * + * @param string $url Site url + * @param string $content Feed content + * @param string $encoding HTTP encoding * - * @access public - * @param string $url Site url - * @param string $content Feed content - * @param string $encoding HTTP encoding * @return \PicoFeed\Parser\Parser */ public function getParser($url, $content, $encoding) @@ -177,10 +170,10 @@ class Reader } /** - * Detect the feed format + * Detect the feed format. + * + * @param string $content Feed content * - * @access public - * @param string $content Feed content * @return string */ public function detectFormat($content) @@ -200,16 +193,15 @@ class Reader } /** - * Add the prefix "http://" if the end-user just enter a domain name + * Add the prefix "http://" if the end-user just enter a domain name. * - * @access public - * @param string $url Url + * @param string $url Url * @retunr string */ public function prependScheme($url) { - if (! preg_match('%^https?://%', $url)) { - $url = 'http://' . $url; + if (!preg_match('%^https?://%', $url)) { + $url = 'http://'.$url; } return $url; diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/ReaderException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/ReaderException.php index a8e973f..4f03dbe 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/ReaderException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/ReaderException.php @@ -4,12 +4,10 @@ namespace PicoFeed\Reader; use PicoFeed\PicoFeedException; - /** - * ReaderException Exception + * ReaderException Exception. * * @author Frederic Guillot - * @package Reader */ abstract class ReaderException extends PicoFeedException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/SubscriptionNotFoundException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/SubscriptionNotFoundException.php index 1121fdf..dd77847 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/SubscriptionNotFoundException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/SubscriptionNotFoundException.php @@ -3,10 +3,9 @@ namespace PicoFeed\Reader; /** - * SubscriptionNotFoundException Exception + * SubscriptionNotFoundException Exception. * * @author Frederic Guillot - * @package Reader */ class SubscriptionNotFoundException extends ReaderException { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/UnsupportedFeedFormatException.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/UnsupportedFeedFormatException.php index 7d4df08..4aa8d87 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/UnsupportedFeedFormatException.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/UnsupportedFeedFormatException.php @@ -3,11 +3,10 @@ namespace PicoFeed\Reader; /** - * UnsupportedFeedFormatException Exception + * UnsupportedFeedFormatException Exception. * * @author Frederic Guillot - * @package Reader */ class UnsupportedFeedFormatException extends ReaderException { -} \ No newline at end of file +} diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.blog.lemonde.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.blog.lemonde.fr.php index eec5e12..773616c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.blog.lemonde.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.blog.lemonde.fr.php @@ -11,4 +11,4 @@ return array( ), ) ) -); \ No newline at end of file +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.igen.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.igen.fr.php index e2d1cc6..f2028f4 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.igen.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.igen.fr.php @@ -10,4 +10,4 @@ return array( ), ) ) -); \ No newline at end of file +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.slate.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.slate.com.php index 164ded6..a795bca 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.slate.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.slate.com.php @@ -17,4 +17,4 @@ return array( ) ) ) -); \ No newline at end of file +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.theguardian.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.theguardian.com.php index 4a1e8d2..e0d6f3f 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.theguardian.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.theguardian.com.php @@ -11,4 +11,4 @@ return array( ), ) ) -); \ No newline at end of file +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wired.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wired.com.php index 5ae4c69..3e40e40 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wired.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wired.com.php @@ -22,7 +22,7 @@ return array( '//img[contains(@src, "1x1")]', '//a[contains(@href, "creativecommons")]', '//a[@href="#start-of-content"]', - '//ul[@id="article-tags"], + '//ul[@id="article-tags"]', ), ) ) diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wsj.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wsj.com.php index 752e8c2..f6e6cc1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wsj.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wsj.com.php @@ -12,4 +12,4 @@ return array( ) ) ) -); \ No newline at end of file +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/01net.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/01net.com.php index 9c64491..2f11fd0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/01net.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/01net.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -11,8 +12,8 @@ return array( '//*[contains(@class, "article_navigation")]', '//h1', '//*[contains(@class, "article_toolbarMain")]', - '//*[contains(@class, "article_imagehaute_box")]' - ) - ) - ) -); \ No newline at end of file + '//*[contains(@class, "article_imagehaute_box")]', + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/abstrusegoose.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/abstrusegoose.com.php index 1d103c2..412d6a0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/abstrusegoose.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/abstrusegoose.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%alt="(.+)" title="(.+)" */>%' => "/>
$1
$2" - ) - ) + '%alt="(.+)" title="(.+)" */>%' => '/>
$1
$2', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/alainonline.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/alainonline.net.php index 2faf0c4..48a571a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/alainonline.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/alainonline.net.php @@ -1,14 +1,15 @@ array( '%.*%' => array( 'test_url' => 'http://www.alainonline.net/news_details.php?lang=arabic&sid=18907', 'body' => array( - '//div[@class="news_details"]' + '//div[@class="news_details"]', ), 'strip' => array( '//div[@class="news_details"]/div/div[last()]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php index 1050756..f369d43 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,8 +14,8 @@ return array( '//ul', '//a[@target="_self"]', '//div[@data-embed-type="Brightcove"]', - '//div[@class="QuoteContainer"]' + '//div[@class="QuoteContainer"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allafrica.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allafrica.com.php index bab3d44..50a9bd6 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allafrica.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allafrica.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -14,6 +15,6 @@ return array( '//sharebar', '//related-topics', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allgemeine-zeitung.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allgemeine-zeitung.de.php index 984e827..4acdeaf 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allgemeine-zeitung.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allgemeine-zeitung.de.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -16,8 +17,8 @@ return array( '//*[@class="skip"]', '//*[@class="funcs"]', '//span[@class="nd address"]', - '//a[contains(@href, "abo-und-services")]' - ) - ) - ) + '//a[contains(@href, "abo-und-services")]', + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/amazingsuperpowers.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/amazingsuperpowers.com.php index b773c6f..634fe37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/amazingsuperpowers.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/amazingsuperpowers.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/anythingcomic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/anythingcomic.com.php index df8b8b7..c73ac3b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/anythingcomic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/anythingcomic.com.php @@ -1,13 +1,14 @@ array( '%.*%' => array( 'body' => array( '//img[@id="comic_image"]', - '//div[@class="comment-wrapper"][position()=1]' + '//div[@class="comment-wrapper"][position()=1]', ), 'strip' => array(), 'test_url' => 'http://www.anythingcomic.com/comics/2108929/stress-free/', - ) + ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ap.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ap.org.php index 1717ad5..6fadc7c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ap.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ap.org.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( '//span[@class="entry-content"]', ), 'strip' => array(), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/areadvd.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/areadvd.de.php index ce93b3e..139fee5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/areadvd.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/areadvd.de.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://www.areadvd.de/news/daily-deals-angebote-bei-lautsprecher-teufel-3/', 'body' => array('//div[contains(@class,"entry")]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/arstechnica.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/arstechnica.com.php index d5e2de8..667b90a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/arstechnica.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/arstechnica.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -12,6 +13,6 @@ return array( '//aside', '//div[@class="article-expander"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/awkwardzombie.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/awkwardzombie.com.php index ab3fde0..6dcb0e8 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/awkwardzombie.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/awkwardzombie.com.php @@ -1,10 +1,11 @@ array( '%/index.php.*comic=.*%' => array( 'test_url' => 'http://www.awkwardzombie.com/index.php?comic=041315', 'body' => array('//*[@id="comic"]/img'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bangkokpost.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bangkokpost.com.php index 20aed4a..4dab77c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bangkokpost.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bangkokpost.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -15,6 +16,6 @@ return array( '//script', '//ul', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bgr.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bgr.com.php index ef62fa3..d78709b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bgr.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bgr.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -10,6 +11,6 @@ return array( 'strip' => array( '//strong', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bigfootjustice.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bigfootjustice.com.php index 907eec4..6d1c667 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bigfootjustice.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bigfootjustice.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( '%-150x150%' => '', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bizjournals.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bizjournals.com.php index c6addb5..44a644a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bizjournals.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bizjournals.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( '//figure/div/a/img', '//p[@class="content__segment"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.fefe.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.fefe.de.php index 829cf3f..d3ed697 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.fefe.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.fefe.de.php @@ -1,13 +1,14 @@ array( '%.*%' => array( 'test_url' => 'http://blog.fefe.de/?ts=ad706a73', 'body' => array( - '/html/body/ul' + '/html/body/ul', ), 'strip' => array( ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.mapillary.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.mapillary.com.php index 5c77b95..e67afe7 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.mapillary.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.mapillary.com.php @@ -1,11 +1,12 @@ array( '%.*%' => array( 'test_url' => 'http://blog.mapillary.com/update/2015/08/26/traffic-sign-updates.html', 'body' => array( - '//div[contains(@class, "blog-post__content")]' - ) - ) - ) + '//div[contains(@class, "blog-post__content")]', + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buenosairesherald.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buenosairesherald.com.php index 23dc2f7..acec44e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buenosairesherald.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buenosairesherald.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,6 +14,6 @@ return array( '//h1', '//div[@class="autor"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bunicomic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bunicomic.com.php index 2073faf..fc54a81 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bunicomic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bunicomic.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( ), 'strip' => array( ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buttersafe.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buttersafe.com.php index eda3f19..04c860e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buttersafe.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buttersafe.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//div[@id="comic"]', '//div[@class="post-comic"]', ), - 'strip' => array() - ) - ) + 'strip' => array(), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cad-comic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cad-comic.com.php index e12f69f..5c05f51 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cad-comic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cad-comic.com.php @@ -1,12 +1,13 @@ array( '%/cad/.+%' => array( 'test_url' => 'http://www.cad-comic.com/cad/20150417', 'body' => array( - '//*[@id="content"]/img' + '//*[@id="content"]/img', ), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php index 68475cb..f07f792 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/channelate.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%href="http://www.channelate.com/(\\d+)/(\\d+)/(\\d+)/[^"]*"%' => 'href="http://www.channelate.com/extra-panel/$1$2$3/"' - ) - ) + '%href="http://www.channelate.com/(\\d+)/(\\d+)/(\\d+)/[^"]*"%' => 'href="http://www.channelate.com/extra-panel/$1$2$3/"', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/chaoslife.findchaos.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/chaoslife.findchaos.com.php index b013a1d..3bc711a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/chaoslife.findchaos.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/chaoslife.findchaos.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://chaoslife.findchaos.com/pets-in-the-wild', 'body' => array('//div[@id="comic"]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cliquerefresh.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cliquerefresh.com.php index 40e3eb8..67a59c5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cliquerefresh.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cliquerefresh.com.php @@ -1,10 +1,11 @@ array( '%/comic.*%' => array( 'test_url' => 'http://cliquerefresh.com/comic/078-stating-the-obvious/', 'body' => array('//div[@class="comicImg"]/img | //div[@class="comicImg"]/a/img'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cnet.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cnet.com.php index a8db47b..fdffefd 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cnet.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cnet.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -15,6 +16,6 @@ return array( '//div[contains(@class,"ad-")]', '//div[@section="shortcodeGallery"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/consomac.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/consomac.fr.php index 7953b9a..31cf6cb 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/consomac.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/consomac.fr.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( ), 'strip' => array( ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cowbirdsinlove.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cowbirdsinlove.com.php index b773c6f..634fe37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cowbirdsinlove.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cowbirdsinlove.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/csmonitor.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/csmonitor.com.php index 7c44e3a..74b149d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/csmonitor.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/csmonitor.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,6 +14,6 @@ return array( '//*[contains(@class,"promo_link")]', '//div[@id="story-embed-column"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyjs.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyjs.com.php index 44ba13e..809a18a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyjs.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyjs.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,7 +14,7 @@ return array( '//*[contains(@class, "addthis_default_style")]', '//*[@class="navigation small"]', '//*[@id="related"]', - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailytech.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailytech.com.php index 432f2b4..19a23c9 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailytech.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailytech.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( '//span[@id="lblSummary"]', '//span[@id="lblBody"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/degroupnews.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/degroupnews.com.php index c1499d4..c166c51 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/degroupnews.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/degroupnews.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,8 +8,8 @@ return array( '//div[@class="contenu"]', ), 'strip' => array( - '//div[contains(@class, "a2a")]' + '//div[contains(@class, "a2a")]', ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/derstandard.at.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/derstandard.at.php index 599a686..66331e1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/derstandard.at.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/derstandard.at.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -9,6 +10,6 @@ return array( ), 'strip' => array( ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/discovermagazine.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/discovermagazine.com.php index a081acf..5b50ad1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/discovermagazine.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/discovermagazine.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -12,6 +13,6 @@ return array( '//div[@class="shareIcons"]', '//div[@class="navigation"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/distrowatch.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/distrowatch.com.php index 5c143f4..ee0b977 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/distrowatch.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/distrowatch.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//td[@class="NewsText"][1]', ), 'strip' => array( - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dozodomo.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dozodomo.com.php index a57b7f4..b894abf 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dozodomo.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dozodomo.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -9,7 +10,7 @@ return array( '//div[@class="story-content"]', ), 'strip' => array( - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/drawingboardcomic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/drawingboardcomic.com.php index e5ade2e..85c623a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/drawingboardcomic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/drawingboardcomic.com.php @@ -1,15 +1,16 @@ array( '%.*%' => array( 'body' => array('//img[@id="comicimage"]'), 'strip' => array(), 'test_url' => 'http://drawingboardcomic.com/index.php?comic=208', - ) + ), ), 'filter' => array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/endlessorigami.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/endlessorigami.com.php index 907eec4..6d1c667 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/endlessorigami.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/endlessorigami.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( '%-150x150%' => '', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/engadget.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/engadget.com.php index aada167..3b7fc5d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/engadget.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/engadget.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://www.engadget.com/2015/04/20/dark-matter-discovery/?ncid=rss_truncated', 'body' => array('//div[@class="article-content"]/p[not(@class="read-more")] | //div[@class="article-content"]/div[@style="text-align: center;"]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/escapistmagazine.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/escapistmagazine.com.php index eaa6a42..052fc0f 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/escapistmagazine.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/escapistmagazine.com.php @@ -1,47 +1,46 @@ array( '%/articles/view/comicsandcosplay/comics/critical-miss.*%' => array( 'body' => array('//*[@class="body"]/span/img | //div[@class="folder_nav_links"]/following::p'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/comicsandcosplay/comics/critical-miss/13776-Critical-Miss-on-Framerates?utm_source=rss&utm_medium=rss&utm_campaign=articles', - 'strip' => array() + 'strip' => array(), ), '%/articles/view/comicsandcosplay/comics/namegame.*%' => array( 'body' => array('//*[@class="body"]/span/p/img[@height != "120"]'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/comicsandcosplay/comics/namegame/9759-Leaving-the-Nest?utm_source=rss&utm_medium=rss&utm_campaign=articles', - 'strip' => array() + 'strip' => array(), ), '%/articles/view/comicsandcosplay/comics/stolen-pixels.*%' => array( 'body' => array('//*[@class="body"]/span/p[2]/img'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/comicsandcosplay/comics/stolen-pixels/8866-Stolen-Pixels-258-Where-the-Boys-Are?utm_source=rss&utm_medium=rss&utm_campaign=articles', - 'strip' => array() + 'strip' => array(), ), '%/articles/view/comicsandcosplay/comics/bumhugparade.*%' => array( 'body' => array('//*[@class="body"]/span/p[2]/img'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/comicsandcosplay/comics/bumhugparade/8262-Bumhug-Parade-13?utm_source=rss&utm_medium=rss&utm_campaign=articles', - 'strip' => array() + 'strip' => array(), ), '%/articles/view/comicsandcosplay.*/comics/escapistradiotheater%' => array( 'body' => array('//*[@class="body"]/span/p[2]/img'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/comicsandcosplay/comics/escapistradiotheater/8265-The-Escapist-Radio-Theater-13?utm_source=rss&utm_medium=rss&utm_campaign=articles', - 'strip' => array() + 'strip' => array(), ), '%/articles/view/comicsandcosplay/comics/paused.*%' => array( 'body' => array('//*[@class="body"]/span/p[2]/img | //*[@class="body"]/span/div/img'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/comicsandcosplay/comics/paused/8263-Paused-16?utm_source=rss&utm_medium=rss&utm_campaign=articles', - 'strip' => array() + 'strip' => array(), ), '%/articles/view/comicsandcosplay/comics/fraughtwithperil.*%' => array( 'body' => array('//*[@class="body"]'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/comicsandcosplay/comics/fraughtwithperil/12166-The-Escapist-Presents-Escapist-Comics-Critical-Miss-B-lyeh-Fhlop?utm_source=rss&utm_medium=rss&utm_campaign=articles', - 'strip' => array() + 'strip' => array(), ), '%/articles/view/video-games/columns/.*%' => array( 'body' => array('//*[@id="article_content"]'), 'test_url' => 'http://www.escapistmagazine.com/articles/view/video-games/columns/experienced-points/13971-What-50-Shades-and-Batman-Have-in-Common.2', - 'strip' => array() + 'strip' => array(), ), - ) + ), ); - - diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/espn.go.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/espn.go.com.php index 5980d1b..08cfd64 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/espn.go.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/espn.go.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,6 +7,6 @@ return array( 'body' => array( '//p', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/exocomics.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/exocomics.com.php index 406e25f..1938281 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/exocomics.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/exocomics.com.php @@ -1,15 +1,16 @@ array( '%.*%' => array( 'body' => array('//a[@class="comic"]/img'), 'strip' => array(), 'test_url' => 'http://www.exocomics.com/379', - ) + ), ), 'filter' => array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php index 83a0890..1ea2efc 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( ), 'strip' => array( ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/extrafabulouscomics.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/extrafabulouscomics.com.php index d6d1e08..29e0f19 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/extrafabulouscomics.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/extrafabulouscomics.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( '%-150x150%' => '', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcodesign.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcodesign.com.php index 50995b8..9cfa252 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcodesign.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcodesign.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//article[contains(@class, "body prose")]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcoexist.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcoexist.com.php index 6aacbdb..b1e42fe 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcoexist.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcoexist.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//article[contains(@class, "body prose")]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcompany.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcompany.com.php index 778adbf..acade0c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcompany.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcompany.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//article[contains(@class, "body prose")]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ffworld.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ffworld.com.php index 64dd263..7b99c2e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ffworld.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ffworld.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//div[@class="news_body"]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fowllanguagecomics.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fowllanguagecomics.com.php index 027c57a..79ae240 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fowllanguagecomics.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fowllanguagecomics.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'body' => array('//*[@id="comic"] | //*[@class="post-image"]'), 'strip' => array(), - 'test_url' => 'http://www.fowllanguagecomics.com/comic/working-out/' - ) - ) + 'test_url' => 'http://www.fowllanguagecomics.com/comic/working-out/', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/geek.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/geek.com.php index cef9562..1f00a88 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/geek.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/geek.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -11,6 +12,6 @@ return array( 'strip' => array( '//span[@class="red"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/giantitp.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/giantitp.com.php index 5acf091..b7a6a9a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/giantitp.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/giantitp.com.php @@ -1,12 +1,13 @@ array( '%/comics/oots.*%' => array( - 'test_url' => 'http://www.giantitp.com/comics/oots0989.html', - 'body' => array( - '//td[@align="center"]/img' - ), - 'strip' => array() - ) - ) + 'test_url' => 'http://www.giantitp.com/comics/oots0989.html', + 'body' => array( + '//td[@align="center"]/img', + ), + 'strip' => array(), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/github.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/github.com.php index 6e28b99..abc41ed 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/github.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/github.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,8 +8,8 @@ return array( '//article[contains(@class, "entry-content")]', ), 'strip' => array( - '//h1' - ) - ) - ) + '//h1', + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gocomics.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gocomics.com.php index b93f565..5bfbe37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gocomics.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gocomics.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,6 +8,6 @@ return array( '//div[1]/p[1]/a[1]/img', ), 'strip' => array(), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/golem.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/golem.de.php index 269170c..ea1af87 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/golem.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/golem.de.php @@ -1,12 +1,13 @@ array( '%.*%' => array( 'test_url' => 'http://www.golem.de/news/breko-telekom-verzoegert-gezielt-den-vectoring-ausbau-1311-102974.html', 'body' => array( '//header[@class="cluster-header"]', - '//div[@class="formatted"]' - ) - ) - ) -); \ No newline at end of file + '//div[@class="formatted"]', + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/happletea.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/happletea.com.php index 1821c3b..5651bf4 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/happletea.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/happletea.com.php @@ -1,18 +1,19 @@ array( '%.*%' => array( 'body' => array( '//div[@id="comic"]', - '//div[@class="entry"]' + '//div[@class="entry"]', ), 'strip' => array('//div[@class="ssba"]'), 'test_url' => 'http://www.happletea.com/comic/mans-best-friend/', - ) + ), ), 'filter' => array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/heise.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/heise.de.php index 93343bb..8a5f312 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/heise.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/heise.de.php @@ -1,11 +1,12 @@ array( '%.*%' => array( 'test_url' => 'http://www.heise.de/security/meldung/BND-300-Millionen-Euro-fuer-Fruehwarnsystem-gegen-Cyber-Attacken-2192237.html', 'body' => array( - '//div[@class="meldung_wrapper"]' - ) - ) - ) + '//div[@class="meldung_wrapper"]', + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/huffingtonpost.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/huffingtonpost.com.php index 07f4816..adbc581 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/huffingtonpost.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/huffingtonpost.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//article[@class="content")]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/imogenquest.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/imogenquest.net.php index b773c6f..634fe37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/imogenquest.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/imogenquest.net.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ing.dk.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ing.dk.php index e61e09a..5081a26 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ing.dk.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ing.dk.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,7 +7,7 @@ return array( 'body' => array( '//section[contains(@class, "teaser")]', '//section[contains(@class, "body")]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/invisiblebread.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/invisiblebread.com.php index ac15132..e4fd6ef 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/invisiblebread.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/invisiblebread.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%()%' => '$1' - ) - ) + '%()%' => '$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ir.amd.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ir.amd.com.php index 63a7dbb..112165a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ir.amd.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ir.amd.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'body' => array('//span[@class="ccbnTxt"]'), 'strip' => array(), 'test_url' => 'http://ir.amd.com/phoenix.zhtml?c=74093&p=RssLanding&cat=news&id=2055819', - ) + ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantimes.co.jp.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantimes.co.jp.php index 50e6c47..b0c8ff2 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantimes.co.jp.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantimes.co.jp.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -16,6 +17,6 @@ return array( '//div[@class="article_footer_ad"]', '//div[@id="disqus_thread"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantoday.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantoday.com.php index 4e5a6a4..8334689 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantoday.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantoday.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -10,6 +11,6 @@ return array( '//h2', '//div[@id="article_info"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/journaldugeek.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/journaldugeek.com.php index 99d4ab1..1034c9d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/journaldugeek.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/journaldugeek.com.php @@ -1,11 +1,12 @@ array( '%.*%' => array( 'test_url' => 'http://www./2014/05/20/le-playstation-now-arrive-en-beta-fermee-aux-etats-unis/', 'body' => array( '//div[@class="post-content"]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/jsonline.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/jsonline.com.php index 8b35c4f..2fdc432 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/jsonline.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/jsonline.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -22,6 +23,6 @@ return array( '//div[contains(@class, "footer-pkg")]', '//img[contains(@src,"analytics")]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/kanpai.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/kanpai.fr.php index 3471bf5..a93ef6c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/kanpai.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/kanpai.fr.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//div[@class="single-left"]', ), 'strip' => array( - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/karriere.jobfinder.dk.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/karriere.jobfinder.dk.php index cdd6389..7c7b456 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/karriere.jobfinder.dk.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/karriere.jobfinder.dk.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,7 +7,7 @@ return array( 'body' => array( '//section[contains(@class, "teaser")]', '//section[contains(@class, "body")]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreaherald.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreaherald.com.php index 1e0cc8d..dacaa9b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreaherald.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreaherald.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,6 +7,6 @@ return array( 'body' => array( '//div[@class="content_view"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lastplacecomics.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lastplacecomics.com.php index d6d1e08..29e0f19 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lastplacecomics.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lastplacecomics.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( '%-150x150%' => '', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lejapon.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lejapon.fr.php index 4de41e4..07cfdbb 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lejapon.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lejapon.fr.php @@ -1,17 +1,18 @@ array( '%.*%' => array( 'test_url' => 'http://lejapon.fr/guide-voyage-japon/5223/tokyo-sous-la-neige.htm', 'body' => array( - '//div[@class="entry"]' + '//div[@class="entry"]', ), 'strip' => array( '//*[contains(@class, "addthis_toolbox")]', '//*[contains(@class, "addthis_default_style")]', '//*[@class="navigation small"]', '//*[@id="related"]', - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php index 861e725..12177e9 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//div[@class="blog-post-content"]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lfg.co.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lfg.co.php index 50e84fd..1073f0e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lfg.co.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lfg.co.php @@ -1,13 +1,13 @@ array( '%.*%' => array( 'test_url' => 'http://www.lfg.co/page/871/?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+LookingForGroup+%28Looking+For+Group%29&utm_content=FeedBurner', 'body' => array( - '//*[@id="comic"]/img | //*[@class="content"]' + '//*[@id="comic"]/img | //*[@class="content"]', ), 'strip' => array(), - ) - ) + ), + ), ); - diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lifehacker.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lifehacker.com.php index 77c6cf3..a42df27 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lifehacker.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lifehacker.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -12,7 +13,7 @@ return array( '//span[contains(@class, "icon")]', '//h1', '//aside', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php index d9d7e43..26bddbf 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -9,6 +10,6 @@ return array( 'strip' => array( '//aside', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php index 9bbd137..50595b0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -12,6 +13,6 @@ return array( '//div[@class="story-advertisement"]', '//iframe', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lists.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lists.php index fdd92d3..c707551 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lists.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lists.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//pre', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loadingartist.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loadingartist.com.php index 907eec4..6d1c667 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loadingartist.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loadingartist.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( '%-150x150%' => '', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loldwell.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loldwell.com.php index 282013c..6954ebf 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loldwell.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loldwell.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://loldwell.com/?comic=food-math-101', 'body' => array('//*[@id="comic"]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lukesurl.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lukesurl.com.php index a1b98b1..15850e4 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lukesurl.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lukesurl.com.php @@ -1,15 +1,16 @@ array( '%.*%' => array( 'body' => array('//div[@id="comic"]//img'), 'strip' => array(), 'test_url' => 'http://www.lukesurl.com/archives/comic/665-3-of-clubs', - ) + ), ), 'filter' => array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/macg.co.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/macg.co.php index 695190a..1d84ffa 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/macg.co.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/macg.co.php @@ -1,13 +1,14 @@ array( '%.*%' => array( 'test_url' => 'http://www.macg.co//logiciels/2014/05/feedly-sameliore-un-petit-peu-sur-mac-82205', 'body' => array( - '//div[contains(@class, "field-name-body")]' + '//div[contains(@class, "field-name-body")]', ), 'strip' => array( ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marc.info.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marc.info.php index 4cda04b..5603940 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marc.info.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marc.info.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( ), 'strip' => array( ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marriedtothesea.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marriedtothesea.com.php index d42157b..b33b0d0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marriedtothesea.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marriedtothesea.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,6 +8,6 @@ return array( '//div[@align]/a/img', ), 'strip' => array(), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marycagle.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marycagle.com.php index 570953e..3a8c783 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marycagle.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marycagle.com.php @@ -1,13 +1,14 @@ array( '%.*%' => array( 'body' => array( '//img[@id="cc-comic"]', - '//div[@class="cc-newsbody"]' + '//div[@class="cc-newsbody"]', ), 'strip' => array(), 'test_url' => 'http://www.marycagle.com/letsspeakenglish/74-grim-reality/', - ) + ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/maximumble.thebookofbiff.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/maximumble.thebookofbiff.com.php index 88c5fdc..a94a166 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/maximumble.thebookofbiff.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/maximumble.thebookofbiff.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://maximumble.thebookofbiff.com/2015/04/20/1084-change/', 'body' => array('//div[@id="comic"]/div/a/img'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/medium.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/medium.com.php index c0dfc49..880a42c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/medium.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/medium.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//div[contains(@class, "post-field body")]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mercworks.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mercworks.net.php index d692802..e478ddf 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mercworks.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mercworks.net.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,11 +8,11 @@ return array( ), 'strip' => array(), 'test_url' => 'http://mercworks.net/comicland/healthy-choice/', - ) + ), ), 'filter' => array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/metronieuws.nl.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/metronieuws.nl.php index 787553f..ee505a1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/metronieuws.nl.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/metronieuws.nl.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://www.metronieuws.nl/sport/2015/04/broer-fellaini-zorgde-bijna-voor-paniek-bij-mourinho', 'body' => array('//div[contains(@class,"article-top")]/div[contains(@class,"image-component")] | //div[@class="article-full-width"]/div[1]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mokepon.smackjeeves.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mokepon.smackjeeves.com.php index 632c864..b76812b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mokepon.smackjeeves.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mokepon.smackjeeves.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://mokepon.smackjeeves.com/comics/2120096/chapter-9-page-68/', 'body' => array('//*[@id="comic_area_inner"]/img | //*[@id="comic_area_inner"]/a/img'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/monwindowsphone.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/monwindowsphone.com.php index d3838af..47c93d7 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/monwindowsphone.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/monwindowsphone.com.php @@ -1,13 +1,14 @@ array( '%.*%' => array( 'test_url' => 'http://www.monwindowsphone.com/tout-savoir-sur-le-centre-d-action-de-windows-phone-8-1-t40574.html', 'body' => array( - '//div[@class="blog-post-body"]' + '//div[@class="blog-post-body"]', ), 'strip' => array( ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mrlovenstein.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mrlovenstein.com.php index 8276a1e..fb6ae75 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mrlovenstein.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mrlovenstein.com.php @@ -1,9 +1,10 @@ array( '%.*%' => array( - '%alt="(.+)" */>%' => "/>
$1", - '%\.png%' => "_rollover.png", - ) - ) + '%alt="(.+)" */>%' => '/>
$1', + '%\.png%' => '_rollover.png', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nba.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nba.com.php index 078ce85..a9afb62 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nba.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nba.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -10,6 +11,6 @@ return array( '//div[@id="nbaArticleSocialWrapper_bot"]', '//h5', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nedroid.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nedroid.com.php index b773c6f..634fe37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nedroid.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nedroid.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/networkworld.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/networkworld.com.php index 79629f6..82982c6 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/networkworld.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/networkworld.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -11,6 +12,6 @@ return array( 'strip' => array( '//aside', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/neustadt-ticker.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/neustadt-ticker.de.php index 3d2a058..d17ed91 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/neustadt-ticker.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/neustadt-ticker.de.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,8 +7,8 @@ return array( 'body' => array('//div[contains(@class,"article")]/div[@class="PostContent" and *[not(contains(@class, "navigation"))]]'), 'strip' => array( '//*[@id="wp_rp_first"]', - '//*[@class="yarpp-related"]' + '//*[@class="yarpp-related"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/niceteethcomic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/niceteethcomic.com.php index d3048c4..a1d495d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/niceteethcomic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/niceteethcomic.com.php @@ -1,10 +1,11 @@ array( '%/archives.*%' => array( 'test_url' => 'http://niceteethcomic.com/archives/page119/', 'body' => array('//*[@class="comicpane"]/a/img'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nichtlustig.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nichtlustig.de.php index b4fb73f..2083fdd 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nichtlustig.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nichtlustig.de.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%.*static.nichtlustig.de/comics/full/(\\d+).*%s' => '' - ) - ) -); \ No newline at end of file + '%.*static.nichtlustig.de/comics/full/(\\d+).*%s' => '', + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/oglaf.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/oglaf.com.php index d995907..8614985 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/oglaf.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/oglaf.com.php @@ -1,19 +1,20 @@ array( '%.*%' => array( 'body' => array( '//img[@id="strip"]', - '//a/div[@id="nx"]/..' + '//a/div[@id="nx"]/..', ), 'strip' => array(), - 'test_url' => 'http://oglaf.com/slodging/' - ) + 'test_url' => 'http://oglaf.com/slodging/', + ), ), 'filter' => array( '%.*%' => array( - '%alt="(.+)" title="(.+)" */>%' => "/>
$1
$2
", + '%alt="(.+)" title="(.+)" */>%' => '/>
$1
$2
', '%%' => 'Next page', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php index 1bdc199..0440009 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -15,6 +16,6 @@ return array( '//h1[@class="pageTitle"]', '//p[@class="bookmarkThis"]', ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/optipess.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/optipess.com.php index b773c6f..634fe37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/optipess.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/optipess.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/osnews.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/osnews.com.php index 5b894b6..10bd0b1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/osnews.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/osnews.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,6 +7,6 @@ return array( 'body' => array( '//div[@class="newscontent1"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pastebin.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pastebin.com.php index 232cbca..4cfc859 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pastebin.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pastebin.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//div[@class="text"]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/peebleslab.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/peebleslab.com.php index 43b5ed4..0689f87 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/peebleslab.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/peebleslab.com.php @@ -1,9 +1,10 @@ array( '%.*%' => array( // the extra space is required to strip the title cleanly - '%title="(.+) " */>%' => "/>
$1" - ) - ) + '%title="(.+) " */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/penny-arcade.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/penny-arcade.com.php index dcd35a5..84596fa 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/penny-arcade.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/penny-arcade.com.php @@ -1,4 +1,5 @@ array( '%/news/.*%' => array( @@ -7,7 +8,7 @@ return array( '//*[@class="postBody"]/*', ), 'strip' => array( - ) + ), ), '%/comic/.*%' => array( 'test_url' => 'http://penny-arcade.com/comic/2015/04/15', @@ -15,7 +16,7 @@ return array( '//*[@id="comicFrame"]/a/img', ), 'strip' => array( - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pixelbeat.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pixelbeat.org.php index 4aeb388..289f839 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pixelbeat.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pixelbeat.org.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,6 +8,6 @@ return array( '//div[@class="contentText"]', ), 'strip' => array(), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/plus.google.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/plus.google.com.php index 3b09b40..f6e3d37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/plus.google.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/plus.google.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,6 +7,6 @@ return array( 'body' => array( '//div[@role="article"]/div[contains(@class, "eE")]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/popstrip.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/popstrip.com.php index 1cc8fd9..7c4da00 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/popstrip.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/popstrip.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%( '$1$2$1bonus.png"/>' - ) - ) + '%( '$1$2$1bonus.png"/>', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/putaindecode.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/putaindecode.fr.php index e44a130..f3885f5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/putaindecode.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/putaindecode.fr.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -9,8 +10,8 @@ return array( 'strip' => array( '//*[contains(@class, "inlineimg")]', '//*[contains(@class, "comment-respond")]', - '//header' - ) - ) - ) + '//header', + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php index e7ace0b..1782729 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,6 +14,6 @@ return array( '//div[contains(@class,"sharedaddy")]', '//div[@class="post-send-off"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/rue89.nouvelobs.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/rue89.nouvelobs.com.php index 08a2b2f..ba5bb48 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/rue89.nouvelobs.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/rue89.nouvelobs.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,7 +8,7 @@ return array( '//*[@id="article"]/div[contains(@class, "content")]', ), 'strip' => array( - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/satwcomic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/satwcomic.com.php index 067f8f9..836cc97 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/satwcomic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/satwcomic.com.php @@ -1,13 +1,14 @@ array( '%.*%' => array( 'test_url' => 'http://satwcomic.com/day-at-the-beach', 'body' => array( '//div[@class="container"]/center/a/img', - '//span[@itemprop="articleBody"]' + '//span[@itemprop="articleBody"]', ), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/scrumalliance.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/scrumalliance.org.php index 34f385d..1715edd 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/scrumalliance.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/scrumalliance.org.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,7 +7,7 @@ return array( 'body' => array( '//div[@class="article_content"]', ), - 'strip' => array() - ) - ) + 'strip' => array(), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php index ed0d681..fd77746 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,6 +7,6 @@ return array( 'body' => array( '//div[@class="expanded"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sentfromthemoon.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sentfromthemoon.com.php index 58bfc03..94955b2 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sentfromthemoon.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sentfromthemoon.com.php @@ -1,18 +1,19 @@ array( '%.*%' => array( 'body' => array( '//div[@class="comicpane"]/a/img', - '//div[@class="entry"]' + '//div[@class="entry"]', ), 'strip' => array(), - 'test_url' => 'http://sentfromthemoon.com/archives/1417' - ) + 'test_url' => 'http://sentfromthemoon.com/archives/1417', + ), ), 'filter' => array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sitepoint.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sitepoint.com.php index 5b3cbc7..b7b9fbe 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sitepoint.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sitepoint.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( ), 'strip' => array( ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/slashdot.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/slashdot.org.php index b212fce..f3496ba 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/slashdot.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/slashdot.org.php @@ -1,11 +1,12 @@ array( '%.*%' => array( 'test_url' => 'http://science.slashdot.org/story/15/04/20/0528253/pull-top-can-tabs-at-50-reach-historic-archaeological-status', 'body' => array( - '//article/div[@class="body"] | //article[@class="layout-article"]/div[@class="elips"]'), + '//article/div[@class="body"] | //article[@class="layout-article"]/div[@class="elips"]', ), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smallhousebliss.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smallhousebliss.com.php index c82e31d..bc0aa48 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smallhousebliss.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smallhousebliss.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,7 +14,7 @@ return array( '//*[contains(@class, "meta")]', '//*[contains(@class, "postitle")]', '//*[@id="nav-below"]', - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smarthomewelt.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smarthomewelt.de.php index 83f93f1..fe6e79a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smarthomewelt.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smarthomewelt.de.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://smarthomewelt.de/apple-tv-amazon-echo-smart-home/', 'body' => array('//div[@class="entry-inner"]/p | //div[@class="entry-inner"]/div[contains(@class,"wp-caption")]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smashingmagazine.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smashingmagazine.com.php index 5000072..2e95d1c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smashingmagazine.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smashingmagazine.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://www.smashingmagazine.com/2015/04/17/using-sketch-for-responsive-web-design-case-study/', 'body' => array('//article[contains(@class,"post")]/p'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smbc-comics.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smbc-comics.com.php index f339a40..cbf6c99 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smbc-comics.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smbc-comics.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%()%' => '$1$2$1after$2' - ) - ) + '%()%' => '$1$2$1after$2', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php index 7382afc..6e9f215 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -16,6 +17,6 @@ return array( '//div[@class="book-navigation"]', '//div[@class="comment-links"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/spiegel.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/spiegel.de.php index d71893a..9348ae0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/spiegel.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/spiegel.de.php @@ -1,11 +1,12 @@ array( '%.*%' => array( 'test_url' => 'http://www.spiegel.de/politik/ausland/afrika-angola-geht-gegen-islam-vor-und-schliesst-moscheen-a-935788.html', 'body' => array( - '//div[contains(@class, "article-section")]' - ) - ) - ) -); \ No newline at end of file + '//div[contains(@class, "article-section")]', + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php index 0a2a8d9..97fc404 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,6 +7,6 @@ return array( 'body' => array( '//div[@class="content clear-block"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stupidfox.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stupidfox.net.php index d45551f..b8aef24 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stupidfox.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stupidfox.net.php @@ -1,13 +1,14 @@ array( '%.*%' => array( 'test_url' => 'http://stupidfox.net/134-sleepy-time', 'body' => array( '//div[@class="comicmid"]/center/a/img', - '//div[@class="stand_high"]' + '//div[@class="stand_high"]', ), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/subtraction.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/subtraction.com.php index a210a62..37ce1cc 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/subtraction.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/subtraction.com.php @@ -1,15 +1,16 @@ array( '%.*%' => array( 'test_url' => 'http://www.subtraction.com/2015/06/06/time-lapse-video-of-one-world-trade-center/', 'body' => array('//article/div[@class="entry-content"]'), - 'strip' => array() - ) + 'strip' => array(), + ), ), 'filter' => array( '%.*%' => array( '%\+%' => '', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sz.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sz.de.php index 8629a58..53f8b6c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sz.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sz.de.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://sz.de/1.2443161', 'body' => array('//article[@id="sitecontent"]/section[@class="topenrichment"]//img | //article[@id="sitecontent"]/section[@class="body"]/section[@class="authors"]/preceding-sibling::*[not(contains(@class, "ad"))]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/techcrunch.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/techcrunch.com.php index 5646a17..8671ac5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/techcrunch.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/techcrunch.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,8 +9,8 @@ return array( '//div[@class="body-copy"]', ), 'strip' => array( - '//*[contains(@class, "module-crunchbase")]' - ) - ) - ) + '//*[contains(@class, "module-crunchbase")]', + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php index d7b0308..307b599 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,6 +7,6 @@ return array( 'body' => array( '//div[@class="entry"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php index dbf57ec..5583f41 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -17,6 +18,6 @@ return array( '//div[contains(@class,"ad")]', '//a[contains(@class,"social-icon")]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theawkwardyeti.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theawkwardyeti.com.php index d6d1e08..29e0f19 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theawkwardyeti.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theawkwardyeti.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( '%-150x150%' => '', - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thecodinglove.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thecodinglove.com.php index d33e127..fb7f174 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thecodinglove.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thecodinglove.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://thecodinglove.com/post/116897934767', 'body' => array('//div[@class="bodytype"]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php index 58bfc03..94955b2 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php @@ -1,18 +1,19 @@ array( '%.*%' => array( 'body' => array( '//div[@class="comicpane"]/a/img', - '//div[@class="entry"]' + '//div[@class="entry"]', ), 'strip' => array(), - 'test_url' => 'http://sentfromthemoon.com/archives/1417' - ) + 'test_url' => 'http://sentfromthemoon.com/archives/1417', + ), ), 'filter' => array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thegamercat.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thegamercat.com.php index e733730..e1a1318 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thegamercat.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thegamercat.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://www.thegamercat.com/comic/just-no/', 'body' => array('//div[@id="comic"] | //div[@class="post-content"]/div[@class="entry"]/p'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php index 1af0b38..37464ba 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -12,8 +13,8 @@ return array( ), 'strip' => array( '//div[@id="articleKeywords"]', - '//div[@class="photo-source"]' + '//div[@class="photo-source"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themerepublic.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themerepublic.net.php index b625ac2..d537eb8 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themerepublic.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themerepublic.net.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://www.themerepublic.net/2015/04/david-lopez-pitoko.html?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+blogspot%2FDngUJ+%28Theme+Republic%29&utm_content=FeedBurner', 'body' => array('//*[@class="post-body"]'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php index a01d9aa..a6f9ed5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,6 +14,6 @@ return array( '//p/a[contains(@href, "/article.php?id=")]', '//div[@class="disqus_wrap"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php index 81f69ba..dd403f0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -7,6 +8,6 @@ return array( '//div[@class="content-masthead"]/figure/div/noscript/img', '//div[@class="content-text"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php index 24f1237..7f32814 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -15,8 +16,8 @@ return array( '//span[@class="bodyHeadline"]', '//i', '//b', - '//table' + '//table', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php index 3c7adc8..66c9cca 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'body' => array('//img[@id="cc-comic"]'), 'strip' => array(), 'test_url' => 'http://www.threepanelsoul.com/comic/subjective-tastes', - ) + ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/travel-dealz.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/travel-dealz.de.php index b563a71..76d22ca 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/travel-dealz.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/travel-dealz.de.php @@ -1,4 +1,5 @@ array( '%^/blog.*%' => array( @@ -10,6 +11,6 @@ return array( '//*[@class="post-data"]', '//*[@id="author-meta"]', ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treehugger.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treehugger.com.php index f324f4c..8be61aa 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treehugger.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treehugger.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,7 +9,7 @@ return array( '//div[contains(@id, "entry-body")]', ), 'strip' => array( - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treelobsters.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treelobsters.com.php index b773c6f..634fe37 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treelobsters.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treelobsters.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%title="(.+)" */>%' => "/>
$1" - ) - ) + '%title="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twogag.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twogag.com.php index 77caec8..36c260d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twogag.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twogag.com.php @@ -1,9 +1,9 @@ array( '%.*%' => array( - "%http://www.twogag.com/comics-rss/([^.]+)\\.jpg%" => - "http://www.twogag.com/comics/$1.jpg" - ) - ) + '%http://www.twogag.com/comics-rss/([^.]+)\\.jpg%' => 'http://www.twogag.com/comics/$1.jpg', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twokinds.keenspot.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twokinds.keenspot.com.php index aafb71c..f86ae34 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twokinds.keenspot.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twokinds.keenspot.com.php @@ -1,10 +1,11 @@ array( '%.*%' => array( 'test_url' => 'http://twokinds.keenspot.com/archive.php?p=0', 'body' => array('//*[@class="comic"]/div/a/img | //*[@class="comic"]/div/img | //*[@id="cg_img"]/img | //*[@id="cg_img"]/a/img'), 'strip' => array(), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/undeadly.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/undeadly.org.php index 8b14d96..3fe8261 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/undeadly.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/undeadly.org.php @@ -1,14 +1,15 @@ array( '%.*%' => array( 'test_url' => 'http://undeadly.org/cgi?action=article&sid=20141101181155', 'body' => array( - '/html/body/table[3]/tbody/tr/td[1]/table[2]/tr/td[1]' + '/html/body/table[3]/tbody/tr/td[1]/table[2]/tr/td[1]', ), 'strip' => array( '//font', ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php index 435a96f..413a172 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -16,6 +17,6 @@ return array( '//ul', '//style[@type="text/css"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/version2.dk.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/version2.dk.php index 520496a..a961b90 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/version2.dk.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/version2.dk.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -6,7 +7,7 @@ return array( 'body' => array( '//section[contains(@class, "teaser")]', '//section[contains(@class, "body")]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vgcats.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vgcats.com.php index 05de7c2..c36b16c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vgcats.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vgcats.com.php @@ -1,4 +1,5 @@ array( '%/comics.*%' => array( @@ -10,7 +11,6 @@ return array( 'test_url' => 'http://www.vgcats.com/super/?strip_id=84', 'body' => array('//*[@align="center"]/p/img'), 'strip' => array(), - ) - ) + ), + ), ); - diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vuxml.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vuxml.org.php index e9880f2..d8c286e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vuxml.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vuxml.org.php @@ -1,17 +1,18 @@ array( '%.*%' => array( 'test_url' => 'http://www.vuxml.org/freebsd/a5f160fa-deee-11e4-99f8-080027ef73ec.html', 'body' => array( - '//body' + '//body', ), 'strip' => array( '//h1', '//div[@class="blurb"]', '//hr', - '//p[@class="copyright"]' - ) - ) - ) -); \ No newline at end of file + '//p[@class="copyright"]', + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bbc.co.uk.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bbc.co.uk.php index 0c4bcf2..52b5f12 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bbc.co.uk.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bbc.co.uk.php @@ -1,21 +1,22 @@ array( '%.*%' => array( 'test_url' => 'http://www.bbc.co.uk/news/world-middle-east-23911833', 'body' => array( '//div[@class="story-body__inner"] | //div[@class="article"]', - '//div[@class="indPost"]' + '//div[@class="indPost"]', ), 'strip' => array( '//form', - '//div[@id="headline"]', + '//div[@id="headline"]', '//*[@class="warning"]', '//span[@class="off-screen"]', '//span[@class="story-image-copyright"]', '//div[@class="ad_wrapper"]', '//div[@id="article-sidebar"]', - '//div[@class="data-table-outer"]', + '//div[@class="data-table-outer"]', '//*[@class="story-date"]', '//*[@class="story-header"]', '//figure[contains(@class,"has-caption")]', @@ -26,7 +27,7 @@ return array( '//*[@id="video-carousel-container"]', '//*[@id="also-related-links"]', '//*[contains(@class, "share") or contains(@class, "hidden") or contains(@class, "hyper")]', - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bdgest.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bdgest.com.php index be1cbcd..ffb13ac 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bdgest.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bdgest.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -10,6 +11,6 @@ return array( '//*[contains(@class, "post-review")]', '//*[contains(@class, "footer-review")]', ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.businessweek.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.businessweek.com.php index 1f2ad25..6f805f2 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.businessweek.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.businessweek.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -10,6 +11,6 @@ return array( 'strip' => array( '//*[contains(@class, "related_item")]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.cnn.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.cnn.com.php index c041aec..a8f772f 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.cnn.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.cnn.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -18,7 +19,7 @@ return array( '//div[contains(@class, "cnnArticleGalleryNavPrevNext")]', '//div[contains(@class, "cnn_html_media_title_new")]', '//div[contains(@id, "disqus")]', - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.developpez.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.developpez.com.php index 3f1dd59..cc7e125 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.developpez.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.developpez.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -15,7 +16,7 @@ return array( '//*[contains(@class,"inlineimg")]', '//*[@id="signaler"]', '//*[@id="signalerFrame"]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.egscomics.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.egscomics.com.php index ada54ab..49befe1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.egscomics.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.egscomics.com.php @@ -1,12 +1,13 @@ array( '%.*%' => array( 'test_url' => 'http://www.egscomics.com/index.php?id=1690', 'title' => '/html/head/title', 'body' => array( - '//img[@id="comic"]' - ) - ) - ) + '//img[@id="comic"]', + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.forbes.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.forbes.com.php index 4b92aaf..2167ff9 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.forbes.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.forbes.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -14,7 +15,7 @@ return array( '//div[contains(@id, "comment")]', '//div[contains(@class, "widget")]', '//div[contains(@class, "pagination")]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.futura-sciences.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.futura-sciences.com.php index 238b056..7fe324b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.futura-sciences.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.futura-sciences.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -14,6 +15,6 @@ return array( '//*[contains(@class, "cartouche")]', '//*[contains(@class, "noprint")]', ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lepoint.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lepoint.fr.php index 9a3107f..f7386a5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lepoint.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lepoint.fr.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -12,7 +13,7 @@ return array( '//*[contains(@class, "entete2_article")]', '//*[contains(@class, "signature_article")]', '//*[contains(@id, "share")]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lesnumeriques.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lesnumeriques.com.php index 8fe6299..dfc0de6 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lesnumeriques.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lesnumeriques.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -19,7 +20,7 @@ return array( '//div[@id="product-reviews"]', '//div[@id="publication-breadcrumbs-and-date"]', '//div[@id="publication-breadcrumbs-and-date"]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.mac4ever.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.mac4ever.com.php index 3951329..a280bd3 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.mac4ever.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.mac4ever.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( ), 'strip' => array( ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.npr.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.npr.org.php index dd319a3..b871abe 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.npr.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.npr.org.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -14,6 +15,6 @@ return array( '//*[@class="toggle-caption"]', '//*[contains(@class, "enlargebtn")]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.numerama.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.numerama.com.php index e3b50dc..d18ed1c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.numerama.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.numerama.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -9,7 +10,7 @@ return array( 'strip' => array( '//footer', '//section[@class="related-article"]', - ) - ) - ) + ), + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pcinpact.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pcinpact.com.php index 2010e09..24e9a2f 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pcinpact.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pcinpact.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -8,6 +9,6 @@ return array( ), 'strip' => array( ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pseudo-sciences.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pseudo-sciences.org.php index 63a918e..017f916 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pseudo-sciences.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pseudo-sciences.org.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -11,6 +12,6 @@ return array( '//div[@id="art_chapo"]', '//img[@class="puce"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.slate.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.slate.fr.php index c619199..3591f39 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.slate.fr.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.slate.fr.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -13,7 +14,7 @@ return array( '//div[contains(@id, "reseaux")]', '//*[contains(@class, "smart") or contains(@class, "article_tags") or contains(@class, "article_reactions")]', '//*[contains(@class, "OUTBRAIN") or contains(@class, "related_item") or contains(@class, "share")]', - ) - ) - ) -); \ No newline at end of file + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.universfreebox.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.universfreebox.com.php index 8203b97..fe9b54a 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.universfreebox.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.universfreebox.com.php @@ -1,15 +1,16 @@ array( '%.*%' => array( 'test_url' => 'http://www.universfreebox.com/article/24305/4G-Bouygues-Telecom-lance-une-vente-flash-sur-son-forfait-Sensation-3Go', 'body' => array( - '//div[@id="corps_corps"]' + '//div[@id="corps_corps"]', ), 'strip' => array( '//*[@id="formulaire"]', '//*[@id="commentaire"]', ), - ) - ) -); \ No newline at end of file + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.zeit.de.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.zeit.de.php index a952043..cdac1cb 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.zeit.de.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.zeit.de.php @@ -4,7 +4,7 @@ return array( '%^/zeit-magazin.*%' => array( 'test_url' => 'http://www.zeit.de/zeit-magazin/2015/15/pegida-kathrin-oertel-lutz-bachmann', 'body' => array( - '//article[@class="article"]' + '//article[@class="article"]', ), 'strip' => array( '//header/div/h1', @@ -19,13 +19,13 @@ return array( '//div[@id="iq-artikelanker"]', '//div[@id="js-social-services"]', '//section[@id="js-comments"]', - '//aside' - ) + '//aside', + ), ), '%.*%' => array( 'test_url' => 'http://www.zeit.de/politik/ausland/2015-04/thessaloniki-krise-griechenland-yannis-boutaris/', 'body' => array( - '//div[@class="article-body"]' + '//div[@class="article-body"]', ), 'strip' => array( '//*[@class="articleheader"]', @@ -34,8 +34,8 @@ return array( '//div[@itemprop="video"]', '//*[@class="articlemeta"]', '//*[@class="articlemeta-clear"]', - '//*[@class="zol_inarticletools"]' - ) - ) - ) -); + '//*[@class="zol_inarticletools"]', + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/xkcd.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/xkcd.com.php index 4d8dc6e..7a04bec 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/xkcd.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/xkcd.com.php @@ -1,8 +1,9 @@ array( '%.*%' => array( - '%alt="(.+)" */>%' => "/>
$1" - ) - ) + '%alt="(.+)" */>%' => '/>
$1', + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/zdnet.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/zdnet.com.php index 2a1b1d4..d9c81bd 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/zdnet.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/zdnet.com.php @@ -1,4 +1,5 @@ array( '%.*%' => array( @@ -17,6 +18,6 @@ return array( '//p[@class="photoDetails"]', '//div[@class="thumbnailSlider"]', ), - ) - ) + ), + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/CandidateParser.php b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/CandidateParser.php index 907c4d8..802b01b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/CandidateParser.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/CandidateParser.php @@ -8,10 +8,9 @@ use PicoFeed\Logging\Logger; use PicoFeed\Parser\XmlParser; /** - * Candidate Parser + * Candidate Parser. * * @author Frederic Guillot - * @package Scraper */ class CandidateParser implements ParserInterface { @@ -19,9 +18,8 @@ class CandidateParser implements ParserInterface private $xpath; /** - * List of attributes to try to get the content, order is important, generic terms at the end + * List of attributes to try to get the content, order is important, generic terms at the end. * - * @access private * @var array */ private $candidatesAttributes = array( @@ -49,9 +47,8 @@ class CandidateParser implements ParserInterface ); /** - * List of attributes to strip + * List of attributes to strip. * - * @access private * @var array */ private $stripAttributes = array( @@ -79,9 +76,8 @@ class CandidateParser implements ParserInterface ); /** - * Tags to remove + * Tags to remove. * - * @access private * @var array */ private $stripTags = array( @@ -93,10 +89,9 @@ class CandidateParser implements ParserInterface ); /** - * Constructor + * Constructor. * - * @access public - * @param string $html + * @param string $html */ public function __construct($html) { @@ -105,9 +100,8 @@ class CandidateParser implements ParserInterface } /** - * Get the relevant content with the list of potential attributes + * Get the relevant content with the list of potential attributes. * - * @access public * @return string */ public function execute() @@ -126,21 +120,20 @@ class CandidateParser implements ParserInterface } /** - * Find content based on the list of tag candidates + * Find content based on the list of tag candidates. * - * @access public * @return string */ public function findContentWithCandidates() { foreach ($this->candidatesAttributes as $candidate) { - Logger::setMessage(get_called_class().': Try this candidate: "'.$candidate.'"'); $nodes = $this->xpath->query('//*[(contains(@class, "'.$candidate.'") or @id="'.$candidate.'") and not (contains(@class, "nav") or contains(@class, "page"))]'); if ($nodes !== false && $nodes->length > 0) { Logger::setMessage(get_called_class().': Find candidate "'.$candidate.'"'); + return $this->dom->saveXML($nodes->item(0)); } } @@ -149,9 +142,8 @@ class CandidateParser implements ParserInterface } /** - * Find
tag + * Find
tag. * - * @access public * @return string */ public function findContentWithArticle() @@ -160,6 +152,7 @@ class CandidateParser implements ParserInterface if ($nodes !== false && $nodes->length > 0) { Logger::setMessage(get_called_class().': Find
tag'); + return $this->dom->saveXML($nodes->item(0)); } @@ -167,9 +160,8 @@ class CandidateParser implements ParserInterface } /** - * Find tag + * Find tag. * - * @access public * @return string */ public function findContentWithBody() @@ -178,6 +170,7 @@ class CandidateParser implements ParserInterface if ($nodes !== false && $nodes->length > 0) { Logger::setMessage(get_called_class().' Find '); + return $this->dom->saveXML($nodes->item(0)); } @@ -185,10 +178,10 @@ class CandidateParser implements ParserInterface } /** - * Strip useless tags + * Strip useless tags. + * + * @param string $content * - * @access public - * @param string $content * @return string */ public function stripGarbage($content) @@ -196,7 +189,6 @@ class CandidateParser implements ParserInterface $dom = XmlParser::getDomDocument($content); if ($dom !== false) { - $xpath = new DOMXPath($dom); $this->stripTags($xpath); @@ -209,19 +201,16 @@ class CandidateParser implements ParserInterface } /** - * Remove blacklisted tags + * Remove blacklisted tags. * - * @access public - * @param DOMXPath $xpath + * @param DOMXPath $xpath */ public function stripTags(DOMXPath $xpath) { foreach ($this->stripTags as $tag) { - $nodes = $xpath->query('//'.$tag); if ($nodes !== false && $nodes->length > 0) { - Logger::setMessage(get_called_class().': Strip tag: "'.$tag.'"'); foreach ($nodes as $node) { @@ -232,20 +221,17 @@ class CandidateParser implements ParserInterface } /** - * Remove blacklisted attributes + * Remove blacklisted attributes. * - * @access public - * @param DomDocument $dom - * @param DOMXPath $xpath + * @param DomDocument $dom + * @param DOMXPath $xpath */ public function stripAttributes(DomDocument $dom, DOMXPath $xpath) { foreach ($this->stripAttributes as $attribute) { - $nodes = $xpath->query('//*[contains(@class, "'.$attribute.'") or contains(@id, "'.$attribute.'")]'); if ($nodes !== false && $nodes->length > 0) { - Logger::setMessage(get_called_class().': Strip attribute: "'.$attribute.'"'); foreach ($nodes as $node) { @@ -258,12 +244,12 @@ class CandidateParser implements ParserInterface } /** - * Return false if the node should not be removed + * Return false if the node should not be removed. * - * @access public - * @param DomDocument $dom - * @param DomNode $node - * @return boolean + * @param DomDocument $dom + * @param DomNode $node + * + * @return bool */ public function shouldRemove(DomDocument $dom, $node) { @@ -278,6 +264,7 @@ class CandidateParser implements ParserInterface if ($ratio >= 90) { Logger::setMessage(get_called_class().': Should not remove this node ('.$node->nodeName.') ratio: '.$ratio.'%'); + return false; } diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/ParserInterface.php b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/ParserInterface.php index 4cce68f..a33fefc 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/ParserInterface.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/ParserInterface.php @@ -5,7 +5,7 @@ namespace PicoFeed\Scraper; interface ParserInterface { /** - * Execute the parser and return the contents + * Execute the parser and return the contents. * * @return string */ diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleLoader.php b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleLoader.php index 204b4d7..0cffbf6 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleLoader.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleLoader.php @@ -6,27 +6,24 @@ use PicoFeed\Logging\Logger; use PicoFeed\Config\Config; /** - * RuleLoader class + * RuleLoader class. * * @author Frederic Guillot * @author Bernhard Posselt - * @package Scraper */ class RuleLoader { /** - * Config object + * Config object. * - * @access private * @var \PicoFeed\Config\Config */ private $config; /** - * Constructor + * Constructor. * - * @access public - * @param \PicoFeed\Config\Config $config Config class instance + * @param \PicoFeed\Config\Config $config Config class instance */ public function __construct(Config $config) { @@ -34,10 +31,10 @@ class RuleLoader } /** - * Get the rules for an URL + * Get the rules for an URL. * - * @access public * @param string $url the URL that should be looked up + * * @return array the array containing the rules */ public function getRules($url) @@ -45,13 +42,12 @@ class RuleLoader $hostname = parse_url($url, PHP_URL_HOST); if ($hostname !== false) { - $files = $this->getRulesFileList($hostname); foreach ($this->getRulesFolders() as $folder) { $rule = $this->loadRuleFile($folder, $files); - if (! empty($rule)) { + if (!empty($rule)) { return $rule; } } @@ -61,10 +57,10 @@ class RuleLoader } /** - * Get the list of possible rules file names for a given hostname + * Get the list of possible rules file names for a given hostname. + * + * @param string $hostname Hostname * - * @access public - * @param string $hostname Hostname * @return array */ public function getRulesFileList($hostname) @@ -78,8 +74,7 @@ class RuleLoader $files[] = implode('.', $parts); // domain.tld $files[] = '.'.implode('.', $parts); // .domain.tld $files[] = $subdomain; // subdomain - } - else if ($len === 2) { + } elseif ($len === 2) { $files[] = '.'.implode('.', $parts); // .domain.tld $files[] = $parts[0]; // domain } @@ -88,11 +83,11 @@ class RuleLoader } /** - * Load a rule file from the defined folder + * Load a rule file from the defined folder. + * + * @param string $folder Rule directory + * @param array $files List of possible file names * - * @access public - * @param string $folder Rule directory - * @param array $files List of possible file names * @return array */ public function loadRuleFile($folder, array $files) @@ -101,6 +96,7 @@ class RuleLoader $filename = $folder.'/'.$file.'.php'; if (file_exists($filename)) { Logger::setMessage(get_called_class().' Load rule: '.$file); + return include $filename; } } @@ -109,9 +105,8 @@ class RuleLoader } /** - * Get the list of folders that contains rules + * Get the list of folders that contains rules. * - * @access public * @return array */ public function getRulesFolders() diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleParser.php b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleParser.php index f89ed0b..95665bf 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleParser.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleParser.php @@ -6,10 +6,9 @@ use DOMXPath; use PicoFeed\Parser\XmlParser; /** - * Rule Parser + * Rule Parser. * * @author Frederic Guillot - * @package Scraper */ class RuleParser implements ParserInterface { @@ -18,11 +17,10 @@ class RuleParser implements ParserInterface private $rules = array(); /** - * Constructor + * Constructor. * - * @access public - * @param string $html - * @param array $rules + * @param string $html + * @param array $rules */ public function __construct($html, array $rules) { @@ -32,28 +30,24 @@ class RuleParser implements ParserInterface } /** - * Get the relevant content with predefined rules + * Get the relevant content with predefined rules. * - * @access public * @return string */ public function execute() { $this->stripTags(); + return $this->findContent(); } /** - * Remove HTML tags - * - * @access public + * Remove HTML tags. */ public function stripTags() { if (isset($this->rules['strip']) && is_array($this->rules['strip'])) { - foreach ($this->rules['strip'] as $pattern) { - $nodes = $this->xpath->query($pattern); if ($nodes !== false && $nodes->length > 0) { @@ -66,18 +60,14 @@ class RuleParser implements ParserInterface } /** - * Fetch content based on Xpath rules - * - * @access public + * Fetch content based on Xpath rules. */ public function findContent() { $content = ''; if (isset($this->rules['body']) && is_array($this->rules['body'])) { - foreach ($this->rules['body'] as $pattern) { - $nodes = $this->xpath->query($pattern); if ($nodes !== false && $nodes->length > 0) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/Scraper.php b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/Scraper.php index a9d8e65..f1d1222 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/Scraper.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/Scraper.php @@ -12,66 +12,58 @@ use PicoFeed\Logging\Logger; use PicoFeed\Parser\XmlParser; /** - * Scraper class + * Scraper class. * * @author Frederic Guillot - * @package Scraper */ class Scraper { /** - * URL + * URL. * - * @access private * @var string */ private $url = ''; /** - * Relevant content + * Relevant content. * - * @access private * @var string */ private $content = ''; /** - * HTML content + * HTML content. * - * @access private * @var string */ private $html = ''; /** - * HTML content encoding + * HTML content encoding. * - * @access private * @var string */ private $encoding = ''; /** - * Flag to enable candidates parsing + * Flag to enable candidates parsing. * - * @access private - * @var boolean + * @var bool */ private $enableCandidateParser = true; /** - * Config object + * Config object. * - * @access private * @var \PicoFeed\Config\Config */ private $config; /** - * Constructor + * Constructor. * - * @access public - * @param \PicoFeed\Config\Config $config Config class instance + * @param \PicoFeed\Config\Config $config Config class instance */ public function __construct(Config $config) { @@ -80,22 +72,21 @@ class Scraper } /** - * Disable candidates parsing + * Disable candidates parsing. * - * @access public - * @return Scraper + * @return Scraper */ public function disableCandidateParser() { $this->enableCandidateParser = false; + return $this; } /** - * Get encoding + * Get encoding. * - * @access public - * @return string + * @return string */ public function getEncoding() { @@ -103,23 +94,23 @@ class Scraper } /** - * Set encoding + * Set encoding. * - * @access public - * @param string $encoding - * @return Scraper + * @param string $encoding + * + * @return Scraper */ public function setEncoding($encoding) { $this->encoding = $encoding; + return $this; } /** - * Get URL to download + * Get URL to download. * - * @access public - * @return string + * @return string */ public function getUrl() { @@ -127,33 +118,32 @@ class Scraper } /** - * Set URL to download + * Set URL to download. * - * @access public - * @param string $url URL - * @return Scraper + * @param string $url URL + * + * @return Scraper */ public function setUrl($url) { $this->url = $url; + return $this; } /** - * Return true if the scraper found relevant content + * Return true if the scraper found relevant content. * - * @access public - * @return boolean + * @return bool */ public function hasRelevantContent() { - return ! empty($this->content); + return !empty($this->content); } /** - * Get relevant content + * Get relevant content. * - * @access public * @return string */ public function getRelevantContent() @@ -162,9 +152,8 @@ class Scraper } /** - * Get raw content (unfiltered) + * Get raw content (unfiltered). * - * @access public * @return string */ public function getRawContent() @@ -173,40 +162,40 @@ class Scraper } /** - * Set raw content (unfiltered) + * Set raw content (unfiltered). + * + * @param string $html * - * @access public - * @param string $html * @return Scraper */ public function setRawContent($html) { $this->html = $html; + return $this; } /** - * Get filtered relevant content + * Get filtered relevant content. * - * @access public * @return string */ public function getFilteredContent() { $filter = Filter::html($this->content, $this->url); $filter->setConfig($this->config); + return $filter->execute(); } /** - * Download the HTML content + * Download the HTML content. * - * @access public - * @return boolean + * @return bool */ public function download() { - if (! empty($this->url)) { + if (!empty($this->url)) { // Clear everything $this->html = ''; @@ -214,7 +203,6 @@ class Scraper $this->encoding = ''; try { - $client = Client::getInstance(); $client->setConfig($this->config); $client->setTimeout($this->config->getGrabberTimeout()); @@ -226,8 +214,7 @@ class Scraper $this->encoding = $client->getEncoding(); return true; - } - catch (ClientException $e) { + } catch (ClientException $e) { Logger::setMessage(get_called_class().': '.$e->getMessage()); } } @@ -236,15 +223,13 @@ class Scraper } /** - * Execute the scraper - * - * @access public + * Execute the scraper. */ public function execute() { $this->download(); - if (! $this->skipProcessing()) { + if (!$this->skipProcessing()) { $this->prepareHtml(); $parser = $this->getParser(); @@ -257,10 +242,9 @@ class Scraper } /** - * Returns true if the parsing must be skipped + * Returns true if the parsing must be skipped. * - * @access public - * @return boolean + * @return bool */ public function skipProcessing() { @@ -277,6 +261,7 @@ class Scraper if (empty($this->html)) { Logger::setMessage(get_called_class().': Raw HTML is empty'); + return true; } @@ -284,9 +269,8 @@ class Scraper } /** - * Get the parser + * Get the parser. * - * @access public * @return ParserInterface */ public function getParser() @@ -294,33 +278,30 @@ class Scraper $ruleLoader = new RuleLoader($this->config); $rules = $ruleLoader->getRules($this->url); - if (! empty($rules['grabber'])) { - + if (!empty($rules['grabber'])) { Logger::setMessage(get_called_class().': Parse content with rules'); foreach ($rules['grabber'] as $pattern => $rule) { - $url = new Url($this->url); $sub_url = $url->getFullPath(); if (preg_match($pattern, $sub_url)) { Logger::setMessage(get_called_class().': Matched url '.$sub_url); + return new RuleParser($this->html, $rule); } } - } - else if ($this->enableCandidateParser) { + } elseif ($this->enableCandidateParser) { Logger::setMessage(get_called_class().': Parse content with candidates'); + return new CandidateParser($this->html); } - return null; + return; } /** - * Normalize encoding and strip head tag - * - * @access public + * Normalize encoding and strip head tag. */ public function prepareHtml() { @@ -333,15 +314,15 @@ class Scraper } /** - * Return the Youtube embed player and skip processing + * Return the Youtube embed player and skip processing. * - * @access public - * @return boolean + * @return bool */ public function detectStreamingVideos() { if (preg_match("#(?<=v=|v\/|vi=|vi\/|youtu.be\/)[a-zA-Z0-9_-]{11}#", $this->url, $matches)) { $this->content = ''; + return true; } @@ -349,10 +330,9 @@ class Scraper } /** - * Skip processing for PDF documents + * Skip processing for PDF documents. * - * @access public - * @return boolean + * @return bool */ public function detectPdfFiles() { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Export.php b/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Export.php index 61aa2b1..e5b6197 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Export.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Export.php @@ -5,25 +5,22 @@ namespace PicoFeed\Serialization; use SimpleXMLElement; /** - * OPML export class + * OPML export class. * * @author Frederic Guillot - * @package Serialization */ class Export { /** - * List of feeds to exports + * List of feeds to exports. * - * @access private * @var array */ private $content = array(); /** - * List of required properties for each feed + * List of required properties for each feed. * - * @access private * @var array */ private $required_fields = array( @@ -33,10 +30,9 @@ class Export ); /** - * Constructor + * Constructor. * - * @access public - * @param array $content List of feeds + * @param array $content List of feeds */ public function __construct(array $content) { @@ -44,9 +40,8 @@ class Export } /** - * Get the OPML document + * Get the OPML document. * - * @access public * @return string */ public function execute() @@ -59,11 +54,9 @@ class Export $body = $xml->addChild('body'); foreach ($this->content as $category => $values) { - if (is_string($category)) { $this->createCategory($body, $category, $values); - } - else { + } else { $this->createEntry($body, $values); } } @@ -72,18 +65,17 @@ class Export } /** - * Create a feed entry + * Create a feed entry. * - * @access public - * @param SimpleXMLElement $parent Parent Element - * @param array $feed Feed properties + * @param SimpleXMLElement $parent Parent Element + * @param array $feed Feed properties */ public function createEntry(SimpleXMLElement $parent, array $feed) { $valid = true; foreach ($this->required_fields as $field) { - if (! isset($feed[$field])) { + if (!isset($feed[$field])) { $valid = false; break; } @@ -102,11 +94,10 @@ class Export } /** - * Create entries for a feed list + * Create entries for a feed list. * - * @access public - * @param SimpleXMLElement $parent Parent Element - * @param array $feeds Feed list + * @param SimpleXMLElement $parent Parent Element + * @param array $feeds Feed list */ public function createEntries(SimpleXMLElement $parent, array $feeds) { @@ -116,12 +107,11 @@ class Export } /** - * Create a category entry + * Create a category entry. * - * @access public - * @param SimpleXMLElement $parent Parent Element - * @param string $category Category - * @param array $feeds Feed properties + * @param SimpleXMLElement $parent Parent Element + * @param string $category Category + * @param array $feeds Feed properties */ public function createCategory(SimpleXMLElement $parent, $category, array $feeds) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Import.php b/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Import.php index cbc1cfb..5a426e6 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Import.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Import.php @@ -8,34 +8,30 @@ use PicoFeed\Logging\Logger; use PicoFeed\Parser\XmlParser; /** - * OPML Import + * OPML Import. * * @author Frederic Guillot - * @package Serialization */ class Import { /** - * OPML file content + * OPML file content. * - * @access private * @var string */ private $content = ''; /** - * Subscriptions + * Subscriptions. * - * @access private * @var array */ private $items = array(); /** - * Constructor + * Constructor. * - * @access public - * @param string $content OPML file content + * @param string $content OPML file content */ public function __construct($content) { @@ -43,9 +39,8 @@ class Import } /** - * Parse the OPML file + * Parse the OPML file. * - * @access public * @return array|false */ public function execute() @@ -54,8 +49,9 @@ class Import $xml = XmlParser::getSimpleXml(trim($this->content)); - if ($xml === false || $xml->getName() !== 'opml' || ! isset($xml->body)) { + if ($xml === false || $xml->getName() !== 'opml' || !isset($xml->body)) { Logger::setMessage(get_called_class().': OPML tag not found or malformed XML document'); + return false; } @@ -66,23 +62,18 @@ class Import } /** - * Parse each entries of the subscription list + * Parse each entries of the subscription list. * - * @access public - * @param SimpleXMLElement $tree XML node + * @param SimpleXMLElement $tree XML node */ - public function parseEntries($tree) + public function parseEntries(SimpleXMLElement $tree) { if (isset($tree->outline)) { - foreach ($tree->outline as $item) { - if (isset($item->outline)) { $this->parseEntries($item); - } - else if ((isset($item['text']) || isset($item['title'])) && isset($item['xmlUrl'])) { - - $entry = new StdClass; + } elseif ((isset($item['text']) || isset($item['title'])) && isset($item['xmlUrl'])) { + $entry = new StdClass(); $entry->category = $this->findCategory($tree); $entry->title = $this->findTitle($item); $entry->feed_url = $this->findFeedUrl($item); @@ -96,10 +87,10 @@ class Import } /** - * Find category + * Find category. + * + * @param SimpleXmlElement $tree XML tree * - * @access public - * @param SimpleXmlElement $tree XML tree * @return string */ public function findCategory(SimpleXmlElement $tree) @@ -108,10 +99,10 @@ class Import } /** - * Find title + * Find title. + * + * @param SimpleXmlElement $item XML tree * - * @access public - * @param SimpleXmlElement $item XML tree * @return string */ public function findTitle(SimpleXmlElement $item) @@ -120,10 +111,10 @@ class Import } /** - * Find feed url + * Find feed url. + * + * @param SimpleXmlElement $item XML tree * - * @access public - * @param SimpleXmlElement $item XML tree * @return string */ public function findFeedUrl(SimpleXmlElement $item) @@ -132,11 +123,11 @@ class Import } /** - * Find site url + * Find site url. + * + * @param SimpleXmlElement $item XML tree + * @param StdClass $entry Feed entry * - * @access public - * @param SimpleXmlElement $item XML tree - * @param StdClass $entry Feed entry * @return string */ public function findSiteUrl(SimpleXmlElement $item, StdClass $entry) @@ -145,10 +136,10 @@ class Import } /** - * Find type + * Find type. + * + * @param SimpleXmlElement $item XML tree * - * @access public - * @param SimpleXmlElement $item XML tree * @return string */ public function findType(SimpleXmlElement $item) @@ -157,11 +148,11 @@ class Import } /** - * Find description + * Find description. + * + * @param SimpleXmlElement $item XML tree + * @param StdClass $entry Feed entry * - * @access public - * @param SimpleXmlElement $item XML tree - * @param StdClass $entry Feed entry * @return string */ public function findDescription(SimpleXmlElement $item, StdClass $entry) diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Atom.php b/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Atom.php index a379056..759f35b 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Atom.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Atom.php @@ -7,17 +7,15 @@ use DomElement; use DomAttr; /** - * Atom writer class + * Atom writer class. * * @author Frederic Guillot - * @package Syndication */ class Atom extends Writer { /** - * List of required properties for each feed + * List of required properties for each feed. * - * @access private * @var array */ private $required_feed_properties = array( @@ -27,9 +25,8 @@ class Atom extends Writer ); /** - * List of required properties for each item + * List of required properties for each item. * - * @access private * @var array */ private $required_item_properties = array( @@ -38,10 +35,10 @@ class Atom extends Writer ); /** - * Get the Atom document + * Get the Atom document. + * + * @param string $filename Optional filename * - * @access public - * @param string $filename Optional filename * @return string */ public function execute($filename = '') @@ -80,7 +77,9 @@ class Atom extends Writer $this->addLink($feed, $this->feed_url, 'self', 'application/atom+xml'); // - if (isset($this->author)) $this->addAuthor($feed, $this->author); + if (isset($this->author)) { + $this->addAuthor($feed, $this->author); + } // foreach ($this->items as $item) { @@ -92,17 +91,16 @@ class Atom extends Writer if ($filename) { $this->dom->save($filename); - } - else { + } else { return $this->dom->saveXML(); } } /** - * Create item entry + * Create item entry. + * + * @param arrray $item Item properties * - * @access public - * @param arrray $item Item properties * @return DomElement */ public function createEntry(array $item) @@ -154,13 +152,12 @@ class Atom extends Writer } /** - * Add Link + * Add Link. * - * @access public - * @param DomElement $xml XML node - * @param string $url URL - * @param string $rel Link rel attribute - * @param string $type Link type attribute + * @param DomElement $xml XML node + * @param string $url URL + * @param string $rel Link rel attribute + * @param string $type Link type attribute */ public function addLink(DomElement $xml, $url, $rel = 'alternate', $type = 'text/html') { @@ -172,11 +169,10 @@ class Atom extends Writer } /** - * Add publication date + * Add publication date. * - * @access public - * @param DomElement $xml XML node - * @param integer $value Timestamp + * @param DomElement $xml XML node + * @param int $value Timestamp */ public function addUpdated(DomElement $xml, $value = 0) { @@ -187,11 +183,10 @@ class Atom extends Writer } /** - * Add author + * Add author. * - * @access public - * @param DomElement $xml XML node - * @param array $values Author name and email + * @param DomElement $xml XML node + * @param array $values Author name and email */ public function addAuthor(DomElement $xml, array $values) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Rss20.php b/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Rss20.php index 32b45e7..3d0150d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Rss20.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Rss20.php @@ -7,17 +7,15 @@ use DomAttr; use DomElement; /** - * Rss 2.0 writer class + * Rss 2.0 writer class. * * @author Frederic Guillot - * @package Syndication */ class Rss20 extends Writer { /** - * List of required properties for each feed + * List of required properties for each feed. * - * @access private * @var array */ private $required_feed_properties = array( @@ -27,9 +25,8 @@ class Rss20 extends Writer ); /** - * List of required properties for each item + * List of required properties for each item. * - * @access private * @var array */ private $required_item_properties = array( @@ -38,10 +35,10 @@ class Rss20 extends Writer ); /** - * Get the Rss 2.0 document + * Get the Rss 2.0 document. + * + * @param string $filename Optional filename * - * @access public - * @param string $filename Optional filename * @return string */ public function execute($filename = '') @@ -89,7 +86,9 @@ class Rss20 extends Writer $channel->appendChild($link); // - if (isset($this->author)) $this->addAuthor($channel, 'webMaster', $this->author); + if (isset($this->author)) { + $this->addAuthor($channel, 'webMaster', $this->author); + } // foreach ($this->items as $item) { @@ -102,17 +101,16 @@ class Rss20 extends Writer if ($filename) { $this->dom->save($filename); - } - else { + } else { return $this->dom->saveXML(); } } /** - * Create item entry + * Create item entry. + * + * @param arrray $item Item properties * - * @access public - * @param arrray $item Item properties * @return DomElement */ public function createEntry(array $item) @@ -135,8 +133,7 @@ class Rss20 extends Writer $guid->setAttribute('isPermaLink', 'false'); $guid->appendChild($this->dom->createTextNode($item['id'])); $entry->appendChild($guid); - } - else { + } else { $guid = $this->dom->createElement('guid'); $guid->setAttribute('isPermaLink', 'true'); $guid->appendChild($this->dom->createTextNode($item['url'])); @@ -169,11 +166,10 @@ class Rss20 extends Writer } /** - * Add publication date + * Add publication date. * - * @access public - * @param DomElement $xml XML node - * @param integer $value Timestamp + * @param DomElement $xml XML node + * @param int $value Timestamp */ public function addPubDate(DomElement $xml, $value = 0) { @@ -184,19 +180,22 @@ class Rss20 extends Writer } /** - * Add author + * Add author. * - * @access public - * @param DomElement $xml XML node - * @param string $tag Tag name - * @param array $values Author name and email + * @param DomElement $xml XML node + * @param string $tag Tag name + * @param array $values Author name and email */ public function addAuthor(DomElement $xml, $tag, array $values) { $value = ''; - if (isset($values['email'])) $value .= $values['email']; - if ($value && isset($values['name'])) $value .= ' ('.$values['name'].')'; + if (isset($values['email'])) { + $value .= $values['email']; + } + if ($value && isset($values['name'])) { + $value .= ' ('.$values['name'].')'; + } if ($value) { $author = $this->dom->createElement($tag); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Writer.php b/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Writer.php index cbd35f2..9312e7e 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Writer.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Writer.php @@ -5,98 +5,89 @@ namespace PicoFeed\Syndication; use RuntimeException; /** - * Base writer class + * Base writer class. * * @author Frederic Guillot - * @package Syndication */ abstract class Writer { /** - * Dom object + * Dom object. * - * @access protected * @var \DomDocument */ protected $dom; /** - * Items + * Items. * - * @access public * @var array */ public $items = array(); /** - * Author + * Author. * - * @access public * @var array */ public $author = array(); /** - * Feed URL + * Feed URL. * - * @access public * @var string */ public $feed_url = ''; /** - * Website URL + * Website URL. * - * @access public * @var string */ public $site_url = ''; /** - * Feed title + * Feed title. * - * @access public * @var string */ public $title = ''; /** - * Feed description + * Feed description. * - * @access public * @var string */ public $description = ''; /** - * Feed modification date (timestamp) + * Feed modification date (timestamp). * - * @access public - * @var integer + * @var int */ public $updated = 0; /** - * Generate the XML document + * Generate the XML document. * * @abstract - * @access public - * @param string $filename Optional filename + * + * @param string $filename Optional filename + * * @return string */ abstract public function execute($filename = ''); /** - * Check required properties to generate the output + * Check required properties to generate the output. * - * @access public - * @param array $properties List of properties - * @param mixed $container Object or array container + * @param array $properties List of properties + * @param mixed $container Object or array container */ public function checkRequiredProperties(array $properties, $container) { foreach ($properties as $property) { - if ((is_object($container) && ! isset($container->$property)) || (is_array($container) && ! isset($container[$property]))) { + if ((is_object($container) && !isset($container->$property)) || (is_array($container) && !isset($container[$property]))) { throw new RuntimeException('Required property missing: '.$property); } }