Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit b67d0f683dd2 · 2022-08-31T10:35:54.000+02:00
* 6.1:
  [HttpKernel] lock when writting profiles
  Using identical comparison for path validation
  [Mime] Fix email rendering when having inlined parts that are not related to the content
  fix typo
  [HttpFoundation] move flushing outside of Response::closeOutputBuffers
  [FrameworkBundle] Do not throw when describing a factory definition
  Fix checking result of DateTime::getLastErrors
  [WebProfilerBundle] Fix profile search bar link query params
diff --git a/Attribute/When.php b/Attribute/When.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Attribute;
 
 /**
- * An attribute to tell under which environement this class should be registered as a service.
+ * An attribute to tell under which environment this class should be registered as a service.
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Attribute;`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * An attribute to tell under which environement this class should be registered as a service.`
	`15`	`+ * An attribute to tell under which environment this class should be registered as a service.`
`16`	`16`	`*`
`17`	`17`	`* @author Nicolas Grekas <[email protected]>`
`18`	`18`	`*/`