Merge branch '3.4' into 4.4

* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public

Author: nicolas-grekas

Adapter/ExtLdap/Adapter.php

@@ -72,7 +72,7 @@ public function escape($subject, $ignore = '', $flags = 0)
         $value = ldap_escape($subject, $ignore, $flags);
 
         // Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.
-        if ((int) $flags & LDAP_ESCAPE_DN) {
+        if ((int) $flags & \LDAP_ESCAPE_DN) {
             if (!empty($value) && ' ' === $value[0]) {
                 $value = '\\20'.substr($value, 1);
             }

Adapter/ExtLdap/Query.php

@@ -193,14 +193,14 @@ private function resetPagination()
         //
         // This is not supported in PHP < 7.2, so these versions will remain broken.
         $ctl = [];
-        ldap_get_option($con, LDAP_OPT_SERVER_CONTROLS, $ctl);
+        ldap_get_option($con, \LDAP_OPT_SERVER_CONTROLS, $ctl);
         if (!empty($ctl)) {
             foreach ($ctl as $idx => $info) {
                 if (static::PAGINATION_OID == $info['oid']) {
                     unset($ctl[$idx]);
                 }
             }
-            ldap_set_option($con, LDAP_OPT_SERVER_CONTROLS, $ctl);
+            ldap_set_option($con, \LDAP_OPT_SERVER_CONTROLS, $ctl);
         }
     }
 }

Adapter/ExtLdap/UpdateOperation.php

@@ -20,10 +20,10 @@ class UpdateOperation
     private $attribute;
 
     private $validOperationTypes = [
-        LDAP_MODIFY_BATCH_ADD,
-        LDAP_MODIFY_BATCH_REMOVE,
-        LDAP_MODIFY_BATCH_REMOVE_ALL,
-        LDAP_MODIFY_BATCH_REPLACE,
+        \LDAP_MODIFY_BATCH_ADD,
+        \LDAP_MODIFY_BATCH_REMOVE,
+        \LDAP_MODIFY_BATCH_REMOVE_ALL,
+        \LDAP_MODIFY_BATCH_REPLACE,
     ];
 
     /**
@@ -37,7 +37,7 @@ public function __construct(int $operationType, string $attribute, ?array $value
         if (!\in_array($operationType, $this->validOperationTypes, true)) {
             throw new UpdateOperationException(sprintf('"%s" is not a valid modification type.', $operationType));
         }
-        if (LDAP_MODIFY_BATCH_REMOVE_ALL === $operationType && null !== $values) {
+        if (\LDAP_MODIFY_BATCH_REMOVE_ALL === $operationType && null !== $values) {
             throw new UpdateOperationException(sprintf('$values must be null for LDAP_MODIFY_BATCH_REMOVE_ALL operation, "%s" given.', \gettype($values)));
         }
 

Tests/Adapter/ExtLdap/AdapterTest.php

@@ -153,7 +153,7 @@ public function testLdapPagination()
             $this->assertEquals(\count($fully_paged_query->getResources()), 1);
             $this->assertEquals(\count($paged_query->getResources()), 5);
 
-            if (PHP_MAJOR_VERSION > 7 || (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION >= 2)) {
+            if (\PHP_MAJOR_VERSION > 7 || (\PHP_MAJOR_VERSION == 7 && \PHP_MINOR_VERSION >= 2)) {
                 // 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.

Tests/Adapter/ExtLdap/LdapManagerTest.php

@@ -272,7 +272,7 @@ public function testLdapApplyOperationsRemoveAllWithArrayError()
 
         $this->expectException(UpdateOperationException::class);
 
-        $entryManager->applyOperations($entry->getDn(), [new UpdateOperation(LDAP_MODIFY_BATCH_REMOVE_ALL, 'mail', [])]);
+        $entryManager->applyOperations($entry->getDn(), [new UpdateOperation(\LDAP_MODIFY_BATCH_REMOVE_ALL, 'mail', [])]);
     }
 
     public function testLdapApplyOperationsWithWrongConstantError()
@@ -295,8 +295,8 @@ public function testApplyOperationsAddRemoveAttributeValues()
         $entry = $result[0];
 
         $entryManager->applyOperations($entry->getDn(), [
-            new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
-            new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
         ]);
 
         $result = $this->executeSearchQuery(1);
@@ -305,8 +305,8 @@ public function testApplyOperationsAddRemoveAttributeValues()
         $this->assertCount(6, $newEntry->getAttribute('mail'));
 
         $entryManager->applyOperations($entry->getDn(), [
-            new UpdateOperation(LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
-            new UpdateOperation(LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
         ]);
 
         $result = $this->executeSearchQuery(1);
@@ -318,13 +318,13 @@ public function testApplyOperationsAddRemoveAttributeValues()
     public function testUpdateOperationsWithIterator()
     {
         $iteratorAdd = new \ArrayIterator([
-            new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
-            new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
         ]);
 
         $iteratorRemove = new \ArrayIterator([
-            new UpdateOperation(LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
-            new UpdateOperation(LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot@example.org', 'fabpot2@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_REMOVE, 'mail', ['fabpot3@example.org', 'fabpot4@example.org']),
         ]);
 
         $entryManager = $this->adapter->getEntryManager();
@@ -350,8 +350,8 @@ public function testUpdateOperationsWithIterator()
     public function testUpdateOperationsThrowsExceptionWhenAddedDuplicatedValue()
     {
         $duplicateIterator = new \ArrayIterator([
-            new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org']),
-            new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org']),
+            new UpdateOperation(\LDAP_MODIFY_BATCH_ADD, 'mail', ['fabpot@example.org']),
         ]);
 
         $entryManager = $this->adapter->getEntryManager();