Jordi Boggiano
c04c42b7b4
Merge branch '1.10'
2020-11-05 16:37:59 +01:00
Jordi Boggiano
444b91a3ce
Add docs, refs #9422
2020-11-05 16:37:51 +01:00
Jordi Boggiano
3ffdd67e81
Fix running compiler in CI env
2020-11-05 15:00:54 +01:00
Jordi Boggiano
22fef8c51a
Make sure no files are missing from the phar, fixes #9421
2020-11-05 14:55:18 +01:00
Jakub Bouček
8dc5effee7
AutoloadGenerator: Send error HTTP status on error
2020-11-05 09:57:48 +01:00
Jordi Boggiano
56c65a58e2
Make platform-check only check non-dev requires, refs #9412
2020-11-04 23:41:58 +01:00
Jordi Boggiano
8c1355f448
Improve output of platform check further in case errors are hidden
2020-11-04 22:28:17 +01:00
Jordi Boggiano
ec960d12b0
Merge remote-tracking branch 'jakubboucek/feature/jb-platform-check-tigger-error'
2020-11-04 21:54:12 +01:00
Jordi Boggiano
6c31744c04
Disable full platform-check for extensions by default, now set to php-only, refs #9412
2020-11-04 21:50:06 +01:00
Jordi Boggiano
fc0d724938
Allow configuring gitlab deploy tokens via config command, refs #9373
2020-11-04 21:36:03 +01:00
Jordi Boggiano
04aad524ec
Fix gitlab-domains/github-domains to avoid overwriting the default when another domain is configured, refs #9373
2020-11-04 21:32:32 +01:00
Jordi Boggiano
abd61369e4
Revert "Support git@bitbucket.org URLs for git-bitbucket driver", fixes #9400
...
This reverts commit 985cef790f
.
2020-11-04 21:18:40 +01:00
Jordi Boggiano
52faa3cdfb
Merge pull request #9388 from JasonStephensTAMU/remove-windows-junction
...
Remove Windows junctions first in PathDownloader
2020-11-04 21:05:57 +01:00
Jakub Bouček
3f63bc9205
AutoloadGenerator: Trigger native PHP error on platform checks fails
2020-11-04 12:28:14 +01:00
johnstevenson
cda49323eb
Remove CURLOPT_SSL_FALSESTART option. Fixes #9405
2020-11-04 11:05:50 +00:00
Jakub Bouček
b83b186ac0
AutoloadGenerator: Send error HTTP status on error
2020-11-04 11:18:21 +01:00
Stephan Vock
0747b072be
RemoteFileSystem: don't throw zlib error on empty response
2020-11-03 16:01:40 +00:00
Tanel Pipar
8f454c6708
Remove CWD from only the beginning of a path in ZipArchiver
...
Fixes https://github.com/composer/composer/issues/9403
2020-11-03 12:01:48 +02:00
Jason Stephens
f486da4578
Remove junctions first in PathDownloader
...
When removing a package from a Path repository, ensure Windows junctions
are handled first. This avoids a potential problem using realpath() when
comparing dist and install paths.
See https://bugs.php.net/bug.php?id=77639
2020-11-02 08:30:15 -06:00
Ondřej Mirtes
48b23b1607
Simplify code in FileDownloader.php
2020-11-02 15:10:57 +01:00
Jordi Boggiano
1bf2df19dd
Avoid cleaning up $path in downloaders if it is the CWD (create-project use case), refs #9396
2020-11-02 13:53:44 +01:00
Jordi Boggiano
6cb0aff417
Fix issue preventing cleanup of vendor dir when it is nested in the install path on Windows, fixes #9396
2020-11-02 13:53:43 +01:00
zorn
5aa90baab1
Add new lines to platform reqs issues
2020-11-01 23:39:06 +10:00
Jordi Boggiano
52f98fd228
Merge branch '1.10'
2020-10-30 17:56:22 +01:00
Marco Sirabella
7f936d7dbc
Ignore failures on preg_match for user supplied regex
...
Fixes #7440
See: https://stackoverflow.com/a/12941133/6381767
2020-10-30 17:56:18 +01:00
Jordi Boggiano
36a9c47830
Fix typo from a637072058
2020-10-30 17:52:29 +01:00
Jordi Boggiano
a637072058
Fix canUseCurl logic to allow local_cert/local_pk to reach curl, refs #9384
2020-10-30 17:48:54 +01:00
Jordi Boggiano
ce7cc3b444
Merge remote-tracking branch 'rtm-ctrlz/master'
2020-10-30 17:48:07 +01:00
Jordi Boggiano
0a356b8a39
Merge branch '1.10'
2020-10-30 17:30:33 +01:00
Jordi Boggiano
78797df5f8
Fix bitbucket handling, fixes #9369
2020-10-30 17:28:30 +01:00
Jordi Boggiano
d25e66ad53
Display auth again for an origin if the auth type changes
2020-10-30 17:15:40 +01:00
Jordi Boggiano
985cef790f
Support git@bitbucket.org URLs for git-bitbucket driver
2020-10-30 17:15:25 +01:00
Jordi Boggiano
1d7ed333c9
Make sure curl is only used when safe to do so, fixes #9381
2020-10-30 16:20:50 +01:00
Jordi Boggiano
8f9486b20e
redirects are handled in userland now so no need for this hack anymore
2020-10-30 15:30:19 +01:00
Jordi Boggiano
e0e4d60166
Fix check-platform-reqs to be more clear about what is going on, and add a --lock flag to allow explicitly checking from lock
2020-10-30 15:05:29 +01:00
Ilia Urvachev
4faaf79b58
CurlDownloader enable support for SSL-client certificates
2020-10-30 17:03:21 +03:00
Jordi Boggiano
3f8f549352
Add new flag to ConfigSourceInterface as most likely there are no implementors anyway
2020-10-30 14:22:57 +01:00
Jordi Boggiano
f2f3b03fec
Fix config/create-project handling of repositories to prepend them by default as this is most likely the goal, fixes #9371
2020-10-30 14:16:40 +01:00
Jordi Boggiano
ffc0f86fc0
Fix warnings in composer require to show when repo prio is at fault, refs #9371
2020-10-30 14:16:40 +01:00
Jordi Boggiano
41daf69c87
Merge pull request #9379 from glaubinix/f/zip-util
...
Zip: ignore mac osx specific folder when searching for composer.json
2020-10-30 10:48:31 +01:00
Jordi Boggiano
34bdc6cbf2
Detect and hint for solutions for common curl errors, fixes #9376
2020-10-30 09:56:58 +01:00
Stephan Vock
d97c37f103
Zip: ignore mac osx specific folder when searching for composer.json
2020-10-29 22:30:12 +00:00
Jordi Boggiano
472f78bff1
Auto-disable misbehaving curl downloader on php 5, refs #9002
2020-10-29 22:39:26 +01:00
johnstevenson
095d133d6b
Remove fulluri checks and tidy diagnose output
2020-10-29 10:28:51 +00:00
Jordi Boggiano
90a6aa7ec0
Make sure we compare packages to their latest without aliases, fixes #9357
2020-10-27 21:04:00 +01:00
Jordi Boggiano
04e5d725f4
Add docs
2020-10-27 20:53:54 +01:00
Jordi Boggiano
ff74d0e686
Fix lock file generation with dev-master aliases to be compatible with Composer 1, fixes #9337
2020-10-27 20:50:26 +01:00
Jordi Boggiano
881ec8c751
Use httpdownloader/curl to process install notifications
2020-10-27 13:50:03 +01:00
Jordi Boggiano
d699e6b36c
Make sure global plugins are described as such in loading output, fixes composer/package-versions-deprecated#15
2020-10-27 09:36:59 +01:00
Jordi Boggiano
5d4bcde454
Allow using --locked with the outdated command directly, fixes #8025
2020-10-26 14:47:52 +01:00
Nils Adermann
289972a177
Remove useless null check, follow up to #9345
2020-10-26 13:29:23 +01:00
Jordi Boggiano
3772696ad6
Use IO for output
2020-10-26 12:34:27 +01:00
Nils Adermann
cbcc3a3080
Remove trailing commas for function calls
2020-10-26 11:42:41 +01:00
Fabien Potencier
d5245387f3
Fix error message
2020-10-26 10:04:10 +01:00
Nils Adermann
b72dc7bb78
Clarify --lock option on update further
...
Specifically state packages do not get updated to new versions, only metadata is updated.
2020-10-25 22:42:50 +01:00
Jordi Boggiano
860a67b776
Update --lock docs, fixes #9315
2020-10-25 22:25:59 +01:00
Jordi Boggiano
4b8c2aa121
Fix default version to be semver parseable, fixes #9342
2020-10-25 22:22:19 +01:00
Jordi Boggiano
5bdb0cfff5
Merge pull request #9339 from Seldaek/fix-plugin-order
...
Fix plugin install order for plugins modifying downloads
2020-10-25 21:28:38 +01:00
Jordi Boggiano
769ce48289
Fix typo
2020-10-25 21:25:56 +01:00
Jordi Boggiano
0543b59e06
Merge pull request #9334 from johnstevenson/proxy-streams
...
Improve proxy error messages for streams
2020-10-25 14:13:40 +01:00
Jordi Boggiano
e770cb4dcf
Fix var name
2020-10-25 14:11:02 +01:00
Jordi Boggiano
2d4e1e0dce
Make sure Transaction sorts operations correctly to begin with
2020-10-25 14:06:45 +01:00
johnstevenson
c99e19db64
Fix logic (again)
2020-10-25 12:59:01 +00:00
Jordi Boggiano
dc88236c07
Make sure operations are executed in batches, including downloads, when a plugin is present which modifies downloads, fixes #9333
2020-10-25 13:49:31 +01:00
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
Helmut Hummel
d1dfd394c1
Correctly avoid partial updates in require commands
...
The installer does not support partial updates, when
no lock file is present. The check in require command
to prevent a partial update however does not check whether
a lock file is present, but whether a lock file should be written,
which most likely always is true.
This check is now changed to check if a lock file is actually present.
2020-10-24 21:34:34 +02:00
Jordi Boggiano
9bfddadf3d
Make sure no unknown files get excluded from the phar, fixes #9331
2020-10-24 20:49:07 +02:00
johnstevenson
2a913c7a68
Improve proxy error messages for streams
2020-10-24 18:20:31 +01:00
Jordi Boggiano
b4f0f4ddd2
Fix php8 file being missing from phar, refs #9331
2020-10-24 14:58:05 +02:00
Jordi Boggiano
191196de48
Detect broken packagist.org mirrors and fix them on the fly, refs #9297
2020-10-24 11:10:08 +02:00
Jordi Boggiano
62eff8e979
Tweaks to new proxying code, refs #9324
2020-10-24 10:36:39 +02:00
Jordi Boggiano
62fd612e63
Merge remote-tracking branch 'johnstevenson/curl-proxy'
2020-10-24 10:22:52 +02:00
Jordi Boggiano
0d236858ec
Merge branch '1.10'
2020-10-24 09:59:46 +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
johnstevenson
d47261eb93
Refactor proxy handling for Composer2
2020-10-23 21:38:29 +01:00
Nils Adermann
e868996bdd
Validate: Warn about providing or replacing packages you require
2020-10-23 22:02:13 +02:00
Jordi Boggiano
8564dd8dac
Allow Url::sanitize to escape URLs without scheme
2020-10-23 13:27:46 +02:00
johnstevenson
8feb83b22b
Remove duplicate StreamContextFactory ssl options
...
Added in Dec 2014 (commit 8dad846
), superseded in Jan 2016 (pr #4759 )
2020-10-23 13:25:17 +02:00
Jordi Boggiano
49a28f606c
Merge branch '1.10'
2020-10-23 10:38:03 +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
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
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
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
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
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
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
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
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