Merge branch '4.0'

* 4.0:
  [DI] Add missing deprecation when fetching private services from ContainerBuilder
  [FrameworkBundle] Rename getDotEnvVars to getDotenvVars
  [DI] Fix false-positive circular exception
  Use a more specific file for detecting the bridge
  [HttpKernel] Fix issue when resetting DumpDataCollector
  bumped Symfony version to 4.0.1
  updated VERSION for 4.0.0
  updated CHANGELOG for 4.0.0
  bumped Symfony version to 3.4.1
  updated VERSION for 3.4.0
  updated CHANGELOG for 3.4.0

Author: nicolas-grekas

CHANGELOG-4.0.md

@@ -7,6 +7,32 @@ in 4.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.0.0...v4.0.1
 
+* 4.0.0 (2017-11-30)
+
+ * bug #25220 [HttpFoundation] Add Session::isEmpty(), fix MockFileSessionStorage to behave like the native one (nicolas-grekas)
+ * bug #25209 [VarDumper] Dont use empty(), it chokes on eg GMP objects (nicolas-grekas)
+ * bug #25200 [HttpKernel] Arrays with scalar values passed to ESI fragment renderer throw deprecation notice (Simperfit)
+ * bug #25201 [HttpKernel] Add a better error messages when passing a private or non-tagged controller (Simperfit)
+ * bug #25155 [DependencyInjection] Detect case mismatch in autowiring (Simperfit, sroze)
+ * bug #25217 [Dotenv] Changed preg_match flags from null to 0 (deekthesqueak)
+ * bug #25180 [DI] Fix circular reference when using setters (nicolas-grekas)
+ * bug #25204 [DI] Clear service reference graph (nicolas-grekas)
+ * bug #25203 [DI] Fix infinite loop in InlineServiceDefinitionsPass (nicolas-grekas)
+ * bug #25185 [Serializer] Do not cache attributes if `attributes` in context (sroze)
+ * bug #25190 [HttpKernel] Keep legacy container files for concurrent requests (nicolas-grekas)
+ * bug #25182 [HttpFoundation] AutExpireFlashBag should not clear new flashes (Simperfit, sroze)
+ * bug #25174 [Translation] modify definitions only if the do exist (xabbuh)
+ * bug #25179 [FrameworkBundle][Serializer] Remove YamlEncoder definition if Yaml component isn't installed (ogizanagi)
+ * bug #25160 [DI] Prevent a ReflectionException during cache:clear when the parent class doesn't exist (dunglas)
+ * bug #25163 [DI] Fix tracking of env vars in exceptions (nicolas-grekas)
+ * bug #25162 [HttpKernel] Read $_ENV when checking SHELL_VERBOSITY (nicolas-grekas)
+ * bug #25158 [DI] Remove unreachable code (GawainLynch)
+ * bug #25152 [Form] Don't rely on `Symfony\Component\HttpFoundation\File\File` if http-foundation isn't in FileType (issei-m)
+ * bug #24987 [Console] Fix global console flag when used in chain (Simperfit)
+ * bug #25137 Adding checks for the expression language (weaverryan)
+ * bug #25151 [FrameworkBundle] Automatically enable the CSRF protection if CSRF manager exists (sroze)
+ * bug #25043 [Yaml] added ability for substitute aliases when mapping is on single line (Michał Strzelecki, xabbuh)
+
 * 4.0.0-RC2 (2017-11-24)
 
  * bug #25146 [DI] Dont resolve envs in service ids (nicolas-grekas)

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

@@ -27,7 +27,7 @@ if (PHP_VERSION_ID >= 70200) {
 }
 
 $root = __DIR__;
-while (!file_exists($root.'/composer.json') || file_exists($root.'/bin/simple-phpunit')) {
+while (!file_exists($root.'/composer.json') || file_exists($root.'/DeprecationErrorHandler.php')) {
     if ($root === dirname($root)) {
         break;
     }

src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php

@@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             array('Xdebug', extension_loaded('xdebug') ? 'true' : 'false'),
         );
 
-        if ($dotenv = self::getDotEnvVars()) {
+        if ($dotenv = self::getDotenvVars()) {
             $rows = array_merge($rows, array(
                 new TableSeparator(),
                 array('<info>Environment (.env)</>'),
@@ -129,7 +129,7 @@ private static function isExpired(string $date): bool
         return false !== $date && new \DateTime() > $date->modify('last day of this month 23:59:59');
     }
 
-    private static function getDotEnvVars(): array
+    private static function getDotenvVars(): array
     {
         $vars = array();
         foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {

src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

@@ -218,9 +218,10 @@ public function testStopwatchExtensionAvailability($debug, $stopwatchEnabled, $e
         }
         $container->registerExtension(new TwigExtension());
         $container->loadFromExtension('twig', array());
+        $container->setAlias('test.twig.extension.debug.stopwatch', 'twig.extension.debug.stopwatch')->setPublic(true);
         $this->compileContainer($container);
 
-        $tokenParsers = $container->get('twig.extension.debug.stopwatch')->getTokenParsers();
+        $tokenParsers = $container->get('test.twig.extension.debug.stopwatch')->getTokenParsers();
         $stopwatchIsAvailable = new \ReflectionProperty($tokenParsers[0], 'stopwatchIsAvailable');
         $stopwatchIsAvailable->setAccessible(true);
 

src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -519,6 +519,10 @@ public function has($id)
      */
     public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
     {
+        if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {
+            return parent::get($id);
+        }
+
         return $this->doGet($id, $invalidBehavior);
     }
 
@@ -715,6 +719,12 @@ public function compile(bool $resolveEnvPlaceholders = false)
         }
 
         parent::compile();
+
+        foreach ($this->definitions + $this->aliasDefinitions as $id => $definition) {
+            if (!$definition->isPublic() || $definition->isPrivate()) {
+                $this->removedIds[$id] = true;
+            }
+        }
     }
 
     /**

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -472,7 +472,7 @@ private function addServiceInlinedDefinitions(string $id, Definition $definition
             // $b = new ServiceB();
             // $a = new ServiceA(ServiceB $b);
             // $b->setServiceA(ServiceA $a);
-            if ($this->hasReference($id, array($def->getArguments(), $def->getFactory()))) {
+            if (isset($inlinedDefinition[$definition]) && $this->hasReference($id, array($def->getArguments(), $def->getFactory()))) {
                 throw new ServiceCircularReferenceException($id, array($id));
             }
 

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

@@ -733,6 +733,7 @@ public function testEnvInId()
             PsrContainerInterface::class => true,
             ContainerInterface::class => true,
             'baz_%env(BAR)%' => true,
+            'bar_%env(BAR)%' => true,
         );
         $this->assertSame($expected, $container->getRemovedIds());
 
@@ -1237,6 +1238,9 @@ public function testAlmostCircular($visibility)
         $this->assertSame($foo2, $foo2->bar->foobar->foo);
 
         $this->assertSame(array(), (array) $container->get('foobar4'));
+
+        $foo5 = $container->get('foo5');
+        $this->assertSame($foo5, $foo5->bar->foo);
     }
 
     public function provideAlmostCircular()

src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php

@@ -781,6 +781,9 @@ public function testAlmostCircular($visibility)
         $this->assertSame($foo2, $foo2->bar->foobar->foo);
 
         $this->assertSame(array(), (array) $container->get('foobar4'));
+
+        $foo5 = $container->get('foo5');
+        $this->assertSame($foo5, $foo5->bar->foo);
     }
 
     public function provideAlmostCircular()

src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_almost_circular.php

@@ -46,4 +46,13 @@
 $container->register('foobar4', 'stdClass')->setPublic(true)
     ->addArgument(new Reference('foo4'));
 
+// loop on the constructor of a setter-injected dep with property
+
+$container->register('foo5', 'stdClass')->setPublic(true)
+    ->setProperty('bar', new Reference('bar5'));
+
+$container->register('bar5', 'stdClass')->setPublic($public)
+    ->addArgument(new Reference('foo5'))
+    ->setProperty('foo', new Reference('foo5'));
+
 return $container;

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php

@@ -28,6 +28,7 @@ public function __construct()
             'bar3' => 'getBar3Service',
             'foo' => 'getFooService',
             'foo2' => 'getFoo2Service',
+            'foo5' => 'getFoo5Service',
             'foobar4' => 'getFoobar4Service',
         );
 
@@ -56,6 +57,7 @@ public function getRemovedIds()
             'Psr\\Container\\ContainerInterface' => true,
             'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
             'bar' => true,
+            'bar5' => true,
             'foo4' => true,
             'foobar' => true,
             'foobar2' => true,
@@ -125,6 +127,24 @@ protected function getFoo2Service()
         return $this->services['foo2'] = new \FooCircular($a);
     }
 
+    /**
+     * Gets the public 'foo5' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo5Service()
+    {
+        $this->services['foo5'] = $instance = new \stdClass();
+
+        $a = new \stdClass(($this->services['foo5'] ?? $this->getFoo5Service()));
+
+        $a->foo = $instance;
+
+        $instance->bar = $a;
+
+        return $instance;
+    }
+
     /**
      * Gets the public 'foobar4' shared service.
      *