Merge branch '4.4' into 5.0

OskarStark · OskarStark · commit 4e09a0bbc234 · 2020-01-16T06:13:55.000+01:00
* 4.4:
  Update extending.rst
  Update example to use tagged_locator helper function
diff --git a/components/expression_language/extending.rst b/components/expression_language/extending.rst
@@ -49,7 +49,7 @@ Example::
 
 In addition to the custom function arguments, the **evaluator** is passed an
 ``arguments`` variable as its first argument, which is equal to the second
-argument of ``compile()`` (e.g. the "values" when evaluating an expression).
+argument of ``evaluate()`` (e.g. the "values" when evaluating an expression).
 
 .. _components-expression-language-provider:
 
diff --git a/service_container/service_subscribers_locators.rst b/service_container/service_subscribers_locators.rst
@@ -544,7 +544,7 @@ attribute to the locator service defining the name of this custom method:
         return function(ContainerConfigurator $configurator) {
             $configurator->services()
                 ->set(App\HandlerCollection::class)
-                    ->args([service_locator(tagged('app.handler', null, 'myOwnMethodName'))])
+                    ->args([tagged_locator('app.handler', null, 'myOwnMethodName')])
             ;
         };
 

Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ attribute to the locator service defining the name of this custom method:`
`544`	`544`	`return function(ContainerConfigurator $configurator) {`
`545`	`545`	`$configurator->services()`
`546`	`546`	`->set(App\HandlerCollection::class)`
`547`		`- ->args([service_locator(tagged('app.handler', null, 'myOwnMethodName'))])`
	`547`	`+ ->args([tagged_locator('app.handler', null, 'myOwnMethodName')])`
`548`	`548`	`;`
`549`	`549`	`};`
`550`	`550`