Merge branch 'master' of git://github.com/zendframework/zf2 into ZF2-377

zendframework · Jul 17, 2012 · d8cde75 · d8cde75
6 parents c655082 + 97a9134 + 4d4dd8b + dbb18b2 + 80367df + 98d5255
commit d8cde75
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 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");
         }
     }

diff --git a/src/Writer/Syslog.php b/src/Writer/Syslog.php
@@ -171,7 +171,7 @@ public function setFacility($facility)
 
         if (!in_array($facility, $this->validFacilities)) {
             throw new Exception\InvalidArgumentException(
-            	'Invalid log facility provided; please see http://php.net/openlog for a list of valid facility values'
+                'Invalid log facility provided; please see http://php.net/openlog for a list of valid facility values'
             );
         }
 

diff --git a/test/Formatter/SimpleTest.php b/test/Formatter/SimpleTest.php
@@ -43,7 +43,7 @@ public function testDefaultFormat()
         $this->assertContains((string)$fields['priority'], $line);
     }
 
-    function testComplexValues()
+    public function testComplexValues()
     {
         $fields = array('timestamp'    => 0,
                         'priority'     => 42,
@@ -90,15 +90,15 @@ function testComplexValues()
      */
     public function testDefaultFormatShouldDisplayExtraInformations()
     {
-    	$message = 'custom message';
-    	$exception = new \RuntimeException($message);
-    	$event = array(
-    	    'timestamp'    => date('c'),
-    	    'message'      => 'Application error',
-    	    'priority'     => 2,
-    	    'priorityName' => 'CRIT',
-    	    'info'         => $exception,
-    	);
+        $message = 'custom message';
+        $exception = new \RuntimeException($message);
+        $event = array(
+            'timestamp'    => date('c'),
+            'message'      => 'Application error',
+            'priority'     => 2,
+            'priorityName' => 'CRIT',
+            'info'         => $exception,
+        );
 
         $formatter = new Simple();
         $output = $formatter->format($event);

diff --git a/test/Writer/DbTest.php b/test/Writer/DbTest.php
@@ -186,7 +186,7 @@ public function testShutdownRemovesReferenceToDatabaseInstance()
      */
     public function testThrowStrictSetFormatter()
     {
-    	$this->setExpectedException('PHPUnit_Framework_Error');
+        $this->setExpectedException('PHPUnit_Framework_Error');
         $this->writer->setFormatter(new \StdClass());
     }
 }