e6c7ab693e
Fix running tests with non standard default branch
...
When the global git config has init.defaultbranch set to
something other than master the tests fail. This is because
the tests assume that the default branch is called master
but that may not be the case.
This fixes the tests by ensuring that when running git init
we ensure the default branch is called master regardless of
how git is configured.
2020-10-29 21:16:11 +00:00
ff74d0e686
Fix lock file generation with dev-master aliases to be compatible with Composer 1, fixes #9337
2020-10-27 20:50:26 +01:00
568d9206cc
Fix tests
2020-10-27 14:04:36 +01:00
4b8c2aa121
Fix default version to be semver parseable, fixes #9342
2020-10-25 22:22:19 +01:00
5bdb0cfff5
Merge pull request #9339 from Seldaek/fix-plugin-order
...
Fix plugin install order for plugins modifying downloads
2020-10-25 21:28:38 +01:00
2d4e1e0dce
Make sure Transaction sorts operations correctly to begin with
2020-10-25 14:06:45 +01:00
2a913c7a68
Improve proxy error messages for streams
2020-10-24 18:20:31 +01:00
62eff8e979
Tweaks to new proxying code, refs #9324
2020-10-24 10:36:39 +02:00
d47261eb93
Refactor proxy handling for Composer2
2020-10-23 21:38:29 +01:00
8564dd8dac
Allow Url::sanitize to escape URLs without scheme
2020-10-23 13:27:46 +02:00
8feb83b22b
Remove duplicate StreamContextFactory ssl options
...
Added in Dec 2014 (commit 8dad846#4759 )
2020-10-23 13:25:17 +02:00
4d2f41a415
Merge pull request #9318 from naderman/validate-provide-replace-requirement
...
Validate: Warn about providing or replacing packages you require
2020-10-23 10:35:26 +02:00
447416a357
Fix typo
2020-10-22 16:16:02 +02:00
6409ed0fc2
Validate: Warn about providing or replacing packages you require
2020-10-22 11:28:19 +02:00
492bece6e2
Merge pull request #9317 from naderman/test-provider-satisfy-self
...
Test: Verify require for package provided or replaced by pkg itself is used
2020-10-22 10:46:05 +02:00
1d6c0865ca
Test: Verify replacing a package required by the same package satisfies the dep
2020-10-22 10:32:04 +02:00
290450214e
Test: Verify require for package provided by pkg itself is used
2020-10-22 10:26:28 +02:00
c0236c5ed2
Move slow integration test to separate fixtures directory and add to slow group
2020-10-22 10:14:17 +02:00
c37dce0bb3
Remove unnecessary hhvm conflict rules from test
2020-10-22 10:02:09 +02:00
2468cd20dd
Update test case for github issue 7665 to have correct output
2020-10-22 09:44:16 +02:00
e11f52c041
Add a test to reproduce github issue #7665
2020-10-22 09:44:16 +02:00
b74afd772b
Merge pull request #9309 from naderman/fix-solver-9290
...
MultiConflictRule conflict analysis handling on level 1 decisions
2020-10-21 18:40:03 +02:00
7b4cb9c370
Solver: Prevent infinite recursion in analyzeUnsolvableRule
...
In complex scenarios reasons for learned rules can themselves be learned
rules caused by other learned rules which had the some of the same
reasons. In this situation iterating over all problem rules requires
keeping track of which rules have previously been analyzed to avoid and
endless loop.
Side effect is that the sorting of problems including learned rules
changes slightly.
2020-10-21 17:11:13 +02:00
9641ad6025
SolverProblemException: Hide learnt rules on output
...
Results in too much error output which is not helpful. Very repetitive
and hard to understand. In issue 8903 even leads to endless recursion
bug.
2020-10-21 14:08:12 +02:00
853305063d
Add test case for github issue 9290
2020-10-21 13:33:39 +02:00
99a5469b5e
More hints
2020-10-18 13:13:44 +02:00
4d005a9786
Merge pull request #9296 from mcaskill/bugfix/file-downloader-cache-keys
...
Fix availability of $urls in FileDownloader
2020-10-16 11:24:03 +02:00
c01e3bd2f0
Make async test more robust
2020-10-16 11:23:03 +02:00
fcc072fdb6
Add test to check processed URL and cache key
2020-10-15 23:46:12 -04:00
fdde9e5933
On composer install we fix locked packages, but consider them locked for error reporting
2020-10-14 11:46:13 +02:00
74fb313c39
Separate locked packages from fixed packages in request
...
Locked packages are basically like removable fixed packages, so we still
only load one version, but we do not require their installation unless
something the user needs requires their use. So they automatically get
removed if they are no longer needed on any update.
2020-10-14 11:46:13 +02:00
73e24ea9fb
Partial updates should remove all unused dependencies
...
Instead of marking locked packages as fixed, we change the pool builder
to load only the locked version and treat it like a fixed package, but
removing the actual request fix, makes the solver treat it as a regular
optional dependency. As a consequence locked packages may be removed on
a partial update of another package, but they cannot be updated.
2020-10-14 11:46:13 +02:00
85eb007f4f
Transaction: Define a total order on packages to keep behavior on PHP8
...
So far the ordering of alias packages with the same name was undefined
so the actual order was determined by implementation of the sorting
algorithm in PHP. As of PHP8 sort is stable by default which changes the
outcome in some of our test cases.
With the fully defined total order the order can longer change depending
on sorting algorithm used and remains the same across PHP versions.
2020-10-14 11:13:51 +02:00
7ea6d5d2e7
Merge branch '1.10'
2020-10-13 16:00:04 +02:00
4feed8b85c
Fix parsing "branch-version"
2020-10-13 15:43:12 +02:00
d702fa0e1a
Add test to ensure root requirements do not get expanded by the pool builder
2020-10-13 15:14:20 +02:00
528030716e
Fix tests
2020-10-13 15:01:22 +02:00
bafdf9f705
Merge branch '1.10'
2020-10-13 14:47:23 +02:00
893fbfcb89
Add support for "extra.branch-version"
2020-10-13 13:56:18 +02:00
24abd233ec
Merge branch 'master' into code-improvements
2020-10-13 12:23:13 +02:00
0775e261c5
Merge remote-tracking branch 'lstrojny/apcu-prefix'
2020-10-13 10:19:30 +02:00
09ef026d43
Remove OperationInterface::getReason, closes #9230 , closes #9263
2020-10-12 12:31:54 +02:00
03b8c3db3f
Merge branch '1.10'
2020-10-08 14:38:41 +02:00
6698e0bafa
Merge remote-tracking branch 'naderman/version-guess-remotes' into 1.10
2020-10-08 14:01:25 +02:00
f9913205dd
Fix VcsRepositoryTest
2020-10-08 11:06:39 +02:00
89afb823b6
VersionGuesser: Add test for remote version guess
2020-10-07 15:21:04 +02:00
92722a9a4c
VersionGuesser: Fix root package loader test which relies on git cmd in guesser
2020-10-07 15:11:08 +02:00
db2f09a361
VersionGuesser: Update tests to match new git command generated
2020-10-07 14:25:55 +02:00
80d71ccb3f
Merged isset, unset and str_replace calls
2020-09-26 00:55:19 +02:00
a4509d28e7
Introduce constants for Composer\Package\Link types
2020-09-21 14:22:06 +02:00
Robert Rhoades