Moved JObject to its own package.

benjaminpick · Mar 2, 2012 · 6c2ce1b · 6c2ce1b
1 parent e185312
commit 6c2ce1b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/libraries/import.php b/libraries/import.php
@@ -47,7 +47,6 @@ class_exists('JLoader') or die;
 // Import the base Joomla Platform libraries.
 JLoader::import('joomla.factory');
 JLoader::import('joomla.error.exception');
-JLoader::import('joomla.base.object');
 
 // Register JRequest for legacy reasons
 JLoader::register('JRequest', JPATH_PLATFORM . '/joomla/environment/request.php');

diff --git a/libraries/joomla/base/object.php b/libraries/joomla/base/object.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Object
+ *
+ * @copyright   Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JObject has been moved to /object/object.php.', JLog::WARNING, 'deprecated');
+require_once JPATH_PLATFORM . '/joomla/object/object.php';
diff --git a/libraries/joomla/object/object.php b/libraries/joomla/object/object.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Platform
- * @subpackage  Base
+ * @subpackage  Object
  *
  * @copyright   Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
@@ -10,13 +10,13 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * Base object class.
+ * Joomla Platform Object Class
  *
  * This class allows for simple but smart objects with get and set methods
  * and an internal error handler.
  *
  * @package     Joomla.Platform
- * @subpackage  Base
+ * @subpackage  Object
  * @since       11.1
  */
 class JObject