public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Make sure no unknown files get excluded from the phar, fixes #9331

pull/9336/head
Jordi Boggiano 2020-10-24 20:41:49 +02:00
parent b1d2842fa7
commit 9bfddadf3d
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/Composer/Compiler.php
View File

@ -80,6 +80,7 @@ class Compiler
return strcmp(strtr($a->getRealPath(), '\\', '/'), strtr($b->getRealPath(), '\\', '/')); return strcmp(strtr($a->getRealPath(), '\\', '/'), strtr($b->getRealPath(), '\\', '/'));
}; };
// Add Composer sources
$finder = new Finder(); $finder = new Finder();
$finder->files() $finder->files()
->ignoreVCS(true) ->ignoreVCS(true)
@ -89,69 +90,61 @@ class Compiler
->in(__DIR__.'/..') ->in(__DIR__.'/..')
->sort($finderSort) ->sort($finderSort)
; ;
foreach ($finder as $file) { foreach ($finder as $file) {
$this->addFile($phar, $file); $this->addFile($phar, $file);
} }
// Add ClassLoader separately to make sure it retains the docblocks as it will get copied into projects
$this->addFile($phar, new \SplFileInfo(__DIR__ . '/Autoload/ClassLoader.php'), false); $this->addFile($phar, new \SplFileInfo(__DIR__ . '/Autoload/ClassLoader.php'), false);
// Add Composer resources
$finder = new Finder(); $finder = new Finder();
$finder->files() $finder->files()
->name('*.json')
->in(__DIR__.'/../../res') ->in(__DIR__.'/../../res')
->in(SpdxLicenses::getResourcesDir())
->sort($finderSort) ->sort($finderSort)
; ;
foreach ($finder as $file) { foreach ($finder as $file) {
$this->addFile($phar, $file, false); $this->addFile($phar, $file, false);
} }
$this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../vendor/symfony/console/Resources/bin/hiddeninput.exe'), false);
$this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../vendor/symfony/polyfill-mbstring/Resources/mb_convert_variables.php8'));
// Add vendor files
$finder = new Finder(); $finder = new Finder();
$finder->files() $finder->files()
->ignoreVCS(true) ->ignoreVCS(true)
->name('*.php') ->notPath('/\/(composer\.(json|lock)|[A-Z]+\.md|\.gitignore|phpunit\.xml\.dist|phpstan\.neon\.dist|phpstan-config\.neon)$/')
->name('LICENSE') ->notPath('symfony/debug/Resources/ext/')
->notPath('justinrainbow/json-schema/demo/')
->notPath('justinrainbow/json-schema/dist/')
->notPath('composer/installed.json')
->notPath('composer/LICENSE')
->exclude('Tests') ->exclude('Tests')
->exclude('tests') ->exclude('tests')
->exclude('docs') ->exclude('docs')
->in(__DIR__.'/../../vendor/symfony/') ->exclude('bin')
->in(__DIR__.'/../../vendor/seld/jsonlint/') ->in(__DIR__.'/../../vendor/')
->in(__DIR__.'/../../vendor/justinrainbow/json-schema/')
->in(__DIR__.'/../../vendor/composer/spdx-licenses/')
->in(__DIR__.'/../../vendor/composer/semver/')
->in(__DIR__.'/../../vendor/composer/ca-bundle/')
->in(__DIR__.'/../../vendor/composer/xdebug-handler/')
->in(__DIR__.'/../../vendor/psr/')
->in(__DIR__.'/../../vendor/react/')
->sort($finderSort) ->sort($finderSort)
; ;
$extraFiles = array(
realpath(__DIR__ . '/../../vendor/composer/spdx-licenses/res/spdx-exceptions.json'),
realpath(__DIR__ . '/../../vendor/composer/spdx-licenses/res/spdx-licenses.json'),
realpath(CaBundle::getBundledCaBundlePath()),
realpath(__DIR__ . '/../../vendor/symfony/console/Resources/bin/hiddeninput.exe'),
realpath(__DIR__ . '/../../vendor/symfony/polyfill-mbstring/Resources/mb_convert_variables.php8'),
);
foreach ($finder as $file) { foreach ($finder as $file) {
$this->addFile($phar, $file); if (!preg_match('{(/LICENSE|\.php)$}', $file) && !in_array(realpath($file), $extraFiles, true)) {
throw new \RuntimeException('Unexpected file should be added to the allow or deny lists: '.$file);
}
if (preg_match('{\.php[\d.]*$}', $file)) {
$this->addFile($phar, $file);
} else {
$this->addFile($phar, $file, false);
}
} }
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/autoload.php')); // Add bin/composer
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_namespaces.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_psr4.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_classmap.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_files.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_real.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_static.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/installed.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/InstalledVersions.php'));
if (file_exists(__DIR__.'/../../vendor/composer/platform_check.php')) {
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/platform_check.php'));
}
if (file_exists(__DIR__.'/../../vendor/composer/include_paths.php')) {
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/include_paths.php'));
}
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/ClassLoader.php'));
$this->addFile($phar, new \SplFileInfo(CaBundle::getBundledCaBundlePath()), false);
$this->addComposerBin($phar); $this->addComposerBin($phar);
// Stubs // Stubs