Merge branch 'master' of dg/rss-php

Author: peter279k

composer.json

@@ -7,7 +7,7 @@
 	"authors": [
 		{
 			"name": "David Grudl",
-			"homepage": "http://davidgrudl.com"
+			"homepage": "https://davidgrudl.com"
 		}
 	],
 	"require": {

example-atom.php

@@ -8,7 +8,7 @@
 require_once 'src/Feed.php';
 
 
-$atom = Feed::loadAtom('http://php.vrana.cz/atom.php');
+$atom = Feed::loadAtom('https://php.vrana.cz/atom.php');
 
 ?>
 

example-rss.php

@@ -7,7 +7,7 @@
 
 require_once 'src/Feed.php';
 
-$rss = Feed::loadRss('http://phpfashion.com/feed/rss');
+$rss = Feed::loadRss('https://phpfashion.com/feed/rss');
 
 ?>
 

readme.md

@@ -54,5 +54,4 @@ Feed::$cacheDir = __DIR__ . '/tmp';
 Feed::$cacheExpire = '5 hours';
 ```
 
------
-(c) David Grudl, 2008 (http://davidgrudl.com)
+If you like it, **[please make a donation now](https://nette.org/make-donation?to=rss-php)**. Thank you!

src/Feed.php

@@ -5,7 +5,7 @@
  *
  * @copyright  Copyright (c) 2008 David Grudl
  * @license    New BSD License
- * @version    1.2
+ * @version    1.3
  */
 
 use GuzzleHttp\Client;
@@ -32,7 +32,7 @@ class Feed
 	 * @return Feed
 	 * @throws FeedException
 	 */
-	public static function load($url, $user = NULL, $pass = NULL)
+	public static function load($url, $user = null, $pass = null)
 	{
 		$xml = self::loadXml($url, $user, $pass);
 		if ($xml->channel) {
@@ -51,7 +51,7 @@ public static function load($url, $user = NULL, $pass = NULL)
 	 * @return Feed
 	 * @throws FeedException
 	 */
-	public static function loadRss($url, $user = NULL, $pass = NULL)
+	public static function loadRss($url, $user = null, $pass = null)
 	{
 		return self::fromRss(self::loadXml($url, $user, $pass));
 	}
@@ -65,7 +65,7 @@ public static function loadRss($url, $user = NULL, $pass = NULL)
 	 * @return Feed
 	 * @throws FeedException
 	 */
-	public static function loadAtom($url, $user = NULL, $pass = NULL)
+	public static function loadAtom($url, $user = null, $pass = null)
 	{
 		return self::fromAtom(self::loadXml($url, $user, $pass));
 	}
@@ -98,8 +98,8 @@ private static function fromRss(SimpleXMLElement $xml)
 
 	private static function fromAtom(SimpleXMLElement $xml)
 	{
-		if (!in_array('http://www.w3.org/2005/Atom', $xml->getDocNamespaces(), TRUE)
-			&& !in_array('http://purl.org/atom/ns#', $xml->getDocNamespaces(), TRUE)
+		if (!in_array('http://www.w3.org/2005/Atom', $xml->getDocNamespaces(), true)
+			&& !in_array('http://purl.org/atom/ns#', $xml->getDocNamespaces(), true)
 		) {
 			throw new FeedException('Invalid feed.');
 		}
@@ -142,9 +142,9 @@ public function __set($name, $value)
 	 * @param  SimpleXMLElement
 	 * @return array
 	 */
-	public function toArray(SimpleXMLElement $xml = NULL)
+	public function toArray(SimpleXMLElement $xml = null)
 	{
-		if ($xml === NULL) {
+		if ($xml === null) {
 			$xml = $this->xml;
 		}
 
@@ -202,7 +202,7 @@ private static function loadXml($url, $user, $pass)
 	 * @param  string
 	 * @param  string
 	 * @param  string
-	 * @return string|FALSE
+	 * @return string|false
 	 * @throws FeedException
 	 */
 	private static function httpRequest($url, $user, $pass)
@@ -229,14 +229,13 @@ private static function httpRequest($url, $user, $pass)
 	 */
 	private static function adjustNamespaces($el)
 	{
-		foreach ($el->getNamespaces(TRUE) as $prefix => $ns) {
+		foreach ($el->getNamespaces(true) as $prefix => $ns) {
 			$children = $el->children($ns);
 			foreach ($children as $tag => $content) {
 				$el->{$prefix . ':' . $tag} = $content;
 			}
 		}
 	}
-
 }