Commit86b8d7f

committed

[Routing] Simplify importing routes defined on controller services

1 parenta232b1b commit86b8d7fCopy full SHA for 86b8d7f

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,7 @@ public static function config(array $config): array`
`184`	`184`	`*`
`185`	`185`	`* return Routes::config([`
`186`	`186`	`* 'controllers' => [`
`187`		`- * 'resource' => 'attributes',`
`188`		`- * 'type' => 'tagged_services',`
	`187`	`+ * 'resource' => 'routing.controllers',`
`189`	`188`	`* ],`
`190`	`189`	`* ]);`
`191`	`190`	* ```

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ public function load(mixed $resource, ?string $type = null): RouteCollection`
`42`	`42`
`43`	`43`	`publicfunctionsupports(mixed$resource, ?string$type =null):bool`
`44`	`44`	`{`
`45`		`-return'tagged_services' ===$type &&'attributes' ===$resource;`
	`45`	`+return'routing.controllers' ===$resource;`
`46`	`46`	`}`
`47`	`47`	`}`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`* return Routes::config([`
`28`	`28`	`* 'controllers' => [`
`29`		`- * 'resource' => 'attributes',`
`30`		`- * 'type' => 'tagged_services',`
	`29`	`+ * 'resource' => 'routing.controllers',`
`31`	`30`	`* ],`
`32`	`31`	`* ]);`
`33`	`32`	* ```

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public function testSupports()`
`26`	`26`
`27`	`27`	`$this->assertFalse($loader->supports('attributes',null));`
`28`	`28`	`$this->assertFalse($loader->supports('attributes','attribute'));`
`29`		`-$this->assertFalse($loader->supports('other','tagged_services'));`
`30`		`-$this->assertTrue($loader->supports('attributes','tagged_services'));`
	`29`	`+$this->assertFalse($loader->supports('other','routing.controllers'));`
	`30`	`+$this->assertTrue($loader->supports('routing.controllers'));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`publicfunctiontestDelegatesToAttributeLoaderAndMergesCollections()`
`@@ -47,7 +47,7 @@ public function testDelegatesToAttributeLoaderAndMergesCollections()`
`47`	`47`	`$attributeLoader->setResolver($resolver);`
`48`	`48`	`$servicesLoader->setResolver($resolver);`
`49`	`49`
`50`		`-$collection =$servicesLoader->load('attributes','tagged_services');`
	`50`	`+$collection =$servicesLoader->load('routing.controllers');`
`51`	`51`
`52`	`52`	`$this->assertArrayHasKey('action',$collection->all());`
`53`	`53`	`$this->assertArrayHasKey('put',$collection->all());`

Comments

(0)