Removing Overloadable and Overloadable2 they are not needed in PHP5.

Removing inheritance and test cases related to Overloadable.
cakephp · Apr 18, 2010 · 9046083 · 9046083
1 parent 92289e5
commit 9046083
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 159 deletions.
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
@@ -1060,9 +1060,7 @@ private function __mapped($name, $type, $plugin) {
  * @access private
  */
 	private function __overload($type, $name, $parent) {
-		if (($type === 'Model' || $type === 'Helper') && $parent !== false) {
-			Overloadable::overload($name);
-		}
+
 	}
 
 /**

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
@@ -27,10 +27,6 @@
 App::import('Model', 'ModelBehavior', false);
 App::import('Model', 'ConnectionManager', false);
 
-if (!class_exists('Overloadable')) {
-	require LIBS . 'overloadable.php';
-}
-
 /**
  * Object-relational mapper.
  *
@@ -43,7 +39,7 @@
  * @subpackage    cake.cake.libs.model
  * @link          http://book.cakephp.org/view/1000/Models
  */
-class Model extends Overloadable {
+class Model extends Object {
 
 /**
  * The name of the DataSource connection that this Model uses
@@ -2997,7 +2993,5 @@ function __sleep() {
 	function __wakeup() {
 	}
 }
-if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
-	Overloadable::overload('Model');
-}
+
 ?>
diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php
diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php
diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php
@@ -53,7 +53,6 @@ function LibGroupTest() {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_log');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'log' . DS . 'file_log');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'overloadable');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'sanitize');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'security');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'set');