Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit a4779a046556 · 2020-06-12T10:11:14.000+02:00
* 4.4:
  [DependencyInjection][CheckTypeDeclarationsPass] Handle unresolved parameters pointing to environment variables
  switch the context when validating nested forms
  remove unused param from validator service config
  Fix typo
  [HttpKernel] Fix regression where Store does not return response body correctly
  rework form validator tests
  Update AbstractController.php
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
@@ -197,7 +197,7 @@ protected function file($file, string $fileName = null, string $disposition = Re
      *
      * @throws \LogicException
      */
-    protected function addFlash(string $type, string $message): void
+    protected function addFlash(string $type, $message): void
     {
         if (!$this->container->has('session')) {
             throw new \LogicException('You can not use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".');
diff --git a/Resources/config/validator.xml b/Resources/config/validator.xml
@@ -5,7 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="validator.mapping.cache.prefix" />
         <parameter key="validator.mapping.cache.file">%kernel.cache_dir%/validation.php</parameter>
     </parameters>
 

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ protected function file($file, string $fileName = null, string $disposition = Re`
`197`	`197`	`*`
`198`	`198`	`* @throws \LogicException`
`199`	`199`	`*/`
`200`		`- protected function addFlash(string $type, string $message): void`
	`200`	`+ protected function addFlash(string $type, $message): void`
`201`	`201`	`{`
`202`	`202`	`if (!$this->container->has('session')) {`
`203`	`203`	`throw new \LogicException('You can not use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".');`