Commit19682cb

committed

[FrameworkBundle] use service() in route condition

1 parent78ad4b9 commit19682cbCopy full SHA for 19682cb

File tree

+14

-4

lines changed

src/Symfony
- Bundle/FrameworkBundle/Resources/config
  - routing.xml
- Component/Routing/Tests/Matcher
  - ExpressionLanguageTest.php

+14

-4

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?xml version="1.0" ?>`
`2`	`2`
`3`	`3`	`<containerxmlns="http://symfony.com/schema/dic/services"`
`4`		`-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`5`		`-xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">`
	`4`	`+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
	`5`	`+xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">`
`6`	`6`
`7`	`7`	`<parameters>`
`8`	`8`	`<parameterkey="router.request_context.host">localhost</parameter>`
`@@ -79,6 +79,15 @@`
`79`	`79`	`</argument>`
`80`	`80`	`</service>`
`81`	`81`	`</argument>`
	`82`	`+ <argumenttype="service"key="service">`
	`83`	`+ <serviceclass="Closure">`
	`84`	`+ <factoryclass="Closure"method="fromCallable" />`
	`85`	`+ <argumenttype="collection">`
	`86`	`+ <argumenttype="service"id="service_container" />`
	`87`	`+ <argument>get</argument>`
	`88`	`+ </argument>`
	`89`	`+ </service>`
	`90`	`+ </argument>`
`82`	`91`	`</argument>`
`83`	`92`	`</argument>`
`84`	`93`	`<callmethod="setConfigCacheFactory">`
`@@ -132,6 +141,7 @@`
`132`	`141`	`<serviceid="Symfony\Component\Routing\Matcher\ExpressionLanguageProvider">`
`133`	`142`	`<argumenttype="collection">`
`134`	`143`	`<argument>env</argument>`
	`144`	`+ <argument>service</argument>`
`135`	`145`	`</argument>`
`136`	`146`	`<tagname="routing.expression_language_provider" />`
`137`	`147`	`</service>`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ExpressionLanguageTest extends TestCase`
`21`	`21`	`private$context;`
`22`	`22`	`private$expressionLanguage;`
`23`	`23`
`24`		`-publicfunctionsetUp():void`
	`24`	`+protectedfunctionsetUp():void`
`25`	`25`	`{`
`26`	`26`	`$this->context =newRequestContext();`
`27`	`27`	`$this->context->setParameter('_functions', [`
`@@ -71,7 +71,7 @@ public function testEvaluate(string $expression, $expected)`
`71`	`71`	`$this->assertSame($expected,$this->expressionLanguage->evaluate($expression, ['context' =>$this->context]));`
`72`	`72`	`}`
`73`	`73`
`74`		`-publicfunctionevaluateProvider():array`
	`74`	`+publicfunctionevaluateProvider():iterable`
`75`	`75`	`{`
`76`	`76`	`return [`
`77`	`77`	`['env("APP_ENV")','test'],`

Comments

(0)