Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit b4c1c0cdd34a · 2021-07-21T15:18:25.000+02:00
* 5.3:
  Fix usage of str_contains()
  fix intersection types in tests
diff --git a/Tests/ImmutableEventDispatcherTest.php b/Tests/ImmutableEventDispatcherTest.php
@@ -24,7 +24,7 @@
 class ImmutableEventDispatcherTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var MockObject&EventDispatcherInterface
      */
     private $innerDispatcher;
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`class ImmutableEventDispatcherTest extends TestCase`
`25`	`25`	`{`
`26`	`26`	`/**`
`27`		`- * @var MockObject`
	`27`	`+ * @var MockObject&EventDispatcherInterface`
`28`	`28`	`*/`
`29`	`29`	`private $innerDispatcher;`
`30`	`30`