Merge branch 'master' into acceptHandling

Conflicts: library/Zend/Http/Header/AbstractAccept.php library/Zend/Http/Header/AcceptEncoding.php library/Zend/Http/Header/AcceptLanguage.php tests/Zend/Http/Header/AcceptCharsetTest.php tests/Zend/Http/Header/AcceptEncodingTest.php tests/Zend/Http/Header/AcceptLanguageTest.php tests/Zend/Http/Header/AcceptTest.php
zendframework · Jul 14, 2012 · 98d5255 · 98d5255
6 parents 3e833ad + 4d4dd8b + c655082 + dbb18b2 + 97a9134 + 80367df
commit 98d5255
Show file tree

Hide file tree

Showing 22 changed files with 266 additions and 88 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
@@ -54,7 +58,7 @@ public function filter(array $event)
     {
         $message = $event['message'];
         if (is_array($event['message'])) {
-            $message = var_export($message, TRUE); 
+            $message = var_export($message, TRUE);
         }
         return preg_match($this->regex, $message) > 0;
     }

diff --git a/src/Filter/Validator.php b/src/Filter/Validator.php
@@ -42,7 +42,7 @@ public function __construct(ZendValidator $validator)
      * Returns TRUE to accept the message, FALSE to block it.
      *
      * @param array $event event data
-     * @return boolean 
+     * @return boolean
      */
     public function filter(array $event)
     {

diff --git a/src/Formatter/ErrorHandler.php b/src/Formatter/ErrorHandler.php
@@ -20,14 +20,14 @@
 class ErrorHandler implements FormatterInterface
 {
     const DEFAULT_FORMAT = '%timestamp% %priorityName% (%priority%) %message% (errno %extra[errno]%) in %extra[file]% on line %extra[line]%';
-    
+
     /**
      * Format
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $format;
-    
+
     /**
      * Class constructor
      *

diff --git a/src/Formatter/ExceptionHandler.php b/src/Formatter/ExceptionHandler.php
@@ -47,9 +47,9 @@ public function format($event)
 
     /**
      * Get the type of a function
-     * 
+     *
      * @param string $type
-     * @return string 
+     * @return string
      */
     protected function getType($type)
     {

diff --git a/src/Writer/Db.php b/src/Writer/Db.php
@@ -30,8 +30,8 @@ class Db extends AbstractWriter
 
     /**
      * Table name
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $tableName;
 
@@ -44,17 +44,17 @@ class Db extends AbstractWriter
 
     /**
      * Field separator for sub-elements
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $separator = '_';
 
     /**
      * Constructor
      *
      * We used the Adapter instead of Zend\Db for a performance reason.
-     * 
-     * @param Adapter $db 
+     *
+     * @param Adapter $db
      * @param string $tableName
      * @param array $columnMap
      * @param string $separator
@@ -66,11 +66,11 @@ public function __construct(Adapter $db, $tableName, array $columnMap = null, $s
         if ($db === null) {
             throw new Exception\InvalidArgumentException('You must pass a valid Zend\Db\Adapter\Adapter');
         }
-        
+
         $this->db        = $db;
         $this->tableName = $tableName;
         $this->columnMap = $columnMap;
-        
+
         if (!empty($separator)) {
             $this->separator = $separator;
         }
@@ -120,34 +120,34 @@ protected function doWrite(array $event)
 
         $statement = $this->db->query($this->prepareInsert($this->db, $this->tableName, $dataToInsert));
         $statement->execute($dataToInsert);
-        
+
     }
 
     /**
      * Prepare the INSERT SQL statement
-     * 
+     *
      * @param  Adapter $db
      * @param  string $tableName
      * @param  array $fields
-     * @return string 
+     * @return string
      */
-    protected function prepareInsert(Adapter $db, $tableName, array $fields) 
-    {               
+    protected function prepareInsert(Adapter $db, $tableName, array $fields)
+    {
         $sql = 'INSERT INTO ' . $db->platform->quoteIdentifier($tableName) . ' (' .
                implode(",",array_map(array($db->platform, 'quoteIdentifier'), $fields)) . ') VALUES (' .
                implode(",",array_map(array($db->driver, 'formatParameterName'), $fields)) . ')';
-               
+
         return $sql;
     }
 
     /**
      * Map event into column using the $columnMap array
-     * 
+     *
      * @param  array $event
      * @param  array $columnMap
-     * @return array 
+     * @return array
      */
-    protected function mapEventIntoColumn(array $event, array $columnMap = null) 
+    protected function mapEventIntoColumn(array $event, array $columnMap = null)
     {
         if (empty($event)) {
             return array();
@@ -163,18 +163,18 @@ protected function mapEventIntoColumn(array $event, array $columnMap = null)
                 }
             } elseif (isset($columnMap[$name])) {
                 $data[$columnMap[$name]] = $value;
-            } 
+            }
         }
         return $data;
     }
 
     /**
      * Transform event into column for the db table
-     * 
+     *
      * @param  array $event
-     * @return array 
+     * @return array
      */
-    protected function eventIntoColumn(array $event) 
+    protected function eventIntoColumn(array $event)
     {
         if (empty($event)) {
             return array();

diff --git a/src/Writer/Mail.php b/src/Writer/Mail.php
@@ -24,7 +24,7 @@
  * completion, so any log entries accumulated are sent in a single email.
  * The email is sent using a Zend\Mail\Transport\TransportInterface object
  * (Sendmail is default).
- * 
+ *
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
@@ -72,7 +72,7 @@ class Mail extends AbstractWriter
 
     /**
      * Constructor
-     * 
+     *
      * @param MailMessage $mail
      * @param Transport\TransportInterface $transport Optional
      * @return Mail

diff --git a/src/Writer/MongoDB.php b/src/Writer/MongoDB.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Log
+ */
+
+namespace Zend\Log\Writer;
+
+use Mongo;
+use Zend\Log\Exception\InvalidArgumentException;
+use Zend\Log\Exception\RuntimeException;
+use Zend\Log\Formatter\FormatterInterface;
+
+/**
+ * MongoDB log writer.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ */
+class MongoDB extends AbstractWriter
+{
+    /**
+     * MongoCollection instance
+     *
+     * @var MongoCollection
+     */
+    protected $mongoCollection;
+
+    /**
+     * Options used for MongoCollection::save()
+     *
+     * @var array
+     */
+    protected $saveOptions;
+
+    /**
+     * Constructor
+     *
+     * @param Mongo $mongo
+     * @param string $database
+     * @param string $collection
+     * @param array  $saveOptions
+     * @return Zend\Log\Writer\MongoDB
+     */
+    public function __construct(Mongo $mongo, $database, $collection, array $saveOptions = array())
+    {
+        $this->mongoCollection = $mongo->selectCollection($database, $collection);
+        $this->saveOptions = $saveOptions;
+    }
+
+    /**
+     * This writer does not support formatting.
+     *
+     * @param Zend\Log\Formatter\FormatterInterface $formatter
+     * @return void
+     * @throws Zend\Log\Exception\InvalidArgumentException
+     */
+    public function setFormatter(FormatterInterface $formatter)
+    {
+        throw new InvalidArgumentException(get_class() . ' does not support formatting');
+    }
+
+    /**
+     * Write a message to the log.
+     *
+     * @param array $event Event data
+     * @return void
+     * @throws Zend\Log\Exception\RuntimeException
+     */
+    protected function doWrite(array $event)
+    {
+        if (null === $this->mongoCollection) {
+            throw new RuntimeException('MongoCollection must be defined');
+        }
+
+        $this->mongoCollection->save($event, $this->saveOptions);
+    }
+}
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/src/WriterPluginManager.php b/src/WriterPluginManager.php
@@ -21,7 +21,7 @@ class WriterPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of writers
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -39,8 +39,8 @@ class WriterPluginManager extends AbstractPluginManager
      * Validate the plugin
      *
      * Checks that the writer loaded is an instance of Writer\WriterInterface.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\InvalidArgumentException if invalid
      */

diff --git a/test/Filter/ChainingTest.php b/test/Filter/ChainingTest.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\Log\Filter;
 
-use \Zend\Log\Logger;
-use \Zend\Log\Writer;
+use Zend\Log\Logger;
+use Zend\Log\Writer;
 
 /**
  * @category   Zend

diff --git a/test/Filter/PriorityTest.php b/test/Filter/PriorityTest.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\Log\Filter;
 
-use \Zend\Log\Logger;
-use \Zend\Log\Filter\Priority;
+use Zend\Log\Logger;
+use Zend\Log\Filter\Priority;
 
 /**
  * @category   Zend

diff --git a/test/Filter/SuppressFilterTest.php b/test/Filter/SuppressFilterTest.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\Log\Filter;
 
-use \Zend\Log\Filter\SuppressFilter;
-use \Zend\Log\Logger;
+use Zend\Log\Filter\SuppressFilter;
+use Zend\Log\Logger;
 
 /**
  * @category   Zend

diff --git a/test/Filter/ValidatorTest.php b/test/Filter/ValidatorTest.php
@@ -32,7 +32,7 @@ public function testValidatorFilter()
         $this->assertFalse($filter->filter(array('message' => 'test123')));
         $this->assertFalse($filter->filter(array('message' => '(%$')));
     }
-    
+
     public function testValidatorChain()
     {
         $validatorChain = new ValidatorChain();