#93 : Remove FOF library

administrator/components/com_admin/script.php

@@ -106,7 +106,6 @@ protected function updateManifestCaches()
 		$extensions[] = array('library', 'phputf8', '', 0);
 		$extensions[] = array('library', 'joomla', '', 0);
 		$extensions[] = array('library', 'idna_convert', '', 0);
-		$extensions[] = array('library', 'fof', '', 0);
 		$extensions[] = array('library', 'phpass', '', 0);
 
 		// Modules site
@@ -1037,15 +1036,11 @@ public function deleteUnexistingFiles()
 	 * @return  void
 	 *
 	 * @since   3.2
+     * @deprecated
 	 */
 	protected function clearRadCache()
 	{
-		jimport('joomla.filesystem.file');
 
-		if (JFile::exists(JPATH_CACHE . '/fof/cache.php'))
-		{
-			JFile::delete(JPATH_CACHE . '/fof/cache.php');
-		}
 	}
 
 	/**

build/phpcs/Joomla/ruleset.xml

@@ -12,7 +12,6 @@
 
  <!-- Exclude 3rd party libraries and Framework code. -->
  <exclude-pattern type="relative">libraries/compat/password/*</exclude-pattern>
- <exclude-pattern type="relative">libraries/fof/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/framework/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/idna_convert/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/phputf8/*</exclude-pattern>

components/com_users/models/profile.php

@@ -24,21 +24,6 @@ class UsersModelProfile extends JModelForm
 	 */
 	protected $data;
 
-	public function __construct($config = array())
-	{
-		parent::__construct($config);
-
-		// Load the Joomla! RAD layer
-		if (!defined('FOF_INCLUDED'))
-		{
-			include_once JPATH_LIBRARIES . '/fof/include.php';
-		}
-
-		// Load the helper and model used for two factor authentication
-		require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php';
-		require_once JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php';
-	}
-
 	/**
 	 * Method to check in a user.
 	 *

installation/sql/mysql/joomla.sql

@@ -308,7 +308,6 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (200, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (201, 'mod_articles_latest', 'module', 'mod_articles_latest', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),

language/en-GB/install.xml

@@ -22,7 +22,6 @@
 		<filename>en-GB.files_joomla.sys.ini</filename>
 		<filename>en-GB.finder_cli.ini</filename>
 		<filename>en-GB.ini</filename>
-		<filename>en-GB.lib_fof.sys.ini</filename>
 		<filename>en-GB.lib_idna_convert.sys.ini</filename>
 		<filename>en-GB.lib_joomla.ini</filename>
 		<filename>en-GB.lib_joomla.sys.ini</filename>

libraries/cms.php

@@ -36,12 +36,6 @@
 // Register the class aliases for Framework classes that have replaced their Platform equivilents
 require_once __DIR__ . '/classmap.php';
 
-// Ensure FOF autoloader included - needed for things like content versioning where we need to get an FOFTable Instance
-if (!class_exists('FOFAutoloaderFof'))
-{
-	include_once JPATH_LIBRARIES . '/fof/include.php';
-}
-
 // Register a handler for uncaught exceptions that shows a pretty error page when possible
 set_exception_handler(array('JErrorPage', 'render'));