Merge branch '2.8'

* 2.8:
  Added 'default' color
  [HttpFoundation] Reload the session after regenerating its id
  [HttpFoundation] Add a test case to confirm a bug in session migration
  [Serializer] Fix ClassMetadata::sleep()
  [2.6] Static Code Analysis for Components and Bundles
  [Finder] Command::addAtIndex() fails with Command instance argument
  [DependencyInjection] Freeze also FrozenParameterBag::remove
  [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
  fix CS
  fixed CS
  Add a way to reset the singleton
  [Security] allow to use `method` in XML configs
  [Serializer] Fix Groups tests.
  Remove duplicate example
  Remove var not used due to returning early (introduced in 8982c32)
  [Serializer] Fix Groups PHPDoc
  Enhance hhvm test skip message
  fix for legacy asset() with EmptyVersionStrategy
  [Form] Added upgrade notes for #15061

Command/DebugCommand.php

@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 /**
- * Lists twig functions, filters, globals and tests present in the current project
+ * Lists twig functions, filters, globals and tests present in the current project.
  *
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */

DependencyInjection/TwigExtension.php

@@ -88,7 +88,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->addResource(new FileExistenceResource($dir));
 
             $reflection = new \ReflectionClass($class);
-            $dir = dirname($reflection->getFilename()).'/Resources/views';
+            $dir = dirname($reflection->getFileName()).'/Resources/views';
             if (is_dir($dir)) {
                 $this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
             }

Tests/DependencyInjection/TwigExtensionTest.php

@@ -154,10 +154,8 @@ public function testTwigLoaderPaths($format)
         $def = $container->getDefinition('twig.loader.filesystem');
         $paths = array();
         foreach ($def->getMethodCalls() as $call) {
-            if ('addPath' === $call[0]) {
-                if (false === strpos($call[1][0], 'Form')) {
-                    $paths[] = $call[1];
-                }
+            if ('addPath' === $call[0] && false === strpos($call[1][0], 'Form')) {
+                $paths[] = $call[1];
             }
         }