8cec8bd546
Allow verify_peer/verify_peer_name http options to be handled by curl downloader
2020-07-17 17:22:41 +02:00
c3d40ae79a
Fix passing of repo http options in async requests
2020-07-17 17:16:19 +02:00
071350286f
Compact constraints to avoid ending up with very long multi constraints
2020-07-17 16:16:58 +02:00
22367a68f9
Avoid loading same packages multiple times
2020-07-17 16:16:58 +02:00
3577070efa
Fix docblocks
2020-07-17 16:15:19 +02:00
6ba0f3adf9
Merge branch 'master' into filter-packages
...
* master: (59 commits)
Update deps
Reuse repository manager and others directly from the Composer instance, refs #9057
Fix usage of create-project with local filesystem repos
Fix return value
Add support for multiple --repository additions in create-project, and make --add-repository delete the lock file, fixes #8853
Remove cygwin php handling in UAC elevation
Clean up a little to make impl less invasive and to handle replacers/providers
Supply event dispatcher in Create Project Command
Avoid attempting to use /etc/xdg as base config home, fixes #9053 , refs #9045
Create an issue @ Docker repository on tag
Mark transaction classes internal, refs #8827
Prepare 1.10.9 release
Remove highest/lowest builds for 1.10 maintenance branch
Fix bitbucket detection of redirects to login page, fixes #9041
Fix doc comment
Fixed spelling mistake
Add Windows UAC elevation to self-update command
GitLab: clarify interactive auth prompt
Improve support for XDG and default to XDG config dir if both that and ~/.composer are available, fixes #9045
Fix #9033 - inconsistent behavior with minor-only flag
...
2020-07-17 14:30:12 +02:00
c3028c02d9
Merge branch '1.10'
2020-07-17 13:18:02 +02:00
a474dee236
Merge remote-tracking branch 'johnstevenson/elevate2' into 1.10
2020-07-17 13:01:24 +02:00
eac03e16e7
Reuse repository manager and others directly from the Composer instance, refs #9057
2020-07-17 12:05:07 +02:00
433968de17
Fix usage of create-project with local filesystem repos
2020-07-17 11:30:03 +02:00
201533e16f
Fix return value
2020-07-17 11:05:57 +02:00
a2ab6f2b54
Add support for multiple --repository additions in create-project, and make --add-repository delete the lock file, fixes #8853
2020-07-17 10:38:46 +02:00
8ddbae358d
Remove cygwin php handling in UAC elevation
...
When called from a native shell and using cygwin PHP, cygpath translates
`/tmp` to `User\AppData\Local\Temp`, rather than `/cygdrive/.../tmp`.
This change does not affect using windows PHP from a Cygwin shell.
2020-07-16 17:20:12 +01:00
942562c382
Clean up Zip Util to be more strict about what is a valid package archive, fixes #8931
2020-07-16 17:36:46 +02:00
37b1e0fffd
Merge pull request #8955 from tlamy/OutdatedNoDevOption
...
Outdated/Show: no dev option
2020-07-16 15:40:09 +02:00
6869a1a5cb
Clean up a little to make impl less invasive and to handle replacers/providers
2020-07-16 15:37:12 +02:00
b4ecca5d0b
Supply event dispatcher in Create Project Command
...
This update allows composer plugins to intercept the
create-project command to inject additional functionality such as
providing additional remote filesystem handling.
2020-07-16 23:34:30 +10:00
7cecc6ad3f
Avoid attempting to use /etc/xdg as base config home, fixes #9053 , refs #9045
2020-07-16 14:59:49 +02:00
89d35af83d
Mark transaction classes internal, refs #8827
2020-07-16 13:59:49 +02:00
8b934a415f
Merge branch '1.10'
2020-07-16 12:27:00 +02:00
6cb4dc41b8
Fix bitbucket detection of redirects to login page, fixes #9041
2020-07-16 12:26:48 +02:00
57f91d01c7
Fix doc comment
2020-07-16 11:53:55 +02:00
272654d6e2
Fixed spelling mistake
2020-07-16 11:53:55 +02:00
cae913c434
Add Windows UAC elevation to self-update command
...
If self-update fails on Windows due to file permission issues, a .vbs
script is used to elevate a call to the cmd.exe `move` command.
Unfortunately it is not possible to know if the user cancelled the UAC
prompt using this method - it is possible using a Powershell script, but
flashing hidden windows make this a less desirable option.
The only downside is that a UAC invoked process is asynchronous, so a
300 millisecond timeout is used to allow cmd.exe to do its stuff.
Therefore if the OS is busy the script may finish first and incorrectly
report that the file has not been written.
2020-07-16 11:53:55 +02:00
fb0ad7c900
GitLab: clarify interactive auth prompt
2020-07-15 16:18:21 +01:00
870fdc59df
Merge remote-tracking branch 'tomekpryjma/fix-issue-9033'
2020-07-15 17:02:16 +02:00
10590dc519
Improve support for XDG and default to XDG config dir if both that and ~/.composer are available, fixes #9045
2020-07-15 10:56:13 +02:00
23c32ed6d3
Fix #9033 - inconsistent behavior with minor-only flag
2020-07-14 23:06:20 +01:00
92ef439666
Merge branch '1.10'
2020-07-07 21:12:27 +02:00
d2d3aa8494
Fix parsing of # in funding links, fixes composer/packagist#1097, closes #9035
2020-07-07 21:12:04 +02:00
d7b1248508
Create pool before reading package ids as the pool creation reassigns package ids, fixes #9034
2020-07-04 12:00:37 +02:00
1fa6f4c83c
Add a default signal handler to avoid having the SIGINTs ignored, fixes #9027
2020-07-01 11:37:38 +02:00
ee4afa29e7
Include dev packages in locked package listings for show command
2020-07-01 11:17:52 +02:00
70f211923b
Add support for list URL in composer repos, fixes #9009
2020-07-01 11:16:38 +02:00
1824637dab
Merge pull request #8999 from naderman/fix-solver-bug-exception-7051
...
Fix solver bug exception 7051
2020-06-27 23:50:55 +02:00
3f5dde9873
Solver: Ensure multi conflict rules still get added to learned pool
2020-06-26 22:04:17 +02:00
edef748169
Solver: Clarify when/why undecided literals can get skipped in analyze
2020-06-26 21:55:03 +02:00
851050e85c
Solver: multiconflict analyze handles positive decision same as regular literal
2020-06-26 21:51:02 +02:00
6e05345be7
Solver: Move analyze handling of multiconflict rule to clearer location
...
This way we're not looking at the previous decision at the top of the
loop but working with the current decision at the bottom
2020-06-26 21:51:02 +02:00
b34f916470
Solver: No need to check previous decision if we reached the first one
2020-06-26 21:51:02 +02:00
2631210493
Solver: analyze multi conflict rules in conflict resolution correctly
2020-06-26 21:51:02 +02:00
5ef398ebb9
Fix 5.3 support
2020-06-26 16:58:02 +02:00
bee91155a1
Fix guessing of default branch when HEAD is a non-feature-branch
2020-06-26 16:16:16 +02:00
4a2ea3c67a
Fix var name
2020-06-25 09:16:23 +02:00
86af5e5c6e
Remove conflict between trunk and master, as they do not normalize anymore
2020-06-25 08:58:08 +02:00
e2f1e8aed6
Allow optimizing fetching of dev versions only if no other stability is needed
2020-06-25 08:57:42 +02:00
a133e694d0
Speed up fund command fetching of latest data and make sure it uses default branch info
2020-06-25 08:57:18 +02:00
6f9b39180c
Add phpdocs
2020-06-25 08:56:46 +02:00
05dacbdabb
Rename DEV_MASTER_ALIAS to DEFAULT_BRANCH_ALIAS
2020-06-25 08:56:14 +02:00
821e575658
Merge branch '1.10'
2020-06-24 21:35:38 +02:00
74d89d7110
Get rid of default branch handling in version guesser as it is way too time intensive at every initialization
2020-06-24 21:16:16 +02:00
a5e608fb73
Merge pull request #9008 from Ayesh/strtr-improvements
...
Replace cascading str_replace() calls with strtr()
2020-06-24 15:06:52 +02:00
eea7564c9e
Revert accidental rename of $dependencies variable in unrelated code branch
2020-06-24 07:28:22 +02:00
d5d956df4d
Use correct variable name
2020-06-23 19:50:27 +02:00
73a721c7e5
Add the missing summary format to command-line help text
2020-06-23 19:45:26 +02:00
ec6e05d55f
Sort licenses so that the most used license will appear first
2020-06-23 19:44:12 +02:00
668655c21a
Rename variable for clarity
2020-06-23 19:43:27 +02:00
52332d994e
GitDriver: use authentication for supports check
2020-06-23 13:06:30 +01:00
e3c75b3e87
Replace cascading str_replace() calls with strtr()
...
Replaces cascading str_replace() calls with a single strtr() call that makes it mode readable and provides a micro performance improvement.
Some instances of cascading str_replace() calls were not refactored due to the potential recurring replacement patterns.
2020-06-23 04:10:26 +07:00
ea0ce9dd7d
Merge branch 'master' into filter-packages
2020-06-22 18:38:16 +02:00
e76fc2dc39
Avoid blocking when guessing default branch name, fixes #9001
2020-06-22 10:48:15 +02:00
edd2aa27db
Add missing isVerbose argument to problem formatting call
2020-06-19 23:31:11 +02:00
7a37e78a30
Speed up installer tests by avoiding lots of bootstrapping and git processes
2020-06-19 17:56:13 +02:00
6349764c2d
Fix root package handling of default-branch
2020-06-19 15:34:28 +02:00
923f198a1f
Fix default-branch attribute on package files, and add it to schema
2020-06-19 15:33:25 +02:00
6f0e5996de
Treat default branch name as a non-feature-branch no matter what it is called
2020-06-19 14:12:44 +02:00
4682efcf77
Support also default_branch flag in cached versions
2020-06-19 09:45:39 +02:00
52afa5ef16
Fix handling of default branches
2020-06-17 17:54:06 +02:00
f70d527f4f
Fix git tests
2020-06-17 17:53:00 +02:00
ce368f8269
Store default branch info inside metadata
2020-06-17 17:41:38 +02:00
04381c70fe
Merge branch '1.10'
2020-06-17 17:37:39 +02:00
cb1f3899bb
Revert "Store default branch info inside metadata"
...
This reverts commit 472a62152d
2020-06-17 17:32:26 +02:00
0278e7453d
Clean Git repos during discard
2020-06-17 17:00:35 +02:00
8c0ecf7337
Clarify why a dev tag was ignored, fixes #8951
2020-06-17 16:41:33 +02:00
93d4cf6f91
Add --no-show-signature where git supports it, fixes #8966
2020-06-17 16:37:06 +02:00
472a62152d
Store default branch info inside metadata
2020-06-17 16:09:38 +02:00
722bbce72f
Merge remote-tracking branch 'upstream/master' into OutdatedNoDevOption
2020-06-17 13:03:15 +02:00
83c64a9d19
Reuse operation formatting logic in downloaders
2020-06-17 12:33:02 +02:00
aaef3ff5ff
Improve error reporting when unzip fails due to race condition in unhandled Promise, refs #8988
2020-06-17 10:44:50 +02:00
d1fedc3bd6
Restore old behavior of wiping dir contents before installing, fixes #8988
2020-06-17 10:42:05 +02:00
80d1b1a34c
Merge pull request #8987 from GrahamCampbell/patch-2
...
Marked getRootAliasesPerPackage as static
2020-06-17 09:22:18 +02:00
5ec6b81157
Merge pull request #8986 from GrahamCampbell/patch-1
...
Phpdoc tweaks
2020-06-17 09:22:04 +02:00
c8731598cc
Merge branch '1.10'
2020-06-16 17:16:42 +02:00
da572f1fdc
Merge remote-tracking branch 'GrahamCampbell/allow-list' into 1.10
2020-06-16 16:52:54 +02:00
09fc263d37
Fix status command bug
2020-06-16 16:27:36 +02:00
643852a2b0
Marked getRootAliasesPerPackage as static
2020-06-16 13:48:59 +01:00
a4f4101346
Phpdoc tweaks
2020-06-16 13:46:20 +01:00
0d369c87bc
Merge pull request #8975 from ffraenz/pr
...
Composer 2: Allow plugins to override the URL before triggering the download
2020-06-16 14:44:03 +02:00
5aae7f4f20
Merge remote-tracking branch 'jderusse/optimize-compile'
2020-06-16 14:18:03 +02:00
aea074308c
Update batching to install plugin deps before the plugin (alone an own batch)
2020-06-16 14:07:30 +02:00
085fe4e7e5
Add --no-progress support and a few more fixes
2020-06-16 14:00:24 +02:00
9c78eda7db
Fix FileDownloader::update impl to handle promises
2020-06-16 14:00:23 +02:00
87a0fc5506
Execute operations in batches to make sure plugins install in the expected order
2020-06-16 14:00:22 +02:00
9f380d606c
Add basic progress bar capability while waiting for jobs to complete
2020-06-16 14:00:22 +02:00
b1e15c7725
Fix a couple async bugs
2020-06-16 14:00:21 +02:00
3af617efe8
Parallelize zip extraction using async unzip processes
2020-06-16 14:00:20 +02:00
8f6e82f562
Add support for aborting running promises cleanly
2020-06-16 14:00:20 +02:00
0dad963cd8
Add executeAsync to ProcessExecutor and allow Loop class to wait on it in addition to HttpDownloader
2020-06-16 14:00:19 +02:00
d5286d0cb8
Add a way for FileDownloader subclasses to add paths to the cleanup stage
2020-06-16 14:00:18 +02:00
a797ee1322
Fix inline aliases not being loaded when extracting dev requirements, fixes #8954
2020-06-16 13:50:29 +02:00
da6c0635d2
Merge pull request #8980 from stucki/discard-using-git-clean
...
Discard changes is incomplete if Git project has additional folders
2020-06-16 11:08:44 +02:00
8da2811dc3
Add new summary format for licenses ( #8973 )
...
* Add new summary format to render the number of dependencies for each used license
* Array dereferencing wasn't available on php 5.3
* Add summary format to documentation
2020-06-16 10:07:53 +02:00
6d9bf42655
Additional Util\RemoteFileSystem tests ( #8960 )
...
* RemoteFilesystemTest: simplifying some mock expectations calls
- will($this->returnValue()) to willReturn()
- will($this->returnCallBack()) to willReturnCallback()
* RemoteFilesystemTest: extracting identical mocks for IOInterface into a separate getIOInterfaceMock() method
* RemoteFilesystemTest: converting protected helper methods to private.
* RemoteFilesystemTest: moving getConfigMock() private method after the public methods (with other private methods)
* adding RemoteFileSystemTest::testCopyWithRetryAuthFailureFalse() unit test.
* Allow optional injecting of AuthHelper into RemoteFilesystem constructor.
* adding RemoteFileSystemTest::testCopyWithSuccessOnRetry() unit test.
* using backward compatible @expectedException in RemoteFilesystemTest.php
* RemoteFilesystemTest: extracting RemoteFilesystem with mocked method creation into a separate method.
* RemoteFilesystemTest: extracting AuthHelper with mocked method creation into a separate method.
2020-06-16 09:35:33 +02:00
5c13c97428
Implement type and context properties in PreFileDownloadEvent
2020-06-15 21:43:41 +02:00
ae59047166
Clean Git repos during discard
2020-06-15 21:42:41 +02:00
907367ff43
Fix PHPDoc issue
2020-06-15 21:28:27 +02:00
54debe8210
Respect disable-tls in Versions::getLatest
...
Use http to get the latest version when disable-tls is true and error-
trap DiagnoseCommand::checkVersion so that all checks can complete.
Fixes #8657 .
2020-06-15 13:08:38 +02:00
a17bbec842
Avoid double warnings about composer.json when running outdated, fixes #8958
2020-06-15 13:04:02 +02:00
13bdf8553a
Add setProcessedUrl method to PreFileDownloadEvent
2020-06-11 21:53:31 +02:00
a97d13fc6d
Fixed typo
...
Co-authored-by: ZhangWei <zhwei.yes@gmail.com>
2020-06-08 09:33:40 +01:00
fa799970ad
Replace whitelist with allow list
2020-06-07 22:15:09 +01:00
2fa58ccf96
Reduce amount of packages loaded by avoiding extensions of the constraint beyond the root constraint
2020-06-06 17:18:42 +02:00
4b9b499ce5
Fix issue loading aliases and fix markPackageNameForLoading when called twice in a row for same package it would overwrite the constraint the second time
2020-06-06 17:16:54 +02:00
f2befc46c9
Avoid storing duplicate packages when loading the same package twice
2020-06-05 17:13:39 +02:00
67a88880ec
Get rid of EmptyConstraint
2020-06-05 16:52:24 +02:00
cb19347031
Update to latest master
2020-06-05 16:52:24 +02:00
b6c436598b
Updated to latest semver intervals
2020-06-05 16:52:24 +02:00
6ef47baca1
Added a todo for package dupes
2020-06-05 16:52:24 +02:00
014e9d5dd1
Fixed last remaining pool builder test
2020-06-05 16:52:24 +02:00
5097ed6480
Fixed another test
2020-06-05 16:52:24 +02:00
5a835db24d
Fixed another partial update test
2020-06-05 16:52:24 +02:00
7be24dccd9
Fixed some of the partial update tests
2020-06-05 16:52:24 +02:00
225a6a0a82
Improved variable naming
2020-06-05 16:52:24 +02:00
0955d38374
Simplify package loading
2020-06-05 16:52:24 +02:00
779b56ab2b
Fixed psalm annotations
2020-06-05 16:52:24 +02:00
b00291cf21
CS
2020-06-05 16:52:24 +02:00
00500f83c0
Using the current subset branch of @Seldaek to fix subset tests
2020-06-05 16:52:24 +02:00
26877285ad
Filter duplicate packages
2020-06-05 16:52:24 +02:00
bde9502473
Made the constraint argument in Link mandatory
2020-06-05 16:52:24 +02:00
2427bef238
Typo
2020-06-05 16:52:24 +02:00
bca88bdd4b
Fixed PoolBuilder running endlessly when packages do not exist
2020-06-05 16:52:24 +02:00
b87fc5bbfd
Added more poolbuilder test
2020-06-05 16:52:24 +02:00
d78c37edd2
Cleanup and added some more improvements, tests still failing
2020-06-05 16:52:24 +02:00
5dd4b456b9
PoolBuilder: Do not load any alternatives to pkgs replaced by fixed pkg
2020-06-05 16:52:24 +02:00
bb4cabc0b9
PoolBuilder: Avoid loading any alternatives to fixed packages
2020-06-05 16:52:24 +02:00
1c8865a5d1
Comment
2020-06-05 16:52:24 +02:00
10555ecff3
Make sure there's always a constraint
2020-06-05 16:52:24 +02:00
912aecb666
Removed name constraints
2020-06-05 16:52:24 +02:00
af7feade8f
POC
2020-06-05 16:52:24 +02:00
caa5545478
#8945 Add "--no-dev" to outdated/show commands
2020-06-05 16:48:10 +02:00
9d5051faac
Merge branch '1.10'
2020-06-05 16:02:02 +02:00
6630519882
Fix #8298 for COMPOSER_DEV_MODE
2020-06-05 16:01:39 +02:00
29ec10d95c
Fix output formatting
2020-06-05 13:43:42 +02:00
f15b9c258e
Merge pull request #8949 from Seldaek/cleanups
...
Cleanups / docblocks
2020-06-05 10:48:29 +02:00
71ddc487fe
Platform Check: Add a special case for `zend-opcache`.
...
Ref #8946
The platform-check feature maps `ext-X` to `extension_loaded('X')` calls.
While most of the extensions can be tested this way, the `zend-opcache`
extension requires `zend opcache` to be probed instead of the `zend-opcache`
name.
This commit adds a special case for `zend-opcache` to use the correct name
in `extension_loaded()` calls in generated `platform_check.php` file.
2020-06-05 02:09:31 +07:00
c9571f90b4
Run phpstan with regular output and then run again to cs2pr if there was an error, to keep usable output in CI logs
2020-06-04 16:11:02 +02:00
a4a617abb4
Reduce amount of Filesystem/ProcessExecutor instantiations, add lots of docblocks
2020-06-04 16:08:23 +02:00
5761228068
Make installer classes forward promises from downloaders to InstallationManager
2020-06-04 10:34:16 +02:00
816d8e9d1b
Fix phpstan error
2020-06-03 15:41:47 +02:00
90bd351b8b
Allow downgrades to go through even though the target dir for archive extraction exists
2020-06-03 15:37:36 +02:00
Jordi Boggiano