1
0
Fork 0
Commit Graph

11361 Commits (1e914f8afcb8ae2210843ac60a731456dae3755c)

Author SHA1 Message Date
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
Jordi Boggiano e1ead6027f
Update xdebug-handler to latest to fix tty detection 2020-11-13 09:06:50 +01:00
Jordi Boggiano cc536c7f45
Fix/normalize tty handling 2020-11-13 08:58:18 +01:00
Jordi Boggiano 4b4a3937ea
Make sure Loop abortJobs does not lose track of promises in case wait() is called within the scope of a wait(), refs #9463 2020-11-12 15:14:39 +01:00
Jordi Boggiano b0d308319e
Extract POST_PACKAGE_* events to be executed all at once and not in parallel with async code to avoid edge cases, fixes #9463 2020-11-12 15:14:02 +01:00
Jordi Boggiano 45f7036745
Make sure the SOURCE_VERSION works with version_compare against 2.0.0 2020-11-12 15:12:46 +01:00
Sergii Bondarenko abbc0e8a4e
#9464: Remove wrapping slashes from the gitignore rules 2020-11-12 14:56:14 +02:00
Jordi Boggiano cfb3b85454
Update semver to latest 2020-11-12 12:59:48 +01:00
Sergii Bondarenko 1ec5fa81e4
#9464: Add the test to reveal the issue 2020-11-12 13:12:55 +02:00
Jordi Boggiano e5a009ed80
Make sure empty objects are not left behind when removing requires/.. fixes #9462 2020-11-12 11:09:15 +01:00
Jordi Boggiano dfca939f3b
Use proper type hint for local repo 2020-11-12 10:41:07 +01:00
Jordi Boggiano b78b2df5bb
Reuse devPackageNames if available instead of filtering the dev packages out by looping through all requirements 2020-11-12 10:41:07 +01:00
Jordi Boggiano b574f10d9d
Rename mainPackage to rootPackage in AutoloadGenerator and ensure we use RootPackageInterface 2020-11-12 10:41:06 +01:00
Jordi Boggiano 07352eafa8
Update jsonlint 2020-11-12 10:41:06 +01:00
Jordi Boggiano 6a2f9870a7
Warn when init is being used non-interactively without any args passed in, instead of silently overwriting the file 2020-11-12 10:41:05 +01:00
Jordi Boggiano 53412a3299
Merge pull request #9461 from ktomk/patch-9454-isatty
Reference co-relating code sequence for tty test, refs #9454
2020-11-11 21:14:29 +01:00
Tom Klingenberg 258f6dc1a2 Reference co-relating code sequence for tty test, refs #9454 2020-11-11 20:27:38 +01:00
Jordi Boggiano 380dce9a6b
Make sure the IO is not interactive when not run in a tty, refs #9454 2020-11-11 16:30:50 +01:00
Jordi Boggiano 87006774b1
Avoid requiring a lock file to run composer remove, fixes #9439 2020-11-11 14:46:10 +01:00
Jordi Boggiano 4468248c46
Merge remote-tracking branch 'Serializator/reject-promise-on-exception-9424' 2020-11-11 14:35:08 +01:00
Jordi Boggiano 1496277697
Disable TTY mode if STDOUT is not a TTY, fixes #9454 2020-11-11 14:27:17 +01:00
Jordi Boggiano 00dfd2c8e1
Fix lock file being parsed when not strictly needed, fixes #9452 2020-11-11 11:57:08 +01:00
Jordi Boggiano b8e40f6060
Fix tests 2020-11-11 11:49:50 +01:00
Jordi Boggiano 30b98915e9
Move Updating dependencies to the correct point, which is once we have the pool ready 2020-11-11 11:30:37 +01:00
Jordi Boggiano fec44f883c
Always load the current InstalledVersions when writing to disk, fixes #9457 2020-11-11 10:47:54 +01:00
Jordi Boggiano 14d20776a2
Merge pull request #9449 from staabm/patch-3
Remove unnecessary overridden method
2020-11-10 17:05:05 +01:00
Jordi Boggiano 32c52ec564
Merge pull request #9451 from staabm/patch-4
Fixed phpdocs
2020-11-10 17:03:28 +01:00
Markus Staab bfafead42e
Fixed phpdocs 2020-11-09 21:22:23 +01:00
Markus Staab e8ce5a3db6
Remove unnecessary overridden method
The method just called its parent without further logic
2020-11-09 20:45:40 +01:00
Jordi Boggiano a825581ae2
Remove set_time_limit, fixes #9438 2020-11-09 14:23:24 +01:00
Julian van den Berkmortel 23a1d783db Reject job within "HttpDownloader" when an exception is thrown, refs #9424 2020-11-08 21:53:07 +01:00
Jordi Boggiano 86f0c10004
Update changelog 2020-11-07 11:21:13 +01:00