Merge branch '3.4' into 4.0

* 3.4:
  [SecurityBundle] fix setLogoutOnUserChange calls for context listeners
  [DI] Register singly-implemented interfaces when doing PSR-4 discovery
  Fix for missing whitespace control modifier in form layout

Author: Robin Chalas

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

@@ -347,7 +347,7 @@
         {% if not child.rendered %}
             {{- form_row(child) -}}
         {% endif %}
-    {%- endfor %}
+    {%- endfor -%}
 
     {% if not form.methodRendered and form is rootform %}
         {%- do form.setMethodRendered() -%}
@@ -361,7 +361,7 @@
         {%- if form_method != method -%}
             <input type="hidden" name="_method" value="{{ method }}" />
         {%- endif -%}
-    {% endif %}
+    {% endif -%}
 {% endblock form_rest %}
 
 {# Support #}

src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

@@ -290,17 +290,6 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     return $firewall;
                 })
             ->end()
-            ->validate()
-                ->ifTrue(function ($v) {
-                    return (isset($v['stateless']) && true === $v['stateless']) || (isset($v['security']) && false === $v['security']);
-                })
-                ->then(function ($v) {
-                    // this option doesn't change behavior when true when stateless, so prevent deprecations
-                    $v['logout_on_user_change'] = true;
-
-                    return $v;
-                })
-            ->end()
         ;
     }
 

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -181,8 +181,6 @@ private function createFirewalls($config, ContainerBuilder $container)
                 $customUserChecker = true;
             }
 
-            $contextListenerDefinition->addMethodCall('setLogoutOnUserChange', array($firewall['logout_on_user_change']));
-
             $configId = 'security.firewall.map.config.'.$name;
 
             list($matcher, $listeners, $exceptionListener) = $this->createFirewall($container, $name, $firewall, $authenticationProviders, $providerIds, $configId);

src/Symfony/Component/DependencyInjection/Loader/FileLoader.php

@@ -56,10 +56,25 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
 
         $classes = $this->findClasses($namespace, $resource, $exclude);
         // prepare for deep cloning
-        $prototype = serialize($prototype);
+        $serializedPrototype = serialize($prototype);
+        $interfaces = array();
+        $singlyImplemented = array();
 
         foreach ($classes as $class) {
-            $this->setDefinition($class, unserialize($prototype));
+            if (interface_exists($class, false)) {
+                $interfaces[] = $class;
+            } else {
+                $this->setDefinition($class, unserialize($serializedPrototype));
+                foreach (class_implements($class, false) as $interface) {
+                    $singlyImplemented[$interface] = isset($singlyImplemented[$interface]) ? false : $class;
+                }
+            }
+        }
+        foreach ($interfaces as $interface) {
+            if (!empty($singlyImplemented[$interface])) {
+                $this->container->setAlias($interface, $singlyImplemented[$interface])
+                    ->setPublic(false);
+            }
         }
     }
 
@@ -129,7 +144,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
                 throw new InvalidArgumentException(sprintf('Expected to find class "%s" in file "%s" while importing services from resource "%s", but it was not found! Check the namespace prefix used with the resource.', $class, $path, $pattern));
             }
 
-            if ($r->isInstantiable()) {
+            if ($r->isInstantiable() || $r->isInterface()) {
                 $classes[] = $class;
             }
         }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Foo.php

@@ -2,13 +2,13 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
 
-class Foo
+class Foo implements FooInterface, Sub\BarInterface
 {
     public function __construct($bar = null)
     {
     }
 
-    function setFoo(self $foo)
+    public function setFoo(self $foo)
     {
     }
 }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/FooInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+
+interface FooInterface
+{
+}

src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/Bar.php

@@ -2,6 +2,6 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
 
-class Bar
+class Bar implements BarInterface
 {
 }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/BarInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
+
+interface BarInterface
+{
+}

src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php

@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
+use Psr\Container\ContainerInterface as PsrContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\FileLoader;
@@ -25,7 +27,10 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\AnotherSub\DeeperBaz;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Baz;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\FooInterface;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\BarInterface;
 
 class FileLoaderTest extends TestCase
 {
@@ -91,6 +96,14 @@ public function testRegisterClasses()
             array('service_container', Bar::class),
             array_keys($container->getDefinitions())
         );
+        $this->assertEquals(
+            array(
+                PsrContainerInterface::class,
+                ContainerInterface::class,
+                BarInterface::class,
+            ),
+            array_keys($container->getAliases())
+        );
     }
 
     public function testRegisterClassesWithExclude()
@@ -111,6 +124,43 @@ public function testRegisterClassesWithExclude()
         $this->assertTrue($container->has(Baz::class));
         $this->assertFalse($container->has(Foo::class));
         $this->assertFalse($container->has(DeeperBaz::class));
+
+        $this->assertEquals(
+            array(
+                PsrContainerInterface::class,
+                ContainerInterface::class,
+                BarInterface::class,
+            ),
+            array_keys($container->getAliases())
+        );
+    }
+
+    public function testNestedRegisterClasses()
+    {
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        $prototype = new Definition();
+        $prototype->setPublic(true)->setPrivate(true);
+        $loader->registerClasses($prototype, 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\', 'Prototype/*');
+
+        $this->assertTrue($container->has(Bar::class));
+        $this->assertTrue($container->has(Baz::class));
+        $this->assertTrue($container->has(Foo::class));
+
+        $this->assertEquals(
+            array(
+                PsrContainerInterface::class,
+                ContainerInterface::class,
+                FooInterface::class,
+            ),
+            array_keys($container->getAliases())
+        );
+
+        $alias = $container->getAlias(FooInterface::class);
+        $this->assertSame(Foo::class, (string) $alias);
+        $this->assertFalse($alias->isPublic());
+        $this->assertFalse($alias->isPrivate());
     }
 
     /**