1
0
Fork 0
pull/6431/head
Martin Hasoň 2017-05-19 15:14:47 +02:00
parent 810e8bed9f
commit 88ec172bd8
10 changed files with 18 additions and 21 deletions

View File

@ -74,10 +74,10 @@ class ZipDownloader extends ArchiveDownloader
/**
* extract $file to $path with "unzip" command
*
* @param string $file File to extract
* @param string $path Path where to extract file
* @param bool $isLastChance If true it is called as a fallback and should throw an exception
* @return bool Success status
* @param string $file File to extract
* @param string $path Path where to extract file
* @param bool $isLastChance If true it is called as a fallback and should throw an exception
* @return bool Success status
*/
protected function extractWithSystemUnzip($file, $path, $isLastChance)
{
@ -121,10 +121,10 @@ class ZipDownloader extends ArchiveDownloader
/**
* extract $file to $path with ZipArchive
*
* @param string $file File to extract
* @param string $path Path where to extract file
* @param bool $isLastChance If true it is called as a fallback and should throw an exception
* @return bool Success status
* @param string $file File to extract
* @param string $path Path where to extract file
* @param bool $isLastChance If true it is called as a fallback and should throw an exception
* @return bool Success status
*/
protected function extractWithZipArchive($file, $path, $isLastChance)
{

View File

@ -126,7 +126,7 @@ class SuggestedPackagesReporter
}
/**
* @param string $string
* @param string $string
* @return string
*/
private function escapeOutput($string)
@ -137,7 +137,7 @@ class SuggestedPackagesReporter
}
/**
* @param string $string
* @param string $string
* @return string
*/
private function removeControlCharacters($string)

View File

@ -63,9 +63,9 @@ class ValidatingArrayLoader implements LoaderInterface
unset($this->config['version']);
}
}
if (!empty($this->config['config']['platform'])) {
foreach ((array)$this->config['config']['platform'] as $key=>$platform) {
foreach ((array) $this->config['config']['platform'] as $key => $platform) {
try {
$this->versionParser->normalize($platform);
} catch (\Exception $e) {

View File

@ -499,7 +499,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
if (!empty($mirror['dist-url'])) {
$this->distMirrors[] = array(
'url' => $this->canonicalizeUrl($mirror['dist-url']),
'preferred' => !empty($mirror['preferred'])
'preferred' => !empty($mirror['preferred']),
);
}
}

View File

@ -445,9 +445,9 @@ class GitLabDriver extends VcsDriver
}
/**
* @param array $configuredDomains
* @param string $guessedDomain
* @param array $urlParts
* @param array $configuredDomains
* @param string $guessedDomain
* @param array $urlParts
* @return bool|string
*/
private static function determineOrigin(array $configuredDomains, $guessedDomain, array &$urlParts)

View File

@ -16,7 +16,6 @@ use Composer\Config;
use Composer\Util\ProcessExecutor;
use Composer\Util\Filesystem;
use Composer\IO\IOInterface;
use Symfony\Component\Process\Process;
/**
* @author Per Bernhardt <plb@webfactory.de>

View File

@ -89,7 +89,7 @@ class ConfigValidator
'License %s must not contain extra spaces, make sure to trim it.',
json_encode($manifest['license'])
);
} else if ('proprietary' !== $manifest['license'] && array() !== $manifest['license'] && !$licenseValidator->validate($manifest['license'])) {
} elseif ('proprietary' !== $manifest['license'] && array() !== $manifest['license'] && !$licenseValidator->validate($manifest['license'])) {
$warnings[] = sprintf(
'License %s is not a valid SPDX license identifier, see https://spdx.org/licenses/ if you use an open license.'
. PHP_EOL .

View File

@ -32,7 +32,6 @@ class ZipDownloaderTest extends TestCase
$this->config = $this->getMock('Composer\Config');
}
public function tearDown()
{
$fs = new Filesystem;

View File

@ -401,7 +401,7 @@ JSON;
$options = array(
'ssl' => array(
'verify_peer' => false,
)
),
);
$projectData = <<<JSON
{

View File

@ -13,7 +13,6 @@
namespace Composer\Test\Util;
use Composer\Util\Perforce;
use Composer\Util\ProcessExecutor;
/**
* @author Matt Whittom <Matt.Whittom@veteransunited.com>