Jordi Boggiano
d19f5db568
Fix tests to use default-branch prop
2020-06-19 16:06:38 +02:00
Jordi Boggiano
e5fe35d554
Update test description
2020-06-17 09:24:25 +02:00
Jordi Boggiano
c8731598cc
Merge branch '1.10'
2020-06-16 17:16:42 +02:00
Jordi Boggiano
a797ee1322
Fix inline aliases not being loaded when extracting dev requirements, fixes #8954
2020-06-16 13:50:29 +02:00
Graham Campbell
fa799970ad
Replace whitelist with allow list
2020-06-07 22:15:09 +01:00
Jordi Boggiano
a66a939b76
Merge pull request #8937 from Seldaek/optim-rules
...
Optimize rule creation for alias packages
2020-06-03 14:17:13 +02:00
Jordi Boggiano
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
Jordi Boggiano
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
Jordi Boggiano
2ddf4346ef
Improve error reporting for RULE_PACKAGE_ALIAS
2020-06-02 10:35:04 +02:00
Jordi Boggiano
0ea9eafcaf
Add rules for aliased packages when an alias is added, fixes #8902
2020-06-02 10:07:20 +02:00
Jordi Boggiano
dfccf8c091
Add failing test reproducing the problem of #8902
2020-06-02 10:00:09 +02:00
Jordi Boggiano
98e5f81a5f
Fix detection of fixed package problems to include more cases, fixes #8910
2020-05-19 12:17:25 +02:00
Jordi Boggiano
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
Nils Adermann
d15447c454
Add test for replace version overlap
2020-05-04 11:24:11 +02:00
Jordi Boggiano
3a64acb53e
Make sure versions are ordered also in the satisfied by package lists
2020-05-01 15:54:01 +02:00
Jordi Boggiano
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
Jordi Boggiano
d89342dc43
Fix tests
2020-04-24 09:07:32 +02:00
Jordi Boggiano
df0cada93f
Add test for #8669
2020-04-23 15:11:21 +02:00
Jordi Boggiano
34801239f1
Tweak problem wording slightly
2020-04-23 13:17:34 +02:00
Jordi Boggiano
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
Jordi Boggiano
bf39fab82d
Add test for root alias presence in lock
2020-04-21 23:01:20 +02:00
Jordi Boggiano
ba9d4793bc
Fix transaction order
2020-04-20 22:24:00 +02:00
Jordi Boggiano
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
Jordi Boggiano
3f338ee8d9
Make sure versions are sorted before they get trimmed in error output
2020-04-19 15:51:30 +02:00
Jordi Boggiano
80a7c40c76
Shorten long lists of similar versions in problem output, fixes #8743
2020-04-15 16:47:44 +02:00
Ayesh Karunaratne
280f02b4bc
Update HTTP URLs to their HTTPS if they already redirect automatically
2020-04-13 06:22:02 +07:00
Jordi Boggiano
b6bad4eef6
Add options to configure repository priorities
2020-04-09 13:39:06 +02:00
Jordi Boggiano
e09dd9c10d
Detect packages which are only available in lock file and warn appropriately
2020-04-07 13:06:04 +02:00
Jordi Boggiano
8945936dbd
Deduplicate solver problems which list problems for dev-master AND 9999999-dev
2020-04-07 13:06:03 +02:00
Nils Adermann
f38e969b02
Update test expected output to different formatting
2020-04-07 11:16:13 +02:00
Nils Adermann
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
Nils Adermann
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
Nils Adermann
8072ec9b7c
Number 2: Adjust forgotten error message in test to new language
2020-04-02 16:31:30 +02:00
Nils Adermann
ce0c2d44cd
Adjust forgotten error message in test to new language
2020-04-02 16:20:54 +02:00
Nils Adermann
4fab2c7759
Error wording use "thus cannot" instead of "can thus not"
2020-04-02 16:02:17 +02:00
Nils Adermann
88e3f24b91
Fix description of test case
2020-04-02 15:42:42 +02:00
Nils Adermann
9858718ef6
Give a clearer error message explaining how to update a conflicting locked dependency
2020-04-02 15:32:02 +02:00
Nils Adermann
f7b5cbd1fc
Lock file should not contain new aliases for packages which were not updated
2020-04-02 01:12:34 +02:00
Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
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
Nils Adermann
17b50157e4
Test: composer update new/plg --with-dependencies updates locked transitive deps
2020-03-27 22:46:54 +01:00
Nils Adermann
392d0abd21
Rename test files and standardize on allow list rather than whitelist
2020-03-27 22:15:04 +01:00
Nils Adermann
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
Jordi Boggiano
70f23e42f3
Fix tests
2020-03-13 11:26:12 +01:00
Jordi Boggiano
e15f7d6bb7
Merge branch 'master' into 2.0
2020-03-13 11:18:23 +01:00
Aaron Johnson
33479f00ab
Add backticks to test.
2020-03-12 23:20:10 -04:00
Jordi Boggiano
08cee4c3e9
Implement getProviders equally on all repos
2020-03-12 15:39:26 +01:00
Jordi Boggiano
d09daa8d5a
Merge pull request #8684 from naderman/dev-require-errors
...
Handle dev extraction exit codes instead of completing broken lock with errors
2020-03-12 13:20:55 +01:00
Nils Adermann
ee8df484c4
Separate createPool and createPoolWithAllPackages, fix test description
2020-03-12 13:17:04 +01:00
Nils Adermann
3ec59204fc
Update test: require-dev is now allowed to satisfy providers from require
2020-03-12 12:28:46 +01:00
Jordi Boggiano
73a5cc63cc
Always use Removing for consistency between dry-run and actual install
2020-03-12 08:12:12 +01:00
Nils Adermann
1f467046d7
Implement getProviders on reposet for all repo types and add replacers
...
This way errors during require dev extraction make more sense
2020-03-11 17:38:16 +01:00
Jordi Boggiano
589aa351a8
Change Uninstalling to Removing in lock operations
2020-03-11 16:44:08 +01:00
Jordi Boggiano
a7a975ec1c
Alias dev-master/trunk/default to 9999999-dev instead of normalizing the version to that, fixes #8323
2020-03-11 15:04:18 +01:00
Jordi Boggiano
97e2a249e8
Merge branch 'master' into 2.0
2020-03-11 09:34:55 +01:00
Jordi Boggiano
ffac8646fc
Fix tests
2020-03-11 09:34:40 +01:00
Jordi Boggiano
3e82542812
Fix test
2020-03-10 17:11:19 +01:00
Jordi Boggiano
c033644f8b
Present lock changes alphabetically, with uninstalls first, then all install/updates mixed
2020-03-10 16:08:40 +01:00
Jordi Boggiano
0ad322e51f
Fix tests
2020-02-14 16:55:21 +01:00
Jordi Boggiano
bc002ae1fb
Merge branch 'master' into 2.0
2020-02-14 15:42:17 +01:00
Nils Adermann
d665ea7ea9
After update and install commands display how many packages want funding
2020-02-14 10:08:36 +01:00
Jordi Boggiano
44d1e15294
Simplify suggester output when updating, refactor suggest command to reuse SuggestedPackagesReporter and make smarter defaults, fixes #6267
2020-02-13 16:13:29 +01:00
Jordi Boggiano
9609729de7
Change update to upgrade for package update operations which are upgrades, refs #8594
2020-02-11 13:43:38 +01:00
Jordi Boggiano
be8dd528b8
Merge remote-tracking branch 'origin/master' into 2.0
2020-02-11 11:33:52 +01:00
Ion Bazan
a180f48921
Distinguish between updates and downgrades in dry-run
2020-02-11 16:35:35 +08:00
Jordi Boggiano
189d5adab0
Fix reporting of replace conflicts to not mention provides
2020-01-30 17:13:12 +01:00
Jordi Boggiano
ec90c17e3b
Fix conflict order to be more accurate
2020-01-30 15:55:37 +01:00
Jordi Boggiano
f982a10447
Update after rebase
2020-01-30 14:52:47 +01:00
Jordi Boggiano
1d4cdb60d0
Improve error reporting for conflicts/replaces of various kinds, fixes #7254
2020-01-30 14:43:56 +01:00
Jordi Boggiano
6c9d9e775c
Clean up and deduplicate the output of RULE_LEARNED
2020-01-30 14:43:56 +01:00
Jordi Boggiano
e6029d725a
Add individual test checking for clashes between requirements at root and transitive dependency level
2020-01-30 14:43:55 +01:00
Jordi Boggiano
3fc7e10c5c
Improve error reporting of solver issues, refs #7779
...
Fixes #8525
Fixes #6513
2020-01-30 14:43:54 +01:00
Jordi Boggiano
8a41f1a5ca
Allow providers which are selected to be installed in place of existing packages which do not satisfy requirements, fixes #6753
2020-01-30 14:09:55 +01:00
Jordi Boggiano
3f48acf56a
Add test checking references update to latest and remove TODO
2020-01-28 16:01:17 +01:00
Jordi Boggiano
292d4b3c8f
Make sure a lock file is always written and things work well even without any dependencies in the require/require-dev
2020-01-28 15:14:58 +01:00
Nils Adermann
5bdc0fc9c5
Request jobs replaced by root require / fixed package
...
The only type of request job remaining was "install" which is really a
root requirement. The only other kind of input for the solver is now a
set of fixed packages.
Rules have been updated to account for only two kinds of former job
reason: FIXED or ROOT_REQUIRE. The job property has always been
redundant and has been removed, since reasonData suffices.
Problem reasons are always rules, so the unnecessary wrapping in an
array has been removed.
We now only ever generate a single rule per root require or fixed
package, so there is no need for the solver to special handle disabling
"jobs" anymore, the rule can just be disabled as usual.
For consistency special handling of rules for jobs in problems has been
integrated into the rule class like all other rule reasons. As part of
this change the error message for root requirements has been improved a
bit to make it clearer where the package installation request came from.
The word job has also been removed from operations, which are called
operations, not jobs.
2020-01-19 23:21:07 +01:00
Jordi Boggiano
ebe910c3a5
Tweak test to follow changes
2020-01-17 15:16:01 +01:00
Jordi Boggiano
6f44350c01
Remove problem reporting for locked package not being found, needs to be fixed in #7779 later
2020-01-17 14:01:01 +01:00
Jordi Boggiano
47a94b3a88
Ensure packages that exist in a higher prio repo never get loaded in lower prio repos, fixes #5076
2020-01-15 12:02:12 +01:00
Jordi Boggiano
2bd817acf9
Merge pull request #8444 from Toflar/remove-filters-from-pool
...
Removed the filters from the pool
2020-01-13 12:47:22 +01:00
Jordi Boggiano
f6b3f12107
Merge branch 'master' into 2.0
2019-12-07 21:10:14 +01:00
Jordi Boggiano
8449a113b3
Fix build
2019-12-07 21:09:26 +01:00
Yanick Witschi
d1dc367d86
Removed the filters from the pool
2019-11-27 17:57:24 +01:00
Nils Adermann
a732ea5dd8
Display source/dist refs if updates do not change the version
...
We now output an update when only a source or dist ref changes even if
it's a stable version so in these cases the output needs to contain the
ref to make it clear to users what changed
2019-11-23 12:33:58 +01:00
Jordi Boggiano
438c45e991
Change UpdateOperation::show to match what the installers output, fixes the dry-run output to be more like real output
2019-11-14 15:41:23 +01:00
Jordi Boggiano
006985a0ea
Execute all operations at once which lets us download all packages in parallel then install only once all downloads succeeded, fixes #2847
...
This also changes the PRE/POST_PACKAGE_INSTALL/UPDATE/UNINSTALL events to have less information available on them, repositorySet, request and policy are gone
2019-11-14 15:21:28 +01:00
Nils Adermann
3cbe91983c
Display Locking instead of Installing for lock file install operations
2019-11-08 16:57:52 +01:00
Nils Adermann
25de5218c3
Reunify lock and local repo transaction code and apply the same sorting
2019-11-08 15:56:46 +01:00
Nils Adermann
ff5ec54f04
Correctly use install and update commands in our installer tests
2019-11-08 12:31:26 +01:00
Nils Adermann
97ec2d7b61
Merge remote-tracking branch 'github-composer/2.0' into solve-without-installed
...
* github-composer/2.0: (63 commits)
Fix PSR warnings for optimized autoloader, refs #8397 , refs #8403
Prepare 1.9.1 changelog
Output a hint that maybe you are not in the right directory, fixes #8404
Fix PSR warnings for optimized autoloader, refs #8397 , refs #8403
Fix tests for PSR-fix in optimized autoloader, refs #8397
Fix tests for PSR-fix in optimized autoloader, refs #8397
Change PSR-fix for optimized autoloader to only warn for now, refs #8397
Fix output of dump-autoload command to avoid interfering with warnings, refs #8397
Remove credentials from git remotes in cache and vendor dirs
Avoid overwriting credentials with existing ones from git repos, refs #8293
Fix github auth to try https with pwd also, fixes #8356
Fix gitlab support for basic-auth fallback from ssh URLs
Avoid clearing the error output during removeDirectory execution, losing git error output, fixes #8351
Move test file parsing into try/catch block to avoid phpunit swallowing errors
make optimized autoloader respect PSR standards
Validate composer show with --tree and --path options set (#8390 )
Don't show root warning for docker containers
Added phpdoc for ComposerAutoloaderInit$SHA1::getLoader() (#8393 )
Validate schema name, type and version
Fix require command to allow working on network mounts, fixes #8231
...
2019-11-08 12:27:13 +01:00
Nils Adermann
e308f043b9
Fully switch to spl_object_hash in lock transaction
...
The pool builder tries to be minimal so it's fine for present/locked
packages not be assigned a solver/pool id. Adding a test to verify
correct creation of uninstall jobs
2019-11-07 21:18:09 +01:00
Nils Adermann
c50d236378
Correctly load branch aliases from lock file
...
Root aliases are also stored in the lock file, so on install do not read
them from composer.json.
2019-11-07 20:40:28 +01:00
Nils Adermann
2d37bb4116
Outated lock files now trigger an error requesting removal rather than being ignored silently
2019-11-07 17:38:16 +01:00
Nils Adermann
6925005ac9
Implement update mirrors/nothing/lock as its own installer mode
...
These special commands no longer (ab)use the partial update mechanism
but rather create a special install request for all current lock file
contents and later override any modified code references to the
originals. This leads to up to date remote metadata but no other
changes.
2019-11-07 17:35:44 +01:00
Jordi Boggiano
bc2a1d762a
Merge branch 'master' into 2.0
2019-10-30 08:54:44 +01:00
Nils Adermann
eaae360ce6
Correcting lock files in test cases and updating output
2019-10-30 00:55:11 +01:00
Nils Adermann
e6e317bc27
Fix test configurations, missing lock files, invalid ones
...
aliased alias test is failing because double alias is improperly
resolved now
2019-10-30 00:40:36 +01:00