1
0
Fork 0
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

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()

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;
@ -125,7 +134,7 @@ EOT
$platformPackage,
$version,
$link ? sprintf('%s %s %s (%s)', $link->getSource(), $link->getDescription(), $link->getTarget(), $link->getPrettyConstraint()) : '',
$status
$status,
);
}
$table = array_merge($rows, $table);

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;
}
}

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;
}

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);
}

View File

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

View File

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

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';
}
}

View File

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

View File

@ -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",
),
);
}
@ -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');