Commit da1b601

committed

Fix issue while loading a container

When the URI of the container contains escaped characters like `%2F`, `simplexml_load_file` throw an error.

1 parent 6b4d9f1 commit da1b601Copy full SHA for da1b601

File tree

+28

-2

lines changed

+28

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Symfony;`
`4`	`4`
`5`		`-use function simplexml_load_file;`
	`5`	`+use function simplexml_load_string;`
`6`	`6`	`use function sprintf;`
`7`	`7`	`use function strpos;`
`8`	`8`	`use function substr;`
`@@ -20,7 +20,12 @@ public function __construct(string $containerXml)`
`20`	`20`
`21`	`21`	`public function create(): ServiceMap`
`22`	`22`	`{`
`23`		`- $xml = @simplexml_load_file($this->containerXml);`
	`23`	`+ $fileContents = file_get_contents($this->containerXml);`
	`24`	`+ if ($fileContents === false) {`
	`25`	`+ throw new XmlContainerNotExistsException(sprintf('Container %s does not exist or cannot be parsed', $this->containerXml));`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ $xml = @simplexml_load_string($fileContents);`
`24`	`29`	`if ($xml === false) {`
`25`	`30`	`throw new XmlContainerNotExistsException(sprintf('Container %s does not exist or cannot be parsed', $this->containerXml));`
`26`	`31`	`}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,14 @@ public function testGetService(string $id, callable $validator): void`
`17`	`17`	`$validator($factory->create()->getService($id));`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ public function testGetContainerEscapedPath(): void`
	`21`	`+ {`
	`22`	`+ $factory = new XmlServiceMapFactory(__DIR__ . '/containers/bugfix%2Fcontainer.xml');`
	`23`	`+ $serviceMap = $factory->create();`
	`24`	`+`
	`25`	`+ self::assertNotNull($serviceMap->getService('withClass'));`
	`26`	`+ }`
	`27`	`+`
`20`	`28`	`public function getServiceProvider(): Iterator`
`21`	`29`	`{`
`22`	`30`	`yield [`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">`
	`3`	`+ <services>`
	`4`	`+ <service></service><!-- without id -->`
	`5`	`+ <service id="withoutClass"></service>`
	`6`	`+ <service id="withClass" class="Foo"></service>`
	`7`	`+ <service id="withoutPublic" class="Foo"></service>`
	`8`	`+ <service id="publicNotFalse" class="Foo" public="true"></service>`
	`9`	`+ <service id="private" class="Foo" public="false"></service>`
	`10`	`+ <service id="synthetic" class="Foo" synthetic="true"></service>`
	`11`	`+ <service id="alias" class="Bar" alias="withClass"></service>`
	`12`	`+ </services>`
	`13`	`+</container>`

Comments

(0)