[joomla#30583] Deprecate SimplePie. Thanks Elin Waring.

javigomez · Apr 15, 2013 · f7b1c78 · f7b1c78
1 parent f2871e3
commit f7b1c78
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -27,6 +27,7 @@ $ -> Language fix or change
 
 15-Apr-Mark Dexter
  + [#30298] Added note form field. Thanks Peter van Westen.
+ # [#30583] Deprecate SimplePie. Thanks Elin Waring.
 
 15-Apr-2013 Jean-Marie Simonet
  # [#30579] *TAGS: Tags field not displaying tags--Revert changes to the tags API. Thanks Elin

diff --git a/libraries/joomla/factory.php b/libraries/joomla/factory.php
@@ -342,7 +342,7 @@ public static function getMailer()
 	 * @return  mixed  SimplePie parsed object on success, false on failure.
 	 *
 	 * @since   11.1
-	 * @deprecated  13.3  Use JSimplepieFactory::getFeedParser() instead.
+	 * @deprecated  4.0  Use directly JFeedFactory or supply SimplePie instead. Mehod will be proxied to JFeedFactory beginning in 3.2
 	 */
 	public static function getFeedParser($url, $cache_time = 0)
 	{
@@ -351,7 +351,7 @@ public static function getFeedParser($url, $cache_time = 0)
 			throw new BadMethodCallException('JSimplepieFactory not found');
 		}
 
-		JLog::add(__METHOD__ . ' is deprecated.   Use JSimplepieFactory::getFeedParser() instead.', JLog::WARNING, 'deprecated');
+		JLog::add(__METHOD__ . ' is deprecated.   Use JFeedFactory() or supply SimplePie instead.', JLog::WARNING, 'deprecated');
 
 		return JSimplepieFactory::getFeedParser($url, $cache_time);
 	}

diff --git a/libraries/legacy/simplepie/factory.php b/libraries/legacy/simplepie/factory.php
@@ -19,6 +19,8 @@
  * @package     Joomla.Legacy
  * @subpackage  Simplepie
  * @since       12.2
+ *
+ * @deprecated  4.0  Use JFeed or supply your own methods
  */
 class JSimplepieFactory
 {
@@ -31,10 +33,14 @@ class JSimplepieFactory
 	 * @return  mixed  SimplePie parsed object on success, false on failure.
 	 *
 	 * @since   12.2
-	 * @deprecated  12.3  Will be dropped without replacement.
+	 * @deprecated  4.0   Use JFeedFactory($url) instead.
+	 *
+	 * @note  In 3.2 will be proxied to JFeedFactory()
 	 */
 	public static function getFeedParser($url, $cache_time = 0)
 	{
+		JLog::add(__METHOD__ . ' is deprecated.   Use JFeedFactory() or supply Simple Pie instead.', JLog::WARNING, 'deprecated');
+
 		$cache = JFactory::getCache('feed_parser', 'callback');
 
 		if ($cache_time > 0)

diff --git a/libraries/simplepie/simplepie.php b/libraries/simplepie/simplepie.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * This file will be removed in Joomla! CMS version 3.2. Developers should either supply their own copy
+ * in their installation packages or switch to JFeed.
+ */
 /**
  * SimplePie
  *