1
0
Fork 0
Commit Graph

8988 Commits (8925b4f5969412997b1621ab9e477383ea6399db)

Author SHA1 Message Date
Jordi Boggiano 8925b4f596
Attempt fixing handling of root aliases when composer 1 reads composer 2 lock files, fixes #9337 2020-10-25 12:45:33 +01:00
Jordi Boggiano 6f79163a2a
Update changelog 2020-10-24 09:55:52 +02:00
Jordi Boggiano 25496c199d
Update link to composer 2 release notes 2020-10-24 09:43:02 +02:00
Jordi Boggiano 28c7e38411
Merge remote-tracking branch 'stof/fix_why_not' into 1.10 2020-10-24 09:39:09 +02:00
Jordi Boggiano 11e652061e
Merge pull request #9327 from naderman/backport-validate-provide-replace-req
Validate: Warn about providing or replacing packages you require
2020-10-24 09:32:49 +02:00
Jordi Boggiano 8883c1eb15
Merge pull request #9326 from naderman/docs-remove-simple-easy
Docs: Remove unnecessary uses of simple/easy
2020-10-24 09:27:04 +02:00
Nils Adermann e868996bdd Validate: Warn about providing or replacing packages you require 2020-10-23 22:02:13 +02:00
Nils Adermann b12b50c679 Docs: Remove unnecessary uses of simple/easy
They only serve to make anyone reading the docs who doesn't find
something as simple or easy as stated feel bad about themselves, they
don't add anything valuable to the docs in these cases.
2020-10-23 21:52:05 +02:00
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
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 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
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
Jordi Boggiano 7fda8433b1
Update schema to use anyOf instead of oneOf, fixes #9295 2020-10-16 11:27:59 +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 1d553a6795
Update changelog 2020-10-13 15:58:02 +02:00
Jordi Boggiano 47f69c0d3c
Merge pull request #9280 from nicolas-grekas/dev-version
Fix parsing "branch-version"
2020-10-13 15:45:25 +02:00
Nicolas Grekas 4feed8b85c Fix parsing "branch-version" 2020-10-13 15:43:12 +02:00
Jordi Boggiano fec3c6a4e9
Update changelog 2020-10-13 14:44:11 +02:00
Jordi Boggiano d2d606ced2
Merge pull request #9273 from nicolas-grekas/dev-version
Add support for "extra.branch-version"
2020-10-13 14:02:41 +02:00
Nicolas Grekas 893fbfcb89 Add support for "extra.branch-version" 2020-10-13 13:56:18 +02:00
Jordi Boggiano 4a8dbcd145
Fix set-env to use the new gh actions files 2020-10-13 11:17:42 +02:00
Jordi Boggiano bc1cb1636d
Remove dead code, fixes #9277 2020-10-12 15:22:21 +02:00
Jordi Boggiano 6bf136489f
Ignore the COMPOSER env var when executing global scope commands, fixes #9259 2020-10-12 10:53:35 +02:00
Jordi Boggiano 159bb84fa6
Allow running the config command to disable tls even if openssl is not present, fixes #9198 2020-10-12 08:16:36 +02:00
Jordi Boggiano 28fe3baf9c
Disable secure-http automatically when disable-tls is enabled, fixes #9235 2020-10-12 07:57:14 +02:00
Jordi Boggiano 2c6a9aba32
Update to latest semver 2020-10-08 14:29:20 +02:00
Jordi Boggiano 791bbc80a4
Backport some fixes from 2.0, and fix sorting to sort remote branches after local ones, refs #9270 2020-10-08 14:26:04 +02:00
Jordi Boggiano 6698e0bafa
Merge remote-tracking branch 'naderman/version-guess-remotes' into 1.10 2020-10-08 14:01:25 +02:00
Jordi Boggiano 6d8420644e
Merge pull request #9258 from lyrixx/patch-1
Fixed description of StatusCommand: It do list all changes in vendor, not only for "source" ones
2020-10-08 13:46:49 +02:00
Jordi Boggiano 13215cdb1d
Merge pull request #9272 from nicolas-grekas/fix-test
Fix VcsRepositoryTest
2020-10-08 13:40:15 +02:00
Nicolas Grekas f9913205dd Fix VcsRepositoryTest 2020-10-08 11:06:39 +02:00
Nils Adermann 89afb823b6 VersionGuesser: Add test for remote version guess 2020-10-07 15:21:04 +02:00
Nils Adermann 92722a9a4c VersionGuesser: Fix root package loader test which relies on git cmd in guesser 2020-10-07 15:11:08 +02:00
Nils Adermann b3c465d55a VersionGuesser: local branches still need to be considered 2020-10-07 15:10:20 +02:00
Nils Adermann db2f09a361 VersionGuesser: Update tests to match new git command generated 2020-10-07 14:25:55 +02:00
Nils Adermann ad643d9957 VersionGuesser: Analyze remote origin and upstream branches too 2020-10-07 14:21:22 +02:00
Grégoire Pineau bfb4abfb56
Fixed description of StatusCommand: It do list all changes in vendor, not only for "source" ones
I tested it, and even with "dist" packages, the status command is able to find modified vendor 
(And that's amazing, thanks)
2020-10-02 10:11:47 +02:00
Jordi Boggiano 23d42c6717
Merge pull request #9239 from stof/patch-1
Fix support for running diagnose without openssl
2020-09-24 11:38:15 +02:00
Jordi Boggiano d6b39b4c55
Fix syntax error & improve handling 2020-09-24 11:35:38 +02:00
Christophe Coevoet bcd8a73e8c
Fix support for running diagnose without openssl
The diagnose command already warns when openssl is not available. But the command was failing later when displaying the Openssl version.
2020-09-22 18:49:53 +02:00
Jordi Boggiano 44508319d1
Update semver and changelog 2020-09-09 11:46:28 +02:00
Jordi Boggiano 4a02768591
Fail hard if an invalid root alias is detected 2020-09-09 11:44:05 +02:00
Jordi Boggiano d61c1ccb7c
Update changelog 2020-09-08 22:58:48 +02:00
Jordi Boggiano a5f5838873
Update semver to latest 2020-09-08 22:57:43 +02:00
Jordi Boggiano f4f952f1ce
Update changelog 2020-09-08 16:53:29 +02:00
Jordi Boggiano e11d19c255
Update deps 2020-09-08 16:45:52 +02:00
Jordi Boggiano e6b45e853a
Fix status command handling of symlinks, and especially broken ones, fixes #9169 2020-09-07 13:54:14 +02:00