3eb419d2d0
Fix is_dir check to not fail on open_basedir restrictions, fixes #9541
2020-12-03 21:35:23 +01:00
29f4c0b92a
Merge branch '1.10'
2020-12-03 17:17:25 +01:00
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
4e8ca92b6f
Fix error with binaries in PHP8
2020-12-02 13:15:16 +00:00
b4cb2f7321
test before chdir
2020-11-30 01:34:16 +01:00
e712130062
Fix for php8 when symlink function is disabled
2020-11-30 00:59:42 +01:00
1fb6b03e03
Fix a few edge cases in unpushed change handling
2020-11-26 16:03:38 +01:00
f86b3ad0fe
Make sure all remotes are checked for unpushed changes, fixes #9486
2020-11-26 15:42:39 +01:00
00aaffb8f9
Make cache writes atomic
2020-11-26 14:28:58 +01:00
62bd81bf7a
Make sure the default branch alias is never used as a constraint by the VersionSelector
2020-11-26 14:24:22 +01:00
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
be3a520331
Fix feedback
2020-11-26 13:07:33 +01:00
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
e857a8216c
Make sure mirror update fails if no lock file is present
2020-11-26 11:28:17 +01:00
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
08f0af4623
Add docblocks to HttpDownloader, refs #9209
2020-11-25 15:44:59 +01:00
e8a3a33023
Also output headers
2020-11-25 12:40:05 +01:00
8030fbc4ae
Add debug info for http status code 0
2020-11-25 12:37:28 +01:00
b7d770659b
CS fixes
2020-11-22 14:52:39 +01:00
c7da7e55c9
Fix various issues with regard to schema conformity when modifying json, fixes #9515
2020-11-22 14:26:18 +01:00
480a6439fd
Fix phpstan phpdocs issues ( #9478 )
2020-11-20 09:28:09 +01:00
9e279740cd
Go go phpstan 🤞
2020-11-19 11:28:12 +01:00
742c2a9e93
Avoid swallowing exceptions
2020-11-19 10:32:09 +01:00
35b403b266
Make sure a version not found issue is reported as such for clarity, fixes #9500
2020-11-19 09:39:03 +01:00
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
f567fd69eb
List both unzip and zip ext presence in diagnose
2020-11-18 22:33:33 +01:00
5248d6c9f1
Improve curl error reporting some more
2020-11-18 21:36:33 +01:00
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
6937fedaa9
Update user-agent to use cURL instead of curl, fixes #9492
2020-11-18 21:26:32 +01:00
4ac6f57d18
Add debug output when SIGINT is received
2020-11-16 22:42:21 +01:00
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
d19b858e20
Improve decisions debug output
2020-11-13 16:58:43 +01:00
780e6fc027
Avoid creating unnecessary conflict rules for provide/replace of aliases
2020-11-13 16:26:36 +01:00
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
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
27f200caf1
Create ROOT_ALIAS rules inside package rule generation
2020-11-13 15:08:09 +01:00
4215344c93
Rule generator cleanup: no need for 2 added package arrays, more specific root alias rule
2020-11-13 14:53:23 +01:00
595c4c6f75
Make sure we handle cases where STDIN/STDOUT may not be defined
2020-11-13 14:50:24 +01:00
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
7b183956d8
Make sure the root aliases always get installed when a package is updated, fixes #9448
2020-11-13 13:52:21 +01:00
6ace5bb651
Make sure root aliases are marked as such also when loaded from lock file
2020-11-13 10:58:03 +01:00
cc536c7f45
Fix/normalize tty handling
2020-11-13 08:58:18 +01:00
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
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
45f7036745
Make sure the SOURCE_VERSION works with version_compare against 2.0.0
2020-11-12 15:12:46 +01:00
abbc0e8a4e
#9464 : Remove wrapping slashes from the gitignore rules
2020-11-12 14:56:14 +02:00
e5a009ed80
Make sure empty objects are not left behind when removing requires/.. fixes #9462
2020-11-12 11:09:15 +01:00
dfca939f3b
Use proper type hint for local repo
2020-11-12 10:41:07 +01:00
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
b574f10d9d
Rename mainPackage to rootPackage in AutoloadGenerator and ensure we use RootPackageInterface
2020-11-12 10:41:06 +01:00
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
258f6dc1a2
Reference co-relating code sequence for tty test, refs #9454
2020-11-11 20:27:38 +01:00
380dce9a6b
Make sure the IO is not interactive when not run in a tty, refs #9454
2020-11-11 16:30:50 +01:00
87006774b1
Avoid requiring a lock file to run composer remove, fixes #9439
2020-11-11 14:46:10 +01:00
4468248c46
Merge remote-tracking branch 'Serializator/reject-promise-on-exception-9424'
2020-11-11 14:35:08 +01:00
1496277697
Disable TTY mode if STDOUT is not a TTY, fixes #9454
2020-11-11 14:27:17 +01:00
00dfd2c8e1
Fix lock file being parsed when not strictly needed, fixes #9452
2020-11-11 11:57:08 +01:00
30b98915e9
Move Updating dependencies to the correct point, which is once we have the pool ready
2020-11-11 11:30:37 +01:00
fec44f883c
Always load the current InstalledVersions when writing to disk, fixes #9457
2020-11-11 10:47:54 +01:00
14d20776a2
Merge pull request #9449 from staabm/patch-3
...
Remove unnecessary overridden method
2020-11-10 17:05:05 +01:00
bfafead42e
Fixed phpdocs
2020-11-09 21:22:23 +01:00
e8ce5a3db6
Remove unnecessary overridden method
...
The method just called its parent without further logic
2020-11-09 20:45:40 +01:00
a825581ae2
Remove set_time_limit, fixes #9438
2020-11-09 14:23:24 +01:00
23a1d783db
Reject job within "HttpDownloader" when an exception is thrown, refs #9424
2020-11-08 21:53:07 +01:00
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
f31564ef5b
Fix check-platform-reqs --no-dev to not require lock anymore
2020-11-06 20:39:33 +01:00
611a9f5dab
Drop unused imports
2020-11-06 13:31:02 +01:00
c35a8e77c7
Fix missing directory separator in FileDownloader
2020-11-06 13:31:02 +01:00
3f6899946b
Avoid using curl when it has been disabled, fixes #9423
2020-11-06 12:55:54 +01:00
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
c04c42b7b4
Merge branch '1.10'
2020-11-05 16:37:59 +01:00
444b91a3ce
Add docs, refs #9422
2020-11-05 16:37:51 +01:00
3ffdd67e81
Fix running compiler in CI env
2020-11-05 15:00:54 +01:00
22fef8c51a
Make sure no files are missing from the phar, fixes #9421
2020-11-05 14:55:18 +01:00
8dc5effee7
AutoloadGenerator: Send error HTTP status on error
2020-11-05 09:57:48 +01:00
56c65a58e2
Make platform-check only check non-dev requires, refs #9412
2020-11-04 23:41:58 +01:00
8c1355f448
Improve output of platform check further in case errors are hidden
2020-11-04 22:28:17 +01:00
ec960d12b0
Merge remote-tracking branch 'jakubboucek/feature/jb-platform-check-tigger-error'
2020-11-04 21:54:12 +01:00
6c31744c04
Disable full platform-check for extensions by default, now set to php-only, refs #9412
2020-11-04 21:50:06 +01:00
fc0d724938
Allow configuring gitlab deploy tokens via config command, refs #9373
2020-11-04 21:36:03 +01:00
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
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
52faa3cdfb
Merge pull request #9388 from JasonStephensTAMU/remove-windows-junction
...
Remove Windows junctions first in PathDownloader
2020-11-04 21:05:57 +01:00
3f63bc9205
AutoloadGenerator: Trigger native PHP error on platform checks fails
2020-11-04 12:28:14 +01:00
cda49323eb
Remove CURLOPT_SSL_FALSESTART option. Fixes #9405
2020-11-04 11:05:50 +00:00
b83b186ac0
AutoloadGenerator: Send error HTTP status on error
2020-11-04 11:18:21 +01:00
0747b072be
RemoteFileSystem: don't throw zlib error on empty response
2020-11-03 16:01:40 +00:00
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
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
48b23b1607
Simplify code in FileDownloader.php
2020-11-02 15:10:57 +01:00
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
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
5aa90baab1
Add new lines to platform reqs issues
2020-11-01 23:39:06 +10:00
52f98fd228
Merge branch '1.10'
2020-10-30 17:56:22 +01:00
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
36a9c47830
Fix typo from a637072058
2020-10-30 17:52:29 +01:00
a637072058
Fix canUseCurl logic to allow local_cert/local_pk to reach curl, refs #9384
2020-10-30 17:48:54 +01:00
ce7cc3b444
Merge remote-tracking branch 'rtm-ctrlz/master'
2020-10-30 17:48:07 +01:00
0a356b8a39
Merge branch '1.10'
2020-10-30 17:30:33 +01:00
78797df5f8
Fix bitbucket handling, fixes #9369
2020-10-30 17:28:30 +01:00
d25e66ad53
Display auth again for an origin if the auth type changes
2020-10-30 17:15:40 +01:00
985cef790f
Support git@bitbucket.org URLs for git-bitbucket driver
2020-10-30 17:15:25 +01:00
1d7ed333c9
Make sure curl is only used when safe to do so, fixes #9381
2020-10-30 16:20:50 +01:00
8f9486b20e
redirects are handled in userland now so no need for this hack anymore
2020-10-30 15:30:19 +01:00
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
4faaf79b58
CurlDownloader enable support for SSL-client certificates
2020-10-30 17:03:21 +03:00
3f8f549352
Add new flag to ConfigSourceInterface as most likely there are no implementors anyway
2020-10-30 14:22:57 +01:00
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
ffc0f86fc0
Fix warnings in composer require to show when repo prio is at fault, refs #9371
2020-10-30 14:16:40 +01:00
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
34bdc6cbf2
Detect and hint for solutions for common curl errors, fixes #9376
2020-10-30 09:56:58 +01:00
d97c37f103
Zip: ignore mac osx specific folder when searching for composer.json
2020-10-29 22:30:12 +00:00
472f78bff1
Auto-disable misbehaving curl downloader on php 5, refs #9002
2020-10-29 22:39:26 +01:00
095d133d6b
Remove fulluri checks and tidy diagnose output
2020-10-29 10:28:51 +00:00
2d91fbc65a
PoolBuilder: never mark skipped packages for loading
...
Reorder code in loadPackage to avoid duplicate calls
2020-10-28 14:07:04 +01:00
7ddd1c64af
PoolBuilder: On unlock ensure consider all locked requirements for unlocked package
2020-10-27 22:10:15 +01:00
90a6aa7ec0
Make sure we compare packages to their latest without aliases, fixes #9357
2020-10-27 21:04:00 +01:00
04e5d725f4
Add docs
2020-10-27 20:53:54 +01:00
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
7dc67fbbad
Problem: Update fallback error message for requires without matches
2020-10-27 17:11:24 +01:00
881ec8c751
Use httpdownloader/curl to process install notifications
2020-10-27 13:50:03 +01:00
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
5d4bcde454
Allow using --locked with the outdated command directly, fixes #8025
2020-10-26 14:47:52 +01:00
289972a177
Remove useless null check, follow up to #9345
2020-10-26 13:29:23 +01:00
3772696ad6
Use IO for output
2020-10-26 12:34:27 +01:00
cbcc3a3080
Remove trailing commas for function calls
2020-10-26 11:42:41 +01:00
d5245387f3
Fix error message
2020-10-26 10:04:10 +01:00
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
860a67b776
Update --lock docs, fixes #9315
2020-10-25 22:25:59 +01:00
4b8c2aa121
Fix default version to be semver parseable, fixes #9342
2020-10-25 22:22:19 +01:00
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
769ce48289
Fix typo
2020-10-25 21:25:56 +01:00
0543b59e06
Merge pull request #9334 from johnstevenson/proxy-streams
...
Improve proxy error messages for streams
2020-10-25 14:13:40 +01:00
e770cb4dcf
Fix var name
2020-10-25 14:11:02 +01:00
2d4e1e0dce
Make sure Transaction sorts operations correctly to begin with
2020-10-25 14:06:45 +01:00
c99e19db64
Fix logic (again)
2020-10-25 12:59:01 +00:00
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
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
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
9bfddadf3d
Make sure no unknown files get excluded from the phar, fixes #9331
2020-10-24 20:49:07 +02:00
2a913c7a68
Improve proxy error messages for streams
2020-10-24 18:20:31 +01:00
b4f0f4ddd2
Fix php8 file being missing from phar, refs #9331
2020-10-24 14:58:05 +02:00
191196de48
Detect broken packagist.org mirrors and fix them on the fly, refs #9297
2020-10-24 11:10:08 +02:00
62eff8e979
Tweaks to new proxying code, refs #9324
2020-10-24 10:36:39 +02:00
62fd612e63
Merge remote-tracking branch 'johnstevenson/curl-proxy'
2020-10-24 10:22:52 +02:00
0d236858ec
Merge branch '1.10'
2020-10-24 09:59:46 +02:00
25496c199d
Update link to composer 2 release notes
2020-10-24 09:43:02 +02:00
28c7e38411
Merge remote-tracking branch 'stof/fix_why_not' into 1.10
2020-10-24 09:39:09 +02:00
d47261eb93
Refactor proxy handling for Composer2
2020-10-23 21:38:29 +01:00
e868996bdd
Validate: Warn about providing or replacing packages you require
2020-10-23 22:02:13 +02:00
8564dd8dac
Allow Url::sanitize to escape URLs without scheme
2020-10-23 13:27:46 +02:00
8feb83b22b
Remove duplicate StreamContextFactory ssl options
...
Added in Dec 2014 (commit 8dad846#4759 )
2020-10-23 13:25:17 +02:00
49a28f606c
Merge branch '1.10'
2020-10-23 10:38:03 +02:00
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
dacc21e54f
Merge pull request #9158 from infabo/patch-1
...
Fix symlink check
2020-10-22 16:04:27 +02:00
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
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
6409ed0fc2
Validate: Warn about providing or replacing packages you require
2020-10-22 11:28:19 +02:00
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
9338401be7
CS: Typehint array, remove unnecessary docblock, call spl_object_hash once
2020-10-21 18:11:24 +02:00
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
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
7f41698157
Solver: on analyze, when reaching last decision > l1 skip other multi rule literals
2020-10-21 13:36:31 +02:00
14ec957e96
Fix composer show -a usage, fixes #9304
2020-10-20 17:34:07 +02:00
99a5469b5e
More hints
2020-10-18 13:13:44 +02:00
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
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
59acf9d4aa
Remove dev hint for 2.0, fixes #8738
2020-10-15 14:40:27 +02:00
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
2ca2ec3d0a
Allow loading flex main branch
2020-10-15 09:53:12 +02:00
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
8d0596163c
Rename abstract class back to the previously present SolverOperation, mark it internal, reintroduce some duplication
2020-10-14 17:53:57 +02:00
140de5480d
Fixed variable usage
2020-10-14 17:58:39 +03:00
9a5121ed27
Refactor Operation classes to use constants instead of strings for comparison
2020-10-14 17:56:42 +03:00
e7d99c37b3
Fix show --locked to avoid listing all the things
2020-10-14 15:41:53 +02:00
da1357c663
Avoid showing alias versions in show command, show the original version
2020-10-14 15:41:36 +02:00
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
c5d8a13bc4
Bump curl timeout to 300
2020-10-14 13:30:12 +02:00
34dd9e19e1
Add curl/zip ext info to diagnose command
2020-10-14 13:29:41 +02:00
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
fdde9e5933
On composer install we fix locked packages, but consider them locked for error reporting
2020-10-14 11:46:13 +02:00
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
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
85eb007f4f
Transaction: Define a total order on packages to keep behavior on PHP8
...
So far the ordering of alias packages with the same name was undefined
so the actual order was determined by implementation of the sorting
algorithm in PHP. As of PHP8 sort is stable by default which changes the
outcome in some of our test cases.
With the fully defined total order the order can longer change depending
on sorting algorithm used and remains the same across PHP versions.
2020-10-14 11:13:51 +02:00
9ca7457698
Check whether remove command successfully removed the target packages, fixes #6998
2020-10-13 16:18:28 +02:00
7ea6d5d2e7
Merge branch '1.10'
2020-10-13 16:00:04 +02:00
aac1a25ee3
Merge pull request #9278 from Seldaek/plugin-helpers
...
Plugin helpers for v2
2020-10-13 15:49:23 +02:00
4feed8b85c
Fix parsing "branch-version"
2020-10-13 15:43:12 +02:00
bafdf9f705
Merge branch '1.10'
2020-10-13 14:47:23 +02:00
d2d606ced2
Merge pull request #9273 from nicolas-grekas/dev-version
...
Add support for "extra.branch-version"
2020-10-13 14:02:41 +02:00
893fbfcb89
Add support for "extra.branch-version"
2020-10-13 13:56:18 +02:00
8ad33298ff
Fix regression, refs #9204
2020-10-13 12:50:58 +02:00
badd1f2146
Remove silly default values of false on Installer class, refs #9204
2020-10-13 12:33:43 +02:00
24abd233ec
Merge branch 'master' into code-improvements
2020-10-13 12:23:13 +02:00
3c25d180e6
Add detailed notes about events in upgrade guide, add COMPOSER_DEBUG_EVENTS env var for debugging events
2020-10-13 12:08:42 +02:00
f87b1642bc
Expand docs
2020-10-13 11:09:13 +02:00
431dc0d526
Add sync helper to give plugins utilities to work with async stuff more easily when one does not care about async
2020-10-13 11:04:16 +02:00
7917a7e757
Allow fetching the http downloader and process executor from the loop
2020-10-13 10:28:36 +02:00
0775e261c5
Merge remote-tracking branch 'lstrojny/apcu-prefix'
2020-10-13 10:19:30 +02:00
a1b781a302
Merge pull request #9220 from ffraenz/pr
...
Composer 2: Adapt file download cache keys to changed processed URLs
2020-10-12 16:55:35 +02:00
adeabdbd56
Merge branch '1.10'
2020-10-12 15:22:30 +02:00
bc1cb1636d
Remove dead code, fixes #9277
2020-10-12 15:22:21 +02:00
09ef026d43
Remove OperationInterface::getReason, closes #9230 , closes #9263
2020-10-12 12:31:54 +02:00
d204eb4814
Merge branch '1.10'
2020-10-12 10:54:43 +02:00
6bf136489f
Ignore the COMPOSER env var when executing global scope commands, fixes #9259
2020-10-12 10:53:35 +02:00
9c4b00be67
Add -w/-W to docs, refs #9257
2020-10-12 10:36:12 +02:00
de3de0697e
Merge pull request #9257 from flavioheleno/improv/short-with-deps
...
With-dependencies alias
2020-10-12 10:29:07 +02:00
6f77c5f5ea
Avoid adding aliased locked packages twice in the LockArrayRepository, fixes #9240
2020-10-12 10:17:06 +02:00
9528ce7057
Fix invalid usage of Link class, fixes #9252
2020-10-12 09:22:23 +02:00
f966de94a9
Merge branch '1.10'
2020-10-12 08:33:39 +02:00
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
28fe3baf9c
Disable secure-http automatically when disable-tls is enabled, fixes #9235
2020-10-12 07:57:14 +02:00
03b8c3db3f
Merge branch '1.10'
2020-10-08 14:38:41 +02:00
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
6698e0bafa
Merge remote-tracking branch 'naderman/version-guess-remotes' into 1.10
2020-10-08 14:01:25 +02:00
b3c465d55a
VersionGuesser: local branches still need to be considered
2020-10-07 15:10:20 +02:00
ad643d9957
VersionGuesser: Analyze remote origin and upstream branches too
2020-10-07 14:21:22 +02:00
369c2ff552
Implement PR code style feedback
2020-10-05 20:52:27 +02:00
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
9d544d98b3
Added short flags for 'with-dependencies' and 'with-all-dependencies'
2020-10-01 18:35:35 -03:00
0eb31bd027
Fixed incorrect private annotation
2020-10-01 20:24:19 +01:00
2223b93efd
Several small code improvements
2020-09-26 00:55:19 +02:00
80d71ccb3f
Merged isset, unset and str_replace calls
2020-09-26 00:55:19 +02:00
d6b39b4c55
Fix syntax error & improve handling
2020-09-24 11:35:38 +02:00
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
a4509d28e7
Introduce constants for Composer\Package\Link types
2020-09-21 14:22:06 +02:00
4f4c299015
Add pretty constraint to links in PlatformRepository
...
fixes #9210
2020-09-21 14:18:34 +02:00
2a36c3a70a
Minor tweaks
2020-09-21 13:26:53 +02:00
4e8a36556c
Removed deprecated code from 1.x
2020-09-20 17:59:45 +02:00
974e7ba296
Removed unneccesary elseifs
2020-09-20 02:16:28 +02:00
80a75e9959
Minor code improvements
2020-09-20 02:16:28 +02:00
7053b6f761
Fixed function case declaration <> call
2020-09-20 02:16:28 +02:00
33d7a64df9
Removed unused private functions
2020-09-20 02:16:28 +02:00
a6475a7118
Removed unused variables, properties and parameters of private functions
2020-09-20 02:16:28 +02:00
002fd39bc6
Removed passing of parameters with default value
2020-09-20 02:16:28 +02:00
cda6e8bea6
Removed unnecessary property initialization or declaration
2020-09-20 02:16:28 +02:00
6b3b51e299
Fixed $this usage on static functions
2020-09-20 02:16:28 +02:00
7a49cda9f6
Fix PHPDoc types on new PreFileDownloadEvent property
2020-09-16 20:13:20 +02:00
696f27ca83
Enable APCu if prefix is set
2020-09-16 13:44:51 +02:00
a1a3e29f52
Fix using inside anonymous function
2020-09-16 11:39:34 +02:00
6899060f6e
Remove superfluous use
2020-09-16 10:54:52 +02:00
57e1ce6cdb
Change the file download cache key with the processed URL, implement custom cache key
2020-09-16 10:54:14 +02:00
7db8b33a9e
Restore
2020-09-16 10:53:55 +02:00
0b6abf3b96
APCu prefix as a separate option
2020-09-16 10:49:00 +02:00
de0085767c
Sanitize prefix
2020-09-15 12:39:22 +02:00
dafd225a35
Allow to pass a string for apcu-autoloader to set the APCu prefix
2020-09-14 22:36:53 +02:00
99300f6dc0
Merge pull request #9206 from staabm/patch-3
...
Improve error message further
2020-09-14 21:25:21 +02:00
cf9786f112
Improve error message further
2020-09-12 11:13:37 +02:00
74e02193a8
Do not hard fail on lazy repository when network is disabled and no package cache exists
2020-09-11 21:35:20 +02:00
6cf4ba051c
Update messaging about plugin errors
2020-09-11 13:43:32 +02:00
bb96b04f4a
Remove dead code
2020-09-10 16:05:31 +02:00
2a82371adf
Rename available-package-regexes to available-package-patterns and switch negated function around, refs #9197
2020-09-10 14:58:05 +02:00
66a767c065
specify covered names with regexes in 2.x repos
...
This supplements the available-packages list so that repositories may
rule themselves out of a given name (and thus not be probed with lazy
load requests) by regex, as well as by exact name match.
The use case is sizeable and varying supplemental Composer repositories
such as packages.drupal.org, which otherwise must either maintain a list
of over 10k package names in their root packages.json or accept lots of
lazy-load requests for unrelated packages that will 404.
2020-09-09 21:43:46 -05:00
0408207e35
Merge branch '1.10'
2020-09-09 11:49:04 +02:00
4a02768591
Fail hard if an invalid root alias is detected
2020-09-09 11:44:05 +02:00
6f91e038ea
Merge branch '1.10'
2020-09-08 17:04:03 +02:00
c6d0309d48
Merge pull request #9188 from simonberger/fix-php53-closure-self-usage
...
Fix self usage in closures results in fatal error on PHP 5.3
2020-09-08 12:12:59 +02:00
7ef87626ac
Fixed self usage in closure fails on PHP 5.3
2020-09-08 12:01:51 +02:00
57b4016f8a
Show default value instead of optional, refs #9181
2020-09-08 12:01:10 +02:00
5555b04cea
Merge pull request #9181 from shrink/feature/create-project-package-prompt
...
✨ Ask for target directory when using `create-project`
2020-09-08 11:56:22 +02:00
7859fe72e8
Fix line wrapping
2020-09-08 11:15:24 +02:00
9dc125f79c
Fix cleanup of useless feature_versions
2020-09-08 11:14:13 +02:00
bae227ec2d
Changed all substr calls used to compare fragments of text to strpos
...
Some additional code cleanups in those classes
Reverted change causing issues
2020-09-07 21:08:34 +02:00
8694077564
Merge pull request #9177 from simonberger/reduce-requests
...
Re-Fetch cached packages only once in a run
2020-09-07 17:01:46 +02:00
cb3c71a18a
Always assume the cache file is fresh when loading a package again which was already loaded, even if it lacks a last-modified header.
2020-09-07 17:00:02 +02:00
943c7a6433
Merge pull request #9165 from bpesch/master
...
Performance improvements
2020-09-07 16:25:14 +02:00
b8ebc7be5f
Revert a few changes to ConfigCommand
2020-09-07 16:24:15 +02:00
b1cbc08ec0
Allow false as well as repository value, refs #9165
2020-09-07 16:22:28 +02:00
cc1874e21b
Merge pull request #9179 from simonberger/fix-duplicated-code
...
Moved duplicated table render code to a new method in BaseCommand
2020-09-07 15:52:17 +02:00
45653c55d8
Handle authentication for api domains of GitHub/Bitbucket, fixes #9173
2020-09-07 15:29:41 +02:00
e6b45e853a
Fix status command handling of symlinks, and especially broken ones, fixes #9169
2020-09-07 13:54:14 +02:00
199696d120
Fix undefined method call
2020-09-07 11:42:24 +02:00
070530534d
Merge pull request #9176 from glaubinix/t/remote-file-system-response-decode
...
Composer2 RemoteFileSystem: response decode for TransportException
2020-09-04 13:13:51 +02:00
32a0563443
RemoteFileSystem: catch decode errors for content length mismatch
2020-09-04 11:33:36 +01:00
fc462ab978
Merge branch '1.10'
2020-09-04 12:18:24 +02:00
b159e4da7e
Merge pull request #9172 from Toflar/platform-repo-cleanup
...
Consistently reuse new PlatformRepository::isPlatformPackage()
2020-09-04 12:16:55 +02:00
fc961dce70
Call call_user_func_array() with a numeric arguments array.
2020-09-03 23:26:09 +02:00
a66db48673
✨ Ask for target directory when using `create-project`
2020-09-03 17:40:09 +01:00
687f886d56
Moved duplicated table render code to a new method in BaseCommand
2020-09-03 15:56:04 +02:00
9516d0dc98
Re-Fetch cached packages only once in a run
2020-09-03 08:18:07 +02:00
3b2d91975e
RemoteFileSystem: response decode for TransportException
2020-09-02 16:55:37 +01:00
bd6f62c535
Consistently reuse the new PlatformRepository::isPlatformPackage() method
2020-09-01 17:19:19 +02:00
4ac9f44571
Clear up PoolBuilder comment after code move
2020-09-01 16:57:24 +02:00
773635e355
ComposerRepository: avoid notice if includes do not provide a sha1
2020-09-01 12:21:36 +01:00
7b990f3767
PoolBuilder: Move merging of constaints to be loaded into relevant section
2020-09-01 12:28:22 +02:00
b2670945bd
PoolBuilder: clear up comment, matching and identity are different for constraints
2020-09-01 12:23:51 +02:00
fc87caf639
Provide correct parameter data type
2020-08-29 21:21:15 +02:00
113adbcd87
Sort conditions by cost
2020-08-29 21:20:30 +02:00
98462292c0
Sort conditions by cost
2020-08-29 21:19:52 +02:00
abedc0dc42
Sort conditions by cost
2020-08-29 21:19:20 +02:00
17ae93bc9c
Remove unnecessary method call
2020-08-29 21:18:31 +02:00
18009af023
Inline variable
2020-08-29 21:16:58 +02:00
e719be501e
Remove unnecessary method call
2020-08-29 21:15:52 +02:00
459e2473c8
Remove unused variable
2020-08-29 21:15:15 +02:00
3f09ae0737
Simplify duplicate case
2020-08-29 21:13:54 +02:00
46cc387598
Split workflows
2020-08-29 21:12:07 +02:00
1385412748
Merge branch 'master' into filter-packages
...
* master:
Add tests for edge cases of packages providing names which exist as real packages
Add another test verifying that a package may provide an incompatible version of sth that actually exists
Fix provider coexistence test, needs another requirement to install both
Fix test filename to end with .test extension so it gets run
Update config section to note required scope for GitLab tokens
Fix pre/post-package-install/update/uninstall events receiving a partial list of operations, fixes #9079
Also remove credentials from cache dirs in git/svn drivers, fixes #7439 , refs #9155
AuthHelper: Allow fall-through GitLab-specific HTTP headers for auth
Sanitize repo URLs to mask HTTP auth passwords from cache directory
Util/Zip: fix strpos args order
2020-08-28 14:52:58 +02:00
a1e1cd8fa4
Do not trigger Intervals::isSubsetOf() over and over again for platform packages
2020-08-28 14:34:50 +02:00
f18d91bd58
Fix pre/post-package-install/update/uninstall events receiving a partial list of operations, fixes #9079
2020-08-27 11:25:43 +02:00
c3db4614c9
Also remove credentials from cache dirs in git/svn drivers, fixes #7439 , refs #9155
2020-08-27 10:19:23 +02:00
98862f5408
Merge pull request #9155 from Ayesh/hide-passwords-cache
...
Sanitize repo URLs to mask HTTP auth passwords from cache directory
2020-08-27 10:12:56 +02:00
9e77514764
Merge pull request #9156 from Ayesh/gitlab-repos
...
AuthHelper: Allow fall-through GitLab-specific HTTP headers for auth
2020-08-27 10:06:28 +02:00
931a1ff1f8
AuthHelper: Allow fall-through GitLab-specific HTTP headers for auth
...
Previously, `AuthHelper` consumed the authentication credentials for GitLab domains and added access tokens as GitLab-specific headers.
[Composer repositories now supported in GitLab](https://php.watch/articles/composer-gitlab-repositories ) require standard Authorization headers with a personal access to function, which failed to work due to out GitLab-specific headers.
With this commit, AuthHelper checks if the password is an access token, and falls through to HTTP basic authentication even if the domain name is a GitLab domain name.
2020-08-27 12:13:28 +07:00
87573aab27
Sanitize repo URLs to mask HTTP auth passwords from cache directory
...
When a Composer repository is cached, a directory name is generated created stored package meta information fetched from that repository.
The cache directory can contain HTTP basic auth tokens, or access_token query parameters that end up in the directory name of the cache directory.
Discovered when trying out [GitLab composer repository feature](https://php.watch/articles/composer-gitlab-repositories ), and the HTTP password was visible in a `composer update -vvv` command.
Using passwords/tokens in the URL is fundamentally a bad idea, but Composer already has `\Composer\Util\Url::sanitize()` that tries to mitigate such cases, and this same function is applied to the repo URL before deciding the name of the repo cache directory.
2020-08-26 23:01:00 +07:00
dc1fd92b9b
Util/Zip: fix strpos args order
...
`strpos()` first argument is a haystack, not a needle.
`strpos('x', $s)` is identical to `$s === 'x'` which is probably not what we want here.
2020-08-26 17:23:10 +03:00
9a04ecefbf
Merge branch 'master' into filter-packages
2020-08-25 16:51:28 +02:00
f516d36f6f
Make sure Request::requireName can not be called twice for the same name
2020-08-25 15:37:28 +02:00
90332f1dbd
Add a readonly mode to the cache, fixes #9150
2020-08-25 13:55:32 +02:00
875a4784ed
Reorg config class a little
2020-08-25 13:54:29 +02:00
6186c7f36f
Fix handling of root aliases in partial updates, fixes #9110
2020-08-25 11:05:28 +02:00
05e9fe936f
Merge branch '1.10'
2020-08-25 08:59:07 +02:00
b847c4dc3a
Validate licenses correctly even when proprietary is combined with some other license, fixes #9144
2020-08-25 08:58:43 +02:00
d140a842fa
RemoteFilesystem: avoid warning when setting max file size
2020-08-24 13:53:07 +01:00
2bd1bd4194
Merge pull request #9142 from oleg-andreyev/fixing-error-message-for-higher-priority-repo
...
fixing error message for higher repository priority when it provides only a dev-branch
2020-08-23 16:52:55 +02:00
448daea696
Add support for detecting packages not matching only due to minimum stability
2020-08-23 16:48:07 +02:00
e5ba99cf67
Merge branch '1.10'
2020-08-23 15:18:48 +02:00
9ea9d20b21
Merge pull request #9130 from glaubinix/t/max-file-size
...
Downloader: add a max_file_size option to prevent too big files to be downloaded
2020-08-23 13:37:12 +02:00
a16f32484b
Downloader: add a max_file_size to prevent too big files to be downloaded
2020-08-22 19:37:42 +01:00
f262feebec
fixing error message for higher repository priority, when higher repo has only a dev-branch
2020-08-22 20:07:13 +03:00
a83588f568
The proper fix
2020-08-18 16:30:47 +02:00
4e06aa051a
Check if inet_pton() exists
2020-08-18 16:00:44 +02:00
3be62a9fda
Fix openssl_free_key deprecation notice in PHP 8
2020-08-14 17:45:41 +01:00
00e268cdbf
Clear Intervals cache when we are done with it
2020-08-13 16:45:43 +02:00
fdff3aeaba
emit github action formatted error messages ( #9120 )
2020-08-13 16:37:32 +02:00
c845d66818
Lowercase ext- package names, refs #9093
2020-08-13 15:48:41 +02:00
4d20e6f5d6
Move Version util to Platform namespace, fix CS nitpicks, make regexes case insensitive for robustness, refs #9093
2020-08-13 15:48:41 +02:00
7e1ef19a5a
Expand library version checking capabilities ( closes #9093 )
2020-08-13 15:48:41 +02:00
657ae5519e
Add support for TAR in Artifact packages ( #9105 )
2020-08-12 20:30:58 +02:00
ff757e649c
Use pool to match packages to avoid getting packages without ids, fixes #9094
2020-08-12 12:41:19 +02:00
826db3db5e
Used locked repo only if it is present
2020-08-12 11:11:37 +02:00
c0eb9834fe
Merge pull request #9116 from ryanaslett/patch-1
...
Update PathDownloader.php
2020-08-11 09:54:09 +02:00
51b1a752e3
Merge pull request #9098 from GrahamCampbell/patch-1
...
Use consistent phpdoc nullable syntax
2020-08-11 09:52:09 +02:00
7649c8438d
Fix exception when using create-project in current directory, fixes #9073
2020-08-11 09:42:42 +02:00
c0309f22d7
Update PathDownloader.php
...
If a path repository points at a directory that is managed by composer installers, the path that gets set ends up being relative, and this check fails to see that the source is already present, and therefore removes it.
Since ->install is already using realpath around the $path argument, remove should as well.
For an example repository that demonstrates this bug See: https://github.com/ryanaslett/pathrepotestcase
2020-08-10 12:51:48 -07:00
019febb5fa
Use consistent phpdoc nullable syntax
2020-08-02 15:10:54 +01:00
2d3905157d
Merge branch '1.10'
2020-07-30 21:06:51 +02:00
00f712a7c4
Revert "Allow specifying a version requirement for CLDR"
2020-07-30 21:00:43 +02:00
387e828993
Promote next major version when running stable self-update, and prevent self-update from automatically upgrading to the next major release
2020-07-30 16:32:29 +02:00
5bd61ac55c
Cache versions data to avoid redownloading it twice during self-update
2020-07-30 16:32:29 +02:00
7028d0ce27
Merge pull request #9077 from glaubinix/f/api-data-detection
...
Driver: only cache composer.json file without API data to disk
2020-07-30 15:32:10 +02:00
daae46e1e0
Merge pull request #9085 from lstrojny/lib-cldr
...
Allow specifying a version requirement for CLDR
2020-07-30 14:53:46 +02:00
12d6759888
Fail hard instead of skipping branches/tags quietly when parsing VCS repos if 401/403 are returned, fixes #9087
2020-07-30 14:38:49 +02:00
7bcde1481d
Fix git downloader syntax for windows cmd when updating packages, fixes #9089
2020-07-30 14:38:48 +02:00
79813b2f77
Fix detection of git refs to be more strict
2020-07-30 14:38:48 +02:00
5a02ea6a96
Check that class exists
2020-07-30 14:29:48 +02:00
404dea61c2
Allow specifying a version requirement for the relevant CLDR
2020-07-29 19:32:53 +02:00
b25296ef74
Driver: only cache composer.json file without API data to disk
2020-07-27 13:26:57 +01:00
e5c7835d57
Properly support PHP 8.0 Named Arguments
...
See https://wiki.php.net/rfc/named_params#internal_functions
(implemented but not yet merged)
An ArgumentCountError will be thrown when passing variadic arguments to
a function with call_user_func_array() if extra unknown named arguments
are encountered.
Fatal error: Uncaught ArgumentCountError: array_merge() does not accept unknown named parameters in phar:///path/to/composer.phar/src/Composer/DependencyResolver/DefaultPolicy.php:84
(e.g. for `['phpunit/phpunit' => [72]]`)
2020-07-26 15:28:47 -04:00
ac055e5718
Fix: Reference
2020-07-21 23:25:05 +02:00
d8fa746433
Merge pull request #9058 from Seldaek/zip-cleanup
...
Clean up Zip Util to be more strict about what is a valid package archive
2020-07-21 17:17:12 +02:00
c353ac835c
Add exception for multiple composer.json files ( #3 )
2020-07-21 17:10:26 +02:00
4e1dd4bfdf
added phpdocs in StreamContextFactory
2020-07-20 20:49:00 +02:00
750a92b4b7
Fix headers array format
2020-07-17 17:29:00 +02:00
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
63041fbf50
Add missing class
2020-06-03 15:28:10 +02:00
02059d96e7
Fail early if an archive extraction is going to fail at install/update stage to avoid leaving the vendor dir in a half up to date state
2020-06-03 15:19:02 +02:00
396ad87fd0
Add handling of ctrl-C on windows for php 7.4+
2020-06-03 15:18:27 +02:00
a66a939b76
Merge pull request #8937 from Seldaek/optim-rules
...
Optimize rule creation for alias packages
2020-06-03 14:17:13 +02:00
5ef7765cbd
Merge pull request #8923 from staabm/glob-classmap
...
Autoload-Generator: support glob patterns in classmaps
2020-06-03 13:12:44 +02:00
ccea1b95a8
Fix pretty constraint for --with overrides
2020-06-03 10:43:18 +02:00
7507b87fb3
Remove stray var_dump
2020-06-03 10:40:44 +02:00
8d3ec0f718
Do not reverse sorted packages, fixes #8320
2020-06-03 09:42:21 +02:00
1055be7936
Fix unfixing of packages when a replacer gets unfixed before a replacee, refs #8882
2020-06-02 17:03:41 +02:00
4d75d524f1
Fix class name case, refs #8939
2020-06-02 16:20:31 +02:00
462dc5a933
Fix for HHVM 3
2020-06-02 14:52:38 +01:00
86e79fcce3
Merge pull request #8938 from Seldaek/drop-dead-code
...
Remove some dead code from RuleSetGenerator
2020-06-02 15:49:24 +02:00
718021724c
Deduplicate more content in complex problem output
2020-06-02 15:46:12 +02:00
9bd255d8f1
Remove some dead code from RuleSetGenerator
2020-06-02 14:41:18 +02:00
5a4709c3d6
Optimize rule creation for alias packages
...
This mainly benefits projects running updates with minimum-stability: dev
2020-06-02 13:44:56 +02:00
8a7f3a9a09
Avoid rendering problem output for dev-master aliases which is useless
2020-06-02 13:21:06 +02:00
5e5f9f8142
Remove unused RULE_INTERNAL_ALLOW_UPDATE
2020-06-02 11:22:35 +02:00
c8efb50d39
Change the single requirement ignore from --ignore-platform-reqs=xx to --ignore-platform-req=xx to avoid BC issues
2020-06-02 11:22:09 +02:00
2ddf4346ef
Improve error reporting for RULE_PACKAGE_ALIAS
2020-06-02 10:35:04 +02:00
0ea9eafcaf
Add rules for aliased packages when an alias is added, fixes #8902
2020-06-02 10:07:20 +02:00
c0f5c13516
RuleSetGenerator instance does not need to be kept around anymore
2020-06-02 09:45:19 +02:00
1e08097a17
Fix phpstan warning
2020-06-01 16:05:13 +02:00
a9affa8413
Add missing use statement
2020-06-01 15:58:34 +02:00
e85da00dff
Add a way to ignore only some packages in --ignore-platform-reqs, and make the platform check ignore those packages which were ignored as requirements, fixes #8861
2020-06-01 15:43:24 +02:00
21e708f2c4
Remove upper bound PHP version checks from platform-check as there is not enough value added and it risks causing issues
2020-06-01 09:39:44 +02:00
95e6e16b78
Use Semver compiled constraints
2020-05-26 21:35:30 +02:00
6a0e02db1b
Autoload-Generator: support glob patterns in classmaps
2020-05-23 21:22:07 +02:00
a07f9ffba9
Catch SIGINT/Ctrl+C during installs and run cleanups on all packages before exiting
2020-05-22 13:24:30 +02:00
385655f02a
Mark temp files as such for clarity in case any gets left over
2020-05-22 13:23:14 +02:00
acf2b15982
Merge branch '1.10'
2020-05-22 10:30:51 +02:00
30f994e424
fix deprecations in PHP 8
2020-05-21 18:16:19 +01:00
c7fb15faf4
Update to MatchAllConstraint
2020-05-21 16:12:41 +02:00
45d3e133a4
Avoid checking for unbounded constraints in platform checks
2020-05-19 17:15:08 +02:00
62d0443e07
Avoid checking for readline in non-CLI contexts, fixes #8909
2020-05-19 16:46:33 +02:00
d42e12c514
Make config non optional, fixes #8896
2020-05-19 16:34:51 +02:00
b27c4b2472
Merge branch '1.10'
2020-05-19 15:48:19 +02:00
541692bbfe
Use "getInitialWorkingDirectory" instead of "getWorkingDirectory"
...
Follow-up 8d24b61bef
2020-05-19 15:47:51 +02:00
1d2df5ef55
Add output to remove/require command to highlight the fact it is running an update command, refs #8910
2020-05-19 14:48:58 +02:00
af6444353f
Refactor hint generation and whitespace handling in SolverProblemsException
2020-05-19 12:17:57 +02:00
98e5f81a5f
Fix detection of fixed package problems to include more cases, fixes #8910
2020-05-19 12:17:25 +02:00
beded906ba
Merge branch '1.10'
2020-05-08 21:05:07 +02:00
42fc372e52
Add function_exists() for 'pcntl_signal'
2020-05-08 20:53:43 +02:00
a074819a51
Add support for gitlab deploy token ( #8867 )
...
* feat: Added ability to work with GitLab deploy tokens: https://docs.gitlab.com/ee/user/project/deploy_tokens/
Deploy tokens can be specified two ways:
1) GIT CONFIG:
git config --add gitlab.deploytoken.user USERNAME && git config --add gitlab.deploytoken.token TOKEN
2) Auth.json:
"gitlab-token": {
"gitlab.com": {"username": "USERNAME", "token": "TOKEN"}
}
2020-05-08 17:43:07 +02:00
1ef352751c
Fix display issue in create-project when installing dev-master
2020-05-06 13:45:31 +02:00
ba3df8faea
Merge pull request #8843 from FIDATA/feature/archive-name
...
Add (default) base name of archive into composer.json
2020-05-06 11:06:28 +02:00
dd0c8b4278
Merge pull request #8723 from helhum/fix-package-sorting
...
Fix package sorting
2020-05-06 10:47:01 +02:00
3134466b42
Merge branch '1.10'
2020-05-06 10:30:53 +02:00
Jordi Boggiano