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
c78eb49b5e
Remove unnecessary duplicate rule output from expected test result
2020-06-26 21:51:02 +02:00
2cfb60e683
Solver: Add test case for github issue 7051
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
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
95a176c87c
Prepare 1.10.8 release
2020-06-24 21:23:12 +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
05eec0b02f
Prepare alpha2 changelog
2020-06-24 21:16:15 +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
0bb7e03696
Merge pull request #9010 from jdrieghe/sort-licenses-summary
...
Sort licenses summary
2020-06-24 15:04:47 +02:00
7f808c2e8d
Merge pull request #8993 from glaubinix/t/git-driver-use-auth-support
...
GitDriver: use authentication for supports check
2020-06-24 08:55:56 +02:00
57601533d6
Merge branch '1.10' into t/git-driver-use-auth-support
2020-06-24 08:53:10 +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
ae44a5963d
ZipArchive issues fixed in phpstan it seems
2020-06-22 10:54:38 +02:00
e76fc2dc39
Avoid blocking when guessing default branch name, fixes #9001
2020-06-22 10:48:15 +02:00
09d7acee3c
Merge branch '1.10'
2020-06-21 12:45:21 +02:00
edd2aa27db
Add missing isVerbose argument to problem formatting call
2020-06-19 23:31:11 +02:00
cbdee533e3
Merge pull request #8993 from glaubinix/t/git-driver-use-auth-support
...
GitDriver: use authentication for supports check
2020-06-19 18:25:02 +02:00
e55a019b8d
replace toran with private packagist
2020-06-19 18:21:03 +02:00
6d2b5c1950
Add missing class
2020-06-19 17:58:21 +02:00
7a37e78a30
Speed up installer tests by avoiding lots of bootstrapping and git processes
2020-06-19 17:56:13 +02:00
d19f5db568
Fix tests to use default-branch prop
2020-06-19 16:06:38 +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
5ff1423298
GitDriver: use authentication for supports check
2020-06-19 10:24:40 +01: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
04381c70fe
Merge branch '1.10'
2020-06-17 17:37:39 +02:00
cb1f3899bb
Revert "Store default branch info inside metadata"
...
This reverts commit 472a62152d
2020-06-17 17:32:26 +02:00
0278e7453d
Clean Git repos during discard
2020-06-17 17:00:35 +02:00
fb7fc4a4ca
Fix git tests
2020-06-17 16:59:43 +02:00
8c0ecf7337
Clarify why a dev tag was ignored, fixes #8951
2020-06-17 16:41:33 +02:00
93d4cf6f91
Add --no-show-signature where git supports it, fixes #8966
2020-06-17 16:37:06 +02:00
Nils Adermann