1
0
Fork 0
Commit Graph

10622 Commits (5456cf81971b897ee82f75e82d2bcc3ad0bc6b84)

Author SHA1 Message Date
Tanel Pipar 4d05cbffe3 Remove CWD from only the beginning of a path in ZipArchiver
Fixes https://github.com/composer/composer/issues/9403
2020-11-03 12:04:02 +02: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
Jordi Boggiano cdd7460f9f
Merge pull request #9397 from ondrejmirtes/patch-1
Simplify code in FileDownloader.php
2020-11-02 21:22:42 +01: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
Jordi Boggiano feb667e9bd
Merge pull request #9395 from zorn-v/nl-platform-req
Add new lines to platform reqs issues
2020-11-02 13:22:30 +01:00
zorn 5aa90baab1 Add new lines to platform reqs issues 2020-11-01 23:39:06 +10:00
Jordi Boggiano 3daa174bc1
Merge pull request #9391 from Rowayda-Khayri/fixes
Add a missing punctuation mark in README
2020-10-31 20:47:12 +01:00
rowayda_khayri 22e22894e8 Add a missing punctuation mark in README 2020-10-31 14:41:41 +02:00
Jordi Boggiano 5ad3d5aaf4
Update changelog 2020-10-30 22:38:53 +01:00
Jordi Boggiano da73ef1ba6
Merge branch '1.10' 2020-10-30 22:33:03 +01:00
Jordi Boggiano f303419f35
Update changelog 2020-10-30 22:31:38 +01:00
Jordi Boggiano 28e591dcd4
Merge pull request #9387 from studioromeo/fix-git-non-master-default-failing-tests
Fix git init -b being unavailable for older versions
2020-10-30 18:03:00 +01:00
Robert Rhoades 2ced7b0bf8 Fix git init -b being unavailable for older versions
On older versions of git init doesn't have the -b flag. That
was introduced in v2.28.0.

Instead switch to using git checkout -b which has much
wider support (2.4.12 was as far back as I could check on
the docs).
2020-10-30 16:58:32 +00: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 372af31d23
Fix tests 2020-10-30 17:40:35 +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 da90410181
Fix links 2020-10-30 14:39:37 +01: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 097ef425f5
Merge pull request #9378 from studioromeo/fix-git-non-master-default-failing-tests
Fix running tests with non standard default branch
2020-10-30 10:35:13 +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
Robert Rhoades e6c7ab693e Fix running tests with non standard default branch
When the global git config has init.defaultbranch set to
something other than master the tests fail. This is because
the tests assume that the default branch is called master
but that may not be the case.

This fixes the tests by ensuring that when running git init
we ensure the default branch is called master regardless of
how git is configured.
2020-10-29 21:16:11 +00:00
Jordi Boggiano 51685580c7
Merge pull request #9374 from johnstevenson/diagnose1
Remove fulluri checks and tidy diagnose output
2020-10-29 17:16:33 +01:00
johnstevenson 095d133d6b Remove fulluri checks and tidy diagnose output 2020-10-29 10:28:51 +00:00
Jordi Boggiano ec5f020186
Update changelog 2020-10-28 15:50:42 +01:00
Nils Adermann 2d91fbc65a PoolBuilder: never mark skipped packages for loading
Reorder code in loadPackage to avoid duplicate calls
2020-10-28 14:07:04 +01:00
Nils Adermann 63bed40818 PoolBuilderTest: Add a dependency which must not be loaded on unlock 2020-10-27 22:18:05 +01:00
Nils Adermann 7ddd1c64af PoolBuilder: On unlock ensure consider all locked requirements for unlocked package 2020-10-27 22:10:15 +01:00
Nils Adermann ea42d13f37 PoolBuilderTest: check locked constraints are considered on partial update 2020-10-27 21:59:12 +01: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 86072a705b
Merge branch '1.10' 2020-10-27 20:55:27 +01:00
Jordi Boggiano 04e5d725f4
Add docs 2020-10-27 20:53:54 +01:00