Commit 2c3d666

Benoit Viguierondrejmirtes

Benoit Viguier

authored and

committed

Support for alias to inlined service

1 parent d530cfe commit 2c3d666Copy full SHA for 2c3d666

File tree

+20

-2

lines changed

+20

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ public function create(): ServiceMap`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`$service = new Service(`
`51`		`- strpos((string) $attrs->id, '.') === 0 ? substr((string) $attrs->id, 1) : (string) $attrs->id,`
	`51`	`+ $this->cleanServiceId((string) $attrs->id),`
`52`	`52`	`isset($attrs->class) ? (string) $attrs->class : null,`
`53`	`53`	`isset($attrs->public) && (string) $attrs->public === 'true',`
`54`	`54`	`isset($attrs->synthetic) && (string) $attrs->synthetic === 'true',`
`55`		`- isset($attrs->alias) ? (string) $attrs->alias : null`
	`55`	`+ isset($attrs->alias) ? $this->cleanServiceId((string) $attrs->alias) : null`
`56`	`56`	`);`
`57`	`57`
`58`	`58`	`if ($service->getAlias() !== null) {`
`@@ -79,4 +79,9 @@ public function create(): ServiceMap`
`79`	`79`	`return new DefaultServiceMap($services);`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ private function cleanServiceId(string $id): string`
	`83`	`+ {`
	`84`	`+ return strpos($id, '.') === 0 ? substr($id, 1) : $id;`
	`85`	`+ }`
	`86`	`+`
`82`	`87`	`}`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,17 @@ static function (?Service $service): void {`
`113`	`113`	`self::assertSame('withClass', $service->getAlias());`
`114`	`114`	`},`
`115`	`115`	`];`
	`116`	`+ yield [`
	`117`	`+ 'aliasForInlined',`
	`118`	`+ static function (?Service $service): void {`
	`119`	`+ self::assertNotNull($service);`
	`120`	`+ self::assertSame('aliasForInlined', $service->getId());`
	`121`	`+ self::assertNull($service->getClass());`
	`122`	`+ self::assertFalse($service->isPublic());`
	`123`	`+ self::assertFalse($service->isSynthetic());`
	`124`	`+ self::assertSame('inlined', $service->getAlias());`
	`125`	`+ },`
	`126`	`+ ];`
`116`	`127`	`}`
`117`	`128`
`118`	`129`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,7 @@`
`41`	`41`	`<service id="public" class="Foo" public="true"></service>`
`42`	`42`	`<service id="synthetic" class="Foo" synthetic="true"></service>`
`43`	`43`	`<service id="alias" class="Bar" alias="withClass"></service>`
	`44`	`+ <service id=".inlined"></service>`
	`45`	`+ <service id="aliasForInlined" alias=".inlined"></service>`
`44`	`46`	`</services>`
`45`	`47`	`</container>`

Comments

(0)