Merge branch '4.2'

wouterj · wouterj · commit 966fa120f263 · 2019-04-10T14:35:51.000+02:00
* 4.2: Revert "minor #11385 Don't use Flex config in 3.4 branch (javiereguiluz)" Swap aliases Don't use Flex config in 3.4 branch
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
@@ -412,12 +412,12 @@ injection::
             # the ``App\Util\UppercaseTransformer`` service will be
             # injected when an ``App\Util\TransformerInterface``
             # type-hint for a ``$shoutyTransformer`` argument is detected.
-            App\Util\TransformerInterface: '@App\Util\Rot13Transformer'
+            App\Util\TransformerInterface $shoutyTransformer: '@App\Util\UppercaseTransformer'
 
             # If the argument used for injection does not match, but the
             # type-hint still matches, the ``App\Util\Rot13Transformer``
             # service will be injected.
-            App\Util\TransformerInterface $shoutyTransformer: '@App\Util\UppercaseTransformer'
+            App\Util\TransformerInterface: '@App\Util\Rot13Transformer'
 
             App\Service\TwitterClient:
                 # the Rot13Transformer will be passed as the $transformer argument
