feed

joomla · Mar 12, 2019 · d406d1f · d406d1f
1 parent 58758be
commit d406d1f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/administrator/modules/mod_feed/Helper/FeedHelper.php b/administrator/modules/mod_feed/Helper/FeedHelper.php
@@ -11,6 +11,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Feed\Feed;
 use Joomla\CMS\Feed\FeedFactory;
 use Joomla\CMS\Language\Text;
 
@@ -26,7 +27,7 @@ class FeedHelper
 	 *
 	 * @param   JRegisty  $params  The parameters object.
 	 *
-	 * @return  JFeedReader|string  Return a JFeedReader object or a string message if error.
+	 * @return  FeedReader|string  Return a FeedReader object or a string message if error.
 	 *
 	 * @since   1.5
 	 */

diff --git a/build/build-modules-js/namespace.es6.js b/build/build-modules-js/namespace.es6.js
@@ -4,8 +4,8 @@ const RootPath = require('./utils/rootpath.es6.js')._();
 
 
 const jregex = /defined\('(JPATH_BASE|_JEXEC|JPATH_PLATFORM)'\) or die;/gm;
-const oldClassName = 'JFeedEntry';
-const classUse  = 'use Joomla\\CMS\\Feed\\FeedEntry;';
+const oldClassName = 'JFeed';
+const classUse  = 'use Joomla\\CMS\\Feed\\Feed;';
 const newClassName = classUse.substr(classUse.lastIndexOf('\\') + 1).slice(0, -1);
 const root = `${RootPath}/`;
 const filesToIgnore = [
@@ -60,7 +60,7 @@ const readFile = (path) => {
 };
 
 const getInstances = (content, path) => {
-	const regex = /(?=\S)(?!\/\*\*)(?!\/\/)(?!\*)(\\?JFeedEntry)/gm;
+	const regex = /(?=\S)(?!\/\*\*)(?!\/\/)(?!\*)(\\?JFeed)/gm;
 	const matches = content.match(regex);
 
 	if (matches !== null) {

diff --git a/libraries/src/Feed/FeedEntry.php b/libraries/src/Feed/FeedEntry.php
@@ -11,8 +11,11 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\Feed\Feed;
 use Joomla\CMS\Feed\FeedPerson;
 
+
+
 /**
  * Class to encapsulate a feed entry for the Joomla Platform.
  *
@@ -90,7 +93,7 @@ public function __set($name, $value)
 			);
 		}
 
-		// Validate that any sources that are set are instances of JFeed or null.
+		// Validate that any sources that are set are instances of Feed or null.
 		if (($name == 'source') && (!($value instanceof Feed) || ($value === null)))
 		{
 			throw new \InvalidArgumentException(

diff --git a/libraries/src/Feed/FeedParser.php b/libraries/src/Feed/FeedParser.php
@@ -10,6 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Feed\Feed;
 use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
 
 /**
@@ -56,7 +57,7 @@ public function __construct(\XMLReader $stream)
 	}
 
 	/**
-	 * Method to parse the feed into a JFeed object.
+	 * Method to parse the feed into a Feed object.
 	 *
 	 * @return  Feed
 	 *
@@ -116,7 +117,7 @@ public function parse()
 	 * @param   string                    $prefix     The XML namespace prefix for which to register the namespace object.
 	 * @param   NamespaceParserInterface  $namespace  The namespace object to register.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   3.1.4
 	 */

diff --git a/libraries/src/MVC/View/CategoryFeedView.php b/libraries/src/MVC/View/CategoryFeedView.php
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Feed\Feed;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -112,7 +113,7 @@ public function display($tpl = null)
 			}
 
 			// Load individual item creator class.
-			$feeditem              = new \JFeedItem;
+			$feeditem              = new FeedItem;
 			$feeditem->title       = $title;
 			$feeditem->link        = $link;
 			$feeditem->description = $description;

diff --git a/modules/mod_feed/Helper/FeedHelper.php b/modules/mod_feed/Helper/FeedHelper.php
@@ -11,6 +11,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Feed\Feed;
 use Joomla\CMS\Feed\FeedFactory;
 use Joomla\CMS\Language\Text;
 
@@ -26,7 +27,7 @@ class FeedHelper
 	 *
 	 * @param   \Joomla\Registry\Registry  $params  module parameters
 	 *
-	 * @return  JFeedReader|string
+	 * @return  FeedReader|string
 	 */
 	public static function getFeed($params)
 	{