From 9046083dc8c93b50f048aba7c86ebefceb901bb6 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Sun, 18 Apr 2010 01:02:39 -0400 Subject: [PATCH] Removing Overloadable and Overloadable2 they are not needed in PHP5. Removing inheritance and test cases related to Overloadable. --- cake/libs/configure.php | 4 +- cake/libs/model/model.php | 10 +- cake/libs/overloadable.php | 107 -------------------- cake/tests/cases/libs/overloadable.test.php | 40 -------- cake/tests/groups/lib.group.php | 1 - 5 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 cake/libs/overloadable.php delete mode 100644 cake/tests/cases/libs/overloadable.test.php diff --git a/cake/libs/configure.php b/cake/libs/configure.php index dce912c2012..9ba578f7c1c 100644 --- 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 index cc2699cdbb0..565480c31ed 100644 --- 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'); -} + ?> \ No newline at end of file diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php deleted file mode 100644 index 6e7974d1225..00000000000 --- a/cake/libs/overloadable.php +++ /dev/null @@ -1,107 +0,0 @@ -call__($method, $params); - } -} - -/** - * Overloadable2 class selector - * - * Load the interface class based on the version of PHP. - * - * @package cake - */ -class Overloadable2 extends Object { - -/** - * Overload implementation. No need for implementation in PHP5. - * - */ - public function overload() { } - -/** - * Magic method handler. - * - * @param string $method Method name - * @param array $params Parameters to send to method - * @return mixed Return value from method - * @access private - */ - function __call($method, $params) { - if (!method_exists($this, 'call__')) { - trigger_error(sprintf(__('Magic method handler call__ not defined in %s', true), get_class($this)), E_USER_ERROR); - } - return $this->call__($method, $params); - } - -/** - * Getter. - * - * @param mixed $name What to get - * @param mixed $value Where to store returned value - * @return boolean Success - * @access private - */ - function __get($name) { - return $this->get__($name); - } - -/** - * Setter. - * - * @param mixed $name What to set - * @param mixed $value Value to set - * @return boolean Success - * @access private - */ - function __set($name, $value) { - return $this->set__($name, $value); - } -} -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php deleted file mode 100644 index 976ad7d182a..00000000000 --- a/cake/tests/cases/libs/overloadable.test.php +++ /dev/null @@ -1,40 +0,0 @@ - - * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * - * Licensed under The Open Group Test Suite License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs - * @since CakePHP(tm) v 1.2.0.5432 - * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License - */ -App::import('Core', 'Overloadable'); - -/** - * OverloadableTest class - * - * @package cake - * @subpackage cake.tests.cases.libs - */ -class OverloadableTest extends CakeTestCase { - -/** - * skip method - * - * @access public - * @return void - */ - function skip() { - $this->skipIf(true, ' %s OverloadableTest not implemented'); - } -} -?> \ No newline at end of file diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php index c2776a44c9b..be14ddd0b62 100644 --- 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');