Merge branch '2.1' into 2.2

* 2.1:
  bumped Symfony version to 2.1.11-DEV
  updated VERSION for 2.1.10
  update CONTRIBUTORS for 2.1.10
  updated CHANGELOG for 2.1.10
  fixed CS
  [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
  [Filesystem] Fix regression introduced in 10dea948

Conflicts:
	src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php

ClassCollectionLoader.php

@@ -169,18 +169,19 @@ class ClassCollectionLoader
                     $inNamespace = false;
                     prev($tokens);
                 } else {
-                    $rawChunk = rtrim($rawChunk) . "\n{";
+                    $rawChunk = rtrim($rawChunk)."\n{";
                     $inNamespace = true;
                 }
             } elseif (T_START_HEREDOC === $token[0]) {
-                $output .= self::compressCode($rawChunk) . $token[1];
+                $output .= self::compressCode($rawChunk).$token[1];
                 do {
                     $token = next($tokens);
-                    $output .= $token[1];
+                    $output .= is_string($token) ? $token : $token[1];
                 } while ($token[0] !== T_END_HEREDOC);
+                $output .= "\n";
                 $rawChunk = '';
             } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
-                $output .= self::compressCode($rawChunk) . $token[1];
+                $output .= self::compressCode($rawChunk).$token[1];
                 $rawChunk = '';
             } else {
                 $rawChunk .= $token[1];
@@ -191,7 +192,7 @@ class ClassCollectionLoader
             $rawChunk .= "}\n";
         }
 
-        return $output . self::compressCode($rawChunk);
+        return $output.self::compressCode($rawChunk);
     }
 
     /**
@@ -360,6 +361,7 @@ class ClassCollectionLoader
         }
         $resolved[$nodeName] = $node;
         unset($unresolved[$nodeName]);
+
         return $resolved;
     }
 }

DebugClassLoader.php

@@ -53,7 +53,7 @@ class DebugClassLoader
         }
 
         foreach ($functions as $function) {
-            if (is_array($function) && method_exists($function[0], 'findFile')) {
+            if (is_array($function) && !$function[0] instanceof self && method_exists($function[0], 'findFile')) {
                 $function = array(new static($function[0]), 'loadClass');
             }
 

Tests/ClassCollectionLoaderTest.php

@@ -206,7 +206,9 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
             unlink($file);
         }
         spl_autoload_register($r = function ($class) {
-            require_once __DIR__.'/Fixtures/'.str_replace(array('\\', '_'), '/', $class).'.php';
+            if (0 === strpos($class, 'Namespaced') || 0 === strpos($class, 'Pearlike_')) {
+                require_once __DIR__.'/Fixtures/'.str_replace(array('\\', '_'), '/', $class).'.php';
+            }
         });
 
         ClassCollectionLoader::load(
@@ -225,21 +227,23 @@ class WithComments
 {
 public static \$loaded = true;
 }
-\$string ='string shoult not be   modified';
-\$heredoc =<<<HD
+\$string ='string shoult not be   modified {\$string}';
+\$heredoc = (<<<HD
 
 
-Heredoc should not be   modified
+Heredoc should not be   modified {\$string}
 
 
-HD;
+HD
+);
 \$nowdoc =<<<'ND'
 
 
-Nowdoc should not be   modified
+Nowdoc should not be   modified {\$string}
 
 
-ND;
+ND
+;
 }
 namespace
 {

Tests/DebugClassLoaderTest.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\ClassLoader;
+use Symfony\Component\ClassLoader\DebugClassLoader;
+
+class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    private $loader;
+
+    protected function setUp()
+    {
+        $this->loader = new ClassLoader();
+        spl_autoload_register(array($this->loader, 'loadClass'));
+    }
+
+    protected function tearDown()
+    {
+        spl_autoload_unregister(array($this->loader, 'loadClass'));
+    }
+
+    public function testIdempotence()
+    {
+        DebugClassLoader::enable();
+        DebugClassLoader::enable();
+
+        $functions = spl_autoload_functions();
+        foreach ($functions as $function) {
+            if (is_array($function) && $function[0] instanceof DebugClassLoader) {
+                $reflClass = new \ReflectionClass($function[0]);
+                $reflProp = $reflClass->getProperty('classFinder');
+                $reflProp->setAccessible(true);
+
+                $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $reflProp->getValue($function[0]));
+
+                return;
+            }
+        }
+
+        throw new \Exception('DebugClassLoader did not register');
+    }
+}

Tests/Fixtures/Namespaced/WithComments.php

@@ -17,21 +17,21 @@ class WithComments
     public static $loaded = true;
 }
 
-$string = 'string shoult not be   modified';
+$string = 'string shoult not be   modified {$string}';
+
+$heredoc = (<<<HD
 
 
-$heredoc = <<<HD
+Heredoc should not be   modified {$string}
 
 
-Heredoc should not be   modified
-
-
-HD;
+HD
+);
 
 $nowdoc = <<<'ND'
 
 
-Nowdoc should not be   modified
+Nowdoc should not be   modified {$string}
 
 
 ND;