1
0
Fork 0
Commit Graph

5850 Commits (fc4d94f1608136bd953838730639065e635754a0)

Author SHA1 Message Date
Jordi Boggiano 781d8cb925 Merge pull request #3740 from bestform/ignore-root-requirements-in-installer
Ignore root requirements in installer when installing from locked state
2015-02-14 17:12:21 +00:00
Jordi Boggiano 53925295c3 Merge pull request #3699 from trivago/non_feature_branches
added non-feature-branches
2015-02-14 15:44:45 +00:00
Matthias Derer c9cff6387a removed requirements from the root package should we install from the lock file 2015-02-13 16:15:34 +01:00
msiebeneicher 3682a9f5a7 * Cleanup code comments 2015-02-12 10:18:00 +01:00
msiebeneicher 98de300878 * Small improvement of the testExcludeFromClassmap unit test 2015-02-12 09:49:42 +01:00
msiebeneicher dad6b05ca7 Merge branches 'add_exclude' and 'master' of https://github.com/trivago/composer into add_exclude
* Resolve conflicts and update unit test
2015-02-11 18:04:57 +01:00
msiebeneicher f28785a49d Merge branches 'add_exclude' and 'master' of https://github.com/trivago/composer into add_exclude
* 'add_exclude' of https://github.com/trivago/composer:

# By Jordi Boggiano (239) and others
# Via Jordi Boggiano (184) and others
* 'master' of https://github.com/trivago/composer: (638 commits)
  Simplified syntax
  github deprecation changes
  fix bug in GitDriver::supports for remote repo
  strict check, testcase(s)
  Fix regex matching and add more tests for addSubNode, refs #3721, fixes #3716
  solve edge case for `composer remove vendor/pkg`
  chmod 644 src/Composer/Command/RemoveCommand.php
  Avoid failing on composer show of lazy providers
  Show more info when a download fails
  Add notion of autoloader skipping autoload-dev rules
  Satis grammar fix.
  remove unused statements
  removed needless output param
  + limit git ls-remote to heads + escape repo url
  add check for remote Repository in GitDriver::supports
  suppress the prefix
  Improve notice about /usr/local/bin
  Reuse current file permissions
  Add the P character to the regex pattern
  Added deprecated warning for the dev option
  ...

Conflicts:
	src/Composer/Autoload/AutoloadGenerator.php
	src/Composer/Autoload/ClassMapGenerator.php
2015-02-11 17:54:35 +01:00
rkerner 38d546da45 * added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
* added documentation to doc/04-schema.md
* fixed indentation and styling
2015-02-11 16:03:17 +01:00
rkerner 40b498c96e * added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
* added documentation to doc/04-schema.md
* fixed indentation and styling
2015-02-11 16:01:41 +01:00
rkerner 86c7dfcd94 * added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
* added documentation to doc/04-schema.md
* fixed indentation
2015-02-11 16:00:43 +01:00
rkerner 62636cdd64 * added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
* added documentation to doc/04-schema.md
* fixed indentation
2015-02-11 15:59:26 +01:00
rkerner a8b8a2e143 * added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
* added documentation to doc/04-schema.md
2015-02-11 15:57:33 +01:00
Jordi Boggiano 1d8f05f1dd Merge pull request #3726 from davidverholen/patch-1
fix bug in GitDriver::supports for remote repo
2015-02-11 11:31:57 +00:00
Jordi Boggiano e6ebe258be Merge pull request #3732 from francisbesset/patch-1
Simplified syntax
2015-02-11 11:28:36 +00:00
Francis Besset 16578d1d01 Simplified syntax 2015-02-11 11:40:41 +01:00
Jordi Boggiano 1f1b334f46 Merge pull request #3711 from alcohol/github-api-v3-deprecations
GitHub api v3 deprecations, closes #3566
2015-02-11 10:28:17 +00:00
Rob Bast a34335a9bb github deprecation changes
- added some tests
- minor bug fixes discovered during testing
- resolved two deprecations (rate limit api and authorizations api)
- added some more comments to make the flow more understandable
2015-02-11 10:18:47 +01:00
David Verholen 2d9401fb13 fix bug in GitDriver::supports for remote repo
for some reason it does not work (in packagist) without the $output param. I don't get any error message here, maybe someone has an idea, why?

Anyway, need this ;)
2015-02-10 13:33:09 +01:00
Jordi Boggiano 020e1c2143 Merge pull request #3725 from alcohol/stricter-composer-schema
composer-schema strict check for minimum-stability, closes #3723
2015-02-10 12:20:43 +00:00
Rob Bast d02eb8760b strict check, testcase(s) 2015-02-10 12:55:49 +01:00
Jordi Boggiano 6c971c3028 Fix regex matching and add more tests for addSubNode, refs #3721, fixes #3716 2015-02-09 19:11:32 +00:00
Jordi Boggiano 39b3a19cf7 Merge remote-tracking branch 'alcohol/fix-remove-package-edge-case' 2015-02-09 18:01:34 +00:00
Rob Bast fb54429941 solve edge case for `composer remove vendor/pkg` 2015-02-09 17:21:20 +01:00
Kocsis Máté d7437f19ad Changed config key order 2015-02-04 19:40:50 +01:00
Kocsis Máté 63b3bc61b2 Added docs for bin-compat 2015-02-03 21:06:53 +01:00
Kocsis Máté f503ee2f4e Adding composer config bin-compat command 2015-02-03 20:34:26 +01:00
Kocsis Máté 08c4732d1e Improving bin-compat configuration 2015-02-03 19:27:29 +01:00
Rob Bast 1575f19ef2 Updated documentation 2015-02-03 15:26:02 +01:00
Rob Bast 1b10740473 Added --list to run-script command, closes #3671 2015-02-03 13:56:15 +01:00
Jordi Boggiano 07c644ac22 Merge remote-tracking branch 'alcohol/modify-diagnose-output' 2015-02-03 12:51:10 +00:00
Kocsis Máté 6a776c5edf Supporting bin_compat option 2015-02-03 00:37:11 +01:00
Jordi Boggiano f1a2f5b1d0 Merge pull request #3700 from alcohol/not-so-executable
chmod 644 src/Composer/Command/RemoveCommand.php
2015-02-02 15:36:15 +00:00
Rob 27d211096c chmod 644 src/Composer/Command/RemoveCommand.php 2015-02-02 16:31:31 +01:00
rkerner abc9d60fcc added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches 2015-02-02 14:36:50 +01:00
Jordi Boggiano 8d6ab70ae5 Merge pull request #3697 from hannesvdvreken/patch-1
Add notion of autoloader skipping autoload-dev rules
2015-02-01 14:00:06 +00:00
Jordi Boggiano 8b46880f42 Avoid failing on composer show of lazy providers 2015-01-31 21:24:50 +00:00
Jordi Boggiano 777f2e81a3 Show more info when a download fails 2015-01-31 21:24:48 +00:00
Hannes Van De Vreken 955e3f776a Add notion of autoloader skipping autoload-dev rules 2015-01-30 21:51:12 +01:00
Jordi Boggiano be23cbfa6e Merge pull request #3691 from bragento/master
add check for remote Repository in GitDriver::supports
2015-01-30 20:24:26 +00:00
Jordi Boggiano cee89b5be4 Merge pull request #3694 from TaeL/master
remove unused statements
2015-01-30 10:58:26 +00:00
SofHad f9777bc70a Check if input is interactive 2015-01-30 11:53:42 +01:00
Jordi Boggiano ccd4e03967 Merge pull request #3695 from dragoonis/patch-2
Satis grammar fix.
2015-01-30 10:40:40 +00:00
Paul Dragoonis 2bd9cef799 Satis grammar fix. 2015-01-30 10:35:39 +00:00
SofHad 1a82ecad91 Refactor the loop + add private method isInteractive 2015-01-30 11:29:58 +01:00
Jordi Boggiano b39e0a271f Merge pull request #3517 from WouterJ/patch-2
Added deprecated warning for the dev option
2015-01-30 10:00:15 +00:00
TaeL Kim 0ec4505401 remove unused statements 2015-01-30 16:39:55 +09:00
Padraic Brady 939a4aa9c2 Get tests running to prep for fixes 2015-01-29 20:59:27 +00:00
Padraic Brady 510ec6b91c A couple of minor omissions from the merge 2015-01-29 20:57:23 +00:00
Padraic Brady 6ce20d36b6 Resolve final conflicts 2015-01-29 20:34:05 +00: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