Merge branch '4.1'

* 4.1:
  [TwigBridge] fix lowest version of symfony/form
  Think positive
  KernelInterface can return null container
  [DI] Detect circular references with ChildDefinition parent
  [VarDumper] Fix global dump function return value for PHP7
  [Ldap] Use shut up operator on connection errors at ldap_start_tls
  Implement startTest rather than startTestSuite
  [OptionsResolver] remove dead code and useless else
  [HttpFoundation] don't override StreamedResponse::setNotModified()
  Added relevent links for parsing to the phpdoc
  Add stricter checking for valid date time string
  Fix symfony/console (optional) dependency for MonologBridge
  fix not displaying labels when value is false
  [Form] Fix DateTimeType html5 input format

Author: nicolas-grekas

src/Symfony/Bridge/Monolog/composer.json

@@ -28,11 +28,12 @@
         "symfony/var-dumper": "~3.4|~4.0"
     },
     "conflict": {
+        "symfony/console": "<3.4",
         "symfony/http-foundation": "<3.4"
     },
     "suggest": {
         "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
-        "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.",
+        "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings.",
         "symfony/event-dispatcher": "Needed when using log messages in console commands.",
         "symfony/var-dumper": "For using the debugging handlers like the console handler or the log server handler."
      },

src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV5.php

@@ -12,8 +12,8 @@
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
 /**
- * CoverageListener adds `@covers <className>` on each test suite when possible
- * to make the code coverage more accurate.
+ * CoverageListener adds `@covers <className>` on each test when possible to
+ * make the code coverage more accurate.
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  *

src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV6.php

@@ -15,8 +15,8 @@
 use PHPUnit\Framework\Test;
 
 /**
- * CoverageListener adds `@covers <className>` on each test suite when possible
- * to make the code coverage more accurate.
+ * CoverageListener adds `@covers <className>` on each test when possible to
+ * make the code coverage more accurate.
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  *

src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php

@@ -11,13 +11,13 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
+use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestListener;
 use PHPUnit\Framework\TestListenerDefaultImplementation;
-use PHPUnit\Framework\TestSuite;
 
 /**
- * CoverageListener adds `@covers <className>` on each test suite when possible
- * to make the code coverage more accurate.
+ * CoverageListener adds `@covers <className>` on each test when possible to
+ * make the code coverage more accurate.
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  *
@@ -34,8 +34,8 @@ public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFo
         $this->trait = new CoverageListenerTrait($sutFqcnResolver, $warningOnSutNotFound);
     }
 
-    public function startTestSuite(TestSuite $suite): void
+    public function startTest(Test $test): void
     {
-        $this->trait->startTest($suite);
+        $this->trait->startTest($test);
     }
 }

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

@@ -64,11 +64,13 @@
         {%- if datetime is not defined or not datetime -%}
             <div {{ block('widget_container_attributes') -}}>
         {%- endif %}
+        {%- if label is not same as(false) -%}
             <div class="sr-only">
                 {{ form_label(form.year) }}
                 {{ form_label(form.month) }}
                 {{ form_label(form.day) }}
             </div>
+        {%- endif -%}
 
             {{- date_pattern|replace({
                 '{{ year }}': form_widget(form.year),
@@ -89,10 +91,10 @@
         {%- if datetime is not defined or false == datetime -%}
             <div {{ block('widget_container_attributes') -}}>
         {%- endif -%}
-        <div class="sr-only">{{ form_label(form.hour) }}</div>
+        {%- if label is not same as(false) -%}<div class="sr-only">{{ form_label(form.hour) }}</div>{%- endif -%}
         {{- form_widget(form.hour) -}}
-        {%- if with_minutes -%}:<div class="sr-only">{{ form_label(form.minute) }}</div>{{ form_widget(form.minute) }}{%- endif -%}
-        {%- if with_seconds -%}:<div class="sr-only">{{ form_label(form.second) }}</div>{{ form_widget(form.second) }}{%- endif -%}
+        {%- if with_minutes -%}:{%- if label is not same as(false) -%}<div class="sr-only">{{ form_label(form.minute) }}</div>{%- endif -%}{{ form_widget(form.minute) }}{%- endif -%}
+        {%- if with_seconds -%}:{%- if label is not same as(false) -%}<div class="sr-only">{{ form_label(form.second) }}</div>{%- endif -%}{{ form_widget(form.second) }}{%- endif -%}
         {%- if datetime is not defined or false == datetime -%}
             </div>
         {%- endif -%}

src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php

@@ -1577,7 +1577,7 @@ public function testDateTimeWithWidgetSingleText()
     [@type="datetime-local"]
     [@name="name"]
     [@class="my&class form-control"]
-    [@value="2011-02-03T04:05:06Z"]
+    [@value="2011-02-03T04:05:06"]
 '
         );
     }
@@ -1598,7 +1598,7 @@ public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
     [@type="datetime-local"]
     [@name="name"]
     [@class="my&class form-control"]
-    [@value="2011-02-03T04:05:06Z"]
+    [@value="2011-02-03T04:05:06"]
 '
         );
     }

src/Symfony/Bridge/Twig/composer.json

@@ -23,7 +23,7 @@
         "symfony/asset": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
-        "symfony/form": "^4.1.2",
+        "symfony/form": "^4.1.5",
         "symfony/http-foundation": "~3.4|~4.0",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/polyfill-intl-icu": "~1.0",

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

@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\ExceptionInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 
 /**
  * This replaces all ChildDefinition instances with their equivalent fully
@@ -25,6 +26,8 @@
  */
 class ResolveChildDefinitionsPass extends AbstractRecursivePass
 {
+    private $currentPath;
+
     protected function processValue($value, $isRoot = false)
     {
         if (!$value instanceof Definition) {
@@ -36,6 +39,7 @@ protected function processValue($value, $isRoot = false)
             $value = $this->container->getDefinition($this->currentId);
         }
         if ($value instanceof ChildDefinition) {
+            $this->currentPath = array();
             $value = $this->resolveDefinition($value);
             if ($isRoot) {
                 $this->container->setDefinition($this->currentId, $value);
@@ -56,6 +60,8 @@ private function resolveDefinition(ChildDefinition $definition)
     {
         try {
             return $this->doResolveDefinition($definition);
+        } catch (ServiceCircularReferenceException $e) {
+            throw $e;
         } catch (ExceptionInterface $e) {
             $r = new \ReflectionProperty($e, 'message');
             $r->setAccessible(true);
@@ -71,6 +77,13 @@ private function doResolveDefinition(ChildDefinition $definition)
             throw new RuntimeException(sprintf('Parent definition "%s" does not exist.', $parent));
         }
 
+        $searchKey = array_search($parent, $this->currentPath);
+        $this->currentPath[] = $parent;
+
+        if (false !== $searchKey) {
+            throw new ServiceCircularReferenceException($parent, \array_slice($this->currentPath, $searchKey));
+        }
+
         $parentDef = $this->container->findDefinition($parent);
         if ($parentDef instanceof ChildDefinition) {
             $id = $this->currentId;

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

@@ -396,4 +396,21 @@ protected function process(ContainerBuilder $container)
         $pass = new ResolveChildDefinitionsPass();
         $pass->process($container);
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
+     * @expectedExceptionMessageRegExp /^Circular reference detected for service "c", path: "c -> b -> a -> c"./
+     */
+    public function testProcessDetectsChildDefinitionIndirectCircularReference()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('a');
+
+        $container->setDefinition('b', new ChildDefinition('a'));
+        $container->setDefinition('c', new ChildDefinition('b'));
+        $container->setDefinition('a', new ChildDefinition('c'));
+
+        $this->process($container);
+    }
 }

src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php

@@ -0,0 +1,104 @@
+<?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\Form\Extension\Core\DataTransformer;
+
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * @author Franz Wilding <franz.wilding@me.com>
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ * @author Fred Cox <mcfedr@gmail.com>
+ */
+class DateTimeToHtml5LocalDateTimeTransformer extends BaseDateTimeTransformer
+{
+    const HTML5_FORMAT = 'Y-m-d\\TH:i:s';
+
+    /**
+     * Transforms a \DateTime into a local date and time string.
+     *
+     * According to the HTML standard, the input string of a datetime-local
+     * input is a RFC3339 date followed by 'T', followed by a RFC3339 time.
+     * https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-local-date-and-time-string
+     *
+     * @param \DateTime|\DateTimeInterface $dateTime A DateTime object
+     *
+     * @return string The formatted date
+     *
+     * @throws TransformationFailedException If the given value is not an
+     *                                       instance of \DateTime or \DateTimeInterface
+     */
+    public function transform($dateTime)
+    {
+        if (null === $dateTime) {
+            return '';
+        }
+
+        if (!$dateTime instanceof \DateTime && !$dateTime instanceof \DateTimeInterface) {
+            throw new TransformationFailedException('Expected a \DateTime or \DateTimeInterface.');
+        }
+
+        if ($this->inputTimezone !== $this->outputTimezone) {
+            if (!$dateTime instanceof \DateTimeImmutable) {
+                $dateTime = clone $dateTime;
+            }
+
+            $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
+        }
+
+        return $dateTime->format(self::HTML5_FORMAT);
+    }
+
+    /**
+     * Transforms a local date and time string into a \DateTime.
+     *
+     * When transforming back to DateTime the regex is slightly laxer, taking into
+     * account rules for parsing a local date and time string
+     * https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#parse-a-local-date-and-time-string
+     *
+     * @param string $dateTimeLocal Formatted string
+     *
+     * @return \DateTime Normalized date
+     *
+     * @throws TransformationFailedException If the given value is not a string,
+     *                                       if the value could not be transformed
+     */
+    public function reverseTransform($dateTimeLocal)
+    {
+        if (!\is_string($dateTimeLocal)) {
+            throw new TransformationFailedException('Expected a string.');
+        }
+
+        if ('' === $dateTimeLocal) {
+            return;
+        }
+
+        if (!preg_match('/^(\d{4})-(\d{2})-(\d{2})[T ]\d{2}:\d{2}(?::\d{2})?$/', $dateTimeLocal, $matches)) {
+            throw new TransformationFailedException(sprintf('The date "%s" is not a valid date.', $dateTimeLocal));
+        }
+
+        try {
+            $dateTime = new \DateTime($dateTimeLocal, new \DateTimeZone($this->outputTimezone));
+        } catch (\Exception $e) {
+            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
+        }
+
+        if ($this->inputTimezone !== $dateTime->getTimezone()->getName()) {
+            $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
+        }
+
+        if (!checkdate($matches[2], $matches[3], $matches[1])) {
+            throw new TransformationFailedException(sprintf('The date "%s-%s-%s" is not a valid date.', $matches[1], $matches[2], $matches[3]));
+        }
+
+        return $dateTime;
+    }
+}