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

Reduce line length

pull/5068/head
Barry vd. Heuvel 2016-03-16 11:04:37 +01:00
parent 54d86ebfc9
commit fd46c7e4ba
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Composer/Command/ShowCommand.php
View File

@ -243,11 +243,13 @@ EOT
foreach ($packages[$type] as $package) { foreach ($packages[$type] as $package) {
if (is_object($package)) { if (is_object($package)) {
$nameLength = max($nameLength, strlen($package->getPrettyName())); $nameLength = max($nameLength, strlen($package->getPrettyName()));
$versionLength = max($versionLength, strlen($package->getFullPrettyVersion())); if ($showVersion) {
if ($showLatest) { $versionLength = max($versionLength, strlen($package->getFullPrettyVersion()));
$latestPackage = $this->findLatestPackages($package->getName()); if ($showLatest) {
$latestPackages[$package->getPrettyName()] = $latestPackage; $latestPackage = $this->findLatestPackages($package->getName());
$latestLength = max($latestLength, strlen($latestPackage->getFullPrettyVersion())); $latestPackages[$package->getPrettyName()] = $latestPackage;
$latestLength = max($latestLength, strlen($latestPackage->getFullPrettyVersion()));
}
} }
} else { } else {
$nameLength = max($nameLength, $package); $nameLength = max($nameLength, $package);
@ -270,8 +272,8 @@ EOT
$writePath = !$input->getOption('name-only') && $input->getOption('path'); $writePath = !$input->getOption('name-only') && $input->getOption('path');
$writeVersion = !$input->getOption('name-only') && !$input->getOption('path') && $showVersion && ($nameLength + $versionLength + 3 <= $width); $writeVersion = !$input->getOption('name-only') && !$input->getOption('path') && $showVersion && ($nameLength + $versionLength + 3 <= $width);
$writeLatest = !$input->getOption('name-only') && !$input->getOption('path') && $showLatest && ($nameLength + ($showVersion ? $versionLength : 0) + $latestLength + 3 <= $width); $writeLatest = $writeVersion && $showLatest && ($nameLength + $versionLength + $latestLength + 3 <= $width);
$writeDescription = !$input->getOption('name-only') && !$input->getOption('path') && ($nameLength + ($showVersion ? $versionLength : 0) + ($showLatest ? $latestLength : 0) + 24 <= $width); $writeDescription = !$input->getOption('name-only') && !$input->getOption('path') && ($nameLength + $versionLength + $latestLength + 24 <= $width);
foreach ($packages[$type] as $package) { foreach ($packages[$type] as $package) {
if (is_object($package)) { if (is_object($package)) {
$io->write($indent . str_pad($package->getPrettyName(), $nameLength, ' '), false); $io->write($indent . str_pad($package->getPrettyName(), $nameLength, ' '), false);
@ -293,7 +295,10 @@ EOT
if ($writeDescription) { if ($writeDescription) {
$description = strtok($package->getDescription(), "\r\n"); $description = strtok($package->getDescription(), "\r\n");
$remaining = $width - $nameLength - $versionLength - ($writeLatest ? $latestLength : 0) - 4; $remaining = $width - $nameLength - $versionLength - 4;
if ($writeLatest) {
$remaining -= $latestLength;
}
if (strlen($description) > $remaining) { if (strlen($description) > $remaining) {
$description = substr($description, 0, $remaining - 3) . '...'; $description = substr($description, 0, $remaining - 3) . '...';
} }