Merge branch '5.1' into 5.2

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

Author: nicolas-grekas

Generator/UrlGeneratorInterface.php

@@ -34,25 +34,25 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
     /**
      * Generates an absolute URL, e.g. "http://example.com/dir/file".
      */
-    const ABSOLUTE_URL = 0;
+    public const ABSOLUTE_URL = 0;
 
     /**
      * Generates an absolute path, e.g. "/dir/file".
      */
-    const ABSOLUTE_PATH = 1;
+    public const ABSOLUTE_PATH = 1;
 
     /**
      * Generates a relative path based on the current request path, e.g. "../parent-file".
      *
      * @see UrlGenerator::getRelativePath()
      */
-    const RELATIVE_PATH = 2;
+    public const RELATIVE_PATH = 2;
 
     /**
      * Generates a network path, e.g. "//example.com/dir/file".
      * Such reference reuses the current scheme but specifies the host.
      */
-    const NETWORK_PATH = 3;
+    public const NETWORK_PATH = 3;
 
     /**
      * Generates a URL or path for a specific route based on the given parameters.

Loader/XmlFileLoader.php

@@ -31,8 +31,8 @@ class XmlFileLoader extends FileLoader
     use LocalizedRouteTrait;
     use PrefixTrait;
 
-    const NAMESPACE_URI = 'http://symfony.com/schema/routing';
-    const SCHEME_PATH = '/schema/routing/routing-1.0.xsd';
+    public const NAMESPACE_URI = 'http://symfony.com/schema/routing';
+    public const SCHEME_PATH = '/schema/routing/routing-1.0.xsd';
 
     /**
      * Loads an XML file.

Matcher/TraceableUrlMatcher.php

@@ -23,9 +23,9 @@
  */
 class TraceableUrlMatcher extends UrlMatcher
 {
-    const ROUTE_DOES_NOT_MATCH = 0;
-    const ROUTE_ALMOST_MATCHES = 1;
-    const ROUTE_MATCHES = 2;
+    public const ROUTE_DOES_NOT_MATCH = 0;
+    public const ROUTE_ALMOST_MATCHES = 1;
+    public const ROUTE_MATCHES = 2;
 
     protected $traces;
 

Matcher/UrlMatcher.php

@@ -28,9 +28,9 @@
  */
 class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
 {
-    const REQUIREMENT_MATCH = 0;
-    const REQUIREMENT_MISMATCH = 1;
-    const ROUTE_MATCH = 2;
+    public const REQUIREMENT_MATCH = 0;
+    public const REQUIREMENT_MISMATCH = 1;
+    public const ROUTE_MATCH = 2;
 
     /** @var RequestContext */
     protected $context;

RouteCompiler.php

@@ -22,22 +22,22 @@ class RouteCompiler implements RouteCompilerInterface
     /**
      * @deprecated since Symfony 5.1, to be removed in 6.0
      */
-    const REGEX_DELIMITER = '#';
+    public const REGEX_DELIMITER = '#';
 
     /**
      * This string defines the characters that are automatically considered separators in front of
      * optional placeholders (with default and no static text following). Such a single separator
      * can be left out together with the optional placeholder from matching and generating URLs.
      */
-    const SEPARATORS = '/,;.:-_~+*=@|';
+    public const SEPARATORS = '/,;.:-_~+*=@|';
 
     /**
      * The maximum supported length of a PCRE subpattern name
      * http://pcre.org/current/doc/html/pcre2pattern.html#SEC16.
      *
      * @internal
      */
-    const VARIABLE_MAXIMUM_LENGTH = 32;
+    public const VARIABLE_MAXIMUM_LENGTH = 32;
 
     /**
      * {@inheritdoc}

Tests/RouteCompilerTest.php

@@ -394,5 +394,5 @@ public function provideRemoveCapturingGroup()
 
 class Utf8RouteCompiler extends RouteCompiler
 {
-    const SEPARATORS = '/§';
+    public const SEPARATORS = '/§';
 }