1
0
Fork 0
Commit Graph

4704 Commits (1a5b87442ab784775a247b088a3f70123c1cd557)

Author SHA1 Message Date
Nicolas Toniazzi 1a5b87442a Fix directory paths when using XDG 2014-12-15 15:10:15 +01:00
Nicolas Toniazzi ad9c3d3b30 Merge branch 'master' of https://github.com/composer/composer
Conflicts:
	src/Composer/Factory.php
2014-12-15 14:36:43 +01:00
Nicolas Toniazzi d3e6a464d6 Fix home directory when system does not support XDG 2014-12-15 14:21:03 +01:00
Jordi Boggiano f592a36b9e Merge pull request #3556 from alcohol/add-option-no-progress-to-selfupdate
added --no-progress to self-update
2014-12-15 09:25:45 +00:00
Rob Bast 47fd093a44 added --no-progress to self-update
closes composer/composer#3555
2014-12-15 08:45:13 +01:00
Jordi Boggiano 523aef76d0 Fix tests again.. 2014-12-14 13:46:37 +00:00
Jordi Boggiano 901fd838f3 Merge pull request #3450 from nicolas-grekas/prefer-lowest-stable
add --prefer-lowest and --prefer-stable to update command
2014-12-14 13:02:06 +00:00
Jordi Boggiano d621c51b2c Bullet-proof global composer instantiation 2014-12-14 12:36:58 +00:00
Nicolas Grekas e821ac2772 Persist prefer-lowest in composer.lock 2014-12-14 10:29:41 +01:00
Jordi Boggiano 4cc52afcc4 Update deps 2014-12-13 18:54:43 +00:00
Jordi Boggiano 0627d846a5 PluginManager refactoring, fixes #3550 2014-12-13 18:54:42 +00:00
Jordi Boggiano e1921ac962 Merge pull request #3551 from alcohol/minor-documentation-adjustments
WIP: rewriting some documentation sections
2014-12-13 18:06:37 +00:00
Rob 2e4cb8be33 scrapping next line 2014-12-13 19:05:52 +01:00
Rob d26f817cfd rewriting some documentation sections 2014-12-13 18:59:14 +01:00
Jordi Boggiano 1622b9a390 Fix tests 2014-12-13 16:14:03 +00:00
Jordi Boggiano 90a29c127f Fix bug when installing 2014-12-13 16:10:51 +00:00
Jordi Boggiano cf9d5f637b Suppress errors when creating global composer 2014-12-13 15:58:42 +00:00
Jordi Boggiano dcd2c9c7c6 Make sure global plugins are purged as well, fixes #3115 2014-12-13 15:49:35 +00:00
Jordi Boggiano 8c3ee03734 Enough intermittent failures already 2014-12-13 15:14:54 +00:00
Jordi Boggiano cc4223e6f9 Avoid loading plugins that have had their code wiped from filesystem, fixes #3115, closes #3538 2014-12-13 14:54:34 +00:00
Jordi Boggiano bef89604e2 Fix parsing of strings, fixes #3543 2014-12-13 14:31:58 +00:00
Nils Adermann e844ead223 Merge pull request #3467 from naderman/fix-update-whitelist-unused
Add test case for removing unused dependencies on whitelisted update
2014-12-13 14:48:24 +01:00
Jordi Boggiano d515577560 Fix wording, refs #3466 2014-12-13 13:37:05 +00:00
Jordi Boggiano d6d8fe5f55 Merge remote-tracking branch 'PaulSchell/patch-1' 2014-12-13 13:35:41 +00:00
Jordi Boggiano aec1af4e11 Point users at troubleshooting if they get known exceptions 2014-12-13 11:47:22 +00:00
Jordi Boggiano 07ad1da3ac Fix HHVM interop 2014-12-13 11:13:25 +00:00
Nicolas Grekas 98b254a3ec split update --prefer-lowest and --prefer-stable 2014-12-13 11:51:30 +01:00
Nicolas Grekas 4a0feb0189 add --prefer-lowest-stable to update command 2014-12-13 11:51:30 +01:00
Jordi Boggiano 2264a80a7d Merge pull request #3549 from localheinz/feature/sort-dependencies
Enhancement: Add sort-packages option which allows sorting of packages
2014-12-13 10:44:56 +00:00
Andreas Möller 6ddd8d4ec7 Enhancement: Add sort-packages option which allows sorting of packages 2014-12-13 00:24:14 +01:00
Jordi Boggiano 89a7202399 Merge pull request #3547 from alcohol/fix-reflection
fix reflection implementation in EventDispatcher
2014-12-12 22:45:23 +00:00
Rob d9b8b3611b fixes composer/composer#3546 2014-12-12 22:33:04 +01:00
Jordi Boggiano 76c666e210 Merge pull request #3544 from alcohol/match-event-to-listener-expectation
fix for composer/composer#3382
2014-12-12 18:18:12 +00:00
Rob Bast 113606be7b should fix composer/composer#3382 2014-12-12 18:41:37 +01:00
Jordi Boggiano 55895ab494 Skip tests on hhvm 2014-12-12 13:33:45 +00:00
Jordi Boggiano da881c118b Fix failures 2014-12-12 13:15:34 +00:00
Jordi Boggiano 8dad846613 Add SNI settings for SSL URLs that are proxied, fixes #3204 2014-12-12 12:25:21 +00:00
Jordi Boggiano 7b13507dd4 Fix typo in test 2014-12-11 21:52:29 +00:00
Jordi Boggiano 4a6503fe36 Add suppor for https_proxy, fixes #3204 2014-12-11 17:42:55 +00:00
Jordi Boggiano 4a3bc58adf Fix formatting 2014-12-10 15:36:16 +00:00
Jordi Boggiano 2131c8b480 Simplify tag probe 2014-12-09 22:40:08 +00:00
Jordi Boggiano 6cbf0d9ae0 Merge pull request #3527 from tlenss/master
Fix #3521 version mismatch when running diag, Replaced git command to ge...
2014-12-09 22:19:08 +00:00
Thijs Lensselink 6ccc804094 Fix #3521 version mismatch when running diag, Replaced git command to get current checked out tag 2014-12-09 21:41:31 +01:00
Jordi Boggiano 5133c3fe9a Merge pull request #3424 from kaktus42/master
return false if local file path does not exist in GitDriver and HgDriver
2014-12-09 14:12:13 +00:00
Jordi Boggiano 10401d544b Avoid leftovers in temp dir 2014-12-09 11:32:02 +00:00
Jordi Boggiano 3ff8bcffea Allow loading of real composer repos by local path, fixes #1899 2014-12-08 22:04:10 +00:00
Jordi Boggiano fa470be001 Wording tweaks and docblock formatting, refs #2536 2014-12-08 21:30:39 +00:00
Jordi Boggiano 5c62e9b487 Merge remote-tracking branch 'cordoval/http-basic-auth' 2014-12-08 21:23:58 +00:00
Jordi Boggiano 90a69cd02e Add new arg to docs, refs #3385 2014-12-08 21:21:33 +00:00
Jordi Boggiano d8f043e12c Remove object state from methods to simplify things, refs #3385 2014-12-08 21:19:55 +00:00