Ignore errorHandler if warning suppressor (@command()) is used.

cakephp · Dec 2, 2010 · aa0bad9 · aa0bad9
1 parent ffaec10
commit aa0bad9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/cake/console/libs/console_error_handler.php b/cake/console/libs/console_error_handler.php
@@ -70,6 +70,9 @@ public static function handleException($exception) {
  * @return void
  */
 	public static function handleError($code, $description, $file = null, $line = null, $context = null) {
+		if (error_reporting() === 0) {
+			return;
+		}
 		$stderr = self::getStderr();
 		list($name, $log) = self::_mapErrorCode($code);
 		$message = sprintf(__('%s in [%s, line %s]'), $description, $file, $line);

diff --git a/cake/libs/error/error_handler.php b/cake/libs/error/error_handler.php
@@ -135,6 +135,9 @@ public static function handleException(Exception $exception) {
  * @return boolean true if error was handled
  */
 	public static function handleError($code, $description, $file = null, $line = null, $context = null) {
+		if (error_reporting() === 0) {
+			return false;
+		}
 		$errorConfig = Configure::read('Error');
 		list($error, $log) = self::_mapErrorCode($code);
 

diff --git a/cake/tests/cases/libs/error/error_handler.test.php b/cake/tests/cases/libs/error/error_handler.test.php
@@ -113,6 +113,21 @@ function testErrorMapping($error, $expected) {
 		$this->assertPattern('/<b>' . $expected . '<\/b>/', $result);
 	}
 
+/**
+ * test error prepended by @
+ *
+ * @return void
+ */
+	function testErrorSuppressed() {
+		set_error_handler('ErrorHandler::handleError');
+		$this->_restoreError = true;
+
+		ob_start();
+		@include 'invalid.file';
+		$result = ob_get_clean();
+		$this->assertTrue(empty($result));
+	}
+
 /**
  * Test that errors go into CakeLog when debug = 0.
  *