f0e178c318
Merge branch '2.0'
2021-05-21 16:49:42 +02:00
17f6363ea9
Fix tests
2021-05-21 16:49:17 +02:00
9b7a8d4543
Hint at a branch rename if we detect dev-master can not be found but dev-main or dev-default exists, fixes #9850
2021-05-03 14:42:58 +02:00
e6cede4a61
Make sure update mirrors/--lock keeps the release date of the original reference when dev versions have newer commits, refs #9812
2021-04-08 11:54:39 +02:00
0ab4013788
Fix output listing some updates that do not really happen when updating mirrors/--lock, fixes #9812
2021-04-08 10:55:48 +02:00
f10ae542ff
Always mark symlinked path packages for update even during partial updates to make sure they always reflect the current state on disk, fixes #9751
2021-03-10 14:26:42 +01:00
ab84916422
Fix unclear error when a package can be found in lock but not in the remote repo, fixes #9750
2021-03-09 15:01:23 +01:00
d91fe67a80
Remove default branch alias from versions which are numeric, fixes #9705
2021-02-17 23:48:03 +01:00
7402ef33fc
Dont recommend to use with all dependencies option when it is already used
2021-02-03 23:43:35 -05:00
7f3a56f39b
Merge pull request #9360 from naderman/pool-builder-unlock-consider-all-constraints
...
PoolBuilder: Ensure versions matching locked constraints get loaded
2020-12-03 16:59:39 +01:00
db0656eab0
Duplicate partial update unlock but keep old version test with provide keyword
2020-12-01 14:55:05 +01:00
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
e203809106
Fix test description
2020-11-26 13:59:35 +01:00
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
e857a8216c
Make sure mirror update fails if no lock file is present
2020-11-26 11:28:17 +01:00
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
58f358d028
Correct test case descriptions
2020-11-26 11:21:53 +01:00
1b337be236
Add expected lock files to conflict with branch alias tests, add install from lock test
2020-11-16 13:27:54 +01:00
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
045b5c6b6b
Add test case verifying conflicts on alias prevent it from getting installed
2020-11-13 15:47:27 +01:00
6b48258432
Add test case for root alias on an unloadable package
2020-11-13 14:40:54 +01:00
7b183956d8
Make sure the root aliases always get installed when a package is updated, fixes #9448
2020-11-13 13:52:21 +01:00
b8e40f6060
Fix tests
2020-11-11 11:49:50 +01: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
7bc2112f2b
InstallerTest: Add a test for partial updates
...
Needs to take constraints of locked packages into account
2020-10-27 17:02:31 +01:00
447416a357
Fix typo
2020-10-22 16:16:02 +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
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
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
43093d0eeb
Add tests for edge cases of packages providing names which exist as real packages
2020-08-28 14:50:28 +02:00
140665eadd
Add another test verifying that a package may provide an incompatible version of sth that actually exists
2020-08-28 13:40:44 +02:00
85950f8e9a
Fix provider coexistence test, needs another requirement to install both
2020-08-28 13:40:44 +02:00
cf8ff2a75d
Fix test filename to end with .test extension so it gets run
2020-08-28 13:40:44 +02:00
6186c7f36f
Fix handling of root aliases in partial updates, fixes #9110
2020-08-25 11:05:28 +02:00
448daea696
Add support for detecting packages not matching only due to minimum stability
2020-08-23 16:48:07 +02:00
4d83783641
Fix test to avoid network usage
2020-08-23 16:03:00 +02:00
e745e59656
updated repositories-priorities4.test
2020-08-22 20:11:15 +03:00
f262feebec
fixing error message for higher repository priority, when higher repo has only a dev-branch
2020-08-22 20:07:13 +03:00
212fbc516e
Fix test issues
2020-07-02 08:12:25 +02:00
3d2d33dd58
Solver: Add missing rules and replace some with %A for pcre length limit
2020-06-26 22:11:13 +02:00
de3931c742
Revert "Remove unnecessary duplicate rule output from expected test result"
...
This reverts commit c78eb49b5e
2020-06-26 22:03:18 +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
05dacbdabb
Rename DEV_MASTER_ALIAS to DEFAULT_BRANCH_ALIAS
2020-06-25 08:56:14 +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
e5fe35d554
Update test description
2020-06-17 09:24:25 +02:00
c8731598cc
Merge branch '1.10'
2020-06-16 17:16:42 +02:00
a797ee1322
Fix inline aliases not being loaded when extracting dev requirements, fixes #8954
2020-06-16 13:50:29 +02:00
fa799970ad
Replace whitelist with allow list
2020-06-07 22:15:09 +01:00
a66a939b76
Merge pull request #8937 from Seldaek/optim-rules
...
Optimize rule creation for alias packages
2020-06-03 14:17:13 +02:00
fafa959933
Add test to assert prefer-lowest behavior when conflicting branches prevent absolute lowest version from being installed, closes #7408
2020-06-03 08:34:25 +02:00
5a4709c3d6
Optimize rule creation for alias packages
...
This mainly benefits projects running updates with minimum-stability: dev
2020-06-02 13:44:56 +02:00
2ddf4346ef
Improve error reporting for RULE_PACKAGE_ALIAS
2020-06-02 10:35:04 +02:00
0ea9eafcaf
Add rules for aliased packages when an alias is added, fixes #8902
2020-06-02 10:07:20 +02:00
dfccf8c091
Add failing test reproducing the problem of #8902
2020-06-02 10:00:09 +02:00
98e5f81a5f
Fix detection of fixed package problems to include more cases, fixes #8910
2020-05-19 12:17:25 +02:00
f73c8c419c
Merge pull request #8869 from naderman/replace-semver-test
...
Adding a test to verify replace version overlap with unbound constraints and single versions
2020-05-06 10:53:45 +02:00
d15447c454
Add test for replace version overlap
2020-05-04 11:24:11 +02:00
3a64acb53e
Make sure versions are ordered also in the satisfied by package lists
2020-05-01 15:54:01 +02:00
56a11b9c2c
Deduplicate require/conflict rules which are the same but for different versions of the same package, fixes #8851
2020-05-01 15:41:54 +02:00
d89342dc43
Fix tests
2020-04-24 09:07:32 +02:00
df0cada93f
Add test for #8669
2020-04-23 15:11:21 +02:00
34801239f1
Tweak problem wording slightly
2020-04-23 13:17:34 +02:00
1000d49145
Fix error reporting when the root version changed since the last update, and does not match circular deps in lock file anymore
2020-04-22 14:02:09 +02:00
bf39fab82d
Add test for root alias presence in lock
2020-04-21 23:01:20 +02:00
ba9d4793bc
Fix transaction order
2020-04-20 22:24:00 +02:00
17ed09be2e
Add failing test showing that packages fail to be installed if they match a previous alias which was not removed yet
2020-04-20 21:50:06 +02:00
3f338ee8d9
Make sure versions are sorted before they get trimmed in error output
2020-04-19 15:51:30 +02:00
80a7c40c76
Shorten long lists of similar versions in problem output, fixes #8743
2020-04-15 16:47:44 +02:00
b6bad4eef6
Add options to configure repository priorities
2020-04-09 13:39:06 +02:00
e09dd9c10d
Detect packages which are only available in lock file and warn appropriately
2020-04-07 13:06:04 +02:00
8945936dbd
Deduplicate solver problems which list problems for dev-master AND 9999999-dev
2020-04-07 13:06:03 +02:00
f38e969b02
Update test expected output to different formatting
2020-04-07 11:16:13 +02:00
80a5fdf398
Remove obsolete rules and their generation
...
The only automatic conflict we have results from packages using the same name
either by literally having the same name and being different versions or they
replace the same name, so
- removed all types of obsolete rules
- simplified rule generation significantly
- got rid of provide filtering in the pool
- fixed some language in error handling
2020-04-07 11:11:18 +02:00
4e3d989978
A package providing a name should not conflict with a package replacing it
...
Simplified whatProvides, mustMatchName is unused, removed unused
function from policy
2020-04-07 11:08:47 +02:00
8072ec9b7c
Number 2: Adjust forgotten error message in test to new language
2020-04-02 16:31:30 +02:00
ce0c2d44cd
Adjust forgotten error message in test to new language
2020-04-02 16:20:54 +02:00
4fab2c7759
Error wording use "thus cannot" instead of "can thus not"
2020-04-02 16:02:17 +02:00
88e3f24b91
Fix description of test case
2020-04-02 15:42:42 +02:00
9858718ef6
Give a clearer error message explaining how to update a conflicting locked dependency
2020-04-02 15:32:02 +02:00
f7b5cbd1fc
Lock file should not contain new aliases for packages which were not updated
2020-04-02 01:12:34 +02:00
5ad93959cf
PoolBuilder: On partial update of a new dep with mutual replace, unfix replacer
...
Test also verifies provider does not get uninstalled in partial update
for another package name
2020-04-02 00:54:49 +02:00
613450e58a
PoolBuilder: properly clean up alias packages when unfixing packages
...
Prevent aliases to be duplicated: no need to apply root aliases from
composer.json on packages currently locked, they should have their
aliases in the lock file, otherwise request an update.
2020-04-02 00:08:53 +02:00
14000e7575
PoolBuilder: Ensure alias references get removed when unfixing a locked package
...
Use the last key + 1 for an index instead of count, since we unset elements somtimes
2020-04-01 16:40:45 +02:00
ef42d323b1
Test: partial update adding a new dep on a locked package should mark it for update
2020-03-27 23:07:02 +01:00
443553423b
Mark replaced packages for update when using --with-dependencies
...
This is necessary to allow the requiring of new packages which replace
packages currently locked without requiring explicitly listing them as
an argument, so simplifies the composer require command
2020-03-27 22:59:00 +01:00
17b50157e4
Test: composer update new/plg --with-dependencies updates locked transitive deps
2020-03-27 22:46:54 +01:00
392d0abd21
Rename test files and standardize on allow list rather than whitelist
2020-03-27 22:15:04 +01:00
01fe92905a
The update allow list is now generated while building the pool
...
This reduces code complexity while making partial updates more
predictable. This also allows composer require to successfully run a
partial update for a new package with transitive dependency updates.
2020-03-27 21:41:49 +01:00
70f23e42f3
Fix tests
2020-03-13 11:26:12 +01:00
e15f7d6bb7
Merge branch 'master' into 2.0
2020-03-13 11:18:23 +01:00
Jordi Boggiano