1
0
Fork 0
Commit Graph

8415 Commits (7f34189f91a06531bb8a8a3afcb9cf88f03fdbc7)

Author SHA1 Message Date
Jordi Boggiano df2f2dc113 Merge branch '1.7' 2018-08-27 12:34:42 +02:00
Nils Adermann bbd10c1552
Merge pull request #7454 from stof/conflict_optimization
Refactor the handling of conflict rules in the solver
2018-08-27 12:30:15 +02:00
Christophe Coevoet 8c3898aa57 Update tests for replace conflicts
This reverts the test changes done in b4698568d2 to the original tests added
in 1425bb7fc3.
2018-08-27 12:14:34 +02:00
Christophe Coevoet e5b948c683 Refactor the handling of conflict rules in the solver
Conflict rules are not added in the solver based on the packages loaded in the
solver by require rules, instead of loading remote metadata for them. This has
2 benefits:

- it reduces the number of conflict rules in the solver in case of conflict
  rules targetting packages which are not required
- it fixes the behavior of replaces, which is meant to conflict with all
  versions of the replaced package, without introducing a performance
  regression (this behavior was changed when optimizing composer in the past).
2018-08-27 12:14:34 +02:00
Jordi Boggiano 734735c691
Merge pull request #7574 from seferov/patch-1
Remove github API request retries as it is not needed anymore
2018-08-27 09:56:31 +02:00
Jordi Boggiano bcf615ddc7
Merge pull request #7589 from pierredup/patch-2
Fix typo in variable name in GitHubDriver
2018-08-27 09:54:10 +02:00
Pierre du Plessis 33341130a9
Fix typo in variable name in GitHubDriver 2018-08-27 09:13:52 +02:00
Jordi Boggiano d100620987 Merge branch '1.7' 2018-08-25 18:49:56 +02:00
Jordi Boggiano 3b587eed21 Update xdebug-handler to latest, fixes #7436 2018-08-25 18:48:56 +02:00
Jordi Boggiano bf125295df Fix escaping of URLs in Perforce and Subversion drivers 2018-08-25 18:48:56 +02:00
Farhad Safarov 4014c914ab remove Github 404 retries 2018-08-25 16:37:20 +03:00
Jordi Boggiano 0f6b305bd9 Merge branch '1.7' 2018-08-22 09:57:41 +02:00
Jordi Boggiano 3d01ef28fa Revert "Do not dump source and dist for metapackages"
The source/dist reference is needed to operate composer outdated and other functionality

Fixes #7546

This reverts commit 42739e7959.
2018-08-22 09:45:54 +02:00
Jordi Boggiano c46f9f061a Update deps 2018-08-22 09:43:30 +02:00
Rob Bast cfb0d33c45
add removePackage() to RepositoryInterface 2018-08-20 10:41:34 +02:00
Jordi Boggiano 81516098e5 Update target release for master 2018-08-16 16:58:19 +02:00
Jordi Boggiano 5e21826fba Merge branch '1.7' 2018-08-16 16:57:41 +02:00
Jordi Boggiano 7d273f7cd8 Update changelog 2018-08-16 16:57:03 +02:00
Jordi Boggiano 15313209d6 Merge branch '1.7' 2018-08-16 16:50:10 +02:00
Jordi Boggiano 0181f07491 Fix create-project not updating to latest commit when cache is present, fixes #7550 2018-08-16 16:48:47 +02:00
Jordi Boggiano 0dab7facbf
Merge pull request #7555 from pierredup/require-signal
Revert composer.json changes when require process stops
2018-08-16 16:12:42 +02:00
Jordi Boggiano 020d1f88c7 Improve error reporting on global command, fixes #7556 2018-08-16 16:08:31 +02:00
Jordi Boggiano b8e8cc2516 Update xdebug-handler, fixes #7517 2018-08-16 15:18:40 +02:00
Pierre du Plessis d65e1c0112
Revert composer.json changes when require process stops 2018-08-15 12:59:05 +02:00
Jordi Boggiano db13cc4960 Merge branch '1.7' 2018-08-10 08:58:12 +02:00
Daniel Karl 849f4eda56 Using cwd for 2nd process-execution (auth) in HgUtils 2018-08-10 08:58:05 +02:00
Alexander Kurilo e1a6bd5ff1 Make JSON formatter test clearer 2018-08-10 08:54:34 +02:00
Alexander Kurilo 5a22a4f1f3 Make surrogate sequences in JSON work on PHP 5.3
Fixes #7510
2018-08-10 08:54:27 +02:00
Jordi Boggiano 1e6ceea0f9 Update to latest CA bundle 2018-08-10 08:52:30 +02:00
Jordi Boggiano e718f34ba4 Properly detect rate limit errors on github before outputting messages, fixes #6621 2018-08-10 08:43:51 +02:00
Daniel Karl d87416e6d0 Using cwd for 2nd process-execution (auth) in HgUtils 2018-08-09 08:22:41 +02:00
Jordi Boggiano b9adf38571 Merge branch '1.7' 2018-08-07 09:38:53 +02:00
Jordi Boggiano 9e7d48f70e Update changelog 2018-08-07 09:38:26 +02:00
Jordi Boggiano e7a9bd3362 Attempt workaround for repo.packagist.org domain SSL on very old PHP, fixes #7530 2018-08-07 09:33:04 +02:00
Jordi Boggiano a28808752d Attempt workaround for repo.packagist.org domain SSL on very old PHP, fixes #7530 2018-08-07 08:11:10 +02:00
Jordi Boggiano 7ea15eec6c Merge branch '1.7' 2018-08-04 17:44:30 +02:00
Jordi Boggiano a74b63985e Avoid filtering dev-require packages when loading plugins/scripts, fixes #7516 2018-08-04 17:43:43 +02:00
Jordi Boggiano 2f6d9741e7
Merge pull request #7515 from dzuelke/patch-1
Fix 1.7.0 changes link
2018-08-03 18:05:27 +02:00
David Zülke a5037385d1
Fix 1.7.0 changes link 2018-08-03 17:21:28 +02:00
Jordi Boggiano a1179aa4a7 Update changelog 2018-08-03 15:38:59 +02:00
Jordi Boggiano 0fdf746ebe Fix --no-plugins not working in certain edge cases 2018-08-03 15:23:04 +02:00
Jordi Boggiano 73f14c0c7c Fix output when loading zips from cache, fixes #7498 2018-08-03 14:06:31 +02:00
Rob a53b3c6b66
Merge pull request #7501 from kassner/patch-1
Do not dump source and dist for metapackages
2018-07-30 12:16:25 +02:00
Rafael Kassner 42739e7959 Do not dump source and dist for metapackages 2018-07-29 16:16:02 +02:00
Jordi Boggiano de6432f5f0 Show overridden php version in diagnose command, fixes #7497 2018-07-27 11:03:45 +02:00
Jordi Boggiano 35389f1cc2
Merge pull request #7495 from nicolas-grekas/resp-exc
Make RemoteFilesystem::getRemoteContents() report response headers also on exceptions
2018-07-26 22:27:39 +02:00
Nicolas Grekas a3bbcf9c77 Make RemoteFilesystem::getRemoteContents() report response headers also on exceptions 2018-07-26 18:31:33 +02:00
Jordi Boggiano 9bc578e24a Fix warning tag name, fixes #7494 2018-07-26 14:15:32 +02:00
Jordi Boggiano d73aef5c8a Respect --no-plugins flag when firing pre-command-run event 2018-07-25 10:22:21 +02:00
Jordi Boggiano 8eae15182c
Merge pull request #7487 from staabm/patch-1
Fixed typo
2018-07-24 21:44:27 +02:00