1
0
Fork 0
Commit Graph

6967 Commits (e291aa1d12cf7dc5c50be7c1c7219998745382e1)

Author SHA1 Message Date
Jordi Boggiano a6d92e1eee
Sanitize URLs 2021-02-10 12:46:57 +01:00
Jordi Boggiano 8d94e25c2f
Minor fixes 2021-02-10 11:28:01 +01:00
Jordi Boggiano 902174d2a7
Improve error reporting when failing to load a package, fixes #9680 2021-02-10 11:24:59 +01:00
Jordi Boggiano 6a869ede77
Fail early if git/hg/svn can not be found on the system, so that download can be retried from dist, fixes #9681 2021-02-10 10:48:08 +01:00
Jordi Boggiano 78d7792eb8
Fix handling of promises for uninstall step when updating to a different install source 2021-02-10 10:48:07 +01:00
Ayesh Karunaratne 228428747a
Add support for autoloading Enums
PHP 8.1 supports Enums, and [Enums follow class-semantics](https://php.watch/versions/8.1/enums#class-semantics-autoload).

Composer's class-map generator currently looks for `class`, `interface`, and `trait` keywords. If Composer is run in PHP 8.1 or later, Composer now additionally looks for `enum` keyword as well. This is similar to how Hack's `enum` support is added.

This PR also adds tests for basic enums, backed enums, namespaced enums, and an enum that implements an interface and extends a class.
2021-02-06 15:51:18 +07:00
adlacruzes 2d914524e9 JsonFile: add missing ParsingException throws annotations 2021-02-05 17:32:25 +01:00
Arnaud Vanwambeke 7402ef33fc Dont recommend to use with all dependencies option when it is already used 2021-02-03 23:43:35 -05:00
Yanick Witschi ea6b0836c4
Allow to override Installer::createPlatformRepo 2021-02-01 15:17:02 +01:00
Jordi Boggiano 1e72b23fd3
Merge pull request #9658 from Ayesh/improve/class-autoloader-conditional-path
Minor improvement to ClassLoader::register no-op block
2021-02-01 14:14:34 +01:00
Jordi Boggiano 4ade9bd960
Avoid accessing undefined indices, fixes #9654 2021-02-01 12:55:55 +01:00
Ayesh Karunaratne 980aac6eb2
Minor improvement to ClassLoader::register no-op block
A recent change in the ClassAutoloader (#9635) added support for specifying a vendorDir, and `\Composer\Autoload\ClassLoader::register` now has a if-elseif-else chain.
The first block has a `// no-op` comment, followed by an `elseif` block. It's more readable to `return;`, and remove the `elseif` for readability.
2021-01-29 20:10:18 +07:00
Jordi Boggiano cee34b06b4
No need to ignore phpstan error now that getRegisteredLoaders is in a release 2021-01-29 09:46:21 +01:00
Jordi Boggiano 1a0e578b14
Remove ungreedy modifier and make a few domain matches case insensitive, fixes #9656 2021-01-29 09:43:47 +01:00
Jordi Boggiano 07b8c23f02
Merge branch '1.10' 2021-01-27 15:46:58 +01:00
Jordi Boggiano 37c5e9961c
Merge remote-tracking branch 'nicolas-grekas/path-version' into 1.10 2021-01-27 15:20:38 +01:00
Jordi Boggiano 92313447d6
Filter out exclude-from-classmap rules to avoid generating very long regexes, fixes #9487 2021-01-27 15:10:32 +01:00
Nicolas Grekas 725b33ee5a Handle "versions" option in PathRepository, remove support for "branch-version" 2021-01-27 14:28:26 +01:00
Nicolas Grekas 079e501ac8 Revert "Merge pull request #9273 from nicolas-grekas/dev-version"
This reverts commit d2d606ced2, reversing
changes made to 4a8dbcd145.
2021-01-27 14:03:44 +01:00
Jordi Boggiano 51371944e1
Add comment about not removing the static $installed data, refs #9635 2021-01-27 11:05:53 +01:00
Jordi Boggiano 51001dec60
Merge remote-tracking branch 'nicolas-grekas/install-stack' 2021-01-27 11:04:09 +01:00
Nicolas Grekas ba94445bb9 Ensure InstalledVersions reports info about all currently registered class loaders 2021-01-27 10:39:35 +01:00
Jordi Boggiano 4e0b8c1086
Update src/Composer/Console/Application.php 2021-01-27 09:17:25 +01:00
Ben Beckford 8eaae9f50a Suppress error when chdir($oldWorkingDir); unsuccessful
resolves #9649
2021-01-26 20:48:19 +00:00
Jordi Boggiano 125f8a3319
Merge branch '1.10' 2021-01-26 15:56:49 +01:00
Jordi Boggiano 2cb9630320
Fix $_SERVER var not being updated when using putenv, refs b80038804f and fixes #9372 2021-01-26 15:54:21 +01:00
Jordi Boggiano 6c346d00f3
Merge pull request #9617 from clxmstaab/merge-checkout-reset
GitDownloader: combine checkout + reset commands into a single process
2021-01-26 11:01:58 +01:00
Jordi Boggiano 471a63c206
Merge pull request #9465 from BR0kEN-/issues/9464
#9464: ZipArchiver incorrectly treats `.gitignore` directory inclusions
2021-01-26 10:42:26 +01:00
Jordi Boggiano 5c35f37f92
Properly handle installed repos as additionalFixedRepository, fixes #9574 2021-01-26 09:41:20 +01:00
Jordi Boggiano c800db04d3
Merge pull request #9616 from clxmstaab/fast-first
Filesystem: use fast operation first in emptyDirectory()
2021-01-17 15:01:05 +01:00
Jordi Boggiano 09bf5ec85c
Merge pull request #9615 from clxmstaab/is-dir
Filesystem: use is_dir() instead of file_exists() which is faster
2021-01-17 14:59:52 +01:00
Jordi Boggiano c33f2615b5
Include json response bodies in transport exceptions, fixes #9606 2021-01-17 14:13:58 +01:00
Jordi Boggiano 7ea17d7db9
Merge remote-tracking branch 'naderman/curl-download-performance-select-not-sleep' 2021-01-17 12:50:53 +01:00
Markus Staab 62817a4cb2 fast operation first 2021-01-16 22:50:58 +01:00
Markus Staab 6774e7ee29 Filesystem: use fast operation first in emptyDirectory() 2021-01-16 22:45:41 +01:00
Markus Staab 8dfe45a026 GitDownloader: combine checkout + reset commands into a single process
use a single process instead of 3 to improve performance
2021-01-16 22:26:20 +01:00
Markus Staab 6552b85100 Filesystem: use is_dir() instead of file_exists() which is faster
this reproducible saves 1-2 seconds while running `COMPOSER_DISABLE_NETWORK=1 php
 composer/bin/composer install -vvv --profile` on the rector/rector project
2021-01-16 22:03:52 +01:00
Nils Adermann 8a85a79b50 Remove debug output 2021-01-15 10:10:27 +01:00
Nils Adermann f72ad485ef Revert lastInfoUpdate change to keep full comaptibility to current behavior 2021-01-15 09:41:53 +01:00
Jordi Boggiano de58c5499e
Always make the root package autoloadable when executing plugins, fixes #9530 2021-01-13 11:45:00 +01:00
Jordi Boggiano 147d884996
Also avoid matching .git suffix in bitbucket URLs, refs #9590 2021-01-13 11:38:45 +01:00
Nils Adermann d665301368 Rewrite while if return as do while 2021-01-12 21:04:52 +01:00
Nils Adermann c043fe841b Remove sleeps from curl handling, select it is responsible for waiting
The current sleeps mean that large files download slowly as select would
return quickly when data has arrived and needs to be processed, but the
sleep waits while the buffers are full.

On the flipside we need to ensure that some code that would keep the CPU
busy if run too often does not get run every time select returns.
2021-01-12 17:52:53 +01:00
Jordi Boggiano a20ee1a448
Avoid matching .git suffix if present in private github URLs, fixes #9590 2021-01-12 16:31:48 +01:00
Jordi Boggiano 4a740e3e61
Add warnings when running updates without curl enabled, fixes #9558 2021-01-12 14:56:17 +01:00
Jordi Boggiano 57117384df
Merge pull request #9601 from Seldaek/json-fix
Fix JSON manipulation issue with large files and jit enabled
2021-01-12 14:45:13 +01:00
Jordi Boggiano 492f8cb350
Add more possessive quantifiers 2021-01-12 14:05:55 +01:00
Jordi Boggiano d94e638461
Fix tests and edge case 2021-01-12 14:00:02 +01:00
Jordi Boggiano 94076c0bb9
Make sure if plugins depend on the root package that the root package is also autoloaded correctly, refs #9530 2021-01-12 13:47:45 +01:00
Jordi Boggiano 598beb240a
CS fixes 2021-01-12 13:04:32 +01:00
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