1
0
Fork 0
Commit Graph

10442 Commits (d9454938b0644fd9fa57ee6e63c4c285d8b40792)

Author SHA1 Message Date
Jordi Boggiano d00edab884
Merge pull request #9477 from naderman/fix-alias-conflicts
Explicit conflicts should conflict with aliases of packages too
2020-11-26 13:59:57 +01:00
Jordi Boggiano e203809106
Fix test description 2020-11-26 13:59:35 +01:00
Nils Adermann 01887a2488
Merge pull request #9519 from Seldaek/lock-update-with-new-req
Fix mirror updates when adding new reqs and dev-reqs are present
2020-11-26 13:29:00 +01:00
Jordi Boggiano be3a520331
Fix feedback 2020-11-26 13:07:33 +01:00
Nils Adermann 7197278fe9 Always install aliases together with their original package
Restores some Composer 1.x behavior like unbound constraints conflicting
with default branches unless they are branch aliased.

Simplifies conflicts with aliases because packages cannot be installed
without their aliases, so we do not need to know which aliases are
uninstalled in lock file or installed.json.
2020-11-26 12:10:07 +01:00
Jordi Boggiano e857a8216c
Make sure mirror update fails if no lock file is present 2020-11-26 11:28:17 +01:00
Jordi Boggiano 2d025dce05
Make sure mirror updates do not fail if there are dev requirements and new requires are present, fixes #9514 2020-11-26 11:27:44 +01:00
Nils Adermann 58f358d028 Correct test case descriptions 2020-11-26 11:21:53 +01:00
Jordi Boggiano 08f0af4623
Add docblocks to HttpDownloader, refs #9209 2020-11-25 15:44:59 +01:00
Jordi Boggiano e8a3a33023
Also output headers 2020-11-25 12:40:05 +01:00
Jordi Boggiano 8030fbc4ae
Add debug info for http status code 0 2020-11-25 12:37:28 +01:00
Jordi Boggiano 47672a73c0
Merge pull request #9517 from bradjones1/patch-2
Clarify difference in create-project related scripts
2020-11-24 09:41:54 +01:00
Brad Jones 4b2df65833
Clarify difference in create-project related scripts
I wasn't entirely clear the difference between post-root-package-install and post-create-project-cmd, so this is an effort to clarify (as to the best of my understanding.)
2020-11-23 10:41:52 -10:00
Jordi Boggiano b7d770659b
CS fixes 2020-11-22 14:52:39 +01:00
Jordi Boggiano 152694b574
Fix tests 2020-11-22 14:31:38 +01:00
Jordi Boggiano c7da7e55c9
Fix various issues with regard to schema conformity when modifying json, fixes #9515 2020-11-22 14:26:18 +01:00
Andrés De la Cruz 480a6439fd
Fix phpstan phpdocs issues (#9478) 2020-11-20 09:28:09 +01:00
Jordi Boggiano f129c231b1
Update recommended php req in docs 2020-11-20 09:18:21 +01:00
Jordi Boggiano 9e279740cd
Go go phpstan 🤞 2020-11-19 11:28:12 +01:00
Jordi Boggiano 742c2a9e93
Avoid swallowing exceptions 2020-11-19 10:32:09 +01:00
Jordi Boggiano 5b5a8da6bb
Merge pull request #9494 from JanSlabon/patch-1
Update authentication-for-private-packages.md
2020-11-19 09:45:13 +01:00
Jordi Boggiano 35b403b266
Make sure a version not found issue is reported as such for clarity, fixes #9500 2020-11-19 09:39:03 +01:00
Jordi Boggiano 351b14e32b
Installed repo contains only the required versions but the aliases are not always present at the right time so avoid looking up plugin dependencies using a constraint as it may not find dev-* packages even though they are there, fixes #9499 2020-11-18 22:33:34 +01:00
Jordi Boggiano f567fd69eb
List both unzip and zip ext presence in diagnose 2020-11-18 22:33:33 +01:00
jvoisin 456096d5ff
Fix a type-juggling issue (#9498) 2020-11-18 21:53:09 +01:00
Jordi Boggiano 5248d6c9f1
Improve curl error reporting some more 2020-11-18 21:36:33 +01:00
Jordi Boggiano 852990d06c
Make sure git gc runs if needed when syncing git mirrors in cache dir to avoid them getting very stale 2020-11-18 21:36:14 +01:00
Jordi Boggiano 6937fedaa9
Update user-agent to use cURL instead of curl, fixes #9492 2020-11-18 21:26:32 +01:00
Jan Slabon 27339aeaf8
Update authentication-for-private-packages.md
Added some information about encoding of username and password for "Inline http-basic" authentication.
2020-11-18 14:41:27 +01:00
Jordi Boggiano 4ac6f57d18
Add debug output when SIGINT is received 2020-11-16 22:42:21 +01:00
Jordi Boggiano 8ed2aa8d6d
Make sure curl errors without message are shown as code, and add URL linked to the failure 2020-11-16 22:41:19 +01:00
Nils Adermann 1b337be236 Add expected lock files to conflict with branch alias tests, add install from lock test 2020-11-16 13:27:54 +01:00
Jordi Boggiano 9aefbee53a
Update changelog 2020-11-13 17:30:31 +01:00
Nils Adermann d19b858e20 Improve decisions debug output 2020-11-13 16:58:43 +01:00
Nils Adermann c02d2842b0 Test conflict with an unrequired alias does not prevent install.
The alias still ends up being marked as installed as the install step
reads it from the branch alias in the lock file and doesn't know a
conflict required it to be skipped.
2020-11-13 16:55:35 +01:00
Nils Adermann 780e6fc027 Avoid creating unnecessary conflict rules for provide/replace of aliases 2020-11-13 16:26:36 +01:00
Nils Adermann 3764b3007d Explicit conflict rule generation needs to use pool->whatProvides
If relying on packages added by name in the generator aliases will be
skipped.
2020-11-13 16:01:54 +01:00
Jordi Boggiano 89947c5e37
Bulk up platform config docs, refs https://github.com/composer/composer/issues/9377#issuecomment-719019204 2020-11-13 15:51:24 +01:00
Nils Adermann 045b5c6b6b Add test case verifying conflicts on alias prevent it from getting installed 2020-11-13 15:47:27 +01:00
PrinsFrank 3d5be62250
Add article on resolving merge conflicts (#9386) 2020-11-13 15:38:28 +01:00
Jordi Boggiano d6794217d9
Merge pull request #9475 from naderman/fix-alias-alt
Make sure the root aliases always get installed when a package is updated
2020-11-13 15:15:32 +01:00
Nils Adermann 27f200caf1 Create ROOT_ALIAS rules inside package rule generation 2020-11-13 15:08:09 +01:00
Nils Adermann 4215344c93 Rule generator cleanup: no need for 2 added package arrays, more specific root alias rule 2020-11-13 14:53:23 +01:00
Jordi Boggiano 59b7246523
Update semver to latest 2020-11-13 14:51:16 +01:00
Jordi Boggiano 595c4c6f75
Make sure we handle cases where STDIN/STDOUT may not be defined 2020-11-13 14:50:24 +01:00
Nils Adermann 6b48258432 Add test case for root alias on an unloadable package 2020-11-13 14:40:54 +01:00
Jordi Boggiano b7e1383083
Make sure the alias package gets added to conflict rules etc, and only add it if aliased package is actually added 2020-11-13 14:16:37 +01:00
Jordi Boggiano 7b183956d8
Make sure the root aliases always get installed when a package is updated, fixes #9448 2020-11-13 13:52:21 +01:00
Nils Adermann 8936f724d4
Merge pull request #9469 from Seldaek/fix-aliases-2
Make sure root aliases are marked as such also when loaded from lock file
2020-11-13 11:03:10 +01:00
Jordi Boggiano 6ace5bb651
Make sure root aliases are marked as such also when loaded from lock file 2020-11-13 10:58:03 +01:00