Merge branch '2.5'

* 2.5: (37 commits)
  [Validator] Backported constraint validator tests from 2.5
  [Validator] Backported constraint validator tests from 2.5
  [DIC] Fixed: anonymous services are always private
  Fix toolbar vertical alignment.
  [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
  [Validator] Fix little typo in ExecutionContextInterface::buildViolation() method comments
  fix dependencies on HttpFoundation component
  [FrameworkBundle] add missing attribute to XSD
  Allow basic auth in url. Improve regex. Add tests.
  fix typos and syntax in Profiler controller method comments
  resolve parameters before the configs are processed
  add symfony/yaml suggestion to composer.json
  [HttpKernel] added an analyze of environment parameters for built-in server.
  remove volatile tests
  [Console] fixed style creation when providing an unknown tag option
  change command to which available under most unix systems
  add way to test command under windows
  fix shell command injection
  [Form] allowed CallbackTransformer to use callable
  [Process] Added process synchronization to the incremental output tests
  ...

Conflicts:
	src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Validator/Constraints/AllValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Constraints/LegacyAllValidator.php
	src/Symfony/Component/Validator/Constraints/LegacyCollectionValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php

Author: webmozart

Command/ConfigDebugCommand.php

@@ -78,11 +78,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->validateConfiguration($extension, $configuration);
 
+        $configs = $container->getParameterBag()->resolveValue($configs);
+
         $processor = new Processor();
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $config = $container->getParameterBag()->resolveValue($config);
-
         if ($name === $extension->getAlias()) {
             $output->writeln(sprintf('# Current configuration for extension with alias: "%s"', $name));
         } else {

Command/ServerRunCommand.php

@@ -82,6 +82,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $documentRoot = $input->getOption('docroot');
+
+        if (!is_dir($documentRoot)) {
+            $output->writeln(sprintf('<error>The given document root directory "%s" does not exist</error>', $documentRoot));
+
+            return 1;
+        }
+
         $env = $this->getContainer()->getParameter('kernel.environment');
 
         if ('prod' === $env) {
@@ -91,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln(sprintf("Server running on <info>http://%s</info>\n", $input->getArgument('address')));
 
         $builder = $this->createPhpProcessBuilder($input, $output, $env);
-        $builder->setWorkingDirectory($input->getOption('docroot'));
+        $builder->setWorkingDirectory($documentRoot);
         $builder->setTimeout(null);
         $process = $builder->getProcess();
 

DependencyInjection/FrameworkExtension.php

@@ -741,7 +741,6 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
             switch ($config['api']) {
                 case '2.4':
                     $api = Validation::API_VERSION_2_4;
-                    $container->setParameter('validator.validator_factory.class', $container->getParameter('validator.legacy_validator_factory.class'));
                     break;
                 case '2.5':
                     $api = Validation::API_VERSION_2_5;

Resources/config/router_dev.php

@@ -25,6 +25,7 @@
     return false;
 }
 
+$_SERVER = array_merge($_SERVER, $_ENV);
 $_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app_dev.php';
 
 require 'app_dev.php';

Resources/config/router_prod.php

@@ -25,6 +25,7 @@
     return false;
 }
 
+$_SERVER = array_merge($_SERVER, $_ENV);
 $_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app.php';
 
 require 'app.php';

Resources/config/schema/symfony-1.0.xsd

@@ -136,6 +136,7 @@
         <xsd:attribute name="assets-version" type="xsd:string" />
         <xsd:attribute name="assets-version-format" type="xsd:string" />
         <xsd:attribute name="cache" type="xsd:string" />
+        <xsd:attribute name="hinclude-default-template" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="form-resources">

Resources/config/validator.xml

@@ -11,7 +11,6 @@
         <parameter key="validator.mapping.cache.apc.class">Symfony\Component\Validator\Mapping\Cache\ApcCache</parameter>
         <parameter key="validator.mapping.cache.prefix" />
         <parameter key="validator.validator_factory.class">Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory</parameter>
-        <parameter key="validator.legacy_validator_factory.class">Symfony\Bundle\FrameworkBundle\Validator\LegacyConstraintValidatorFactory</parameter>
         <parameter key="validator.expression.class">Symfony\Component\Validator\Constraints\ExpressionValidator</parameter>
         <parameter key="validator.email.class">Symfony\Component\Validator\Constraints\EmailValidator</parameter>
     </parameters>

Tests/DependencyInjection/Fixtures/php/full.php

@@ -56,6 +56,7 @@
         'form'              => array(
             'resources'     => array('theme1', 'theme2')
         ),
+        'hinclude_default_template' => 'global_hinclude_template',
     ),
     'translator' => array(
         'enabled'  => true,

Tests/DependencyInjection/Fixtures/xml/full.xml

@@ -22,7 +22,7 @@
                 <framework:mime-type>application/pdf</framework:mime-type>
             </framework:format>
         </framework:request>
-        <framework:templating assets-version="SomeVersionScheme" cache="/path/to/cache" >
+        <framework:templating assets-version="SomeVersionScheme" cache="/path/to/cache" hinclude-default-template="global_hinclude_template">
             <framework:loader>loader.foo</framework:loader>
             <framework:loader>loader.bar</framework:loader>
             <framework:engine>php</framework:engine>

Tests/DependencyInjection/Fixtures/yml/full.yml

@@ -44,6 +44,7 @@ framework:
                 base_urls: ["http://images1.example.com", "http://images2.example.com"]
         form:
             resources:    [theme1, theme2]
+        hinclude_default_template: global_hinclude_template
     translator:
         enabled:  true
         fallback: fr

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -198,6 +198,7 @@ public function testTemplating()
         $this->assertEquals(array('php', 'twig'), $container->getParameter('templating.engines'), '->registerTemplatingConfiguration() sets a templating.engines parameter');
 
         $this->assertEquals(array('FrameworkBundle:Form', 'theme1', 'theme2'), $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
+        $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');
     }
 
     public function testTemplatingAssetsHelperScopeDependsOnPackageArgumentScopes()

Validator/LegacyConstraintValidatorFactory.php

@@ -43,6 +43,7 @@
         "symfony/finder": "For using the translation loader and cache warmer",
         "symfony/form": "For using forms",
         "symfony/validator": "For using validation",
+        "symfony/yaml": "For using the config:debug and yaml:lint commands",
         "doctrine/cache": "For using alternative cache drivers"
     },
     "autoload": {