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

CS fixes

pull/6574/merge
Jordi Boggiano 2017-12-18 16:02:48 +01:00
parent f31b820b09
commit c8aea719b1
19 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.php_cs
View File

@ -12,10 +12,10 @@ EOF;
$finder = PhpCsFixer\Finder::create()
->files()
->name('*.php')
->exclude('Fixtures')
->in(__DIR__.'/src')
->in(__DIR__.'/tests')
->name('*.php')
->notPath('Fixtures')
;
return PhpCsFixer\Config::create()

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

@ -1,11 +1,20 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Command;
use Composer\Package\Link;
use Composer\Package\PackageInterface;
use Composer\Semver\Constraint\Constraint;
use Composer\Semver\Constraint\MultiConstraint;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@ -115,17 +124,17 @@ EOT
protected function printTable(OutputInterface $output, $results)
{
$table = array();
$rows = array();
$rows = array();
foreach ($results as $result) {
/**
* @var Link|null $link
*/
list($platformPackage, $version, $link, $status) = $result;
$rows[] = array(
$rows[] = array(
$platformPackage,
$version,
$link ? sprintf('%s %s %s (%s)', $link->getSource(), $link->getDescription(), $link->getTarget(), $link->getPrettyConstraint()) : '',
$status
$status,
);
}
$table = array_merge($rows, $table);

14
src/Composer/Command/InitCommand.php
View File

@ -191,7 +191,7 @@ EOT
$name = basename($cwd);
$name = preg_replace('{(?:([a-z])([A-Z])|([A-Z])([A-Z][a-z]))}', '\\1\\3-\\2\\4', $name);
$name = strtolower($name);
if ( !empty($_SERVER['COMPOSER_DEFAULT_VENDOR']) ) {
if (!empty($_SERVER['COMPOSER_DEFAULT_VENDOR'])) {
$name = $_SERVER['COMPOSER_DEFAULT_VENDOR'] . '/' . $name;
} elseif (isset($git['github.user'])) {
$name = $git['github.user'] . '/' . $name;
@ -242,15 +242,15 @@ EOT
$input->setOption('description', $description);
if (null === $author = $input->getOption('author')) {
if ( !empty($_SERVER['COMPOSER_DEFAULT_AUTHOR']) ) {
if (!empty($_SERVER['COMPOSER_DEFAULT_AUTHOR'])) {
$author_name = $_SERVER['COMPOSER_DEFAULT_AUTHOR'];
} elseif ( isset($git['user.name']) ) {
} elseif (isset($git['user.name'])) {
$author_name = $git['user.name'];
}
if ( !empty($_SERVER['COMPOSER_DEFAULT_EMAIL']) ) {
if (!empty($_SERVER['COMPOSER_DEFAULT_EMAIL'])) {
$author_email = $_SERVER['COMPOSER_DEFAULT_EMAIL'];
} elseif ( isset($git['user.email']) ) {
} elseif (isset($git['user.email'])) {
$author_email = $git['user.email'];
}
@ -306,7 +306,7 @@ EOT
$input->setOption('type', $type);
if (null === $license = $input->getOption('license')) {
if ( !empty($_SERVER['COMPOSER_DEFAULT_LICENSE']) ) {
if (!empty($_SERVER['COMPOSER_DEFAULT_LICENSE'])) {
$license = $_SERVER['COMPOSER_DEFAULT_LICENSE'];
}
}
@ -423,7 +423,7 @@ EOT
$abandoned = sprintf('<warning>Abandoned. %s.</warning>', $replacement);
}
$choices[] = sprintf(' <info>%5s</info> %s %s',"[$position]", $foundPackage['name'], $abandoned);
$choices[] = sprintf(' <info>%5s</info> %s %s', "[$position]", $foundPackage['name'], $abandoned);
if ($foundPackage['name'] === $package) {
$exactMatch = true;
break;

2
src/Composer/Compiler.php
View File

@ -165,7 +165,7 @@ class Compiler
}
/**
* @param \SplFileInfo $file
* @param \SplFileInfo $file
* @return string
*/
private function getRelativeFilePath($file)

4
src/Composer/Installer.php
View File

@ -767,7 +767,7 @@ class Installer
// is this a plugin or a dependency of a plugin?
if ($isPlugin || count(array_intersect($package->getNames(), $pluginRequires))) {
// get the package's requires, but filter out any platform requirements or 'composer-plugin-api'
$requires = array_filter(array_keys($package->getRequires()), function($req) {
$requires = array_filter(array_keys($package->getRequires()), function ($req) {
return $req !== 'composer-plugin-api' && !preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $req);
});
@ -1207,7 +1207,7 @@ class Installer
if (preg_match('{^https?://(?:(?:www\.)?bitbucket\.org|(api\.)?github\.com)/}i', $package->getDistUrl())) {
$package->setDistReference($reference);
$package->setDistUrl(preg_replace('{(?<=/)[a-f0-9]{40}(?=/|$)}i', $reference, $package->getDistUrl()));
} else if ($package->getDistReference()) { // update the dist reference if there was one, but if none was provided ignore it
} elseif ($package->getDistReference()) { // update the dist reference if there was one, but if none was provided ignore it
$package->setDistReference($reference);
}
}

2
src/Composer/Repository/FilesystemRepository.php
View File

@ -83,7 +83,7 @@ class FilesystemRepository extends WritableArrayRepository
$data[] = $dumper->dump($package);
}
usort($data, function($a, $b) {
usort($data, function ($a, $b) {
return strcmp($a['name'], $b['name']);
});

1
src/Composer/Repository/Vcs/GitDriver.php
View File

@ -216,6 +216,7 @@ class GitDriver extends VcsDriver
}
$process = new ProcessExecutor($io);
return $process->execute('git ls-remote --heads ' . ProcessExecutor::escape($url), $output) === 0;
}
}

2
src/Composer/Repository/Vcs/GitLabDriver.php
View File

@ -261,6 +261,7 @@ class GitLabDriver extends VcsDriver
{
$domainName = $this->originUrl;
$portNumber = (true === is_numeric($this->portNumber)) ? sprintf(':%s', $this->portNumber) : '';
return $this->scheme.'://'.$domainName.$portNumber.'/api/v4/projects/'.$this->urlEncodeAll($this->namespace).'%2F'.$this->urlEncodeAll($this->repository);
}
@ -449,7 +450,6 @@ class GitLabDriver extends VcsDriver
*/
public static function supports(IOInterface $io, Config $config, $url, $deep = false)
{
if (!preg_match(self::URL_REGEX, $url, $match)) {
return false;
}

5
src/Composer/Util/Filesystem.php
View File

@ -264,7 +264,8 @@ class Filesystem
* @param $target
* @return bool
*/
public function copy($source, $target) {
public function copy($source, $target)
{
if (!is_dir($source)) {
return copy($source, $target);
}
@ -273,7 +274,7 @@ class Filesystem
$ri = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::SELF_FIRST);
$this->ensureDirectoryExists($target);
$result=true;
$result = true;
foreach ($ri as $file) {
$targetPath = $target . DIRECTORY_SEPARATOR . $ri->getSubPathName();
if ($file->isDir()) {

1
src/Composer/Util/Perforce.php
View File

@ -117,6 +117,7 @@ class Perforce
protected function executeCommand($command)
{
$this->commandResult = '';
return $this->process->execute($command, $this->commandResult);
}

1
src/Composer/Util/ProcessExecutor.php
View File

@ -134,6 +134,7 @@ class ProcessExecutor
if (method_exists('Symfony\Component\Process\ProcessUtils', 'escapeArgument')) {
return ProcessUtils::escapeArgument($argument);
}
return self::escapeArgument($argument);
}

1
src/Composer/Util/RemoteFilesystem.php
View File

@ -1013,6 +1013,7 @@ class RemoteFilesystem
// Path for a public download follows this pattern /{user}/{repo}/downloads/{whatever}
// {@link https://blog.bitbucket.org/2009/04/12/new-feature-downloads/}
$pathParts = explode('/', $path);
return count($pathParts) >= 4 && $pathParts[3] == 'downloads';
}
}

2
src/Composer/XdebugHandler.php
View File

@ -203,7 +203,7 @@ class XdebugHandler
* Returns true if the restart environment variables were set
*
* @param bool $additional Whether there were additional inis
* @param array $iniPaths Locations reported by the current process
* @param array $iniPaths Locations reported by the current process
*
* @return bool
*/

2
tests/Composer/Test/IO/ConsoleIOTest.php
View File

@ -219,7 +219,7 @@ class ConsoleIOTest extends TestCase
;
$validator = function ($value) {
return true;
return true;
};
$consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
$consoleIO->askAndValidate('Why?', $validator, 10, 'default');

2
tests/Composer/Test/Json/JsonManipulatorTest.php
View File

@ -111,7 +111,6 @@ class JsonManipulatorTest extends TestCase
',
),
array(
'{
"require":
@ -2360,6 +2359,5 @@ class JsonManipulatorTest extends TestCase
}
}
', $manipulator->getContents());
}
}

33
tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
View File

@ -143,13 +143,13 @@ JSON;
return $driver;
}
/**
* @dataProvider getInitializeUrls
*/
public function testInitializePublicProjectAsAnonymous($url, $apiUrl)
{
// @link http://doc.gitlab.com/ce/api/projects.html#get-single-project
$projectData = <<<JSON
/**
* @dataProvider getInitializeUrls
*/
public function testInitializePublicProjectAsAnonymous($url, $apiUrl)
{
// @link http://doc.gitlab.com/ce/api/projects.html#get-single-project
$projectData = <<<JSON
{
"id": 17,
"default_branch": "mymaster",
@ -308,7 +308,8 @@ JSON;
$this->assertEquals($expected, $driver->getTags(), 'Tags are cached');
}
public function testGetPaginatedRefs() {
public function testGetPaginatedRefs()
{
$driver = $this->testInitialize('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject');
$apiUrl = 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/branches?per_page=100';
@ -319,15 +320,15 @@ JSON;
"name" => "mymaster",
"commit" => array(
"id" => "97eda36b5c1dd953a3792865c222d4e85e5f302e",
"committed_date" => "2013-01-03T21:04:07.000+01:00"
)
"committed_date" => "2013-01-03T21:04:07.000+01:00",
),
),
array(
"name" => "staging",
"commit" => array(
"id" => "502cffe49f136443f2059803f2e7192d1ac066cd",
"committed_date" => "2013-03-09T16:35:23.000+01:00"
)
"committed_date" => "2013-03-09T16:35:23.000+01:00",
),
),
);
@ -336,8 +337,8 @@ JSON;
"name" => "stagingdupe",
"commit" => array(
"id" => "502cffe49f136443f2059803f2e7192d1ac066cd",
"committed_date" => "2013-03-09T16:35:23.000+01:00"
)
"committed_date" => "2013-03-09T16:35:23.000+01:00",
),
);
}
@ -349,7 +350,7 @@ JSON;
->shouldBeCalledTimes(1)
;
$this->remoteFilesystem
$this->remoteFilesystem
->getContents('gitlab.com', "http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20", false, array())
->willReturn($branchData)
->shouldBeCalledTimes(1)
@ -372,8 +373,8 @@ JSON;
$this->assertEquals($expected, $driver->getBranches());
$this->assertEquals($expected, $driver->getBranches(), 'Branches are cached');
}
public function testGetBranches()
{
$driver = $this->testInitialize('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v4/projects/mygroup%2Fmyproject');

2
tests/Composer/Test/Util/FilesystemTest.php
View File

@ -324,7 +324,7 @@ class FilesystemTest extends TestCase
$fs = new Filesystem();
$result1 = $fs->copy($this->workingDir . '/foo', $this->workingDir . '/foop');
$this->assertTrue($result1,'Copying directory failed.');
$this->assertTrue($result1, 'Copying directory failed.');
$this->assertTrue(is_dir($this->workingDir . '/foop'), 'Not a directory: ' . $this->workingDir . '/foop');
$this->assertTrue(is_dir($this->workingDir . '/foop/bar'), 'Not a directory: ' . $this->workingDir . '/foop/bar');
$this->assertTrue(is_dir($this->workingDir . '/foop/baz'), 'Not a directory: ' . $this->workingDir . '/foop/baz');

2
tests/Composer/Test/Util/RemoteFilesystemTest.php
View File

@ -252,7 +252,7 @@ class RemoteFilesystemTest extends TestCase
$io
->expects($this->any())
->method('hasAuthentication')
->will($this->returnCallback(function($arg) use (&$domains) {
->will($this->returnCallback(function ($arg) use (&$domains) {
$domains[] = $arg;
// first time is called with bitbucket.org, then it redirects to bbuseruploads.s3.amazonaws.com so next time we have no auth configured
return $arg === 'bitbucket.org';