1
0
Fork 0
Commit Graph

10302 Commits (456096d5fff9cb6b01591e80a481831e7a536c84)

Author SHA1 Message Date
Christophe Coevoet 3dd7e829b9 Fix support of provided packages in the why-not command
The version provided by such a rule is defined by the constraint of the
rule, not by the package version.
2020-10-22 19:54:03 +02:00
Michael McMahon d4e818c22f
Setting permissions prevents a warning from swapon
Warning text:
```
/sbin/swapon /var/swap.1
swapon: /var/swap.1: insecure permissions 0644, 0600 suggested.
```
2020-10-22 17:50:35 +00:00
Jordi Boggiano 447416a357
Fix typo 2020-10-22 16:16:02 +02:00
Nils Adermann dacc21e54f
Merge pull request #9158 from infabo/patch-1
Fix symlink check
2020-10-22 16:04:27 +02:00
Jordi Boggiano 5f6c6216e0
Merge pull request #9321 from stof/patch-1
Enhance the doc about provide to reduce mistakes
2020-10-22 15:51:47 +02:00
Jordi Boggiano ccac664da1
Merge pull request #9320 from ruudk/patch-1
Specify unit for `process-timeout` config in docs
2020-10-22 15:51:00 +02:00
Jordi Boggiano 94e7ed4f05
Merge pull request #9305 from TerryKern/patch-1
Improve readability of version info message
2020-10-22 15:32:30 +02:00
Christophe Coevoet 8e9262f129
Enhance the doc about provide to reduce mistakes 2020-10-22 15:13:01 +02:00
Ruud Kamphuis 0234b13817
Specify unit for `process-timeout` config in docs 2020-10-22 14:43:26 +02:00
terry.kern 0466add822 Also use channel string for update message
https://github.com/composer/composer/pull/9305#issuecomment-714381153
2020-10-22 14:41:16 +02:00
TerryKern e68b52697b Improve readability of version info message
Instead of:

> You are already using composer version 1.10.15 (1 channel).

it shows:

> You are already using composer version 1.10.15 (1.x channel).
2020-10-22 11:54:59 +02:00
Nils Adermann 6409ed0fc2 Validate: Warn about providing or replacing packages you require 2020-10-22 11:28:19 +02:00
Jordi Boggiano 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
Nils Adermann 1d6c0865ca Test: Verify replacing a package required by the same package satisfies the dep 2020-10-22 10:32:04 +02:00
Jordi Boggiano 50d0e3d3fa
Merge pull request #8733 from naderman/fix-solver-bug-exception-7665
Test for issue resulting in overly long learnt rules and solver bug exception
2020-10-22 10:30:46 +02:00
Nils Adermann 290450214e Test: Verify require for package provided by pkg itself is used 2020-10-22 10:26:28 +02:00
Nils Adermann c0236c5ed2 Move slow integration test to separate fixtures directory and add to slow group 2020-10-22 10:14:17 +02:00
Nils Adermann c37dce0bb3 Remove unnecessary hhvm conflict rules from test 2020-10-22 10:02:09 +02:00
Nils Adermann 2468cd20dd Update test case for github issue 7665 to have correct output 2020-10-22 09:44:16 +02:00
Nils Adermann e11f52c041 Add a test to reproduce github issue #7665 2020-10-22 09:44:16 +02:00
Jordi Boggiano 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
Jordi Boggiano 7cfb6dadf0
Merge pull request #9312 from naderman/fix-solver-9012
Solver: Prevent infinite recursion in analyzeUnsolvableRule
2020-10-21 18:36:10 +02:00
Nils Adermann 9338401be7 CS: Typehint array, remove unnecessary docblock, call spl_object_hash once 2020-10-21 18:11:24 +02:00
Nils Adermann 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
Nils Adermann 6e8e5f6ba6
Merge pull request #9310 from naderman/fix-solver-8903
SolverProblemException: Hide learnt rules on output
2020-10-21 17:01:12 +02:00
Nils Adermann 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
Nils Adermann 7f41698157 Solver: on analyze, when reaching last decision > l1 skip other multi rule literals 2020-10-21 13:36:31 +02:00
Nils Adermann 853305063d Add test case for github issue 9290 2020-10-21 13:33:39 +02:00
Jordi Boggiano 14ec957e96
Fix composer show -a usage, fixes #9304 2020-10-20 17:34:07 +02:00
Jordi Boggiano 99a5469b5e
More hints 2020-10-18 13:13:44 +02:00
Jordi Boggiano 08ad53f9fb
Merge branch '1.10' 2020-10-16 11:28:07 +02:00
Jordi Boggiano 7fda8433b1
Update schema to use anyOf instead of oneOf, fixes #9295 2020-10-16 11:27:59 +02:00
Jordi Boggiano 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
Jordi Boggiano c01e3bd2f0
Make async test more robust 2020-10-16 11:23:03 +02:00
Chauncey McAskill fcc072fdb6 Add test to check processed URL and cache key 2020-10-15 23:46:12 -04:00
Chauncey McAskill 1bb87babe6 Fix availability of $urls in FileDownloader
Fixed:
- Ensure manipulations to the first element of $urls in the $download callback are available in $accept and $reject
2020-10-15 16:11:16 -04:00
Jordi Boggiano c46b75de81
Allow any non-numeric version to be used for flex as we can not establish if they are compatible 2020-10-15 16:16:00 +02:00
Jordi Boggiano 59acf9d4aa
Remove dev hint for 2.0, fixes #8738 2020-10-15 14:40:27 +02:00
Ingo Fabbri 750172dc4c
Fix symlink check
Given you have a symlink in one of your path repositories and mirroring-strategy enabled.

```bash
lrwxrwxrwx 1 inf inf    8 27. Aug 17:41 Create.html -> New.html
-rw-r--r-- 1 inf inf  750 27. Aug 17:24 Edit.html
-rw-r--r-- 1 inf inf    0 27. Aug 17:24 List.html
-rw-r--r-- 1 inf inf 5064 27. Aug 17:24 New.html
-rw-r--r-- 1 inf inf  716 27. Aug 17:24 Show.html
```

`$file->getLinkTarget()` just returns a relative path in this example. It does not return an absolute normalized path.
`$sources` is always a normalized path.

`strpos` can never be `0`.

Use `$file->getRealPath()` to fix the strpos-check.
2020-10-15 14:17:53 +02:00
Jordi Boggiano 2ca2ec3d0a
Allow loading flex main branch 2020-10-15 09:53:12 +02:00
Jordi Boggiano df863f8860
Update repo docs 2020-10-14 21:18:56 +02:00
Jordi Boggiano 7ca3847fa3
Update changelog 2020-10-14 17:58:36 +02:00
Jordi Boggiano 743d551399
Fix using show command to show platform packages, and allow using it to show replacers too by using the replaced name, fixes #7628 2020-10-14 17:58:35 +02:00
Jordi Boggiano 8e888bec78
Merge pull request #9286 from bezpiatovs/refactored-operations
Refactor Operations classes to get rid of explicit strings comparison
2020-10-14 17:57:49 +02:00
Jordi Boggiano 8d0596163c
Rename abstract class back to the previously present SolverOperation, mark it internal, reintroduce some duplication 2020-10-14 17:53:57 +02:00
Bezpiatov 140de5480d Fixed variable usage 2020-10-14 17:58:39 +03:00
Bezpiatov 9a5121ed27 Refactor Operation classes to use constants instead of strings for comparison 2020-10-14 17:56:42 +03:00
Jordi Boggiano e7d99c37b3
Fix show --locked to avoid listing all the things 2020-10-14 15:41:53 +02:00
Jordi Boggiano da1357c663
Avoid showing alias versions in show command, show the original version 2020-10-14 15:41:36 +02:00
Jordi Boggiano 7e223104c7
Merge pull request #9283 from PrinsFrank/update-authentication-methods-in-documentation
Update authentication methods in documentation
2020-10-14 14:47:28 +02:00