Merge branch '5.1' into 5.2

* 5.1:
  Fix EncoderInterface::encode() return type
  [Lock] Prevent store exception break combined store
  Remove check for unsupported PHP version
  [Notifier] Rename test method names

Author: nicolas-grekas

Tests/Adapter/ExtLdap/AdapterTest.php

@@ -148,19 +148,17 @@ public function testLdapPagination()
             $this->assertEquals(\count($fully_paged_query->getResources()), 1);
             $this->assertEquals(\count($paged_query->getResources()), 5);
 
-            if (\PHP_VERSION_ID >= 70200) {
-                // This last query is to ensure that we haven't botched the state of our connection
-                // by not resetting pagination properly. extldap <= PHP 7.1 do not implement the necessary
-                // bits to work around an implementation flaw, so we simply can't guarantee this to work there.
-                $final_query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectClass=applicationProcess)(cn=user*))', [
-                    'scope' => Query::SCOPE_ONE,
-                ]);
-
-                $final_results = $final_query->execute();
-
-                $this->assertEquals($final_results->count(), 25);
-                $this->assertEquals(\count($final_query->getResources()), 1);
-            }
+            // This last query is to ensure that we haven't botched the state of our connection
+            // by not resetting pagination properly. extldap <= PHP 7.1 do not implement the necessary
+            // bits to work around an implementation flaw, so we simply can't guarantee this to work there.
+            $final_query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectClass=applicationProcess)(cn=user*))', [
+                'scope' => Query::SCOPE_ONE,
+            ]);
+
+            $final_results = $final_query->execute();
+
+            $this->assertEquals($final_results->count(), 25);
+            $this->assertEquals(\count($final_query->getResources()), 1);
         } catch (LdapException $exc) {
             $this->markTestSkipped('Test LDAP server does not support pagination');
         }