Merge branch 'master' of git://git.zendframework.com/zf

zendframework · Apr 30, 2011 · a569f01 · a569f01
3 parents cc446b7 + d913f72 + 2b48cb0
commit a569f01
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 8 deletions.
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -1,6 +1,38 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
 namespace Zend\Log\Exception;
 
+/**
+ * Invalid argument exception
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class InvalidArgumentException
 	extends \InvalidArgumentException
 	implements \Zend\Log\Exception

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -1,6 +1,38 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
 namespace Zend\Log\Exception;
 
+/**
+ * Runtime argument exception
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class RuntimeException
 	extends \RuntimeException
 	implements \Zend\Log\Exception

diff --git a/src/Formatter/AbstractFormatter.php b/src/Formatter/AbstractFormatter.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -32,7 +32,7 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractFormatter implements Formatter, Factory

diff --git a/src/Writer/Firebug.php b/src/Writer/Firebug.php
@@ -196,6 +196,7 @@ protected function _write($event)
         FirePhp::getInstance()->send($message,
                                      $label,
                                      $type,
-                                     array('traceOffset'=>6));
+                                     array('traceOffset'=>4,
+                                           'fixZendLogOffsetIfApplicable'=>true));
     }
 }
diff --git a/src/Writer/Stream.php b/src/Writer/Stream.php
@@ -51,7 +51,7 @@ class Stream extends AbstractWriter
      * @param string|null $mode Mode, only applicable if a URL is given
      * @return void
      * @throws \Zend\Log\Exception\InvalidArgumentException
-     * @throws \Zend\Log\Excpeiton\RuntimeException
+     * @throws \Zend\Log\Exception\RuntimeException
      */
     public function __construct($streamOrUrl, $mode = null)
     {

diff --git a/test/Formatter/FirebugTest.php b/test/Formatter/FirebugTest.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -27,7 +27,7 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Log
  */

diff --git a/test/Writer/FirebugTest.php b/test/Writer/FirebugTest.php
@@ -260,4 +260,55 @@ public function testFactory()
         $logger = Logger::factory($cfg['log']);
         $this->assertTrue($logger instanceof Logger);
     }
+
+    /**
+     * @group ZF-10537
+     */
+    public function testFileLineOffsets()
+    {
+        $firephp = FirePhp::getInstance();
+        $channel = Channel\HttpHeaders::getInstance();
+        $protocol = $channel->getProtocol(FirePhp::PROTOCOL_URI);
+        $firephp->setOption('includeLineNumbers', true);
+        $firephp->setOption('maxTraceDepth', 0);
+
+        $lines = array();
+        // NOTE: Do NOT separate the following pairs otherwise the line numbers will not match for the test
+
+        // Message number: 1
+        $lines[] = __LINE__ + 1;
+        $this->_logger->log('Hello World', Logger::INFO);
+
+        // Message number: 2
+        $this->_logger->addPriority('TRACE', 8);
+        $this->_writer->setPriorityStyle(8, 'TRACE');
+        $lines[] = __LINE__ + 1;
+        $this->_logger->trace('Trace to here');
+
+        // Message number: 3
+        $this->_logger->addPriority('TABLE', 9);
+        $this->_writer->setPriorityStyle(9, 'TABLE');
+        $table = array('Summary line for the table',
+                       array(
+                           array('Column 1', 'Column 2'),
+                           array('Row 1 c 1',' Row 1 c 2'),
+                           array('Row 2 c 1',' Row 2 c 2')
+                       )
+                      );
+        $lines[] = __LINE__ + 1;
+        $this->_logger->table($table);
+
+        // Message number: 4
+        $lines[] = __LINE__ + 1;
+        $this->_logger->info('Hello World');
+
+        $messages = $protocol->getMessages();
+        $messages = $messages[FirePhp::STRUCTURE_URI_FIREBUGCONSOLE][FirePhp::PLUGIN_URI];
+
+        for ($i = 0; $i < count($messages); $i++) {
+            if (!preg_match_all('/FirebugTest\.php","Line":' . $lines[$i] . '/', $messages[$i], $m)) {
+                $this->fail("File and line does not match for message number: " . ($i + 1));
+            }
+        }
+    }
 }
diff --git a/test/Writer/SyslogTest.php b/test/Writer/SyslogTest.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -30,7 +30,7 @@
  * @category   Zend
  * @package    Zend_Log
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Log
  */