symfony
diff --git a/‎UPGRADE-4.0.md
Lines changed: 0 additions & 6 deletions b/‎UPGRADE-4.0.md
Lines changed: 0 additions & 6 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Lines changed: 18 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Lines changed: 18 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Dotenv/Dotenv.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Dotenv/Dotenv.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Session.php
Lines changed: 21 additions & 4 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Session.php
Lines changed: 21 additions & 4 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php
Lines changed: 79 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php
Lines changed: 79 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
Lines changed: 20 additions & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
Lines changed: 20 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
Lines changed: 18 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
Lines changed: 18 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
Lines changed: 11 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
Lines changed: 11 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Lines changed: 5 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Lines changed: 5 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
Lines changed: 2 additions & 2 deletions
@@ -598,12 +598,6 @@ HttpKernel
            tags: ['console.command']
    ```
 
- * Removed the `kernel.root_dir` parameter. Use the `kernel.project_dir` parameter
-   instead.
-
- * Removed the `Kernel::getRootDir()` method. Use the `Kernel::getProjectDir()`
-   method instead.
-
  * The `Extension::addClassesToCompile()` and `Extension::getClassesToCompile()` methods have been removed.
 
  * Possibility to pass non-scalar values as URI attributes to the ESI and SSI
 
@@ -29,7 +29,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface
     protected $options = array(
         'check_path' => '/login_check',
         'use_forward' => false,
-        'require_previous_session' => true,
+        'require_previous_session' => false,
     );
 
     protected $defaultSuccessHandlerOptions = array(
 
@@ -28,7 +28,6 @@ public function __construct()
         $this->addOption('password_path', 'password');
         $this->defaultFailureHandlerOptions = array();
         $this->defaultSuccessHandlerOptions = array();
-        $this->options['require_previous_session'] = false;
     }
 
     /**
 
@@ -337,7 +337,10 @@ private function createTypeAlternatives(TypedReference $reference)
             return ' '.$message;
         }
 
-        if (isset($this->ambiguousServiceTypes[$type])) {
+        $servicesAndAliases = $this->container->getServiceIds();
+        if (!$this->container->has($type) && false !== $key = array_search(strtolower($type), array_map('strtolower', $servicesAndAliases))) {
+            return sprintf(' Did you mean "%s"?', $servicesAndAliases[$key]);
+        } elseif (isset($this->ambiguousServiceTypes[$type])) {
             $message = sprintf('one of these existing services: "%s"', implode('", "', $this->ambiguousServiceTypes[$type]));
         } elseif (isset($this->types[$type])) {
             $message = sprintf('the existing "%s" service', $this->types[$type]);
 
@@ -685,6 +685,24 @@ public function provideNotWireableCalls()
         );
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
+     * @expectedExceptionMessage Cannot autowire service "foo": argument "$sam" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireableBecauseOfATypo()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\lesTilleuls" but no such service exists. Did you mean "Symfony\Component\DependencyInjection\Tests\Compiler\LesTilleuls"?
+     */
+    public function testSuggestRegisteredServicesWithSimilarCase()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(LesTilleuls::class, LesTilleuls::class);
+        $container->register('foo', NotWireable::class)->setAutowired(true)
+            ->addMethodCall('setNotAutowireableBecauseOfATypo', array())
+        ;
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
      * @expectedExceptionMessage Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. Try changing the type-hint to "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" instead.
 
@@ -299,6 +299,10 @@ public function setNotAutowireable(NotARealClass $n)
     {
     }
 
+    public function setNotAutowireableBecauseOfATypo(lesTilleuls $sam)
+    {
+    }
+
     public function setBar()
     {
     }
 
@@ -174,7 +174,7 @@ private function lexVarname()
 
     private function lexValue()
     {
-        if (preg_match('/[ \t]*+(?:#.*)?$/Am', $this->data, $matches, null, $this->cursor)) {
+        if (preg_match('/[ \t]*+(?:#.*)?$/Am', $this->data, $matches, 0, $this->cursor)) {
             $this->moveCursor($matches[0]);
             $this->skipEmptyLines();
 
@@ -296,7 +296,7 @@ private function lexNestedExpression()
 
     private function skipEmptyLines()
     {
-        if (preg_match('/(?:\s*+(?:#[^\n]*+)?+)++/A', $this->data, $match, null, $this->cursor)) {
+        if (preg_match('/(?:\s*+(?:#[^\n]*+)?+)++/A', $this->data, $match, 0, $this->cursor)) {
             $this->moveCursor($match[0]);
         }
     }
 
@@ -28,6 +28,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
 
     private $flashName;
     private $attributeName;
+    private $data = array();
 
     /**
      * @param SessionStorageInterface $storage    A SessionStorageInterface instance
@@ -108,7 +109,7 @@ public function remove($name)
      */
     public function clear()
     {
-        $this->storage->getBag($this->attributeName)->clear();
+        $this->getAttributeBag()->clear();
     }
 
     /**
@@ -139,6 +140,22 @@ public function count()
         return count($this->getAttributeBag()->all());
     }
 
+    /**
+     * @return bool
+     *
+     * @internal
+     */
+    public function isEmpty()
+    {
+        foreach ($this->data as &$data) {
+            if (!empty($data)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -210,15 +227,15 @@ public function getMetadataBag()
      */
     public function registerBag(SessionBagInterface $bag)
     {
-        $this->storage->registerBag($bag);
+        $this->storage->registerBag(new SessionBagProxy($bag, $this->data));
     }
 
     /**
      * {@inheritdoc}
      */
     public function getBag($name)
     {
-        return $this->storage->getBag($name);
+        return $this->storage->getBag($name)->getBag();
     }
 
     /**
@@ -240,6 +257,6 @@ public function getFlashBag()
      */
     private function getAttributeBag()
     {
-        return $this->storage->getBag($this->attributeName);
+        return $this->storage->getBag($this->attributeName)->getBag();
     }
 }
@@ -0,0 +1,79 @@
+<?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\Component\HttpFoundation\Session;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+final class SessionBagProxy implements SessionBagInterface
+{
+    private $bag;
+    private $data;
+
+    public function __construct(SessionBagInterface $bag, array &$data)
+    {
+        $this->bag = $bag;
+        $this->data = &$data;
+    }
+
+    /**
+     * @return SessionBagInterface
+     */
+    public function getBag()
+    {
+        return $this->bag;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->data[$this->bag->getStorageKey()]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->bag->getName();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(array &$array)
+    {
+        $this->data[$this->bag->getStorageKey()] = &$array;
+
+        $this->bag->initialize($array);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStorageKey()
+    {
+        return $this->bag->getStorageKey();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
+        return $this->bag->clear();
+    }
+}
@@ -91,7 +91,26 @@ public function save()
             throw new \RuntimeException('Trying to save a session that was not started yet or was already closed');
         }
 
-        file_put_contents($this->getFilePath(), serialize($this->data));
+        $data = $this->data;
+
+        foreach ($this->bags as $bag) {
+            if (empty($data[$key = $bag->getStorageKey()])) {
+                unset($data[$key]);
+            }
+        }
+        if (array($key = $this->metadataBag->getStorageKey()) === array_keys($data)) {
+            unset($data[$key]);
+        }
+
+        try {
+            if ($data) {
+                file_put_contents($this->getFilePath(), serialize($data));
+            } else {
+                $this->destroy();
+            }
+        } finally {
+            $this->data = $data;
+        }
 
         // this is needed for Silex, where the session object is re-used across requests
         // in functional tests. In Symfony, the container is rebooted, so we don't have
 
@@ -221,4 +221,22 @@ public function testGetMeta()
     {
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\MetadataBag', $this->session->getMetadataBag());
     }
+
+    public function testIsEmpty()
+    {
+        $this->assertTrue($this->session->isEmpty());
+
+        $this->session->set('hello', 'world');
+        $this->assertFalse($this->session->isEmpty());
+
+        $this->session->remove('hello');
+        $this->assertTrue($this->session->isEmpty());
+
+        $flash = $this->session->getFlashBag();
+        $flash->set('hello', 'world');
+        $this->assertFalse($this->session->isEmpty());
+
+        $flash->get('hello');
+        $this->assertTrue($this->session->isEmpty());
+    }
 }
@@ -13,6 +13,7 @@
 
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -86,6 +87,15 @@ protected function instantiateController($class)
             return $this->container->get($class);
         }
 
-        return parent::instantiateController($class);
+        try {
+            return parent::instantiateController($class);
+        } catch (\ArgumentCountError $e) {
+        }
+
+        if ($this->container instanceof Container && in_array($class, $this->container->getRemovedIds(), true)) {
+            throw new \LogicException(sprintf('Controller "%s" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?', $class), 0, $e);
+        }
+
+        throw $e;
     }
 }
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
@@ -60,8 +61,10 @@ public function onKernelResponse(FilterResponseEvent $event)
         $session = $event->getRequest()->getSession();
         if ($session && $session->isStarted()) {
             $session->save();
-            $params = session_get_cookie_params();
-            $event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
+            if (!$session instanceof Session || !\method_exists($session, 'isEmpty') || !$session->isEmpty()) {
+                $params = session_get_cookie_params();
+                $event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
+            }
         }
     }
 
 
@@ -98,8 +98,8 @@ private function generateSignedFragmentUri($uri, Request $request): string
     private function containsNonScalars(array $values): bool
     {
         foreach ($values as $value) {
-            if (is_array($value) && $this->containsNonScalars($value)) {
-                return true;
+            if (is_array($value)) {
+                return $this->containsNonScalars($value);
             } elseif (!is_scalar($value) && null !== $value) {
                 return true;
             }