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
29efc473a1
Suggest which providers could be required to fulfill a virtual package requirement, fixes #2811
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
f611c641db
Merge pull request #8561 from Seldaek/allow-providers-even-on-match
...
Allow providers which are selected to be installed in place of existing packages which do not satisfy requirements
2020-01-30 14:22:42 +01:00
Jordi Boggiano
46e35bc8d7
Fix 5.3/undef var issues
2020-01-30 14:17:49 +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
2901995fc8
Fix issue excluding unstable packages when stabilityFlags are empty
2020-01-30 10:17:42 +01:00
Jordi Boggiano
8f09f3764b
Avoid fetching non-existing files multiple times
2020-01-30 08:40:35 +01:00
Jordi Boggiano
d18b5b6f2e
Update phpstan config
2020-01-29 23:13:55 +01:00
Jordi Boggiano
39fb2cc51c
Fix case
2020-01-28 16:04:11 +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
41720e9b70
Show abandoned warnings from the locked repo
2020-01-28 15:56:52 +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
Jordi Boggiano
173b96de2d
Make sure the first require does not fail due to a missing lock file
2020-01-28 15:13:35 +01:00
Jordi Boggiano
7e6fe585bc
Merge branch 'master' into 2.0
2020-01-28 14:22:25 +01:00
Jordi Boggiano
fb93036a70
Fix putenv to avoid leaving the environment in a dirty state
2020-01-28 14:22:11 +01:00
Jordi Boggiano
8584d15e8c
Merge branch 'master' into 2.0
2020-01-28 14:04:27 +01:00
Jordi Boggiano
94dce37424
Avoid use of refs and avoid a false path when showing the root package, refs #8545
2020-01-28 13:52:34 +01:00
Jordi Boggiano
9db08f9883
Merge remote-tracking branch 'Serializator/feature/show-package-json'
2020-01-28 12:57:34 +01:00
Jordi Boggiano
e9c7e253f4
Merge pull request #8529 from vitalyzhakov/master
...
Change only modified files for docker caching
2020-01-28 11:31:40 +01:00
Jordi Boggiano
1287a7a611
Merge pull request #8538 from adrianosferreira/add-vendor-bin-for-each-event
...
Append the bin dir on each listener iteration
2020-01-28 11:29:22 +01:00
Julian van den Berkmortel
933fe27cd5
Add support for "composer show --format=json <package>" #8544
2020-01-21 23:07:54 +01:00
Жаков Виталий
ccd8be382b
comments for #2764
2020-01-21 11:10:18 +05:00
Жаков Виталий
415cf9fd50
Merge branch 'master' of https://github.com/composer/composer
2020-01-21 11:06:56 +05:00
Жаков Виталий
48c7442b63
should be || not OR
2020-01-20 16:25:38 +05:00
Adriano Ferreira
acc040f745
Append the bin dir on each listener iteration
...
The "composer install" can create the vendor/dir folders and be used as a script item on composer.json. Having another script running after it that relies on vendor/bir binaries (such as phpunit) will cause it to not find the binary. This fix addresses the issue by trying to append the path on each script iteration.
2020-01-20 08:11:08 -02:00
Nils Adermann
a8963cc0e2
Merge pull request #8537 from naderman/remove-jobs-just-require
...
Request jobs replaced by root require / fixed package
2020-01-20 10:46:45 +01:00
Nils Adermann
8b877eb068
Remove superfluous check in Problem
2020-01-20 10:27:04 +01:00
Nils Adermann
0b4e8952f6
PHP5 disallows require as a function name, use requireName analog to fixPackage
2020-01-19 23:28:00 +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
921a97457d
Add PoolBuilder test harness for writing .test files
2020-01-19 19:46:16 +01:00
Jordi Boggiano
88cff792cc
Merge pull request #8534 from pweyck/normalize-rc-to-RC-in-init
...
Normalize minimum-stability `rc` to `RC` in `InitCommand`
2020-01-18 13:54:01 +01:00
Jordi Boggiano
b1c0d7fb61
Merge pull request #8533 from Seldaek/remove-stability-callback
...
Remove callback and pass stabilities all the way instead
2020-01-17 15:57:27 +01:00
Jordi Boggiano
1d31190472
Keep track of unacceptable fixed packages for later to use in error reporting and make sure the pool state is consistent
2020-01-17 15:48:31 +01:00
Жаков Виталий
1e92780600
operations case touch
2020-01-17 19:37:39 +05:00
Jordi Boggiano
c6a3f48eaf
Remove some more remove request handling
2020-01-17 15:35:37 +01:00
Patrick Weyck
7d7e3d594b
Normalize minimum-stability `rc` to `RC` in `InitCommand`
...
A `minimum-stability` of `rc` is valid according to
`composer-schema.json` and works fine with install and update and
generally in version comparisons, because it's normalized to `RC`.
This commit makes it work in `InitCommand` and `RequireCommand` too.
2020-01-17 15:34:18 +01:00
Jordi Boggiano
7cc8a4aed8
Avoid checking stability on platform packages too
2020-01-17 15:29:30 +01:00
Jordi Boggiano
ebe910c3a5
Tweak test to follow changes
2020-01-17 15:16:01 +01:00
Jordi Boggiano
6dc576738a
Avoid partial updates from applying changes to packages which are not locked with an acceptable stability
2020-01-17 15:15:46 +01:00
Jordi Boggiano
b5e34ca767
Fix remove tests
2020-01-17 14:57:33 +01:00
Jordi Boggiano
e162cc6f0a
Remove "remove" from request
2020-01-17 14:57:32 +01:00
Jordi Boggiano
304753ff69
Remove callback and pass stabilities all the way instead
...
This allows optimizing the loading of ~dev files, and cleans up a few things
2020-01-17 14:57:32 +01:00
Jordi Boggiano
98860b8619
Fix show command when no package is found
2020-01-17 14:52:28 +01:00
Jordi Boggiano
8bb472a608
No need to alias platform packages before the repository set as the pool builder already does it
2020-01-17 14:52:28 +01:00
Jordi Boggiano
b9d00153d9
Suggest using -p when a platform package can not be found in show command
2020-01-17 14:52:07 +01:00
Jordi Boggiano
79c59805ad
Merge pull request #8531 from Seldaek/pool-builder-tweaks
...
Pool builder cleanups
2020-01-17 14:31:45 +01:00