|
@@ -164,10 +164,24 @@ class Compiler
|
|
$util->save($pharFile, \Phar::SHA1);
|
|
$util->save($pharFile, \Phar::SHA1);
|
|
}
|
|
}
|
|
|
|
|
|
- private function addFile($phar, $file, $strip = true)
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @param \SplFileInfo $file
|
|
|
|
+ * @return string
|
|
|
|
+ */
|
|
|
|
+ private function getRelativeFilePath($file)
|
|
{
|
|
{
|
|
- $path = strtr(str_replace(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR, '', $file->getRealPath()), '\\', '/');
|
|
|
|
|
|
+ $realPath = $file->getRealPath();
|
|
|
|
+ $pathPrefix = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR;
|
|
|
|
+
|
|
|
|
+ $pos = strpos($realPath, $pathPrefix);
|
|
|
|
+ $relativePath = ($pos !== false) ? substr_replace($realPath, '', $pos, strlen($pathPrefix)) : $realPath;
|
|
|
|
|
|
|
|
+ return strtr($relativePath, '\\', '/');
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private function addFile($phar, $file, $strip = true)
|
|
|
|
+ {
|
|
|
|
+ $path = $this->getRelativeFilePath($file);
|
|
$content = file_get_contents($file);
|
|
$content = file_get_contents($file);
|
|
if ($strip) {
|
|
if ($strip) {
|
|
$content = $this->stripWhitespace($content);
|
|
$content = $this->stripWhitespace($content);
|