Merge branch '2.5'

* 2.5:
  added missing files
  [TwigBundle] added a test
  Indicate which file was being parsed if an exception is thrown while running translation:debug
  [ClassLoader] Cast $useIncludePath property to boolean
  [HttpFoundation] Minor spelling fix in PHPDocs
  improve error message for multiple documents
  Remove aligned '=>' and '='
  [Session] remove invalid workaround in session regenerate
  [Kernel] ensure session is saved before sending response
  [Routing] serialize the compiled route to speed things up
  [Form] Fixed usage of "name" variable in form_start block
  [Validator] Fixed Regex::getHtmlPattern() to work with complex and negated patterns
  [DependencyInjection] use inheritdoc for loaders
  [Config] fix filelocator with empty name
  [Form] fix form handling with unconventional request methods like OPTIONS
  CSRF warning docs on Request::enableHttpMethodParameterOverride()

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressBar.php

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -382,9 +382,9 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
 
         if (!isset($cacheDriver['namespace'])) {
             // generate a unique namespace for the given application
-            $env        = $container->getParameter('kernel.root_dir').$container->getParameter('kernel.environment');
-            $hash       = hash('sha256', $env);
-            $namespace  = 'sf2'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.$hash;
+            $env = $container->getParameter('kernel.root_dir').$container->getParameter('kernel.environment');
+            $hash = hash('sha256', $env);
+            $namespace = 'sf2'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.$hash;
 
             $cacheDriver['namespace'] = $namespace;
         }

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -192,21 +192,21 @@ public function providerBasicDrivers()
      */
     public function testLoadBasicCacheDriver($class, array $config, array $expectedCalls = array())
     {
-        $container      = $this->createContainer();
-        $cacheName      = 'metadata_cache';
-        $objectManager  = array(
-            'name'                  => 'default',
+        $container = $this->createContainer();
+        $cacheName = 'metadata_cache';
+        $objectManager = array(
+            'name' => 'default',
             'metadata_cache_driver' => $config,
         );
 
         $this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
 
         $this->assertTrue($container->hasDefinition('doctrine.orm.default_metadata_cache'));
 
-        $definition      = $container->getDefinition('doctrine.orm.default_metadata_cache');
-        $defCalls        = $definition->getMethodCalls();
+        $definition = $container->getDefinition('doctrine.orm.default_metadata_cache');
+        $defCalls = $definition->getMethodCalls();
         $expectedCalls[] = 'setNamespace';
-        $actualCalls     = array_map(function ($call) {
+        $actualCalls = array_map(function ($call) {
             return $call[0];
         }, $defCalls);
 
@@ -220,14 +220,14 @@ public function testLoadBasicCacheDriver($class, array $config, array $expectedC
 
     public function testServiceCacheDriver()
     {
-        $cacheName      = 'metadata_cache';
-        $container      = $this->createContainer();
-        $definition     = new Definition('%doctrine.orm.cache.apc.class%');
-        $objectManager  = array(
-            'name'                  => 'default',
+        $cacheName = 'metadata_cache';
+        $container = $this->createContainer();
+        $definition = new Definition('%doctrine.orm.cache.apc.class%');
+        $objectManager = array(
+            'name' => 'default',
             'metadata_cache_driver' => array(
                 'type' => 'service',
-                'id'   => 'service_driver',
+                'id' => 'service_driver',
             ),
         );
 
@@ -244,10 +244,10 @@ public function testServiceCacheDriver()
      */
     public function testUnrecognizedCacheDriverException()
     {
-        $cacheName      = 'metadata_cache';
-        $container      = $this->createContainer();
-        $objectManager  = array(
-            'name'                  => 'default',
+        $cacheName = 'metadata_cache';
+        $container = $this->createContainer();
+        $objectManager = array(
+            'name' => 'default',
             'metadata_cache_driver' => array(
                 'type' => 'unrecognized_type',
             ),
@@ -273,12 +273,12 @@ protected function invokeLoadCacheDriver(array $objectManager, ContainerBuilder
     protected function createContainer(array $data = array())
     {
         return new ContainerBuilder(new ParameterBag(array_merge(array(
-            'kernel.bundles'     => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'),
-            'kernel.cache_dir'   => __DIR__,
-            'kernel.debug'       => false,
+            'kernel.bundles' => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'),
+            'kernel.cache_dir' => __DIR__,
+            'kernel.debug' => false,
             'kernel.environment' => 'test',
-            'kernel.name'        => 'kernel',
-            'kernel.root_dir'    => __DIR__,
+            'kernel.name' => 'kernel',
+            'kernel.root_dir' => __DIR__,
         ), $data)));
     }
 }

src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php

@@ -38,16 +38,16 @@ public function format(array $record)
     {
         if ($record['level'] >= Logger::ERROR) {
             $record['start_tag'] = '<error>';
-            $record['end_tag']   = '</error>';
+            $record['end_tag'] = '</error>';
         } elseif ($record['level'] >= Logger::NOTICE) {
             $record['start_tag'] = '<comment>';
-            $record['end_tag']   = '</comment>';
+            $record['end_tag'] = '</comment>';
         } elseif ($record['level'] >= Logger::INFO) {
             $record['start_tag'] = '<info>';
-            $record['end_tag']   = '</info>';
+            $record['end_tag'] = '</info>';
         } else {
             $record['start_tag'] = '';
-            $record['end_tag']   = '';
+            $record['end_tag'] = '';
         }
 
         return parent::format($record);

src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

@@ -268,7 +268,7 @@
     {%- else -%}
         {% set form_method = "POST" %}
     {%- endif -%}
-    <form name="{{ form.vars.name }}" method="{{ form_method|lower }}" action="{{ action }}"{% for attrname, attrvalue in attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}{% if multipart %} enctype="multipart/form-data"{% endif %}>
+    <form name="{{ name }}" method="{{ form_method|lower }}" action="{{ action }}"{% for attrname, attrvalue in attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}{% if multipart %} enctype="multipart/form-data"{% endif %}>
     {%- if form_method != method -%}
         <input type="hidden" name="_method" value="{{ method }}" />
     {%- endif -%}

src/Symfony/Bridge/Twig/Tests/Fixtures/extractor/syntax_error.twig

@@ -0,0 +1 @@
+{% syntax error

src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php

@@ -70,4 +70,17 @@ public function getExtractData()
             array('{{ "new key" | transchoice(domain="domain", count=1) }}', array('new key' => 'domain')),
         );
     }
+
+    /**
+     * @expectedException        \Twig_Error
+     * @expectedExceptionMessage Unclosed "block" in "extractor/syntax_error.twig" at line 1
+     */
+    public function testExtractSyntaxError()
+    {
+        $twig = new \Twig_Environment(new \Twig_Loader_Array(array()));
+        $twig->addExtension(new TranslationExtension($this->getMock('Symfony\Component\Translation\TranslatorInterface')));
+
+        $extractor = new TwigExtractor($twig);
+        $extractor->extract(__DIR__.'/../Fixtures', new MessageCatalogue('en'));
+    }
 }

src/Symfony/Bridge/Twig/Translation/TwigExtractor.php

@@ -58,7 +58,13 @@ public function extract($directory, MessageCatalogue $catalogue)
         $finder = new Finder();
         $files = $finder->files()->name('*.twig')->sortByName()->in($directory);
         foreach ($files as $file) {
-            $this->extractTemplate(file_get_contents($file->getPathname()), $catalogue);
+            try {
+                $this->extractTemplate(file_get_contents($file->getPathname()), $catalogue);
+            } catch (\Twig_Error $e) {
+                $e->setTemplateFile($file->getRelativePathname());
+
+                throw $e;
+            }
         }
     }
 

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

@@ -185,15 +185,15 @@ protected function getRouteData(Route $route)
         unset($requirements['_scheme'], $requirements['_method']);
 
         return array(
-            'path'         => $route->getPath(),
-            'host'         => '' !== $route->getHost() ? $route->getHost() : 'ANY',
-            'scheme'       => $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY',
-            'method'       => $route->getMethods() ? implode('|', $route->getMethods()) : 'ANY',
-            'class'        => get_class($route),
-            'defaults'     => $route->getDefaults(),
+            'path' => $route->getPath(),
+            'host' => '' !== $route->getHost() ? $route->getHost() : 'ANY',
+            'scheme' => $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY',
+            'method' => $route->getMethods() ? implode('|', $route->getMethods()) : 'ANY',
+            'class' => get_class($route),
+            'defaults' => $route->getDefaults(),
             'requirements' => $requirements ?: 'NO CUSTOM',
-            'options'      => $route->getOptions(),
-            'pathRegex'    => $route->compile()->getRegex(),
+            'options' => $route->getOptions(),
+            'pathRegex' => $route->compile()->getRegex(),
         );
     }
 
@@ -206,11 +206,11 @@ protected function getRouteData(Route $route)
     private function getContainerDefinitionData(Definition $definition, $omitTags = false)
     {
         $data = array(
-            'class'     => (string) $definition->getClass(),
-            'scope'     => $definition->getScope(),
-            'public'    => $definition->isPublic(),
+            'class' => (string) $definition->getClass(),
+            'scope' => $definition->getScope(),
+            'public' => $definition->isPublic(),
             'synthetic' => $definition->isSynthetic(),
-            'file'      => $definition->getFile(),
+            'file' => $definition->getFile(),
         );
 
         if (!$omitTags) {
@@ -236,7 +236,7 @@ private function getContainerAliasData(Alias $alias)
     {
         return array(
             'service' => (string) $alias,
-            'public'  => $alias->isPublic(),
+            'public' => $alias->isPublic(),
         );
     }
 

src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml

@@ -62,6 +62,10 @@
             <argument type="service" id="service_container" />
         </service>
 
+        <service id="session.save_listener" class="Symfony\Component\HttpKernel\EventListener\SaveSessionListener">
+            <tag name="kernel.event_subscriber" />
+        </service>
+
         <!-- for BC -->
         <service id="session.storage.filesystem" alias="session.storage.mock_file" />
     </services>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_start.html.php

@@ -1,6 +1,6 @@
 <?php $method = strtoupper($method) ?>
 <?php $form_method = $method === 'GET' || $method === 'POST' ? $method : 'POST' ?>
-<form name="<?php echo $form->vars['name'] ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) { printf(' %s="%s"', $view->escape($k), $view->escape($v)); } ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
+<form name="<?php echo $name ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) { printf(' %s="%s"', $view->escape($k), $view->escape($v)); } ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
 <?php if ($form_method !== $method): ?>
     <input type="hidden" name="_method" value="<?php echo $method ?>" />
 <?php endif ?>

src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php

@@ -156,9 +156,9 @@ private function getContainerBuilderDescriptionTestData(array $objects)
     {
         $variations = array(
             'services' => array('show_private' => true),
-            'public'   => array('show_private' => false),
-            'tag1'     => array('show_private' => true, 'tag' => 'tag1'),
-            'tags'     => array('group_by' => 'tags', 'show_private' => true),
+            'public' => array('show_private' => false),
+            'tag1' => array('show_private' => true, 'tag' => 'tag1'),
+            'tags' => array('group_by' => 'tags', 'show_private' => true),
         );
 
         $data = array();

src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php

@@ -60,9 +60,9 @@ public static function getContainerParameters()
         return array(
             'parameters_1' => new ParameterBag(array(
                 'integer' => 12,
-                'string'  => 'Hello world!',
+                'string' => 'Hello world!',
                 'boolean' => true,
-                'array'   => array(12, 'Hello world!', true),
+                'array' => array(12, 'Hello world!', true),
             )),
         );
     }

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -128,10 +128,10 @@ protected static function getBundleDefaultConfig()
             'validation' => array(
                 'enabled' => false,
                 'enable_annotations' => false,
-                'static_method'      => array('loadValidatorMetadata'),
+                'static_method' => array('loadValidatorMetadata'),
                 'translation_domain' => 'validators',
-                'strict_email'       => false,
-                'api'                => version_compare(PHP_VERSION, '5.3.9', '<') ? '2.4' : '2.5-bc',
+                'strict_email' => false,
+                'api' => version_compare(PHP_VERSION, '5.3.9', '<') ? '2.4' : '2.5-bc',
             ),
             'annotations' => array(
                 'cache' => 'file',

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_4_api.php

@@ -3,7 +3,7 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'validation' => array(
-        'enabled'            => true,
-        'api'                => '2.4',
+        'enabled' => true,
+        'api' => '2.4',
     ),
 ));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_api.php

@@ -3,7 +3,7 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'validation' => array(
-        'enabled'            => true,
-        'api'                => '2.5',
+        'enabled' => true,
+        'api' => '2.5',
     ),
 ));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_bc_api.php

@@ -3,7 +3,7 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'validation' => array(
-        'enabled'            => true,
-        'api'                => '2.5-bc',
+        'enabled' => true,
+        'api' => '2.5-bc',
     ),
 ));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_auto_api.php

@@ -3,7 +3,7 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'validation' => array(
-        'enabled'            => true,
-        'api'                => 'auto',
+        'enabled' => true,
+        'api' => 'auto',
     ),
 ));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_implicit_api.php

@@ -3,6 +3,6 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'validation' => array(
-        'enabled'            => true,
+        'enabled' => true,
     ),
 ));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php

@@ -3,7 +3,7 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'validation' => array(
-        'enabled'            => true,
-        'static_method'      => array('loadFoo', 'loadBar'),
+        'enabled' => true,
+        'static_method' => array('loadFoo', 'loadBar'),
     ),
 ));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php

@@ -3,7 +3,7 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'validation' => array(
-        'enabled'            => true,
-        'static_method'      => false,
+        'enabled' => true,
+        'static_method' => false,
     ),
 ));

src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php

@@ -67,12 +67,12 @@ public function testSchemeRedirect()
 
         $this->assertEquals(array(
                 '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
-                'path'        => '/foo',
-                'permanent'   => true,
-                'scheme'      => 'https',
-                'httpPort'    => $context->getHttpPort(),
-                'httpsPort'   => $context->getHttpsPort(),
-                '_route'      => 'foo',
+                'path' => '/foo',
+                'permanent' => true,
+                'scheme' => 'https',
+                'httpPort' => $context->getHttpPort(),
+                'httpsPort' => $context->getHttpsPort(),
+                '_route' => 'foo',
             ),
             $matcher->match('/foo')
         );

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php

@@ -64,9 +64,9 @@ public function testGetInvalidHelper()
     protected function getContainer()
     {
         $container = new Container();
-        $session   = new Session(new MockArraySessionStorage());
-        $request   = new Request();
-        $stack     = new RequestStack();
+        $session = new Session(new MockArraySessionStorage());
+        $request = new Request();
+        $stack = new RequestStack();
         $stack->push($request);
 
         $request->setSession($session);

src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php

@@ -27,7 +27,7 @@ class Translator extends BaseTranslator
 
     protected $options = array(
         'cache_dir' => null,
-        'debug'     => false,
+        'debug' => false,
     );
 
     /**

src/Symfony/Component/ClassLoader/ClassLoader.php

@@ -107,7 +107,7 @@ public function addPrefix($prefix, $paths)
      */
     public function setUseIncludePath($useIncludePath)
     {
-        $this->useIncludePath = $useIncludePath;
+        $this->useIncludePath = (bool) $useIncludePath;
     }
 
     /**

src/Symfony/Component/ClassLoader/UniversalClassLoader.php

@@ -74,7 +74,7 @@ class UniversalClassLoader
      */
     public function useIncludePath($useIncludePath)
     {
-        $this->useIncludePath = $useIncludePath;
+        $this->useIncludePath = (bool) $useIncludePath;
     }
 
     /**