1
0
Fork 0
Commit Graph

18 Commits (b39b113fc3b4376d5c6519a18143f45d8c367086)

Author SHA1 Message Date
Jordi Boggiano 5d015defb8 Merge remote-tracking branch 'origin/master' into tls-config 2016-01-10 16:10:22 +00:00
Jordi Boggiano ce08582671 Fix CS 2015-09-28 10:53:24 +01:00
Padraic Brady 19e24c5804 Merge branch 'master' into tls-config
Conflicts:
	.travis.yml
	doc/03-cli.md
	src/Composer/Command/ConfigCommand.php
	src/Composer/Command/CreateProjectCommand.php
	src/Composer/Command/DiagnoseCommand.php
	src/Composer/Command/InstallCommand.php
	src/Composer/Command/RequireCommand.php
	src/Composer/Command/SelfUpdateCommand.php
	src/Composer/Command/ShowCommand.php
	src/Composer/Command/UpdateCommand.php
	src/Composer/Config.php
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Factory.php
	src/Composer/Repository/ComposerRepository.php
	src/Composer/Repository/PearRepository.php
	src/Composer/Repository/Vcs/VcsDriver.php
	src/Composer/Util/GitHub.php
	src/Composer/Util/RemoteFilesystem.php
2015-01-29 20:31:56 +00:00
Dmitry Tarasov 3b678ee379 Fix error handling for incorrect "repositories" array 2015-01-20 13:03:55 +03:00
Jordi Boggiano 60ac971419 Fix relative path fetching when a var uses var replacement, fixes #3564 2014-12-17 21:57:27 +00:00
Jordi Boggiano 331bda235c Fix activation of global plugins, fixes #3557 2014-12-16 11:12:13 +00:00
Chris Smith c819bd7e70 Update config tests to not use environment variables 2014-11-21 10:15:17 +00:00
Chris Smith 5a56ebd545 Revert "Backup/restore Composer environment variables"
This reverts commit 725a4fd638.
2014-11-21 10:09:21 +00:00
Chris Smith 725a4fd638 Backup/restore Composer environment variables
The tests could fail if an environment variable replaces an expected
value.
2014-11-21 10:07:56 +00:00
Jordi Boggiano 472c8a5113 Fix tests on windows, fixes #3141 2014-09-30 15:18:15 +01:00
Jordi Boggiano 449f8165ef Allow $HOME and ~ usage in all *-dir config values, fixes #3060 2014-06-29 14:47:43 +02:00
Pádraic Brady 7e30c67827 Add config.json default config option for "disable-tls" (FALSE by default) 2014-02-23 10:20:48 +00:00
Jordi Boggiano 0822683706 Fix tests 2013-06-28 20:42:06 +02:00
Jordi Boggiano 5f48d5277d Fix tests 2013-02-21 17:45:03 +01:00
Jordi Boggiano 6d2b4354f4 Fix test 2012-12-08 21:51:52 +01:00
Jordi Boggiano 23d45f67c1 Fix config merging for arrays 2012-12-08 21:45:21 +01:00
Jordi Boggiano ff2f9de128 Fix tests 2012-10-11 21:25:13 +02:00
Jordi Boggiano ffecd39d33 Refactor repositories handling in config/factory/loader, fixes #828, fixes #826 2012-06-24 13:06:13 +02:00