Merge branch '2.3'

* 2.3:
  [Form] fixes empty file-inputs get treated as extra field
  return 0 if there is no valid data
  [DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it
  [DependencyInjection] fixed #8570
  fixed file permission
  The ignoreAttributes itself should be ignored, too.
  [Tests] Tests on php 5.5 should pass
  [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)

src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php

@@ -0,0 +1,56 @@
+<?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\Bridge\Twig\Tests;
+
+use Symfony\Bridge\Twig\TwigEngine;
+
+class TwigEngineTest extends TestCase
+{
+    public function testExistsWithTemplateInstances()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists($this->getMockForAbstractClass('Twig_Template', array(), '', false)));
+    }
+
+    public function testExistsWithNonExistentTemplates()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertFalse($engine->exists('foobar'));
+    }
+
+    public function testExistsWithTemplateWithSyntaxErrors()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists('error'));
+    }
+
+    public function testExists()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists('index'));
+    }
+
+    protected function getTwig()
+    {
+        $twig = new \Twig_Environment(new \Twig_Loader_Array(array(
+            'index' => 'foo',
+            'error' => '{{ foo }',
+        )));
+        $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
+
+        return new TwigEngine($twig, $parser);
+    }
+}

src/Symfony/Bridge/Twig/TwigEngine.php

@@ -75,9 +75,19 @@ class TwigEngine implements EngineInterface, StreamingEngineInterface
      */
     public function exists($name)
     {
+        if ($name instanceof \Twig_Template) {
+            return true;
+        }
+
+        $loader = $this->environment->getLoader();
+
+        if ($loader instanceof \Twig_ExistsLoaderInterface) {
+            return $loader->exists($name);
+        }
+
         try {
-            $this->load($name);
-        } catch (\InvalidArgumentException $e) {
+            $loader->getSource($name);
+        } catch (\Twig_Error_Loader $e) {
             return false;
         }
 

src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php

@@ -49,7 +49,7 @@ class RedirectController extends ContainerAware
         $attributes = array();
         if (false === $ignoreAttributes || is_array($ignoreAttributes)) {
             $attributes = $request->attributes->get('_route_params');
-            unset($attributes['route'], $attributes['permanent']);
+            unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes']);
             if ($ignoreAttributes) {
                 $attributes = array_diff_key($attributes, array_flip($ignoreAttributes));
             }

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php

@@ -53,6 +53,7 @@ class RedirectControllerTest extends TestCase
                 'route' => $route,
                 'permanent' => $permanent,
                 'additional-parameter' => 'value',
+                'ignoreAttributes' => $ignoreAttributes
             ),
         );
 

src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php

@@ -87,6 +87,7 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface
         $def->setConfigurator($parentDef->getConfigurator());
         $def->setFile($parentDef->getFile());
         $def->setPublic($parentDef->isPublic());
+        $def->setLazy($parentDef->isLazy());
 
         // overwrite with values specified in the decorator
         $changes = $definition->getChanges();
@@ -111,6 +112,9 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface
         if (isset($changes['public'])) {
             $def->setPublic($definition->isPublic());
         }
+        if (isset($changes['lazy'])){
+            $def->setLazy($definition->isLazy());
+        }
 
         // merge arguments
         foreach ($definition->getArguments() as $k => $v) {

src/Symfony/Component/DependencyInjection/Container.php

@@ -184,6 +184,9 @@ class Container implements IntrospectableContainerInterface
     /**
      * Sets a service.
      *
+     * Setting a service to null resets the service: has() returns false and get()
+     * behaves in the same way as if the service was never created.
+     *
      * @param string $id      The service identifier
      * @param object $service The service instance
      * @param string $scope   The scope of the service
@@ -214,6 +217,14 @@ class Container implements IntrospectableContainerInterface
         if (method_exists($this, $method = 'synchronize'.strtr($id, array('_' => '', '.' => '_')).'Service')) {
             $this->$method();
         }
+
+        if (self::SCOPE_CONTAINER !== $scope && null === $service) {
+            unset($this->scopedServices[$scope][$id]);
+        }
+
+        if (null === $service) {
+            unset($this->services[$id]);
+        }
     }
 
     /**

src/Symfony/Component/DependencyInjection/DefinitionDecorator.php

@@ -149,6 +149,18 @@ class DefinitionDecorator extends Definition
         return parent::setPublic($boolean);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @api
+     */
+    public function setLazy($boolean)
+    {
+        $this->changes['lazy'] = true;
+
+        return parent::setLazy($boolean);
+    }
+
     /**
      * Gets an argument to pass to the service constructor/factory method.
      *

src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php

@@ -143,6 +143,36 @@ class ResolveDefinitionTemplatesPassTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo', $def->getClass());
     }
 
+    public function testSetLazyOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent','stdClass');
+
+        $container->setDefinition('child1',new DefinitionDecorator('parent'))
+            ->setLazy(true)
+        ;
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetLazyOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent','stdClass')
+            ->setLazy(true)
+        ;
+
+        $container->setDefinition('child1',new DefinitionDecorator('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveDefinitionTemplatesPass();

src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php

@@ -135,6 +135,16 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($foo, $sc->get('foo'), '->set() sets a service');
     }
 
+    /**
+     * @covers Symfony\Component\DependencyInjection\Container::set
+     */
+    public function testSetWithNullResetTheService()
+    {
+        $sc = new Container();
+        $sc->set('foo', null);
+        $this->assertFalse($sc->has('foo'));
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */

src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php

@@ -61,6 +61,16 @@ class DefinitionDecoratorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array('public' => true), $def->getChanges());
     }
 
+    public function testSetLazy()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $this->assertFalse($def->isLazy());
+        $this->assertSame($def, $def->setLazy(false));
+        $this->assertFalse($def->isLazy());
+        $this->assertEquals(array('lazy' => true), $def->getChanges());
+    }
+
     public function testSetArgument()
     {
         $def = new DefinitionDecorator('foo');

src/Symfony/Component/Form/Form.php

@@ -546,7 +546,7 @@ class Form implements \IteratorAggregate, FormInterface
 
             foreach ($this->children as $name => $child) {
                 $fieldValue = null;
-                if (isset($submittedData[$name])) {
+                if (array_key_exists($name, $submittedData)) {
                     $fieldValue = $submittedData[$name];
                     unset($submittedData[$name]);
                 }

src/Symfony/Component/Form/Tests/CompoundFormTest.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Form\Tests;
 
 use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Forms;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Form\Tests\Fixtures\FixedDataTransformer;
@@ -73,6 +74,19 @@ class CompoundFormTest extends AbstractFormTest
         $this->form->submit(array(), false);
     }
 
+    public function testSubmitDoesNotAddExtraFieldForNullValues()
+    {
+        $factory = Forms::createFormFactoryBuilder()
+            ->getFormFactory();
+
+        $child = $factory->create('file', null, array('auto_initialize' => false));
+
+        $this->form->add($child);
+        $this->form->submit(array('file' => null));
+
+        $this->assertCount(0, $this->form->getExtraData());
+    }
+
     public function testClearMissingFlagIsForwarded()
     {
         $child = $this->getMockForm('firstName');

src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php

@@ -78,6 +78,10 @@ class TimeDataCollector extends DataCollector
      */
     public function getDuration()
     {
+        if (!isset($this->data['events']['__section__'])) {
+            return 0;
+        }
+
         $lastEvent = $this->data['events']['__section__'];
 
         return $lastEvent->getOrigin() + $lastEvent->getDuration() - $this->getStartTime();
@@ -92,6 +96,10 @@ class TimeDataCollector extends DataCollector
      */
     public function getInitTime()
     {
+        if (!isset($this->data['events']['__section__'])) {
+            return 0;
+        }
+
         return $this->data['events']['__section__']->getOrigin() - $this->getStartTime();
     }