21ab2f85bb
Fix 7.4 build
2020-02-07 23:21:48 +01:00
589abb06a3
PHPStan fixes
2020-02-07 23:10:10 +01:00
45ecbae8f5
Merge branch 'master' into 2.0
2020-02-07 22:20:51 +01:00
a9bace37f6
fix windows build
2020-02-07 15:18:18 +08:00
58b34d13e8
fix risky tests (without any assertion)
2020-02-07 14:35:07 +08:00
db32d6bc18
do not use env
2020-02-07 13:07:01 +08:00
a2137d5263
use Symfony PHPUnit Bridge
2020-02-07 12:22:22 +08:00
006c3de542
Fix tests and make TTY usage on ProcessExecutor cleaner
2020-01-31 16:33:34 +01:00
2f4ea3a463
Fix show command, refactor RepositorySet constructor
2020-01-30 20:21:17 +01:00
189d5adab0
Fix reporting of replace conflicts to not mention provides
2020-01-30 17:13:12 +01:00
ec90c17e3b
Fix conflict order to be more accurate
2020-01-30 15:55:37 +01:00
1e68555e0a
Sanitize URLs in getRepoName and centralize the Url sanitization process
2020-01-30 15:50:46 +01:00
c41df325d8
Remove RepositorySet from Solver and remove getPool from RepositorySet
2020-01-30 15:23:22 +01:00
f982a10447
Update after rebase
2020-01-30 14:52:47 +01:00
1d4cdb60d0
Improve error reporting for conflicts/replaces of various kinds, fixes #7254
2020-01-30 14:43:56 +01:00
6c9d9e775c
Clean up and deduplicate the output of RULE_LEARNED
2020-01-30 14:43:56 +01:00
e6029d725a
Add individual test checking for clashes between requirements at root and transitive dependency level
2020-01-30 14:43:55 +01:00
3fc7e10c5c
Improve error reporting of solver issues, refs #7779
...
Fixes #8525
Fixes #6513
2020-01-30 14:43:54 +01:00
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
3f48acf56a
Add test checking references update to latest and remove TODO
2020-01-28 16:01:17 +01:00
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
7e6fe585bc
Merge branch 'master' into 2.0
2020-01-28 14:22:25 +01:00
fb93036a70
Fix putenv to avoid leaving the environment in a dirty state
2020-01-28 14:22:11 +01:00
8584d15e8c
Merge branch 'master' into 2.0
2020-01-28 14:04:27 +01:00
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
0b4e8952f6
PHP5 disallows require as a function name, use requireName analog to fixPackage
2020-01-19 23:28:00 +01:00
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
921a97457d
Add PoolBuilder test harness for writing .test files
2020-01-19 19:46:16 +01:00
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
ebe910c3a5
Tweak test to follow changes
2020-01-17 15:16:01 +01:00
b5e34ca767
Fix remove tests
2020-01-17 14:57:33 +01:00
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
de189c1b80
Fix deps=high build
2020-01-17 11:56:23 +01:00
7a4d3e6f25
Fix SolverTest
2020-01-15 15:03:11 +01:00
dd556f989b
Use LockArrayRepository instead of RepositoryInterface to clearly indicate which type of repo it is in some places
2020-01-15 14:56:58 +01:00
6c24e85e54
Merge pull request #8528 from Seldaek/repo-prio-fix
...
Avoid loading packages found in a higher prio repo entirely from lower prio repos
2020-01-15 14:55:25 +01:00
f68731e663
Remove package/repo priority concept as it is enforced by the pool builder now
2020-01-15 14:52:44 +01:00
30b6a41035
Extract MetadataMinifier util
2020-01-15 12:58:30 +01:00
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
4a7d42604f
Fix tests
2020-01-14 16:27:16 +01:00
40f5806a7c
Fix ComposerRepo issue
2020-01-14 16:20:31 +01:00
f91859ceff
Fix expectation
2020-01-14 15:46:58 +01:00
a5b178084c
Merge branch 'master' into 2.0
2020-01-14 15:39:35 +01:00
78217e2313
Merge branch '1.9'
2020-01-14 12:52:32 +01:00
a2dadb91bf
Return two packages in PathRepository when on a feature branch, one for feature branch and one for the source branch it came from, fixes #8498 , fixes #8477
2020-01-14 12:52:20 +01:00
a902279a5b
Merge branch '1.9'
2020-01-14 09:32:27 +01:00
3791a574a2
Provide partial packages names if available, closes #8516 , fixes #8526
2020-01-14 09:31:57 +01:00
ee3fd0f745
Merge remote-tracking branch 'adrianosferreira/package-install-method-cli'
...
Fixed formatting, and handling of config command to be preferred-install.foo value
Refs #8517
2020-01-13 18:18:18 +01:00
f203b3eb41
Merge remote-tracking branch 'adrianosferreira/add-suggest-in-json-by-cli'
2020-01-13 17:36:10 +01:00
c43137db3f
Merge branch '1.9'
2020-01-13 15:50:39 +01:00
Jordi Boggiano