Commit4735e56

authored and

committed

Fix "absolute path" when we look to the cache directory

We should get __DIR__ instead of __DIR__ . '/.'

1 parent309046a commit4735e56Copy full SHA for 4735e56

File tree

+10

-2

lines changed

src/Symfony/Component/HttpKernel
- Kernel.php
- Tests/Fixtures/DumpedContainers/app/cache/dev
  - withAbsolutePaths.php
  - withoutAbsolutePaths.php

+10

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -748,9 +748,15 @@ private function removeAbsolutePathsFromContainer($content)`
`748`	`748`	`$filesystem =newFilesystem();`
`749`	`749`
`750`	`750`	`returnpreg_replace_callback("{'([^'])(".preg_quote($rootDir)."[^'])'}",function ($match)use ($filesystem,$cacheDir) {`
`751`		`-$prefix =isset($match[1]) &&$match[1] ?"'$match[1]'.__DIR__.'/" :"__DIR__.'/";`
	`751`	`+$prefix =isset($match[1]) &&$match[1] ?"'$match[1]'.__DIR__" :"__DIR__";`
`752`	`752`
`753`		`-return$prefix.rtrim($filesystem->makePathRelative($match[2],$cacheDir),'/')."'";`
	`753`	`+$relativePath =rtrim($filesystem->makePathRelative($match[2],$cacheDir),'/');`
	`754`	`+`
	`755`	`+if ($relativePath ==='.') {`
	`756`	`+return$prefix;`
	`757`	`+ }`
	`758`	`+`
	`759`	`+return$prefix .".'/" .$relativePath ."'";`
`754`	`760`	`},$content);`
`755`	`761`	`}`
`756`	`762`

Lines changed: 1 addition & 0 deletions

Lines changed: 1 addition & 0 deletions

Comments

(0)