symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
Lines changed: 4 additions & 4 deletions
@@ -18,8 +18,8 @@
  */
 class Form extends Constraint
 {
-    const NOT_SYNCHRO
8000
NIZED_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',
 
@@ -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');
 
@@ -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));
         }
 
 
@@ -31,9 +31,9 @@ public function getDebugInfo()
 
     public function getSource()
     {
-        return '';
+        return "   foo bar
+     twig source
+
+";
     }
 }
-/*   foo bar*/
-/*     twig source*/
-/* */
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`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public function getDebugInfo()`
`31`	`31`
`32`	`32`	`public function getSource()`
`33`	`33`	`{`
`34`		`- return '';`
	`34`	`+ return " foo bar`
	`35`	`+ twig source`
	`36`	`+`
	`37`	`+";`
`35`	`38`	`}`
`36`	`39`	`}`
`37`		`-/* foo bar*/`
`38`		`-/* twig source*/`
`39`		`-/* */`