Skip to content
Permalink
Browse files

Removing Overloadable and Overloadable2 they are not needed in PHP5.

Removing inheritance and test cases related to Overloadable.
  • Loading branch information...
markstory committed Apr 18, 2010
1 parent 92289e5 commit 9046083dc8c93b50f048aba7c86ebefceb901bb6
@@ -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);
}
}
/**
@@ -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');
}
?>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -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');

0 comments on commit 9046083

Please sign in to comment.
You can’t perform that action at this time.