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

Make sure no files are missing from the phar, fixes #9421

pull/9422/head
Jordi Boggiano 2020-11-05 14:55:06 +01:00
parent 60b1a70bfa
commit 22fef8c51a
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Composer/Compiler.php
View File

@ -111,6 +111,7 @@ class Compiler
$finder->files() $finder->files()
->ignoreVCS(true) ->ignoreVCS(true)
->notPath('/\/(composer\.(json|lock)|[A-Z]+\.md|\.gitignore|phpunit\.xml\.dist|phpstan\.neon\.dist|phpstan-config\.neon)$/') ->notPath('/\/(composer\.(json|lock)|[A-Z]+\.md|\.gitignore|phpunit\.xml\.dist|phpstan\.neon\.dist|phpstan-config\.neon)$/')
->notPath('/bin\/(jsonlint|validate-json)(\.bat)?$/')
->notPath('symfony/debug/Resources/ext/') ->notPath('symfony/debug/Resources/ext/')
->notPath('justinrainbow/json-schema/demo/') ->notPath('justinrainbow/json-schema/demo/')
->notPath('justinrainbow/json-schema/dist/') ->notPath('justinrainbow/json-schema/dist/')
@ -119,7 +120,6 @@ class Compiler
->exclude('Tests') ->exclude('Tests')
->exclude('tests') ->exclude('tests')
->exclude('docs') ->exclude('docs')
->exclude('bin')
->in(__DIR__.'/../../vendor/') ->in(__DIR__.'/../../vendor/')
->sort($finderSort) ->sort($finderSort)
; ;
@ -131,10 +131,13 @@ class Compiler
realpath(__DIR__ . '/../../vendor/symfony/console/Resources/bin/hiddeninput.exe'), realpath(__DIR__ . '/../../vendor/symfony/console/Resources/bin/hiddeninput.exe'),
realpath(__DIR__ . '/../../vendor/symfony/polyfill-mbstring/Resources/mb_convert_variables.php8'), realpath(__DIR__ . '/../../vendor/symfony/polyfill-mbstring/Resources/mb_convert_variables.php8'),
); );
$unexpectedFiles = array();
foreach ($finder as $file) { foreach ($finder as $file) {
if (!preg_match('{(/LICENSE|\.php)$}', $file) && !in_array(realpath($file), $extraFiles, true)) { if (in_array(realpath($file), $extraFiles, true)) {
throw new \RuntimeException('Unexpected file should be added to the allow or deny lists: '.$file); unset($extraFiles[array_search(realpath($file), $extraFiles, true)]);
} elseif (!preg_match('{(/LICENSE|\.php)$}', $file)) {
$unexpectedFiles[] = (string) $file;
} }
if (preg_match('{\.php[\d.]*$}', $file)) { if (preg_match('{\.php[\d.]*$}', $file)) {
@ -144,6 +147,13 @@ class Compiler
} }
} }
if ($extraFiles) {
throw new \RuntimeException('These files were expected but not added to the phar, they might be excluded or gone from the source package:'.PHP_EOL.implode(PHP_EOL, $extraFiles));
}
if ($unexpectedFiles) {
throw new \RuntimeException('These files were unexpectedly added to the phar, make sure they are excluded or listed in $extraFiles:'.PHP_EOL.implode(PHP_EOL, $unexpectedFiles));
}
// Add bin/composer // Add bin/composer
$this->addComposerBin($phar); $this->addComposerBin($phar);