Merge branch '4.4'

* 4.4:
  [Validation] Documented the intlCompatible option in Timezone constraint
  Removed old versionadded directive
  [PhpUnitBridge] Add docs for ClassExistsMock
  Progress Bar Section -- Change CodeBlock
  Use versionadded instead of note directive

Author: javiereguiluz

components/cache/adapters/chain_adapter.rst

@@ -58,11 +58,5 @@ incompatible adapters are silently ignored::
         new FilesystemAdapter(),  // DOES implement PruneableInterface
     ]);
 
-    // prune will proxy the call to FilesystemAdapter while silently skipping ApcuAdapter
+    // prune will proxy the call to FilesystemAdapter while silently skip ApcuAdapter
     $cache->prune();
-
-.. note::
-
-    Since Symfony 3.4, this adapter implements :class:`Symfony\\Component\\Cache\\PruneableInterface`,
-    allowing for manual :ref:`pruning of expired cache entries <component-cache-cache-pool-prune>` by
-    calling its ``prune()`` method.

components/console/helpers/progressbar.rst

@@ -112,7 +112,7 @@ which starts, advances and finishes the progress bar automatically::
 
 If ``$iterable = [1, 2]``, the previous code will output the following:
 
-.. code-block:: terminal
+.. code-block:: console
 
      0/2 [>---------------------------]   0%
      1/2 [==============>-------------]  50%

components/intl.rst

@@ -234,6 +234,8 @@ to catching the exception, you can also check if a given currency code is valid:
 
     $isValidCurrency = Currencies::exists($currencyCode);
 
+.. _component-intl-timezones:
+
 Timezones
 ~~~~~~~~~
 

components/phpunit_bridge.rst

@@ -589,6 +589,78 @@ conditions::
         ],
     ]);
 
+Class Existence Based Tests
+---------------------------
+
+Tests that behave differently depending on existing classes, for example Composer's
+development dependencies, are often hard to test for the alternate case. For that
+reason, this component also provides mocks for these PHP functions:
+
+* :phpfunction:`class_exists`
+* :phpfunction:`interface_exists`
+* :phpfunction:`trait_exists`
+
+Use Case
+~~~~~~~~
+
+Consider the following example that relies on the ``Vendor\DependencyClass`` to
+toggle a behavior::
+
+    use Vendor\DependencyClass;
+
+    class MyClass
+    {
+        public function hello(): string
+        {
+            if (class_exists(DependencyClass::class)) {
+                return 'The dependency bahavior.';
+            }
+
+            return 'The default behavior.';
+        }
+    }
+
+A regular test case for ``MyClass`` (assuming the development dependencies
+are installed during tests) would look like::
+
+    use MyClass;
+    use PHPUnit\Framework\TestCase;
+
+    class MyClassTest extends TestCase
+    {
+        public function testHello()
+        {
+            $class = new MyClass();
+            $result = $class->hello(); // "The dependency bahavior."
+
+            // ...
+        }
+    }
+
+In order to test the default behavior instead use the
+``ClassExistsMock::withMockedClasses()`` to configure the expected
+classes, interfaces and/or traits for the code to run::
+
+    use MyClass;
+    use PHPUnit\Framework\TestCase;
+    use Vendor\DependencyClass;
+
+    class MyClassTest extends TestCase
+    {
+        // ...
+
+        public function testHelloDefault()
+        {
+            ClassExistsMock::register(MyClass::class);
+            ClassExistsMock::withMockedClasses([DependencyClass::class => false]);
+
+            $class = new MyClass();
+            $result = $class->hello(); // "The default bahavior."
+
+            // ...
+        }
+    }
+
 Troubleshooting
 ---------------
 

reference/constraints/Timezone.rst

@@ -5,11 +5,12 @@ Validates that a value is a valid timezone identifier (e.g. ``Europe/Paris``).
 
 ==========  ======================================================================
 Applies to  :ref:`property or method <validation-property-target>`
-Options     - `groups`_
+Options     - `countryCode`_
+            - `groups`_
+            - `intlCompatible`_
             - `message`_
             - `payload`_
             - `zone`_
-            - `countryCode`_
 Class       :class:`Symfony\\Component\\Validator\\Constraints\\Timezone`
 Validator   :class:`Symfony\\Component\\Validator\\Constraints\\TimezoneValidator`
 ==========  ======================================================================
@@ -18,7 +19,7 @@ Basic Usage
 -----------
 
 Suppose you have a ``UserSettings`` class, with a ``timezone`` field that is a
-string meant to contain a timezone identifier (e.g. ``America/New_York``):
+string which contains any of the `PHP timezone identifiers`_ (e.g. ``America/New_York``):
 
 .. configuration-block::
 
@@ -81,8 +82,34 @@ string meant to contain a timezone identifier (e.g. ``America/New_York``):
 Options
 -------
 
+countryCode
+~~~~~~~~~~~
+
+**type**: ``string`` **default**: ``null``
+
+If the ``zone`` option is set to ``\DateTimeZone::PER_COUNTRY``, this option
+restricts the valid timezone identifiers to the ones that belong to the given
+country.
+
+The value of this option must be a valid `ISO 3166-1 alpha-2`_ country code
+(e.g. ``CN`` for China).
+
 .. include:: /reference/constraints/_groups-option.rst.inc
 
+intlCompatible
+~~~~~~~~~~~~~~
+
+**type**: ``boolean`` **default**: ``false``
+
+This constraint considers valid both the `PHP timezone identifiers`_ and the
+:ref:`ICU timezones <component-intl-timezones>` provided by Symfony's
+:doc:`Intl component </components/intl>`
+
+However, the timezones provided by the Intl component can be different from the
+timezones provided by PHP's Intl extension (because they use different ICU
+versions). If this option is set to ``true``, this constraint only considers
+valid the values created with the PHP ``\IntlTimeZone::createTimeZone()`` method.
+
 message
 ~~~~~~~
 
@@ -127,17 +154,6 @@ In addition, there are some special zone values:
 * ``\DateTimeZone::PER_COUNTRY`` restricts the valid timezones to a certain
   country (which is defined using the ``countryCode`` option).
 
-countryCode
-~~~~~~~~~~~
-
-**type**: ``string`` **default**: ``null``
-
-If the ``zone`` option is set to ``\DateTimeZone::PER_COUNTRY``, this option
-restricts the valid timezone identifiers to the ones that belong to the given
-country.
-
-The value of this option must be a valid `ISO 3166-1 alpha-2`_ country code
-(e.g. ``CN`` for China).
-
+.. _`PHP timezone identifiers`: https://www.php.net/manual/en/timezones.php
 .. _`DateTimeZone`: https://www.php.net/datetimezone
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2