Merge remote-tracking branch 'weierophinney/feature/error-suppression…

…-removal'
zendframework · Jul 13, 2012 · 4d4dd8b · 4d4dd8b
5 parents dbb18b2 + c655082 + 97a9134 + 80367df + 970334c
commit 4d4dd8b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Filter/Regex.php b/src/Filter/Regex.php
@@ -11,6 +11,7 @@
 namespace Zend\Log\Filter;
 
 use Zend\Log\Exception;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * @category   Zend
@@ -35,7 +36,10 @@ class Regex implements FilterInterface
      */
     public function __construct($regex)
     {
-        if (@preg_match($regex, '') === false) {
+        ErrorHandler::start(E_WARNING);
+        $result = preg_match($regex, '');
+        ErrorHandler::stop();
+        if ($result === false) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Invalid regular expression "%s"',
                 $regex

diff --git a/src/Writer/Stream.php b/src/Writer/Stream.php
@@ -12,6 +12,7 @@
 
 use Zend\Log\Exception;
 use Zend\Log\Formatter\Simple as SimpleFormatter;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * @category   Zend
@@ -87,7 +88,10 @@ protected function doWrite(array $event)
     {
         $line = $this->formatter->format($event);
 
-        if (false === @fwrite($this->stream, $line)) {
+        ErrorHandler::start(E_WARNING);
+        $result = fwrite($this->stream, $line);
+        ErrorHandler::stop();
+        if (false === $result) {
             throw new Exception\RuntimeException("Unable to write to stream");
         }
     }