Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Jun 19, 2012 · f9f4654 · f9f4654
2 parents 61cb196 + e2c2b94
commit f9f4654
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 201 deletions.
diff --git a/src/Exception.php b/src/Exception.php
diff --git a/src/Filter/Validator.php b/src/Filter/Validator.php
@@ -44,15 +44,9 @@ class Validator implements FilterInterface
      * Filter out any log messages not matching the validator
      *
      * @param  ZendValidator $validator
-     * @throws Exception\InvalidArgumentException
      */
-    public function __construct($validator)
+    public function __construct(ZendValidator $validator)
     {
-        if (!$validator instanceof ZendValidator) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected Zend\Validator object'
-            ));
-        }
         $this->validator = $validator;
     }
 

diff --git a/src/Formatter/ExceptionHandler.php b/src/Formatter/ExceptionHandler.php
@@ -45,13 +45,14 @@ public function format($event)
                   $event['priority'] . ') ' . $event['message'] .' in ' .
                   $event['extra']['file'] . ' on line ' . $event['extra']['line'];
         if (!empty($event['extra']['trace'])) {
+            $outputTrace = '';
             foreach ($event['extra']['trace'] as $trace) {
-                $outputTrace = "File  : {$trace['file']}\n" .
-                               "Line  : {$trace['line']}\n" .
-                               "Func  : {$trace['function']}\n" .
-                               "Class : {$trace['class']}\n" .
-                               "Type  : " . $this->getType($trace['type']) . "\n" .
-                               "Args  : " . print_r($trace['args'], true) . "\n";           
+                $outputTrace .= "File  : {$trace['file']}\n" .
+                                "Line  : {$trace['line']}\n" .
+                                "Func  : {$trace['function']}\n" .
+                                "Class : {$trace['class']}\n" .
+                                "Type  : " . $this->getType($trace['type']) . "\n" .
+                                "Args  : " . print_r($trace['args'], true) . "\n";
             }
             $output.= "\n[Trace]\n" . $outputTrace;
         }

diff --git a/src/LoggableInterface.php b/src/LoggableInterface.php
diff --git a/src/Logger.php b/src/Logger.php
@@ -35,7 +35,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Logger implements LoggableInterface, Pluggable
+class Logger implements LoggerInterface, Pluggable
 {
     /**
      * @const int defined from the BSD Syslog message severities
@@ -239,11 +239,8 @@ public function getWriters()
      * @throws Exception\InvalidArgumentException
      * @return Logger
      */
-    public function setWriters($writers)
+    public function setWriters(SplPriorityQueue $writers)
     {
-        if (!$writers instanceof SplPriorityQueue) {
-            throw new Exception\InvalidArgumentException('Writers must be a SplPriorityQueue of Zend\Log\Writer');
-        }
         foreach ($writers->toArray() as $writer) {
             if (!$writer instanceof Writer\WriterInterface) {
                 throw new Exception\InvalidArgumentException('Writers must be a SplPriorityQueue of Zend\Log\Writer');

diff --git a/src/LoggerAware.php b/src/LoggerAware.php
diff --git a/src/LoggerAwareInterface.php b/src/LoggerAwareInterface.php
@@ -23,7 +23,7 @@
  */
 namespace Zend\Log;
 
-use Zend\Log\Logger;
+use Zend\Log\LoggerInterface;
 
 /**
  * Logger aware interface
@@ -35,5 +35,5 @@
  */
 interface LoggerAwareInterface
 {
-    public function setLogger(Logger $logger);
+    public function setLogger(LoggerInterface $logger);
 }
diff --git a/src/Loggable.php → src/LoggerInterface.php b/src/Loggable.php → src/LoggerInterface.php
@@ -29,7 +29,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Loggable
+interface LoggerInterface
 {
     /**
      * @param string $message

diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
@@ -59,9 +59,7 @@ public function addFilter($filter)
     {
         if (is_int($filter)) {
             $filter = new Filter\Priority($filter);
-        }
-
-        if (!$filter instanceof Filter\FilterInterface) {
+        } elseif (!$filter instanceof Filter\FilterInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Filter must implement Zend\Log\Filter; received %s',
                 is_object($filter) ? get_class($filter) : gettype($filter)

diff --git a/test/Filter/ValidatorTest.php b/test/Filter/ValidatorTest.php
@@ -37,12 +37,6 @@
  */
 class ValidatorTest extends \PHPUnit_Framework_TestCase
 {
-    public function testRecognizesInvalidValidator()
-    {
-        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'Expected Zend\Validator object');
-        new Validator('invalid');
-    }
-
     public function testValidatorFilter()
     {
         $filter = new Validator(new Alnum());

diff --git a/test/Formatter/ExceptionHandlerTest.php b/test/Formatter/ExceptionHandlerTest.php
@@ -35,30 +35,63 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
 {
     public function testFormat()
     {
-        $date = date('c');
         $event = array(
-            'timestamp'    => $date,
+            'timestamp'    => '2012-06-12T09:00:00+02:00',
             'message'      => 'test',
             'priority'     => 1,
             'priorityName' => 'CRIT',
             'extra' => array (
                 'file'  => 'test.php',
                 'line'  => 1,
-                'trace' => array(array(
-                    'file'     => 'test.php',
-                    'line'     => 1,
-                    'function' => 'test',
-                    'class'    => 'Test',
-                    'type'     => '::',
-                    'args'     => array(1)
-                ))
+                'trace' => array(
+                    array(
+                        'file'     => 'test.php',
+                        'line'     => 1,
+                        'function' => 'test',
+                        'class'    => 'Test',
+                        'type'     => '::',
+                        'args'     => array(1)
+                    ),
+                    array(
+                        'file'     => 'test.php',
+                        'line'     => 2,
+                        'function' => 'test',
+                        'class'    => 'Test',
+                        'type'     => '::',
+                        'args'     => array(1)
+                    )
+                )
             )
         );
+        $expected = <<<EOF
+2012-06-12T09:00:00+02:00 CRIT (1) test in test.php on line 1
+[Trace]
+File  : test.php
+Line  : 1
+Func  : test
+Class : Test
+Type  : static
+Args  : Array
+(
+    [0] => 1
+)
+
+File  : test.php
+Line  : 2
+Func  : test
+Class : Test
+Type  : static
+Args  : Array
+(
+    [0] => 1
+)
+
+
+EOF;
+
         $formatter = new ExceptionHandler();
         $output = $formatter->format($event);
 
-        $this->assertEquals($date . " CRIT (1) test in test.php on line 1\n" .
-                "[Trace]\nFile  : test.php\nLine  : 1\nFunc  : test\nClass : Test\n" .
-                "Type  : static\nArgs  : Array\n(\n    [0] => 1\n)\n\n", $output);
+        $this->assertEquals($expected, $output);
     }
 }