8b934a415f
Merge branch '1.10'
2020-07-16 12:27:00 +02:00
6cb4dc41b8
Fix bitbucket detection of redirects to login page, fixes #9041
2020-07-16 12:26:48 +02:00
57f91d01c7
Fix doc comment
2020-07-16 11:53:55 +02:00
272654d6e2
Fixed spelling mistake
2020-07-16 11:53:55 +02:00
cae913c434
Add Windows UAC elevation to self-update command
...
If self-update fails on Windows due to file permission issues, a .vbs
script is used to elevate a call to the cmd.exe `move` command.
Unfortunately it is not possible to know if the user cancelled the UAC
prompt using this method - it is possible using a Powershell script, but
flashing hidden windows make this a less desirable option.
The only downside is that a UAC invoked process is asynchronous, so a
300 millisecond timeout is used to allow cmd.exe to do its stuff.
Therefore if the OS is busy the script may finish first and incorrectly
report that the file has not been written.
2020-07-16 11:53:55 +02:00
fb0ad7c900
GitLab: clarify interactive auth prompt
2020-07-15 16:18:21 +01:00
870fdc59df
Merge remote-tracking branch 'tomekpryjma/fix-issue-9033'
2020-07-15 17:02:16 +02:00
10590dc519
Improve support for XDG and default to XDG config dir if both that and ~/.composer are available, fixes #9045
2020-07-15 10:56:13 +02:00
23c32ed6d3
Fix #9033 - inconsistent behavior with minor-only flag
2020-07-14 23:06:20 +01:00
92ef439666
Merge branch '1.10'
2020-07-07 21:12:27 +02:00
d2d3aa8494
Fix parsing of # in funding links, fixes composer/packagist#1097, closes #9035
2020-07-07 21:12:04 +02:00
d7b1248508
Create pool before reading package ids as the pool creation reassigns package ids, fixes #9034
2020-07-04 12:00:37 +02:00
1fa6f4c83c
Add a default signal handler to avoid having the SIGINTs ignored, fixes #9027
2020-07-01 11:37:38 +02:00
ee4afa29e7
Include dev packages in locked package listings for show command
2020-07-01 11:17:52 +02:00
70f211923b
Add support for list URL in composer repos, fixes #9009
2020-07-01 11:16:38 +02:00
1824637dab
Merge pull request #8999 from naderman/fix-solver-bug-exception-7051
...
Fix solver bug exception 7051
2020-06-27 23:50:55 +02:00
3f5dde9873
Solver: Ensure multi conflict rules still get added to learned pool
2020-06-26 22:04:17 +02:00
edef748169
Solver: Clarify when/why undecided literals can get skipped in analyze
2020-06-26 21:55:03 +02:00
851050e85c
Solver: multiconflict analyze handles positive decision same as regular literal
2020-06-26 21:51:02 +02:00
6e05345be7
Solver: Move analyze handling of multiconflict rule to clearer location
...
This way we're not looking at the previous decision at the top of the
loop but working with the current decision at the bottom
2020-06-26 21:51:02 +02:00
b34f916470
Solver: No need to check previous decision if we reached the first one
2020-06-26 21:51:02 +02:00
2631210493
Solver: analyze multi conflict rules in conflict resolution correctly
2020-06-26 21:51:02 +02:00
5ef398ebb9
Fix 5.3 support
2020-06-26 16:58:02 +02:00
bee91155a1
Fix guessing of default branch when HEAD is a non-feature-branch
2020-06-26 16:16:16 +02:00
4a2ea3c67a
Fix var name
2020-06-25 09:16:23 +02:00
86af5e5c6e
Remove conflict between trunk and master, as they do not normalize anymore
2020-06-25 08:58:08 +02:00
e2f1e8aed6
Allow optimizing fetching of dev versions only if no other stability is needed
2020-06-25 08:57:42 +02:00
a133e694d0
Speed up fund command fetching of latest data and make sure it uses default branch info
2020-06-25 08:57:18 +02:00
6f9b39180c
Add phpdocs
2020-06-25 08:56:46 +02:00
05dacbdabb
Rename DEV_MASTER_ALIAS to DEFAULT_BRANCH_ALIAS
2020-06-25 08:56:14 +02:00
821e575658
Merge branch '1.10'
2020-06-24 21:35:38 +02:00
74d89d7110
Get rid of default branch handling in version guesser as it is way too time intensive at every initialization
2020-06-24 21:16:16 +02:00
a5e608fb73
Merge pull request #9008 from Ayesh/strtr-improvements
...
Replace cascading str_replace() calls with strtr()
2020-06-24 15:06:52 +02:00
eea7564c9e
Revert accidental rename of $dependencies variable in unrelated code branch
2020-06-24 07:28:22 +02:00
d5d956df4d
Use correct variable name
2020-06-23 19:50:27 +02:00
73a721c7e5
Add the missing summary format to command-line help text
2020-06-23 19:45:26 +02:00
ec6e05d55f
Sort licenses so that the most used license will appear first
2020-06-23 19:44:12 +02:00
668655c21a
Rename variable for clarity
2020-06-23 19:43:27 +02:00
52332d994e
GitDriver: use authentication for supports check
2020-06-23 13:06:30 +01:00
e3c75b3e87
Replace cascading str_replace() calls with strtr()
...
Replaces cascading str_replace() calls with a single strtr() call that makes it mode readable and provides a micro performance improvement.
Some instances of cascading str_replace() calls were not refactored due to the potential recurring replacement patterns.
2020-06-23 04:10:26 +07:00
e76fc2dc39
Avoid blocking when guessing default branch name, fixes #9001
2020-06-22 10:48:15 +02:00
edd2aa27db
Add missing isVerbose argument to problem formatting call
2020-06-19 23:31:11 +02:00
7a37e78a30
Speed up installer tests by avoiding lots of bootstrapping and git processes
2020-06-19 17:56:13 +02:00
6349764c2d
Fix root package handling of default-branch
2020-06-19 15:34:28 +02:00
923f198a1f
Fix default-branch attribute on package files, and add it to schema
2020-06-19 15:33:25 +02:00
6f0e5996de
Treat default branch name as a non-feature-branch no matter what it is called
2020-06-19 14:12:44 +02:00
4682efcf77
Support also default_branch flag in cached versions
2020-06-19 09:45:39 +02:00
52afa5ef16
Fix handling of default branches
2020-06-17 17:54:06 +02:00
f70d527f4f
Fix git tests
2020-06-17 17:53:00 +02:00
ce368f8269
Store default branch info inside metadata
2020-06-17 17:41:38 +02:00
Jordi Boggiano