Merge branch '4.4' into 5.1

* 4.4:
  Update .php_cs.dist
  Apply "visibility_required" CS rule to constants

Author: nicolas-grekas

Adapter/ExtLdap/ConnectionOptions.php

@@ -23,44 +23,44 @@
  */
 final class ConnectionOptions
 {
-    const API_INFO = 0x00;
-    const DEREF = 0x02;
-    const SIZELIMIT = 0x03;
-    const TIMELIMIT = 0x04;
-    const REFERRALS = 0x08;
-    const RESTART = 0x09;
-    const PROTOCOL_VERSION = 0x11;
-    const SERVER_CONTROLS = 0x12;
-    const CLIENT_CONTROLS = 0x13;
-    const API_FEATURE_INFO = 0x15;
-    const HOST_NAME = 0x30;
-    const ERROR_NUMBER = 0x31;
-    const ERROR_STRING = 0x32;
-    const MATCHED_DN = 0x33;
-    const DEBUG_LEVEL = 0x5001;
-    const TIMEOUT = 0x5002;
-    const NETWORK_TIMEOUT = 0x5005;
-    const X_TLS_CACERTDIR = 0x6003;
-    const X_TLS_CERTFILE = 0x6004;
-    const X_TLS_CRL_ALL = 0x02;
-    const X_TLS_CRL_NONE = 0x00;
-    const X_TLS_CRL_PEER = 0x01;
-    const X_TLS_KEYFILE = 0x6005;
-    const X_TLS_REQUIRE_CERT = 0x6006;
-    const X_TLS_PROTOCOL_MIN = 0x6007;
-    const X_TLS_CIPHER_SUITE = 0x6008;
-    const X_TLS_RANDOM_FILE = 0x6009;
-    const X_TLS_CRLFILE = 0x6010;
-    const X_TLS_PACKAGE = 0x6011;
-    const X_TLS_CRLCHECK = 0x600b;
-    const X_TLS_DHFILE = 0x600e;
-    const X_SASL_MECH = 0x6100;
-    const X_SASL_REALM = 0x6101;
-    const X_SASL_AUTHCID = 0x6102;
-    const X_SASL_AUTHZID = 0x6103;
-    const X_KEEPALIVE_IDLE = 0x6300;
-    const X_KEEPALIVE_PROBES = 0x6301;
-    const X_KEEPALIVE_INTERVAL = 0x6302;
+    public const API_INFO = 0x00;
+    public const DEREF = 0x02;
+    public const SIZELIMIT = 0x03;
+    public const TIMELIMIT = 0x04;
+    public const REFERRALS = 0x08;
+    public const RESTART = 0x09;
+    public const PROTOCOL_VERSION = 0x11;
+    public const SERVER_CONTROLS = 0x12;
+    public const CLIENT_CONTROLS = 0x13;
+    public const API_FEATURE_INFO = 0x15;
+    public const HOST_NAME = 0x30;
+    public const ERROR_NUMBER = 0x31;
+    public const ERROR_STRING = 0x32;
+    public const MATCHED_DN = 0x33;
+    public const DEBUG_LEVEL = 0x5001;
+    public const TIMEOUT = 0x5002;
+    public const NETWORK_TIMEOUT = 0x5005;
+    public const X_TLS_CACERTDIR = 0x6003;
+    public const X_TLS_CERTFILE = 0x6004;
+    public const X_TLS_CRL_ALL = 0x02;
+    public const X_TLS_CRL_NONE = 0x00;
+    public const X_TLS_CRL_PEER = 0x01;
+    public const X_TLS_KEYFILE = 0x6005;
+    public const X_TLS_REQUIRE_CERT = 0x6006;
+    public const X_TLS_PROTOCOL_MIN = 0x6007;
+    public const X_TLS_CIPHER_SUITE = 0x6008;
+    public const X_TLS_RANDOM_FILE = 0x6009;
+    public const X_TLS_CRLFILE = 0x6010;
+    public const X_TLS_PACKAGE = 0x6011;
+    public const X_TLS_CRLCHECK = 0x600b;
+    public const X_TLS_DHFILE = 0x600e;
+    public const X_SASL_MECH = 0x6100;
+    public const X_SASL_REALM = 0x6101;
+    public const X_SASL_AUTHCID = 0x6102;
+    public const X_SASL_AUTHZID = 0x6103;
+    public const X_KEEPALIVE_IDLE = 0x6300;
+    public const X_KEEPALIVE_PROBES = 0x6301;
+    public const X_KEEPALIVE_INTERVAL = 0x6302;
 
     public static function getOptionName(string $name): string
     {

Adapter/ExtLdap/Query.php

@@ -22,7 +22,7 @@
 class Query extends AbstractQuery
 {
     // As of PHP 7.2, we can use LDAP_CONTROL_PAGEDRESULTS instead of this
-    const PAGINATION_OID = '1.2.840.113556.1.4.319';
+    public const PAGINATION_OID = '1.2.840.113556.1.4.319';
 
     /** @var Connection */
     protected $connection;

Adapter/QueryInterface.php

@@ -21,14 +21,14 @@
  */
 interface QueryInterface
 {
-    const DEREF_NEVER = 0x00;
-    const DEREF_SEARCHING = 0x01;
-    const DEREF_FINDING = 0x02;
-    const DEREF_ALWAYS = 0x03;
+    public const DEREF_NEVER = 0x00;
+    public const DEREF_SEARCHING = 0x01;
+    public const DEREF_FINDING = 0x02;
+    public const DEREF_ALWAYS = 0x03;
 
-    const SCOPE_BASE = 'base';
-    const SCOPE_ONE = 'one';
-    const SCOPE_SUB = 'sub';
+    public const SCOPE_BASE = 'base';
+    public const SCOPE_ONE = 'one';
+    public const SCOPE_SUB = 'sub';
 
     /**
      * Executes a query and returns the list of Ldap entries.

LdapInterface.php

@@ -22,8 +22,8 @@
  */
 interface LdapInterface
 {
-    const ESCAPE_FILTER = 0x01;
-    const ESCAPE_DN = 0x02;
+    public const ESCAPE_FILTER = 0x01;
+    public const ESCAPE_DN = 0x02;
 
     /**
      * Return a connection bound to the ldap.