public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Merge remote-tracking branch 'composer/master' into gitlab

Browse source 
Conflicts:
	doc/04-schema.md
	src/Composer/Util/RemoteFilesystem.php
This commit is contained in:
Jérôme Tamarelle 2015-11-14 14:13:39 +01:00
commit ac68a721f4
262 changed files with 10060 additions and 7682 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Composer/Repository/VcsRepository.php
View file

@ -14,7 +14,7 @@ namespace Composer\Repository;
use Composer\Downloader\TransportException;
use Composer\Repository\Vcs\VcsDriverInterface;
use Composer\Package\Version\VersionParser;
use Composer\Semver\VersionParser;
use Composer\Package\Loader\ArrayLoader;
use Composer\Package\Loader\ValidatingArrayLoader;
use Composer\Package\Loader\InvalidPackageException;
@ -56,7 +56,7 @@ class VcsRepository extends ArrayRepository
$this->url = $repoConfig['url'];
$this->io = $io;
$this->type = isset($repoConfig['type']) ? $repoConfig['type'] : 'vcs';
$this->verbose = $io->isVerbose();
$this->verbose = $io->isVeryVerbose();
$this->config = $config;
$this->repoConfig = $repoConfig;
}