Applying PHP 5.3 compatibility patch from Mark Story. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly.

This commit is contained in:
nate 2009-07-31 11:48:30 -04:00
parent f1a4352620
commit 729d8fddea
9 changed files with 45 additions and 4 deletions

View file

@ -184,6 +184,11 @@
*/ */
Configure::write('Acl.classname', 'DbAcl'); Configure::write('Acl.classname', 'DbAcl');
Configure::write('Acl.database', 'default'); Configure::write('Acl.database', 'default');
/**
* If you are on PHP 5.3 uncomment this line and correct your server timezone
* to fix the date & time related errors.
*/
//date_default_timezone_set('UTC');
/** /**
* *
* Cache Engine Configuration * Cache Engine Configuration

View file

@ -52,6 +52,13 @@
if (!defined('CAKE_CORE_INCLUDE_PATH')) { if (!defined('CAKE_CORE_INCLUDE_PATH')) {
define('CAKE_CORE_INCLUDE_PATH', ROOT); define('CAKE_CORE_INCLUDE_PATH', ROOT);
} }
/**
* PHP 5.3 raises many notices in bootstrap.
*/
if (!defined('E_DEPRECATED')) {
define('E_DEPRECATED', 8192);
}
error_reporting(E_ALL & ~E_DEPRECATED);
/** /**
* Editing below this line should NOT be necessary. * Editing below this line should NOT be necessary.

View file

@ -24,7 +24,14 @@
* @lastmodified $Date$ * @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/ */
error_reporting(E_ALL); /**
* PHP 5.3 raises many notices in bootstrap.
*/
if (!defined('E_DEPRECATED')) {
define('E_DEPRECATED', 8192);
}
error_reporting(E_ALL & ~E_DEPRECATED);
set_time_limit(0); set_time_limit(0);
ini_set('memory_limit','128M'); ini_set('memory_limit','128M');
ini_set('display_errors', 1); ini_set('display_errors', 1);

View file

@ -22,6 +22,9 @@
if (!defined('PHP5')) { if (!defined('PHP5')) {
define('PHP5', (PHP_VERSION >= 5)); define('PHP5', (PHP_VERSION >= 5));
} }
if (!defined('E_DEPRECATED')) {
define('PHP5', (PHP_VERSION >= 5));
}
require CORE_PATH . 'cake' . DS . 'basics.php'; require CORE_PATH . 'cake' . DS . 'basics.php';
$TIME_START = getMicrotime(); $TIME_START = getMicrotime();
require CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php'; require CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php';

View file

@ -170,6 +170,11 @@
*/ */
Configure::write('Acl.classname', 'DbAcl'); Configure::write('Acl.classname', 'DbAcl');
Configure::write('Acl.database', 'default'); Configure::write('Acl.database', 'default');
/**
* If you are on PHP 5.3 uncomment this line and correct your server timezone
* to fix the date & time related errors.
*/
//date_default_timezone_set('UTC');
/** /**
* *
* Cache Engine Configuration * Cache Engine Configuration

View file

@ -57,6 +57,13 @@
if (!defined('CAKE_CORE_INCLUDE_PATH')) { if (!defined('CAKE_CORE_INCLUDE_PATH')) {
define('CAKE_CORE_INCLUDE_PATH', ROOT); define('CAKE_CORE_INCLUDE_PATH', ROOT);
} }
/**
* PHP 5.3 raises many notices in bootstrap.
*/
if (!defined('E_DEPRECATED')) {
define('E_DEPRECATED', 8192);
}
error_reporting(E_ALL & ~E_DEPRECATED);
/** /**
* Editing below this line should not be necessary. * Editing below this line should not be necessary.

View file

@ -24,7 +24,14 @@
* @lastmodified $Date$ * @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/ */
error_reporting(E_ALL); /**
* PHP 5.3 raises many notices in bootstrap.
*/
if (!defined('E_DEPRECATED')) {
define('E_DEPRECATED', 8192);
}
error_reporting(E_ALL & ~E_DEPRECATED);
set_time_limit(0); set_time_limit(0);
ini_set('memory_limit','128M'); ini_set('memory_limit','128M');
ini_set('display_errors', 1); ini_set('display_errors', 1);

View file

@ -110,7 +110,7 @@ class Configure extends Object {
if (isset($config['debug'])) { if (isset($config['debug'])) {
if ($_this->debug) { if ($_this->debug) {
error_reporting(E_ALL); error_reporting(E_ALL & ~E_DEPRECATED);
if (function_exists('ini_set')) { if (function_exists('ini_set')) {
ini_set('display_errors', 1); ini_set('display_errors', 1);

View file

@ -252,7 +252,7 @@ class Debugger extends Object {
* @access public * @access public
*/ */
function handleError($code, $description, $file = null, $line = null, $context = null) { function handleError($code, $description, $file = null, $line = null, $context = null) {
if (error_reporting() == 0 || $code === 2048) { if (error_reporting() == 0 || $code === 2048 || $code === 8192) {
return; return;
} }