Removing inheritance from Object. Constructor workarounds are no long…

…er needed and Object methods are not used on these classes.
cakephp · Apr 18, 2010 · 146ec00 · 146ec00
1 parent c9f3fa5
commit 146ec00
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/cake/libs/file.php b/cake/libs/file.php
@@ -22,9 +22,6 @@
  * Included libraries.
  *
  */
-if (!class_exists('Object')) {
-	require LIBS . 'object.php';
-}
 if (!class_exists('Folder')) {
 	require LIBS . 'folder.php';
 }
@@ -35,7 +32,7 @@
  * @package       cake
  * @subpackage    cake.cake.libs
  */
-class File extends Object {
+class File {
 
 /**
  * Folder object of the File
@@ -96,7 +93,6 @@ class File extends Object {
  * @access private
  */
 	function __construct($path, $create = false, $mode = 0755) {
-		parent::__construct();
 		$this->Folder =& new Folder(dirname($path), $create, $mode);
 		if (!is_dir($path)) {
 			$this->name = basename($path);

diff --git a/cake/libs/folder.php b/cake/libs/folder.php
@@ -22,9 +22,6 @@
  * Included libraries.
  *
  */
-if (!class_exists('Object')) {
-	require LIBS . 'object.php';
-}
 
 /**
  * Folder structure browser, lists folders and files.
@@ -33,7 +30,7 @@
  * @package       cake
  * @subpackage    cake.cake.libs
  */
-class Folder extends Object {
+class Folder {
 
 /**
  * Path to Folder.
@@ -100,7 +97,6 @@ class Folder extends Object {
  * @param mixed $mode Mode (CHMOD) to apply to created folder, false to ignore
  */
 	function __construct($path = false, $create = false, $mode = false) {
-		parent::__construct();
 		if (empty($path)) {
 			$path = TMP;
 		}

diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
@@ -29,7 +29,7 @@
  * @package       cake
  * @subpackage    cake.cake.libs
  */
-class I18n extends Object {
+class I18n {
 
 /**
  * Instance of the I10n class for localization

diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
@@ -24,7 +24,7 @@
  * @package       cake
  * @subpackage    cake.cake.libs
  */
-class L10n extends Object {
+class L10n {
 
 /**
  * The language for current locale
@@ -331,7 +331,6 @@ function __construct() {
 		if (defined('DEFAULT_LANGUAGE')) {
 			$this->default = DEFAULT_LANGUAGE;
 		}
-		parent::__construct();
 	}
 
 /**