Merge branch '4.0'

* 4.0: (28 commits)
  [DI] Add tests for EnvVarProcessor
  typo
  [Bridge\PhpUnit] Fix symfony#26430 Cannot autoload listeners
  Make sure we always render errors. Eventhough labels are disabled
  Make sure form errors is valid HTML
  [HttpKernel] Allow generators in registerBundle
  [TwigBundle] document TwigRenderer BC break in UPGRADE-3.4
  Extra line to bootstrap 3 horizontal layout
  [Serializer] Remove const override
  Update Client.php
  [PhpUnitBridge] Ability to use different composer.json file
  [DomCrawler] FormField: remove an useless return statement
  [Config] ReflectionClassResource check abstract ServiceSubscriberInterface and EventSubscriberInterface
  Display the Welcome Page when there is no homepage defined
  [DI] Remove dead dumper check
  Make KernelInterface docblock more fit for bundle-less environment
  fix regression when extending the Container class without a constructor
  fix the updating of timestamp in the MemcachedSessionHandler
  [SecurityBundle] Make extra character non mandatory in regex
  [Config] Add characters to the regex
  ...

Author: nicolas-grekas

CHANGELOG-4.0.md

@@ -7,6 +7,15 @@ 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.6 (2018-03-05)
+
+ * bug #26393  [DI] Skip resource tracking if disabled (chalasr)
+ * bug #26403 fix the handling of timestamp in the MongoDBSessionHandler (hjanuschka)
+ * bug #26355 [DI] Fix missing "id" normalization when dumping the container (nicolas-grekas)
+ * bug #26368 [WebProfilerBundle] Fix Debug toolbar breaks app (xkobal)
+ * bug #26369 Use fill instead of style for svg colors (rpkamp)
+ * bug #26358 [FrameworkBundle] Silence "Failed to remove directory" on cache:clear (nicolas-grekas)
+
 * 4.0.5 (2018-03-01)
 
  * bug #26327 [Form][WCAG] Errors sign for people that do not see colors (Nyholm)

src/Symfony/Bridge/PhpUnit/CoverageListener.php

@@ -18,3 +18,9 @@ class_alias('Symfony\Bridge\PhpUnit\Legacy\CoverageListenerForV6', 'Symfony\Brid
 } else {
     class_alias('Symfony\Bridge\PhpUnit\Legacy\CoverageListenerForV7', 'Symfony\Bridge\PhpUnit\CoverageListener');
 }
+
+if (false) {
+    class CoverageListener
+    {
+    }
+}

src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php

@@ -18,3 +18,9 @@ class_alias('Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV6', 'Symfony\
 } else {
     class_alias('Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV7', 'Symfony\Bridge\PhpUnit\SymfonyTestsListener');
 }
+
+if (false) {
+    class SymfonyTestsListener
+    {
+    }
+}

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

@@ -26,8 +26,13 @@ if (PHP_VERSION_ID >= 70200) {
     $PHPUNIT_VERSION = '4.8';
 }
 
+if ('composer.json' !== $COMPOSER_JSON = getenv('COMPOSER') ?: 'composer.json') {
+    putenv('COMPOSER=composer.json');
+    $_SERVER['COMPOSER'] = $_ENV['COMPOSER'] = 'composer.json';
+}
+
 $root = __DIR__;
-while (!file_exists($root.'/composer.json') || file_exists($root.'/DeprecationErrorHandler.php')) {
+while (!file_exists($root.'/'.$COMPOSER_JSON) || file_exists($root.'/DeprecationErrorHandler.php')) {
     if ($root === dirname($root)) {
         break;
     }

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

@@ -62,4 +62,4 @@ col-sm-10
             {{- form_errors(form) -}}
         </div>{#--#}
     </div>
-{%- endblock checkbox_row %}
+{%- endblock checkbox_row %}

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

@@ -203,7 +203,13 @@
                 {% set label = name|humanize %}
             {%- endif -%}
         {%- endif -%}
-        <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}>{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}{{- form_errors(form) -}}</{{ element|default('label') }}>
+        <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}>{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}{% block form_label_errors %}{{- form_errors(form) -}}{% endblock form_label_errors %}</{{ element|default('label') }}>
+    {%- else -%}
+        {%- if errors|length > 0 -%}
+        <div id="{{ id }}_errors" class="mb-2">
+            {{- form_errors(form) -}}
+        </div>
+        {%- endif -%}
     {%- endif -%}
 {%- endblock form_label %}
 
@@ -261,12 +267,12 @@
 
 {% block form_errors -%}
     {%- if errors|length > 0 -%}
-        <div class="{% if form is not rootform %}invalid-feedback d-block{% else %}alert alert-danger{% endif %}">
-            <ul class="list-unstyled mb-0">
-                {%- for error in errors -%}
-                    <li><span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span></li>
-                {%- endfor -%}
-            </ul>
-        </div>
+        <span class="{% if form is not rootform %}invalid-feedback d-block{% else %}alert alert-danger{% endif %}">
+            {%- for error in errors -%}
+                <span class="mb-0 d-block">
+                    <span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
+                </span>
+            {%- endfor -%}
+        </span>
     {%- endif %}
 {%- endblock form_errors %}

src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig

@@ -317,7 +317,14 @@
                         </td>
                         <td>
                             {% if decision.attributes|length == 1 %}
-                                {{ decision.attributes|first }}
+                                {% set attribute = decision.attributes|first %}
+                                {% if attribute.expression is defined %}
+                                    Expression: <pre><code>{{ attribute.expression }}</code></pre>
+                                {% elseif attribute.type == 'string' %}
+                                    {{ attribute }}
+                                {% else %}
+                                     {{ profiler_dump(attribute) }}
+                                {% endif %}
                             {% else %}
                                 {{ profiler_dump(decision.attributes) }}
                             {% endif %}

src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php

@@ -86,7 +86,7 @@ public function testEncodePasswordArgon2i()
         $this->assertContains('Password encoding succeeded', $output);
 
         $encoder = new Argon2iPasswordEncoder();
-        preg_match('#  Encoded password\s+(\$argon2id\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);
+        preg_match('#  Encoded password\s+(\$argon2id?\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);
         $hash = $matches[1];
         $this->assertTrue($encoder->isPasswordValid($hash, 'password', null));
     }

src/Symfony/Component/BrowserKit/Client.php

@@ -79,7 +79,7 @@ public function isFollowingRedirects()
     }
 
     /**
-     * Sets the maximum number of requests that crawler can follow.
+     * Sets the maximum number of redirects that crawler can follow.
      *
      * @param int $maxRedirects
      */
@@ -90,7 +90,7 @@ public function setMaxRedirects($maxRedirects)
     }
 
     /**
-     * Returns the maximum number of requests that crawler can follow.
+     * Returns the maximum number of redirects that crawler can follow.
      *
      * @return int
      */

src/Symfony/Component/Config/Resource/ReflectionClassResource.php

@@ -148,12 +148,16 @@ private function generateSignature(\ReflectionClass $class)
             yield print_r($defaults, true);
         }
 
-        if ($class->isSubclassOf(EventSubscriberInterface::class)) {
+        if ($class->isAbstract() || $class->isInterface() || $class->isTrait()) {
+            return;
+        }
+
+        if (interface_exists(EventSubscriberInterface::class, false) && $class->isSubclassOf(EventSubscriberInterface::class)) {
             yield EventSubscriberInterface::class;
             yield print_r(\call_user_func(array($class->name, 'getSubscribedEvents')), true);
         }
 
-        if ($class->isSubclassOf(ServiceSubscriberInterface::class)) {
+        if (interface_exists(ServiceSubscriberInterface::class, false) && $class->isSubclassOf(ServiceSubscriberInterface::class)) {
             yield ServiceSubscriberInterface::class;
             yield print_r(\call_user_func(array($class->name, 'getSubscribedServices')), true);
         }