root

Changeset 512

Show
Ignore:
Timestamp:
02/15/09 17:03:24 (1 year ago)
Author:
wbond
Message:

Changed fCore::handleError() to display the error type as the header

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • fCore.php

    r508 r512 Hide Line Numbers
    1010 * @link       http://flourishlib.com/fCore 
    1111 *  
    12  * @version    1.0.0b2 
     12 * @version    1.0.0b3 
     13 * @changes    1.0.0b3  ::handleError() now displays what kind of error occured as the heading [wb, 2009-02-15] 
    1314 * @changes    1.0.0b2  Added ::registerDebugCallback() [wb, 2009-02-07] 
    1415 * @changes    1.0.0b   The initial implementation [wb, 2007-09-25] 
    …… 
    630631        $error_string = preg_replace('# \[<a href=\'.*?</a>\]: #', ': ', $error_string); 
    631632         
    632         $error   = self::compose('Error') . "\n-----\n" . $backtrace . "\n" . $error_string; 
     633        // This was added in 5.2 
     634        if (!defined('E_RECOVERABLE_ERROR')) { 
     635            define('E_RECOVERABLE_ERROR', 4096); 
     636        } 
     637         
     638        // These were added in 5.3 
     639        if (!defined('E_DEPRECATED')) { 
     640            define('E_DEPRECATED', 8192); 
     641        } 
     642         
     643        if (!defined('E_USER_DEPRECATED')) { 
     644            define('E_USER_DEPRECATED', 16384); 
     645        } 
     646         
     647        switch ($error_number) { 
     648            case E_WARNING:           $type = self::compose('Warning');           break; 
     649            case E_NOTICE:            $type = self::compose('Notice');            break; 
     650            case E_USER_ERROR:        $type = self::compose('User Error');        break; 
     651            case E_USER_WARNING:      $type = self::compose('User Warning');      break; 
     652            case E_USER_NOTICE:       $type = self::compose('User Notice');       break; 
     653            case E_STRICT:            $type = self::compose('Strict');            break; 
     654            case E_RECOVERABLE_ERROR: $type = self::compose('Recoverable Error'); break; 
     655            case E_DEPRECATED:        $type = self::compose('Deprecated');        break; 
     656            case E_USER_DEPRECATED:   $type = self::compose('User Deprecated');   break; 
     657        } 
     658         
     659        $error = $type . "\n-----\n" . $backtrace . "\n" . $error_string; 
    633660         
    634661        self::sendMessageToDestination('error', $error);