Merge branch '4.4' into 5.1

* 4.4:
  [PhpUnitBridge] Fix CS for PHP 5.5

Author: nicolas-grekas

DeprecationErrorHandler.php

@@ -25,9 +25,9 @@
  */
 class DeprecationErrorHandler
 {
-    public const MODE_DISABLED = 'disabled';
-    public const MODE_WEAK = 'max[total]=999999&verbose=0';
-    public const MODE_STRICT = 'max[total]=0';
+    const MODE_DISABLED = 'disabled';
+    const MODE_WEAK = 'max[total]=999999&verbose=0';
+    const MODE_STRICT = 'max[total]=0';
 
     private $mode;
     private $configuration;

DeprecationErrorHandler/Deprecation.php

@@ -21,14 +21,14 @@
  */
 class Deprecation
 {
-    public const PATH_TYPE_VENDOR = 'path_type_vendor';
-    public const PATH_TYPE_SELF = 'path_type_internal';
-    public const PATH_TYPE_UNDETERMINED = 'path_type_undetermined';
-
-    public const TYPE_SELF = 'type_self';
-    public const TYPE_DIRECT = 'type_direct';
-    public const TYPE_INDIRECT = 'type_indirect';
-    public const TYPE_UNDETERMINED = 'type_undetermined';
+    const PATH_TYPE_VENDOR = 'path_type_vendor';
+    const PATH_TYPE_SELF = 'path_type_internal';
+    const PATH_TYPE_UNDETERMINED = 'path_type_undetermined';
+
+    const TYPE_SELF = 'type_self';
+    const TYPE_DIRECT = 'type_direct';
+    const TYPE_INDIRECT = 'type_indirect';
+    const TYPE_UNDETERMINED = 'type_undetermined';
 
     private $trace = [];
     private $message;