Merge branch '2.7' into 2.8

fabpot · fabpot · commit 456b09ce614a · 2016-09-21T12:04:07.000-07:00
* 2.7: Revert "minor symfony#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
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -37,8 +37,8 @@ protected function setUp()
 
         parent::setUp();
 
-        if (version_compare(phpversion('memcached'), '2.2.0', '>=')) {
-            $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower');
+        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, or 3.0.0b1 or higher');
         }
 
         $this->memcached = $this->getMock('Memcached');
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -168,6 +168,10 @@ private function sanitizeContext($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));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ protected function setUp()`
`37`	`37`
`38`	`38`	`parent::setUp();`
`39`	`39`
`40`		`- if (version_compare(phpversion('memcached'), '2.2.0', '>=')) {`
`41`		`- $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower');`
	`40`	`+ if (version_compare(phpversion('memcached'), '2.2.0', '>=') && version_compare(phpversion('memcached'), '3.0.0b1', '<')) {`
	`41`	`+ $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower, or 3.0.0b1 or higher');`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`$this->memcached = $this->getMock('Memcached');`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,10 @@ private function sanitizeContext($context)`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if (is_object($context)) {`
	`171`	`+ if ($context instanceof \Exception) {`
	`172`	`+ return sprintf('Exception(%s): %s', get_class($context), $context->getMessage());`
	`173`	`+ }`
	`174`	`+`
`171`	`175`	`return sprintf('Object(%s)', get_class($context));`
`172`	`176`	`}`
`173`	`177`