Merge branch '5.2' into 5.3

* 5.2:
  Fix usage of str_contains()
  fix intersection types in tests

Author: nicolas-grekas

Tests/Store/CombinedStoreTest.php

@@ -53,11 +53,11 @@ public function getStore(): PersistingStoreInterface
         return new CombinedStore([new RedisStore($redis)], new UnanimousStrategy());
     }
 
-    /** @var MockObject */
+    /** @var MockObject&StrategyInterface */
     private $strategy;
-    /** @var MockObject */
+    /** @var MockObject&BlockingStoreInterface */
     private $store1;
-    /** @var MockObject */
+    /** @var MockObject&BlockingStoreInterface */
     private $store2;
     /** @var CombinedStore */
     private $store;