Merge branch '5.4' into 6.0

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

Author: nicolas-grekas

Tests/Data/Bundle/Reader/BundleEntryReaderTest.php

@@ -31,7 +31,7 @@ class BundleEntryReaderTest extends TestCase
     private $reader;
 
     /**
-     * @var MockObject
+     * @var MockObject&BundleEntryReaderInterface
      */
     private $readerImpl;