Merge branch '5.4' into 6.0

* 5.4:
  Document code-style for enums and class constants
  Fix doc for String

Author: javiereguiluz

components/string.rst

@@ -318,12 +318,11 @@ Methods to Search and Replace
     u('foo')->equalsTo('foo'); // true
 
     // checks if the string content match the given regular expression.
-    // You can pass flags for preg_match() as second argument. If PREG_PATTERN_ORDER
-    // or PREG_SET_ORDER are passed, preg_match_all() will be used.
     u('avatar-73647.png')->match('/avatar-(\d+)\.png/');
-    // result = ['avatar-73647.png', '73647']
-    u('avatar-73647.png')->match('/avatar-(\d+)(-\d+)?\.png/', \PREG_UNMATCHED_AS_NULL);
     // result = ['avatar-73647.png', '73647', null]
+
+    // You can pass flags for preg_match() as second argument. If PREG_PATTERN_ORDER
+    // or PREG_SET_ORDER are passed, preg_match_all() will be used.
     u('206-555-0100 and 800-555-1212')->match('/\d{3}-\d{3}-\d{4}/', \PREG_PATTERN_ORDER);
     // result = [['206-555-0100', '800-555-1212']]
 

contributing/code/standards.rst

@@ -206,8 +206,12 @@ Naming Conventions
 * Use `snake_case`_ for configuration parameters and Twig template variables
   (e.g. ``framework.csrf_protection``, ``http_status_code``);
 
-* Use namespaces for all PHP classes and `UpperCamelCase`_ for their names (e.g.
-  ``ConsoleLogger``);
+* Use `SCREAMING_SNAKE_CASE`_ for constants (e.g. ``InputArgument::IS_ARRAY``);
+
+* Use `UpperCamelCase`_ for enumeration cases (e.g. ``InputArgumentMode::IsArray``);
+
+* Use namespaces for all PHP classes, interfaces, traits and enums and
+  `UpperCamelCase`_ for their names (e.g. ``ConsoleLogger``);
 
 * Prefix all abstract classes with ``Abstract`` except PHPUnit ``*TestCase``.
   Please note some early Symfony classes do not follow this convention and
@@ -218,6 +222,9 @@ Naming Conventions
 
 * Suffix traits with ``Trait``;
 
+* Don't use a dedicated suffix for classes or enumerations (e.g. like ``Class``
+  or ``Enum``), except for the cases listed below.
+
 * Suffix exceptions with ``Exception``;
 
 * Prefix PHP attributes with ``As`` where applicable (e.g. ``#[AsCommand]``