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

Merge pull request #6431 from hason/cs 

Fix CS
pull/6432/merge
Jordi Boggiano 2017-05-21 16:06:45 +02:00 committed by GitHub
parent e5d883f6f7 88ec172bd8
commit d2e1fb0a6f
10 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

1
tests/Composer/Test/Downloader/ZipDownloaderTest.php
View File

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

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

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

1
tests/Composer/Test/Util/PerforceTest.php
View File

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