Jordi Boggiano
92b3725765
Workaround issues when the additional fixed repo is in used and is an installed repo, closes #9574
2021-01-12 11:53:41 +01:00
Jordi Boggiano
b021647e6f
Fix JSON manipulation issue with large files and jit enabled, fixes #9595
2021-01-12 11:02:43 +01:00
Wissem Riahi
f7bf635440
Add response info for 3xx/4xx/5xx http responses
2021-01-08 11:28:35 +01:00
Jordi Boggiano
296bab1292
Merge pull request #9592 from wissem/add-response-duration-http-requests
...
Add response info for HTTP requests in CurlDownloader
2021-01-07 23:28:44 +01:00
Jordi Boggiano
7f85367113
Make sure an array is always returned
2021-01-07 23:26:29 +01:00
Wissem Riahi
bdecb4711d
Add all curl_getinfo into the response and exception for curl requests
2021-01-07 12:01:19 +01:00
Wissem Riahi
a5d79db0a7
Make sure total_time_us from curl progress is set
2021-01-06 18:01:06 +01:00
Wissem Riahi
370e082b4a
Add saving time duration for curl HTTP requests
2021-01-06 16:05:00 +01:00
Ilya Urvachev
cee8e3e3b7
fix `dirname` usage
2021-01-06 15:21:45 +03:00
Ilya Urvachev
ab6e0fa961
use `.tmp` extension for temporary files
...
also updated `catch` block to use temporary filename
2021-01-06 02:17:34 +03:00
Ilya Urvachev
e829ff80bc
feat(Cache): make cache writes more atomic
...
Fixes #9568
2020-12-29 23:57:29 +03:00
Jordi Boggiano
bad4e4edbc
Fix some more wording
2020-12-27 20:51:22 +01:00
Ali Shaikh
6f5c4fcf3e
Improving Composer self-update (version upto date) info message
2020-12-27 12:20:55 +05:00
Jordi Boggiano
bc31351b5b
Only show getting started warning for non-global composer load
2020-12-15 20:39:50 +01:00
Jordi Boggiano
eb9616a82b
Debug info improvements
2020-12-15 14:55:44 +01:00
Jordi Boggiano
378a5b72b9
More open_basedir fixes, refs #9541
2020-12-04 10:50:19 +01:00
Jordi Boggiano
f25271ee22
Add missing file to v1 phar
2020-12-04 09:05:58 +01:00
Jordi Boggiano
3eb419d2d0
Fix is_dir check to not fail on open_basedir restrictions, fixes #9541
2020-12-03 21:35:23 +01:00
Jordi Boggiano
29f4c0b92a
Merge branch '1.10'
2020-12-03 17:17:25 +01:00
Jordi Boggiano
7f3a56f39b
Merge pull request #9360 from naderman/pool-builder-unlock-consider-all-constraints
...
PoolBuilder: Ensure versions matching locked constraints get loaded
2020-12-03 16:59:39 +01:00
Fabien Villepinte
4e8ca92b6f
Fix error with binaries in PHP8
2020-12-02 13:15:16 +00:00
Michael Voříšek
b4cb2f7321
test before chdir
2020-11-30 01:34:16 +01:00
Michael Voříšek
e712130062
Fix for php8 when symlink function is disabled
2020-11-30 00:59:42 +01:00
Jordi Boggiano
1fb6b03e03
Fix a few edge cases in unpushed change handling
2020-11-26 16:03:38 +01:00
Jordi Boggiano
f86b3ad0fe
Make sure all remotes are checked for unpushed changes, fixes #9486
2020-11-26 15:42:39 +01:00
Jordi Boggiano
00aaffb8f9
Make cache writes atomic
2020-11-26 14:28:58 +01:00
Jordi Boggiano
62bd81bf7a
Make sure the default branch alias is never used as a constraint by the VersionSelector
2020-11-26 14:24:22 +01:00
Jordi Boggiano
d00edab884
Merge pull request #9477 from naderman/fix-alias-conflicts
...
Explicit conflicts should conflict with aliases of packages too
2020-11-26 13:59:57 +01:00
Jordi Boggiano
be3a520331
Fix feedback
2020-11-26 13:07:33 +01:00
Nils Adermann
7197278fe9
Always install aliases together with their original package
...
Restores some Composer 1.x behavior like unbound constraints conflicting
with default branches unless they are branch aliased.
Simplifies conflicts with aliases because packages cannot be installed
without their aliases, so we do not need to know which aliases are
uninstalled in lock file or installed.json.
2020-11-26 12:10:07 +01:00
Jordi Boggiano
e857a8216c
Make sure mirror update fails if no lock file is present
2020-11-26 11:28:17 +01:00
Jordi Boggiano
2d025dce05
Make sure mirror updates do not fail if there are dev requirements and new requires are present, fixes #9514
2020-11-26 11:27:44 +01:00
Jordi Boggiano
08f0af4623
Add docblocks to HttpDownloader, refs #9209
2020-11-25 15:44:59 +01:00
Jordi Boggiano
e8a3a33023
Also output headers
2020-11-25 12:40:05 +01:00
Jordi Boggiano
8030fbc4ae
Add debug info for http status code 0
2020-11-25 12:37:28 +01:00
Jordi Boggiano
b7d770659b
CS fixes
2020-11-22 14:52:39 +01:00
Jordi Boggiano
c7da7e55c9
Fix various issues with regard to schema conformity when modifying json, fixes #9515
2020-11-22 14:26:18 +01:00
Andrés De la Cruz
480a6439fd
Fix phpstan phpdocs issues ( #9478 )
2020-11-20 09:28:09 +01:00
Jordi Boggiano
9e279740cd
Go go phpstan 🤞
2020-11-19 11:28:12 +01:00
Jordi Boggiano
742c2a9e93
Avoid swallowing exceptions
2020-11-19 10:32:09 +01:00
Jordi Boggiano
35b403b266
Make sure a version not found issue is reported as such for clarity, fixes #9500
2020-11-19 09:39:03 +01:00
Jordi Boggiano
351b14e32b
Installed repo contains only the required versions but the aliases are not always present at the right time so avoid looking up plugin dependencies using a constraint as it may not find dev-* packages even though they are there, fixes #9499
2020-11-18 22:33:34 +01:00
Jordi Boggiano
f567fd69eb
List both unzip and zip ext presence in diagnose
2020-11-18 22:33:33 +01:00
Jordi Boggiano
5248d6c9f1
Improve curl error reporting some more
2020-11-18 21:36:33 +01:00
Jordi Boggiano
852990d06c
Make sure git gc runs if needed when syncing git mirrors in cache dir to avoid them getting very stale
2020-11-18 21:36:14 +01:00
Jordi Boggiano
6937fedaa9
Update user-agent to use cURL instead of curl, fixes #9492
2020-11-18 21:26:32 +01:00
Jordi Boggiano
4ac6f57d18
Add debug output when SIGINT is received
2020-11-16 22:42:21 +01:00
Jordi Boggiano
8ed2aa8d6d
Make sure curl errors without message are shown as code, and add URL linked to the failure
2020-11-16 22:41:19 +01:00
Nils Adermann
d19b858e20
Improve decisions debug output
2020-11-13 16:58:43 +01:00
Nils Adermann
780e6fc027
Avoid creating unnecessary conflict rules for provide/replace of aliases
2020-11-13 16:26:36 +01:00
Nils Adermann
3764b3007d
Explicit conflict rule generation needs to use pool->whatProvides
...
If relying on packages added by name in the generator aliases will be
skipped.
2020-11-13 16:01:54 +01:00
Jordi Boggiano
d6794217d9
Merge pull request #9475 from naderman/fix-alias-alt
...
Make sure the root aliases always get installed when a package is updated
2020-11-13 15:15:32 +01:00
Nils Adermann
27f200caf1
Create ROOT_ALIAS rules inside package rule generation
2020-11-13 15:08:09 +01:00
Nils Adermann
4215344c93
Rule generator cleanup: no need for 2 added package arrays, more specific root alias rule
2020-11-13 14:53:23 +01:00
Jordi Boggiano
595c4c6f75
Make sure we handle cases where STDIN/STDOUT may not be defined
2020-11-13 14:50:24 +01:00
Jordi Boggiano
b7e1383083
Make sure the alias package gets added to conflict rules etc, and only add it if aliased package is actually added
2020-11-13 14:16:37 +01:00
Jordi Boggiano
7b183956d8
Make sure the root aliases always get installed when a package is updated, fixes #9448
2020-11-13 13:52:21 +01:00
Jordi Boggiano
6ace5bb651
Make sure root aliases are marked as such also when loaded from lock file
2020-11-13 10:58:03 +01:00
Jordi Boggiano
cc536c7f45
Fix/normalize tty handling
2020-11-13 08:58:18 +01:00
Jordi Boggiano
4b4a3937ea
Make sure Loop abortJobs does not lose track of promises in case wait() is called within the scope of a wait(), refs #9463
2020-11-12 15:14:39 +01:00
Jordi Boggiano
b0d308319e
Extract POST_PACKAGE_* events to be executed all at once and not in parallel with async code to avoid edge cases, fixes #9463
2020-11-12 15:14:02 +01:00
Jordi Boggiano
45f7036745
Make sure the SOURCE_VERSION works with version_compare against 2.0.0
2020-11-12 15:12:46 +01:00
Sergii Bondarenko
abbc0e8a4e
#9464 : Remove wrapping slashes from the gitignore rules
2020-11-12 14:56:14 +02:00
Jordi Boggiano
e5a009ed80
Make sure empty objects are not left behind when removing requires/.. fixes #9462
2020-11-12 11:09:15 +01:00
Jordi Boggiano
dfca939f3b
Use proper type hint for local repo
2020-11-12 10:41:07 +01:00
Jordi Boggiano
b78b2df5bb
Reuse devPackageNames if available instead of filtering the dev packages out by looping through all requirements
2020-11-12 10:41:07 +01:00
Jordi Boggiano
b574f10d9d
Rename mainPackage to rootPackage in AutoloadGenerator and ensure we use RootPackageInterface
2020-11-12 10:41:06 +01:00
Jordi Boggiano
6a2f9870a7
Warn when init is being used non-interactively without any args passed in, instead of silently overwriting the file
2020-11-12 10:41:05 +01:00
Tom Klingenberg
258f6dc1a2
Reference co-relating code sequence for tty test, refs #9454
2020-11-11 20:27:38 +01:00
Jordi Boggiano
380dce9a6b
Make sure the IO is not interactive when not run in a tty, refs #9454
2020-11-11 16:30:50 +01:00
Jordi Boggiano
87006774b1
Avoid requiring a lock file to run composer remove, fixes #9439
2020-11-11 14:46:10 +01:00
Jordi Boggiano
4468248c46
Merge remote-tracking branch 'Serializator/reject-promise-on-exception-9424'
2020-11-11 14:35:08 +01:00
Jordi Boggiano
1496277697
Disable TTY mode if STDOUT is not a TTY, fixes #9454
2020-11-11 14:27:17 +01:00
Jordi Boggiano
00dfd2c8e1
Fix lock file being parsed when not strictly needed, fixes #9452
2020-11-11 11:57:08 +01:00
Jordi Boggiano
30b98915e9
Move Updating dependencies to the correct point, which is once we have the pool ready
2020-11-11 11:30:37 +01:00
Jordi Boggiano
fec44f883c
Always load the current InstalledVersions when writing to disk, fixes #9457
2020-11-11 10:47:54 +01:00
Jordi Boggiano
14d20776a2
Merge pull request #9449 from staabm/patch-3
...
Remove unnecessary overridden method
2020-11-10 17:05:05 +01:00
Markus Staab
bfafead42e
Fixed phpdocs
2020-11-09 21:22:23 +01:00
Markus Staab
e8ce5a3db6
Remove unnecessary overridden method
...
The method just called its parent without further logic
2020-11-09 20:45:40 +01:00
Jordi Boggiano
a825581ae2
Remove set_time_limit, fixes #9438
2020-11-09 14:23:24 +01:00
Julian van den Berkmortel
23a1d783db
Reject job within "HttpDownloader" when an exception is thrown, refs #9424
2020-11-08 21:53:07 +01:00
Jordi Boggiano
c362d001f1
Fix regression handling installs with custom installers not passing a fully qualified path to downloaders, fixes #9431 , fixes #9434
2020-11-07 11:17:22 +01:00
Jordi Boggiano
f31564ef5b
Fix check-platform-reqs --no-dev to not require lock anymore
2020-11-06 20:39:33 +01:00
Michaël Jacobs
611a9f5dab
Drop unused imports
2020-11-06 13:31:02 +01:00
Michaël Jacobs
c35a8e77c7
Fix missing directory separator in FileDownloader
2020-11-06 13:31:02 +01:00
Jordi Boggiano
3f6899946b
Avoid using curl when it has been disabled, fixes #9423
2020-11-06 12:55:54 +01:00
Jordi Boggiano
bc9336946e
Trim trailing slash in path downloader to avoid symlink issues, and in FileDownloader::getLocalChanges as we append a string without slash, refs #9422
2020-11-05 16:54:06 +01:00
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
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
7ddd1c64af
PoolBuilder: On unlock ensure consider all locked requirements for unlocked package
2020-10-27 22:10:15 +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
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
Nils Adermann
7dc67fbbad
Problem: Update fallback error message for requires without matches
2020-10-27 17:11:24 +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
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
9492dc7f7c
Make sure symfony/flex does not get loaded in a buggy version to avoid bogus issue reports
2020-10-14 13:48:55 +02:00
Jordi Boggiano
c5d8a13bc4
Bump curl timeout to 300
2020-10-14 13:30:12 +02:00
Jordi Boggiano
34dd9e19e1
Add curl/zip ext info to diagnose command
2020-10-14 13:29:41 +02:00
Nils Adermann
8a2bae82ab
Improve docblocks on fixed/locked/fixedLocked packages in request
...
Also fixes two small code review issues
2020-10-14 11:46:13 +02:00
Nils Adermann
fdde9e5933
On composer install we fix locked packages, but consider them locked for error reporting
2020-10-14 11:46:13 +02:00
Nils Adermann
74fb313c39
Separate locked packages from fixed packages in request
...
Locked packages are basically like removable fixed packages, so we still
only load one version, but we do not require their installation unless
something the user needs requires their use. So they automatically get
removed if they are no longer needed on any update.
2020-10-14 11:46:13 +02:00
Nils Adermann
73e24ea9fb
Partial updates should remove all unused dependencies
...
Instead of marking locked packages as fixed, we change the pool builder
to load only the locked version and treat it like a fixed package, but
removing the actual request fix, makes the solver treat it as a regular
optional dependency. As a consequence locked packages may be removed on
a partial update of another package, but they cannot be updated.
2020-10-14 11:46:13 +02:00