mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
da79dff7d7
- Dispatcher sets a Controller::here variable with the real URL used to access the page, so that tag generators can that use an url (linkTo and formTag for example) use the real url, not guess it from the controller and action names which often fails - Log class works more reliably and a LogError() shortcut function was added - Nstring class added, to store string-related functions (there are just four yet, including a random password generator and an string-to-array splitter - SimpleTest library (with Rephlux) included in /vendors; I've tweaked SimpleScorer::inCli() function, because it didn't work on my setup, it should work everywhere now (it checks for empty REQUEST_METHOD, which should only be empty in CLI) git-svn-id: https://svn.cakephp.org/repo/trunk/cake@248 3807eeeb-6ff5-0310-8944-8be069107fe0
141 lines
No EOL
4.8 KiB
PHP
141 lines
No EOL
4.8 KiB
PHP
<?php
|
|
/**
|
|
* base include file for SimpleTest
|
|
* @package SimpleTest
|
|
* @subpackage UnitTester
|
|
* @version $Id$
|
|
*/
|
|
/** @ignore - PHP5 compatibility fix. */
|
|
if (! defined('E_STRICT')) {
|
|
define('E_STRICT', 2048);
|
|
}
|
|
|
|
/**
|
|
* Singleton error queue used to record trapped
|
|
* errors.
|
|
* @package SimpleTest
|
|
* @subpackage UnitTester
|
|
*/
|
|
class SimpleErrorQueue {
|
|
var $_queue;
|
|
|
|
/**
|
|
* Starts with an empty queue.
|
|
* @access public
|
|
*/
|
|
function SimpleErrorQueue() {
|
|
$this->clear();
|
|
}
|
|
|
|
/**
|
|
* Adds an error to the front of the queue.
|
|
* @param $severity PHP error code.
|
|
* @param $message Text of error.
|
|
* @param $filename File error occoured in.
|
|
* @param $line Line number of error.
|
|
* @param $super_globals Hash of PHP super global arrays.
|
|
* @access public
|
|
*/
|
|
function add($severity, $message, $filename, $line, $super_globals) {
|
|
array_push(
|
|
$this->_queue,
|
|
array($severity, $message, $filename, $line, $super_globals));
|
|
}
|
|
|
|
/**
|
|
* Pulls the earliest error from the queue.
|
|
* @return False if none, or a list of error
|
|
* information. Elements are: severity
|
|
* as the PHP error code, the error message,
|
|
* the file with the error, the line number
|
|
* and a list of PHP super global arrays.
|
|
* @access public
|
|
*/
|
|
function extract() {
|
|
if (count($this->_queue)) {
|
|
return array_shift($this->_queue);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Discards the contents of the error queue.
|
|
* @access public
|
|
*/
|
|
function clear() {
|
|
$this->_queue = array();
|
|
}
|
|
|
|
/**
|
|
* Tests to see if the queue is empty.
|
|
* @return True if empty.
|
|
*/
|
|
function isEmpty() {
|
|
return (count($this->_queue) == 0);
|
|
}
|
|
|
|
/**
|
|
* Global access to a single error queue.
|
|
* @return Global error queue object.
|
|
* @access public
|
|
* @static
|
|
*/
|
|
function &instance() {
|
|
static $queue = false;
|
|
if (! $queue) {
|
|
$queue = new SimpleErrorQueue();
|
|
}
|
|
return $queue;
|
|
}
|
|
|
|
/**
|
|
* Converst an error code into it's string
|
|
* representation.
|
|
* @param $severity PHP integer error code.
|
|
* @return String version of error code.
|
|
* @access public
|
|
* @static
|
|
*/
|
|
function getSeverityAsString($severity) {
|
|
static $map = array(
|
|
E_STRICT => 'E_STRICT',
|
|
E_ERROR => 'E_ERROR',
|
|
E_WARNING => 'E_WARNING',
|
|
E_PARSE => 'E_PARSE',
|
|
E_NOTICE => 'E_NOTICE',
|
|
E_CORE_ERROR => 'E_CORE_ERROR',
|
|
E_CORE_WARNING => 'E_CORE_WARNING',
|
|
E_COMPILE_ERROR => 'E_COMPILE_ERROR',
|
|
E_COMPILE_WARNING => 'E_COMPILE_WARNING',
|
|
E_USER_ERROR => 'E_USER_ERROR',
|
|
E_USER_WARNING => 'E_USER_WARNING',
|
|
E_USER_NOTICE => 'E_USER_NOTICE');
|
|
return $map[$severity];
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Error handler that simply stashes any errors into the global
|
|
* error queue. Simulates the existing behaviour with respect to
|
|
* logging errors, but this feature may be removed in future.
|
|
* @param $severity PHP error code.
|
|
* @param $message Text of error.
|
|
* @param $filename File error occoured in.
|
|
* @param $line Line number of error.
|
|
* @param $super_globals Hash of PHP super global arrays.
|
|
* @static
|
|
* @access public
|
|
*/
|
|
function simpleTestErrorHandler($severity, $message, $filename, $line, $super_globals) {
|
|
if ($severity = $severity & error_reporting()) {
|
|
restore_error_handler();
|
|
if (ini_get('log_errors')) {
|
|
$label = SimpleErrorQueue::getSeverityAsString($severity);
|
|
error_log("$label: $message in $filename on line $line");
|
|
}
|
|
$queue = &SimpleErrorQueue::instance();
|
|
$queue->add($severity, $message, $filename, $line, $super_globals);
|
|
set_error_handler('simpleTestErrorHandler');
|
|
}
|
|
}
|
|
?>
|