Merge branch '2.7' into 2.8
* 2.7: Revert "minor #20011 Use UUID for error codes for Form validator. (Koc)" Use UUID for error codes for Form validator. Fixed regression when exception message swallowed when logging it. [HttpFoundation] Enable memcached tests with the latest memcached extension
This commit is contained in:
commit
456b09ce61
@ -37,8 +37,8 @@ class MemcachedSessionHandlerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
if (version_compare(phpversion('memcached'), '2.2.0', '>=')) {
|
if (version_compare(phpversion('memcached'), '2.2.0', '>=') && version_compare(phpversion('memcached'), '3.0.0b1', '<')) {
|
||||||
$this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower');
|
$this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower, or 3.0.0b1 or higher');
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->memcached = $this->getMock('Memcached');
|
$this->memcached = $this->getMock('Memcached');
|
||||||
|
@ -168,6 +168,10 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (is_object($context)) {
|
if (is_object($context)) {
|
||||||
|
if ($context instanceof \Exception) {
|
||||||
|
return sprintf('Exception(%s): %s', get_class($context), $context->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
return sprintf('Object(%s)', get_class($context));
|
return sprintf('Object(%s)', get_class($context));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user