Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 2cdf69861a7b · 2021-07-21T15:18:10.000+02:00
* 5.2:
  Fix usage of str_contains()
  fix intersection types in tests
diff --git a/Tests/LdapTest.php b/Tests/LdapTest.php
@@ -21,7 +21,7 @@
 
 class LdapTest extends TestCase
 {
-    /** @var MockObject */
+    /** @var MockObject&AdapterInterface */
     private $adapter;
 
     /** @var Ldap */

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`class LdapTest extends TestCase`
`23`	`23`	`{`
`24`		`- /** @var MockObject */`
	`24`	`+ /** @var MockObject&AdapterInterface */`
`25`	`25`	`private $adapter;`
`26`	`26`
`27`	`27`	`/** @var Ldap */`