Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit d160eafc7a18 · 2022-03-02T14:21:45.000+01:00
* 6.0:
  -
  -
  Fix merge
  Fix merge
  [HttpKernel] Guard against bad profile data
  Fix merge
  [FrameworkBundle] Fix resetting container between tests
  Fix deprecations on PHP 8.2
diff --git a/Tests/Fixtures/MockStream/MockStream.php b/Tests/Fixtures/MockStream/MockStream.php
@@ -17,6 +17,8 @@
  */
 class MockStream
 {
+    public $context;
+
     /**
      * Opens file or URL.
      *

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`*/`
`18`	`18`	`class MockStream`
`19`	`19`	`{`
	`20`	`+ public $context;`
	`21`	`+`
`20`	`22`	`/**`
`21`	`23`	`* Opens file or URL.`
`22`	`24`	`*`