Merge branch '3.1'

* 3.1:
  [VarDumper] Fix test
  Revert "minor symfony#20011 Use UUID for error codes for Form validator. (Koc)"
  Use UUID for error codes for Form validator.
  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

Author: fabpot

src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php

@@ -18,8 +18,8 @@
  */
 class Form extends Constraint
 {
-    const NOT_SYNCHRONIZED_ERROR = 1;
-    const NO_SUCH_FIELD_ERROR = 2;
+    const NOT_SYNCHRONIZED_ERROR = '1dafa156-89e1-4736-b832-419c2e501fca';
+    const NO_SUCH_FIELD_ERROR = '6e5212ed-a197-4339-99aa-5654798a4854';
 
     protected static $errorNames = array(
         self::NOT_SYNCHRONIZED_ERROR => 'NOT_SYNCHRONIZED_ERROR',

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');

src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php

@@ -31,9 +31,9 @@ public function getDebugInfo()
 
     public function getSource()
     {
-        return '';
+        return "   foo bar
+     twig source
+
+";
     }
 }
-/*   foo bar*/
-/*     twig source*/
-/* */