Commit966fa12

committed

Merge branch '4.2'

* 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

2 parentsebf693b +50bbacc commit966fa12Copy full SHA for 966fa12

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -412,12 +412,12 @@ injection::`
`412`	`412`	# the ``App\Util\UppercaseTransformer`` service will be
`413`	`413`	# injected when an ``App\Util\TransformerInterface``
`414`	`414`	# type-hint for a ``$shoutyTransformer`` argument is detected.
`415`		`-App\Util\TransformerInterface:'@App\Util\Rot13Transformer'`
	`415`	`+App\Util\TransformerInterface $shoutyTransformer:'@App\Util\UppercaseTransformer'`
`416`	`416`
`417`	`417`	`# If the argument used for injection does not match, but the`
`418`	`418`	# type-hint still matches, the ``App\Util\Rot13Transformer``
`419`	`419`	`# service will be injected.`
`420`		`-App\Util\TransformerInterface $shoutyTransformer:'@App\Util\UppercaseTransformer'`
	`420`	`+App\Util\TransformerInterface:'@App\Util\Rot13Transformer'`
`421`	`421`
`422`	`422`	`App\Service\TwitterClient:`
`423`	`423`	`# the Rot13Transformer will be passed as the $transformer argument`

Comments

(0)