Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into ValidatorMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
Matej Szendi committed Nov 4, 2013
131 parents a5c61e2 + 57ffceb + a6fa26b + 9d36595 + bf0040c + 71b1a95 + 5619ba3 + c093ab0 + de13946 + 04b025f + 0933607 + 34ed3ed + 83f6472 + db74e8c + 7b75da1 + bb4c48f + 9fa3c05 + 139c0b1 + a587eef + 7a782f4 + 39cb2e2 + 31f8c80 + a9b7779 + de058f6 + 67b97f6 + 40d86d0 + b5234cc + 17b4e13 + 8af24aa + 1a9df55 + 2c85c99 + 5557fac + fe78a35 + f6430c3 + 6041a1e + 86b9031 + 674bd75 + 67a1bfb + 4d4dd8b + c655082 + dbb18b2 + 97a9134 + 80367df + 98d5255 + 7946c9f + ea67c13 + 44df0b2 + 38e090d + 7af74e7 + 8b311b1 + e2c2b94 + 51601cb + dcc1eaf + 6f4b805 + a30a64f + ee7347d + 8b04bfe + b487f00 + ecdfdf6 + d8cde75 + b7a33bb + 65ecb58 + 571d938 + 625a786 + 6fe4efc + f94838d + 76607e3 + 492076c + 17b56b8 + c5509fe + e0fa433 + 7d74e99 + 309136e + f1dd38a + 7be533f + 6a618c2 + 3a454e3 + f66ca80 + f1bebf2 + 850249d + 674d7ba + 597ff82 + ae87c49 + fb156fb + 9c474de + 1a75c72 + 47d1cd2 + a937ea3 + 4219922 + 49e380f + 5903df6 + 7a9d632 + 2ef7274 + b606220 + a09c5c7 + 21afa5c + 8faa67f + 1731915 + efa1bb3 + 5576455 + 86d3ae8 + de3fd70 + 398a3c4 + 5c56554 + 7ad896f + fa91c9b + 1372a45 + a0c8737 + e368d53 + 462b1f7 + 79675fe + a8104b9 + 91ed9d0 + b1d1358 + 6a0c90c + 5e4258f + 239c0d0 + b457c76 + a2533a4 + beb6598 + 79d0f46 + 1519723 + ce75f80 + e5fd689 + 6744e82 + 6cb64b8 + ee5efcb + 2ee5d16 + bcb4d03 + 03c6da8 + 7dcfd8f commit a18fe5d
Show file tree
Hide file tree
Showing 43 changed files with 110 additions and 152 deletions.
2 changes: 1 addition & 1 deletion src/Formatter/ErrorHandler.php
View file
Expand Up @@ -44,7 +44,7 @@ public function format($event)
* @param string $key
* @return array
*/
protected function buildReplacementsFromArray ($event, $key = null)
protected function buildReplacementsFromArray($event, $key = null)
{
$result = array();
foreach ($event as $index => $value) {
Expand Down
8 changes: 4 additions & 4 deletions src/Logger.php
View file
Expand Up @@ -123,7 +123,7 @@ class Logger implements LoggerInterface
* @return Logger
* @throws Exception\InvalidArgumentException
*/
public function __construct(array $options = null)
public function __construct($options = null)
{
$this->writers = new SplPriorityQueue();

Expand Down Expand Up @@ -154,6 +154,8 @@ public function __construct(array $options = null)
static::registerErrorHandler($this);
}

} elseif ($options) {
throw new Exception\InvalidArgumentException('Options must be an array or an object implementing \Traversable ');
}

$this->processors = new SplPriorityQueue();
Expand Down Expand Up @@ -519,9 +521,7 @@ public static function registerErrorHandler(Logger $logger, $continueNativeHandl

$errorPriorityMap = static::$errorPriorityMap;

$previous = set_error_handler(function ($level, $message, $file, $line)
use ($logger, $errorPriorityMap, $continueNativeHandler)
{
$previous = set_error_handler(function ($level, $message, $file, $line) use ($logger, $errorPriorityMap, $continueNativeHandler) {
$iniLevel = error_reporting();

if ($iniLevel & $level) {
Expand Down
35 changes: 34 additions & 1 deletion src/LoggerAbstractServiceFactory.php
View file
Expand Up @@ -56,7 +56,9 @@ public function canCreateServiceWithName(ServiceLocatorInterface $services, $nam
public function createServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
{
$config = $this->getConfig($services);
return new Logger($config[$requestedName]);
$config = $config[$requestedName];
$this->processConfig($config, $services);
return new Logger($config);
}

/**
Expand Down Expand Up @@ -85,4 +87,35 @@ protected function getConfig(ServiceLocatorInterface $services)
$this->config = $config[$this->configKey];
return $this->config;
}

protected function processConfig(&$config, ServiceLocatorInterface $services)
{
if (!isset($config['writers'])) {
return;
}

foreach ($config['writers'] as $index => $writerConfig) {
if (!isset($writerConfig['name'])
|| strtolower($writerConfig['name']) != 'db'
) {
continue;
}
if (!isset($writerConfig['options'])
|| !isset($writerConfig['options']['db'])
) {
continue;
}
if (!is_string($writerConfig['options']['db'])) {
continue;
}
if (!$services->has($writerConfig['options']['db'])) {
continue;
}

// Retrieve the DB service from the service locator, and
// inject it into the configuration.
$db = $services->get($writerConfig['options']['db']);
$config['writers'][$index]['options']['db'] = $db;
}
}
}
6 changes: 3 additions & 3 deletions src/Writer/MongoDB.php
View file
Expand Up @@ -55,7 +55,7 @@ public function __construct($mongo, $database = null, $collection = null, array
}
if (is_array($mongo)) {
parent::__construct($mongo);
$saveOptions = isset($mongo['save_options']) ? $mongo['save_options'] : null;
$saveOptions = isset($mongo['save_options']) ? $mongo['save_options'] : array();
$collection = isset($mongo['collection']) ? $mongo['collection'] : null;
$database = isset($mongo['database']) ? $mongo['database'] : null;
$mongo = isset($mongo['mongo']) ? $mongo['mongo'] : null;
Expand All @@ -74,10 +74,10 @@ public function __construct($mongo, $database = null, $collection = null, array
}

if (!($mongo instanceof MongoClient || $mongo instanceof Mongo)) {
throw new Exception\InvalidArgumentException(
throw new Exception\InvalidArgumentException(sprintf(
'Parameter of type %s is invalid; must be MongoClient or Mongo',
(is_object($mongo) ? get_class($mongo) : gettype($mongo))
);
));
}

$this->mongoCollection = $mongo->selectCollection($database, $collection);
Expand Down
4 changes: 0 additions & 4 deletions test/Filter/MockTest.php
View file
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Filter;

use Zend\Log\Filter\Mock as MockFilter;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class MockTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Filter/PriorityTest.php
View file
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Filter;

use Zend\Log\Filter\Priority;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class PriorityTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Filter/RegexTest.php
View file
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Filter;

use Zend\Log\Filter\Regex;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class RegexTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Filter/SuppressFilterTest.php
View file
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Filter;

use Zend\Log\Filter\SuppressFilter;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class SuppressFilterTest extends \PHPUnit_Framework_TestCase
Expand Down
8 changes: 2 additions & 6 deletions test/Filter/ValidatorTest.php
View file
Expand Up @@ -5,20 +5,16 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Filter;

use Zend\Log\Filter\Validator;
use Zend\Validator\ValidatorChain;
use Zend\Validator\Digits as DigitsFilter;
use Zend\I18n\Validator\Int;
use Zend\Validator\NotEmpty as NotEmptyFilter;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class ValidatorTest extends \PHPUnit_Framework_TestCase
Expand All @@ -35,8 +31,8 @@ public function testValidatorFilter()
public function testValidatorChain()
{
$validatorChain = new ValidatorChain();
$validatorChain->attach(new NotEmptyFilter());
$validatorChain->attach(new DigitsFilter());
$validatorChain->attach(new Int());
$filter = new Validator($validatorChain);
$this->assertTrue($filter->filter(array('message' => '123')));
$this->assertFalse($filter->filter(array('message' => 'test')));
Expand Down
32 changes: 20 additions & 12 deletions test/Formatter/BaseTest.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Formatter;
Expand All @@ -18,9 +17,6 @@
use Zend\Log\Formatter\Base as BaseFormatter;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class BaseTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -138,14 +134,26 @@ public function testFormatNoInfiniteLoopOnSelfReferencingArrayValues()
'selfRefArr' => $selfRefArr,
),
);
$outputExpected = array(
'timestamp' => $datetime->format($formatter->getDateTimeFormat()),
'priority' => 1,
'message' => 'tottakai',
'extra' => array(
'selfRefArr' => '{"selfRefArr":{"selfRefArr":null}}',
),
);

if (version_compare(PHP_VERSION, '5.5', 'lt')) {
$outputExpected = array(
'timestamp' => $datetime->format($formatter->getDateTimeFormat()),
'priority' => 1,
'message' => 'tottakai',
'extra' => array(
'selfRefArr' => '{"selfRefArr":{"selfRefArr":null}}',
),
);
} else {
$outputExpected = array(
'timestamp' => $datetime->format($formatter->getDateTimeFormat()),
'priority' => 1,
'message' => 'tottakai',
'extra' => array(
'selfRefArr' => '',
),
);
}

$this->assertEquals($outputExpected, $formatter->format($event));
}
Expand Down
4 changes: 0 additions & 4 deletions test/Formatter/DbTest.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Formatter;
Expand All @@ -14,9 +13,6 @@
use Zend\Log\Formatter\Db as DbFormatter;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class DbTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Formatter/ErrorHandlerTest.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Formatter;
Expand All @@ -16,9 +15,6 @@
use ZendTest\Log\TestAsset\NotStringObject;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Formatter/ExceptionHandlerTest.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Formatter;
Expand All @@ -14,9 +13,6 @@
use Zend\Log\Formatter\ExceptionHandler;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
Expand Down
6 changes: 0 additions & 6 deletions test/Formatter/FirePhpTest.php
View file
Expand Up @@ -3,9 +3,6 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand All @@ -15,9 +12,6 @@
use Zend\Log\Formatter\FirePhp;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @group Zend_Log
Expand Down
4 changes: 0 additions & 4 deletions test/Formatter/SimpleTest.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Formatter;
Expand All @@ -15,9 +14,6 @@
use RuntimeException;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class SimpleTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Formatter/XmlTest.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Log
*/

namespace ZendTest\Log\Formatter;
Expand All @@ -15,9 +14,6 @@
use Zend\Log\Formatter\Xml as XmlFormatter;

/**
* @category Zend
* @package Zend_Log
* @subpackage UnitTests
* @group Zend_Log
*/
class XmlTest extends \PHPUnit_Framework_TestCase
Expand Down

0 comments on commit a18fe5d

Please sign in to comment.