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

Merge pull request #7036 from kalessil/master 

[minor] SCA: reduced repetitive method calls
pull/7005/merge
Jordi Boggiano 2018-01-24 11:27:16 +01:00 committed by GitHub
parent 16dcb04e1d db0cae0477
commit 2224989430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Command/ArchiveCommand.php
View File

@ -66,8 +66,9 @@ EOT
$composer = $this->getComposer(false); $composer = $this->getComposer(false);
if ($composer) { if ($composer) {
$commandEvent = new CommandEvent(PluginEvents::COMMAND, 'archive', $input, $output); $commandEvent = new CommandEvent(PluginEvents::COMMAND, 'archive', $input, $output);
$composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent); $eventDispatcher = $composer->getEventDispatcher();
$composer->getEventDispatcher()->dispatchScript(ScriptEvents::PRE_ARCHIVE_CMD); $eventDispatcher->dispatch($commandEvent->getName(), $commandEvent);
$eventDispatcher->dispatchScript(ScriptEvents::PRE_ARCHIVE_CMD);
} }
if (null === $input->getOption('format')) { if (null === $input->getOption('format')) {

5
src/Composer/Command/BaseDependencyCommand.php
View File

@ -180,8 +180,9 @@ class BaseDependencyCommand extends BaseCommand
// Render table // Render table
$renderer = new Table($output); $renderer = new Table($output);
$renderer->setStyle('compact'); $renderer->setStyle('compact');
$renderer->getStyle()->setVerticalBorderChar(''); $rendererStyle = $renderer->getStyle();
$renderer->getStyle()->setCellRowContentFormat('%s '); $rendererStyle->setVerticalBorderChar('');
$rendererStyle->setCellRowContentFormat('%s ');
$renderer->setRows($table)->render(); $renderer->setRows($table)->render();
} }

5
src/Composer/Command/CheckPlatformReqsCommand.php
View File

@ -142,8 +142,9 @@ EOT
// Render table // Render table
$renderer = new Table($output); $renderer = new Table($output);
$renderer->setStyle('compact'); $renderer->setStyle('compact');
$renderer->getStyle()->setVerticalBorderChar(''); $rendererStyle = $renderer->getStyle();
$renderer->getStyle()->setCellRowContentFormat('%s '); $rendererStyle->setVerticalBorderChar('');
$rendererStyle->setCellRowContentFormat('%s ');
$renderer->setRows($table)->render(); $renderer->setRows($table)->render();
} }
} }

5
src/Composer/Command/LicensesCommand.php
View File

@ -74,8 +74,9 @@ EOT
$table = new Table($output); $table = new Table($output);
$table->setStyle('compact'); $table->setStyle('compact');
$table->getStyle()->setVerticalBorderChar(''); $tableStyle = $table->getStyle();
$table->getStyle()->setCellRowContentFormat('%s '); $tableStyle->setVerticalBorderChar('');
$tableStyle->setCellRowContentFormat('%s ');
$table->setHeaders(array('Name', 'Version', 'License')); $table->setHeaders(array('Name', 'Version', 'License'));
foreach ($packages as $package) { foreach ($packages as $package) {
$table->addRow(array( $table->addRow(array(

5
src/Composer/Command/RunScriptCommand.php
View File

@ -124,8 +124,9 @@ EOT
$renderer = new Table($output); $renderer = new Table($output);
$renderer->setStyle('compact'); $renderer->setStyle('compact');
$renderer->getStyle()->setVerticalBorderChar(''); $rendererStyle = $renderer->getStyle();
$renderer->getStyle()->setCellRowContentFormat('%s '); $rendererStyle->setVerticalBorderChar('');
$rendererStyle->setCellRowContentFormat('%s ');
$renderer->setRows($table)->render(); $renderer->setRows($table)->render();
return 0; return 0;

2
src/Composer/Util/StreamContextFactory.php
View File

@ -169,7 +169,7 @@ final class StreamContextFactory
$header = explode("\r\n", $header); $header = explode("\r\n", $header);
} }
uasort($header, function ($el) { uasort($header, function ($el) {
return preg_match('{^content-type}i', $el) ? 1 : -1; return stripos($el, 'content-type') === 0 ? 1 : -1;
}); });
return $header; return $header;