1
0
Fork 0
Commit Graph

7160 Commits (024f0eda5379d5c04cec00d606e1580598059d7a)

Author SHA1 Message Date
Jordi Boggiano 91dd175f74
Fix env var handling when variables_order includes E and symfony/console 3.3.15+ is used, fixes #9930 2021-06-03 10:17:54 +02:00
Jordi Boggiano 61c7762680
Merge pull request #9932 from jrfnl/php-8.1/9931-fix-deprecation-notice
PHP 8.1 | Fix "Implicit conversion from non-compatible float" deprecation notice
2021-06-03 09:11:02 +02:00
jrfnl 3db2304fc6 PHP 8.1 | Fix "Implicit conversion from non-compatible float" deprecation notice
As reported in 9931.

Unfortunately I gave not been able to track down the input which is causing the notices to be thrown, which is why I haven't added a test case to the unit tests. Would be great if someone would known the exact input to use for those.

The issue (and fix) can be verified by using the "quick preview" option and choosing `git.master` with this code sample: https://3v4l.org/1fr2g
2021-06-03 06:08:51 +02:00
Jordi Boggiano aeb2c8d6e3
Make sure InstalledVersions ships to project with docblocks 2021-06-02 15:21:35 +02:00
Jordi Boggiano 8bf0ddf905
Clean up ZipDownloader, always do async first if possible then fallback to non-async 2021-06-02 15:13:19 +02:00
Jordi Boggiano 28c7d0ea5d
Avoid creating new processes to remove directories which we know are empty, which speeds things up a lot on windows 2021-06-02 13:47:04 +02:00
Jordi Boggiano d864c5743a
Add 7-zip presence check to diagnose command 2021-06-02 13:39:26 +02:00
Nicolas Grekas bec76367db
Speedup extracting on Windows 2021-06-02 11:54:18 +02:00
Nils Adermann 1ca6397442
Merge pull request #9765 from Seldaek/always_sync_symlinked_path_pkgs
Always mark symlinked path packages for update even during partial updates to make sure they always reflect the current state on disk
2021-06-02 11:50:15 +02:00
Nils Adermann 189936dd59
Merge pull request #9928 from Seldaek/replace_conflict
Add better error reporting for cases where a package conflicts with a replace and not directly a package
2021-06-02 11:35:48 +02:00
Jordi Boggiano 1f37d1c1d5
Add better error reporting for cases where a package conflicts with a replace and not directly a package, fixes #9834 2021-06-02 10:08:13 +02:00
Jordi Boggiano 35bfa453cc
Merge pull request #9925 from Seldaek/dist_placeholders
Add support for mirror-style placeholders for the dist url
2021-06-02 10:05:25 +02:00
Jordi Boggiano b751156e1c
Prevent cache gc from happening during test suite runs, and add output so it is clear why it is blocking for a bit 2021-06-02 10:00:01 +02:00
Jordi Boggiano 93a5b27631
Add prettyVersion to URL placeholders 2021-06-01 16:59:35 +02:00
Jordi Boggiano a23f8a3d6c
Add gitlab-protocol to config command and schema 2021-06-01 16:05:53 +02:00
Jordi Boggiano 90d72ca686
Tweak validate command output to be slightly more readable, less colorful 2021-06-01 14:03:19 +02:00
Jordi Boggiano 2eaf81c813
Fix a few issues in lock file validation
- handle packages present but in wrong version
- handle provide/replace correctly
- do not validate if lock file is missing

refs #9899
2021-06-01 14:02:51 +02:00
Jordi Boggiano 69dc607408
Merge remote-tracking branch 'PrinsFrank/detect-missing-packages-on-validate' 2021-05-31 17:29:40 +02:00
Nils Adermann 1dc39bda75
Merge pull request #9915 from Seldaek/reinstall
Add a reinstall command
2021-05-31 17:22:32 +02:00
Jordi Boggiano 4dbdae3ada
Sort uninstalls in reverse order from installs 2021-05-31 17:18:47 +02:00
Jordi Boggiano 5737a34e53
Sort package installs using Transaction 2021-05-31 17:09:19 +02:00
Jordi Boggiano c257395a6d
Add support for mirror-style placeholders for the dist url, fixes #9661 2021-05-31 16:46:49 +02:00
Abi أب 759897e7e8
Update cache dir on macOS to follow OS guidelines (now $HOME/Library/Caches/Composer) (#9898)
Co-authored-by: Jordi Boggiano <j.boggiano@seld.be>
2021-05-27 23:07:23 +02:00
Brad Jones dd625669e8
Introduce gitlab-protocol option to force the gitlab repos to use https or git protocol (#9401) 2021-05-27 23:05:53 +02:00
Jordi Boggiano c8de960018
Throw when repo consistency is in question 2021-05-26 14:01:04 +02:00
Jordi Boggiano 0dce0f80f1
Also hint for errors when the root package does not match the constraint 2021-05-25 23:05:44 +02:00
Nils Adermann 21c70c2606
Merge pull request #9902 from Seldaek/cyclic-deps
Detect and output a better hint for cyclic dependencies
2021-05-25 22:58:50 +02:00
Jordi Boggiano cbef7b9172
Detect and output a better hint for dependencies on the root package, fixes #9837 2021-05-25 22:47:53 +02:00
Jordi Boggiano 387e504437
Undeprecated dump-autoload --no-dev even though it is mostly not needed anymore, refs #9714 2021-05-25 22:39:55 +02:00
Jordi Boggiano 500efbe233
Add a reinstall command, fixes #3112 2021-05-25 22:30:15 +02:00
Jordi Boggiano 084fff2014
Merge remote-tracking branch 'guilliamxavier/lax-schema' 2021-05-24 22:27:48 +02:00
Jordi Boggiano 6ac5b46607
Add legend for outdated and show --latest commands, fixes #9716 2021-05-24 22:19:07 +02:00
Jordi Boggiano 7888d3fb97
Align result descriptions to make search output more readable, fixes #9455 2021-05-24 21:44:56 +02:00
Jordi Boggiano 44e6591573
Improve error reporting for exts overridden by platform config, fixes #9876 2021-05-24 16:57:33 +02:00
Guilliam Xavier 2d21dd675a Invert strict/lax schema validation 2021-05-24 11:51:04 +02:00
Guilliam Xavier 9e2cb30dfb Revert "Merge remote-tracking branch 'BoShurik/schema'"
This reverts commit 89c3045e2b, reversing
changes made to 991985792d.
2021-05-24 11:46:08 +02:00
Guilliam Xavier 41c66b1a2d Revert "Update docs and add more helpful output to validate command, refs #9782"
This reverts commit 458bd41d8f.
2021-05-24 11:46:08 +02:00
Jordi Boggiano da3d5e3143
Merge pull request #9699 from ochorocho/improve-installed-versions-9648
Add install-path and type to installedVersions.php and installed.php,…
2021-05-24 10:29:40 +02:00
Jordi Boggiano 6f255d1230
Merge branch '2.0' 2021-05-21 17:03:16 +02:00
Jordi Boggiano 8874ca0e5a
Fix regression introduced in dd54f295fe 2021-05-21 16:58:34 +02:00
John Stevenson ce19bcd992
Upgrade to xdebug-handler 2 (#9832)
This adds support for Xdebug3 modes and changes the default behaviour
from always restarting if Xdebug is loaded, to only restarting if Xdebug
is active.

Xdebug is considered active if it is loaded, and for Xdebug3, if it is
running in a mode other than `xdebug.mode=off`.
2021-05-21 16:47:29 +02:00
Jordi Boggiano 23d1de5d59
Merge branch '2.0' 2021-05-21 16:44:33 +02:00
Jordi Boggiano fee22972ea
Update basic docs on install/update, fixes #9754 2021-05-21 16:44:05 +02:00
Jordi Boggiano 6441e1f94f
Merge branch '2.0' 2021-05-21 15:01:18 +02:00
Jordi Boggiano 7d19930ca6
Fix minimum-stability validation to match what VersionParser::normalizeStability does, closes #9904 2021-05-21 15:00:48 +02:00
Jordi Boggiano 019d051e9e
Fix type 2021-05-21 14:50:30 +02:00
Jordi Boggiano 284ec95712
Document new methods and update the composer-runtime-api version to 2.1 2021-05-21 14:34:51 +02:00
Jordi Boggiano 82cffa17d3
Undo addition of initializeInstalled and remove inline copy of the data from the class 2021-05-21 14:34:51 +02:00
Jordi Boggiano 3fe4f84a76
Fix handling of metapackages with null paths, and handling of paths which do not have a shortest-path and require an absolute path to be addressed 2021-05-21 14:33:10 +02:00
Jordi Boggiano 518b44a810
Clean up dump code to avoid reimplementing var export, and remove DIRECTORY_SEPARATOR 2021-05-21 14:33:10 +02:00
Jordi Boggiano 5a69a1e483
Add InstalledVersions::getInstallPath($package) getter, and update phpdoc types 2021-05-21 14:33:10 +02:00
Jordi Boggiano 8335b49cf0
Rename dev-requirement to dev_requirement for consistency 2021-05-21 14:33:09 +02:00
Jochen Roth b6c9d34125
Add install-path and type to installedVersions.php and installed.php, add method to get installed packages by type
Issue https://github.com/composer/composer/issues/9648
2021-05-21 14:33:09 +02:00
Jordi Boggiano 31cc102850
Merge branch '2.0' 2021-05-21 14:32:06 +02:00
Frank Prins e83e92b2ae Ignore platform requirements like "ext-*" and "php" when validating the lock file as they don't get locked 2021-05-20 21:14:30 +02:00
Frank Prins 32b70142d9 Replace static anonymous function and replace it with normal anonymous function as static ones are only supported on PHP5.4 and up 2021-05-20 20:55:00 +02:00
Frank Prins f4d3a1e478 Detect missing packages that are a requirement or dev-requirement but not locked. 2021-05-20 20:44:53 +02:00
Nils Adermann 16279d328e
Merge pull request #9816 from Seldaek/install_deprecate
Deprecate InstalledVersions::getRawData in favor of getAllRawData
2021-05-20 16:54:33 +02:00
Jordi Boggiano 8a3f4a8400
Add secure-svn-domains config option to mark secure svn:// hostnames, fixes #9872 2021-05-20 16:27:58 +02:00
Jordi Boggiano 458bd41d8f
Update docs and add more helpful output to validate command, refs #9782 2021-05-20 16:11:51 +02:00
Jordi Boggiano 89c3045e2b
Merge remote-tracking branch 'BoShurik/schema' 2021-05-20 15:42:39 +02:00
Jordi Boggiano 991985792d
Merge branch '2.0' 2021-05-20 14:16:52 +02:00
Jordi Boggiano 251b852fd2
Make sure async processes fail the promise if they fail to start, fixes #9808 2021-05-20 14:15:14 +02:00
Jordi Boggiano 8427b6c8ed
Also make sure filesystem is up to date before generating binary links, refs #9627 2021-05-20 13:27:20 +02:00
Jordi Boggiano 9ba042ded8
Add Platform-PHP version to user-agent header to improve targetted-php stats (#9873) 2021-05-20 10:17:30 +02:00
Jordi Boggiano 5bf614a762
Merge branch '2.0' 2021-05-17 22:35:56 +02:00
Jordi Boggiano dd54f295fe
Fix progress output, and remove progress bar on CI env, fixes #9621, closes #9880 2021-05-17 22:34:32 +02:00
Jordi Boggiano 459a7d9623
Use a simpler suggested require version of * to keep things simple for extensions which are versioned like PHP, fixes #9483 2021-05-17 14:36:46 +02:00
Jordi Boggiano 0021758e0b
Merge branch '2.0' 2021-05-10 13:14:14 +02:00
Jordi Boggiano d56387edb7
Also handle throwable on supported php versions 2021-05-10 13:14:08 +02:00
Jordi Boggiano 649087d6de
Fix type issues with root package interface 2021-05-04 16:47:54 +02:00
Jordi Boggiano 22cc96682d
Merge branch '2.0' 2021-05-04 16:43:31 +02:00
Jordi Boggiano b268e20d9f
Fix invalid interface usage 2021-05-04 16:43:24 +02:00
Jordi Boggiano 7b77161b7e
Merge branch '2.0' 2021-05-04 16:29:32 +02:00
Jordi Boggiano 37f4f531d0
Avoid leaving the event stack in a dirty state if an event listener throws, fixes #9846 2021-05-04 16:18:38 +02:00
Jordi Boggiano a844fce23e
Fix handling of inline-update-constraints with refs or stability flags, fixes #9847 2021-05-04 14:14:57 +02:00
Jordi Boggiano a04202aa7d
Merge pull request #9864 from Seldaek/dev-versions-dx
Hint at a branch rename if we detect dev-master can not be found and condense dev-* versions in problem output
2021-05-04 13:38:33 +02:00
Jordi Boggiano 3380178798
Introduce a cross-platform safe version of is_readable to support UNC / wsl$ paths on Windows (#9861) 2021-05-04 13:25:52 +02:00
Jordi Boggiano 298246dccb
Also condense dev-* versions if there are many, refs #9850 2021-05-03 14:42:59 +02:00
Jordi Boggiano 9b7a8d4543
Hint at a branch rename if we detect dev-master can not be found but dev-main or dev-default exists, fixes #9850 2021-05-03 14:42:58 +02:00
Markus Staab bfea0f7d1e
BinaryInstaller: install full binaries on WSL when bin-compat=auto (#9855) 2021-05-02 16:50:42 +02:00
Jordi Boggiano 4842f213a1
Also make sure type is correct for preg_match 2021-04-30 10:07:28 +02:00
Jordi Boggiano 832f4007d6
Allow ints in source/dist reference 2021-04-30 09:40:58 +02:00
Jordi Boggiano 832af78e28
Add basic source/dist validation 2021-04-28 21:53:09 +02:00
Jordi Boggiano 40c7a725e1
Merge branch '2.0' 2021-04-27 13:06:49 +02:00
Jordi Boggiano 332c46af8b
Merge pull request from GHSA-h5h8-pc6h-jvvx
* Fix external process calls to avoid user input being able to pass extra parameters

* Tweak some fixes
2021-04-27 13:00:40 +02:00
Jordi Boggiano 2a50a9400f
Fix install step at the end of init command 2021-04-20 22:04:28 +02:00
Jordi Boggiano 1fd70de32d
Merge branch '2.0' 2021-04-20 22:03:43 +02:00
Jordi Boggiano 99d8e0ad09
Fix install step at the end of init command 2021-04-20 22:00:01 +02:00
Andreas Scheibel bb1bb022e4
"composer init --autoload" - Interactive generates PSR-4 autoloader in composer.json (#9829)
- Generates PSR-4 autoload entry in composer.json.
- Run dump-autoload, if no dependencies are set
2021-04-20 21:58:38 +02:00
Adam e291aa1d12
Allow PreFileDownloadEvent to carry transport options for metadata (#9831) 2021-04-19 13:55:52 +02:00
John Stevenson c3b76a8532
Upgrade to xdebug-handler 2 (#9832)
This adds support for Xdebug3 modes and changes the default behaviour
from always restarting if Xdebug is loaded, to only restarting if Xdebug
is active.

Xdebug is considered active if it is loaded, and for Xdebug3, if it is
running in a mode other than `xdebug.mode=off`.
2021-04-13 09:59:06 +02:00
Adam 180ba49f33
ComposerRepository::asyncFetchFile() does not pass the downloaded URL to PostFileDownloadEvent (#9827) 2021-04-11 13:59:18 +02:00
Markus Staab 7c602d8807
Added link to composer.org docs on ProcessTimedOutException (#9796) 2021-04-11 13:30:35 +02:00
Jordi Boggiano d75d79b452
Merge pull request #9822 from phenaproxima/post-file-download
Fire POST_FILE_DOWNLOAD event for metadata fetched by ComposerRepository
2021-04-09 14:53:20 +02:00
Jordi Boggiano 9a9c738f23
Add repository instance to Pre/PostFileDownloadEvent metadata 2021-04-09 11:21:14 +02:00
Jordi Boggiano 7dd95a768b
Clean stuff up and deprecate old usages for PostFileDownloadEvent 2021-04-09 11:21:13 +02:00
Phéna Proxima df0a2cdd0a Fire POST_FILE_DOWNLOAD event for metadata fetched by ComposerRepository. 2021-04-08 11:08:13 -04:00
Jordi Boggiano 549dabf878
Merge branch '2.0' 2021-04-08 12:06:38 +02:00
Jordi Boggiano e6cede4a61
Make sure update mirrors/--lock keeps the release date of the original reference when dev versions have newer commits, refs #9812 2021-04-08 11:54:39 +02:00
Jordi Boggiano 0ab4013788
Fix output listing some updates that do not really happen when updating mirrors/--lock, fixes #9812 2021-04-08 10:55:48 +02:00
Jordi Boggiano d519fb8a53
Add warning when loading plugins of type composer-installer as they are unlikely to function correctly and should be upgraded to the composer-plugin type 2021-04-08 10:40:55 +02:00
Jordi Boggiano f13282e555
Change default preferred-install to dist, add --prefer-install=auto|dist|source to allow specifying auto (#9603)
Fixes #9546
Fixes #9674
2021-04-07 16:04:42 +02:00
Jordi Boggiano a4eb2d4096
Merge branch '2.0' 2021-04-07 15:58:25 +02:00
Jordi Boggiano ddc3693725
Switch to composer/metadata-minifier, fixes #9727 2021-04-07 15:56:34 +02:00
Jordi Boggiano cf69f3194a
Fix doctype annotations 2021-04-07 15:56:34 +02:00
Adam 29befaa94b
Make ComposerRepository::configurePackageTransportOptions() protected. (#9818) 2021-04-07 15:56:15 +02:00
Jordi Boggiano 1179e4b481
Change root.dev-requirement to root.dev in installed.php as the root is not required per se, and this simply tracks the dev mode at install time 2021-04-07 13:42:22 +02:00
Jordi Boggiano cb2db16637
Merge branch '2.0' 2021-04-07 13:24:47 +02:00
Jordi Boggiano f5e6cc89cd
Deprecate InstalledVersions::getRawData in favor of getAllRawData 2021-04-07 13:23:34 +02:00
Jordi Boggiano 7ae3fbb81d
Fix doctype annotations 2021-04-07 13:22:48 +02:00
Jordi Boggiano 52a452c885
Improve InstalledVersions docs slightly 2021-04-07 12:44:23 +02:00
Jordi Boggiano 91136213d1
Merge branch '2.0' 2021-04-02 13:41:25 +02:00
Jordi Boggiano c3ae317a71
Support --no-dev combined with --locked in outdated/show commands, fixes #9788 2021-04-02 13:34:50 +02:00
Jordi Boggiano dca8bd7197
Merge branch '2.0' 2021-04-01 10:15:10 +02:00
Jordi Boggiano 18e268556d
Fix type warning on php8.1, refs #9770 2021-04-01 10:14:21 +02:00
Jordi Boggiano dc84dbbbf7
Fixed detection of hg version when localized, fixes #9753 2021-04-01 10:09:49 +02:00
Jordi Boggiano 53a974f9c9
Tweak virtualbox detection and improve it by detecting vbox additions, refs #9627 2021-04-01 09:48:07 +02:00
Jordi Boggiano 836ca051d3
Merge branch '1.10' into 2.0 2021-04-01 09:17:30 +02:00
Jordi Boggiano 96acad1e45
Update github token pattern to match their latest updates 2021-04-01 09:13:32 +02:00
BoShurik cc55b56dd7 Allow optional name and description fields for project type 2021-03-30 16:51:03 +03:00
vitman ecc8331312
Add dev mode env var for scripts run (#9793)
Co-authored-by: Vitali Tsyrkin <vitalit@playtika.com>
2021-03-27 13:23:46 +01:00
Jordi Boggiano bf73a20bc0
Merge branch '2.0' 2021-03-16 20:31:44 +01:00
Jordi Boggiano 63c086c208
Add source package name to debug info when enabling plugins 2021-03-16 20:31:19 +01:00
Jordi Boggiano 3b89a9c3b4
Also attempt working around Vagrant filesystem issues when installing plugins initially, refs #9627 2021-03-16 20:31:18 +01:00
Stephan 2f4b99eacd
MaxFileSizeException should reject download job (#9778) 2021-03-15 13:35:16 +01:00
Brandon Kelly 7652408829
Only call sapi_windows_set_ctrl_handler() for CLI requests (#9771) 2021-03-12 00:18:41 +01:00
Jordi Boggiano f10ae542ff
Always mark symlinked path packages for update even during partial updates to make sure they always reflect the current state on disk, fixes #9751 2021-03-10 14:26:42 +01:00
Jordi Boggiano 346356a4dd
Fix phpdoc 2021-03-10 13:44:42 +01:00
Jordi Boggiano 5d6f9b2528
Prefer @phpstan- annotations as that is what we run against 2021-03-10 10:52:16 +01:00
Jordi Boggiano b40b93bc7d
Merge branch '2.0' 2021-03-10 10:46:34 +01:00
Jordi Boggiano 414586ba05
Attempt working around Vagrant filesystem issues, added COMPOSER_RUNTIME_ENV env var (set to vagrant), fixes #9627 2021-03-10 10:45:40 +01:00
Jordi Boggiano 059b5b197d
Merge branch '2.0' 2021-03-09 23:27:32 +01:00
ochorocho 35210d99a9
Add --format json to search command (#9747)
Co-authored-by: Jordi Boggiano <j.boggiano@seld.be>
2021-03-09 23:06:02 +01:00
Jordi Boggiano 17747181d0
Clarify behavior of name in VCS repo, closes #9752 2021-03-09 23:00:17 +01:00
Jordi Boggiano c81562b343
Merge branch '1.10' into 2.0 2021-03-09 21:39:49 +01:00
Jordi Boggiano 54889ca109
Document GH token usage and also make sure we redact them in Process debug output, refs #9757 2021-03-09 21:37:43 +01:00
Ayesh Karunaratne dc83ba93f3
Update GitHub token pattern
GitHub is updating the format of auth tokens from `a-z0-9` to `A-Za-z0-9` ([notice](https://github.blog/changelog/2021-03-04-authentication-token-format-updates/)).
I'm not sure why `.` is allowed, but I dare not to remove it. In this PR, the token validation regex is updated to allow `A-Za-z0-9` instead of the current all lower-case `a-z` and disallowed `_`.
2021-03-09 17:17:35 +01:00
Jordi Boggiano 4940009f83
Bump phpstan to level 3 (#9734)
Clean up PackageInterface/CompletePackageInterface, add missing methods, type things in solver as BasePackage, added CompleteAliasPackage, ..
2021-03-09 15:49:40 +01:00
Jordi Boggiano 8392508e23
Merge branch '2.0' 2021-03-09 15:29:19 +01:00
Jordi Boggiano ab84916422
Fix unclear error when a package can be found in lock but not in the remote repo, fixes #9750 2021-03-09 15:01:23 +01:00
Jordi Boggiano de8a737015
Fix var shadowing 2021-03-09 14:13:28 +01:00
Jordi Boggiano 4a8e7daf56
Make sure that single files installed via file downloader get the executable bit set if they are a binary file, refs #9742 2021-03-09 14:13:19 +01:00
Jordi Boggiano 4bedd8379a
Fix php-proxying of binaries to avoid proxying phar files, fixes #9742 2021-03-09 14:12:32 +01:00
Jordi Boggiano e9d405ff18
Avoid using str_replace for dev-master replacement as that may be a valid part of a branch name, fixes #9739 2021-03-09 12:08:38 +01:00
Jordi Boggiano b451bcb1ac
Fix issue extracting archives into paths that already exist, fixes composer/installers#479 2021-03-09 11:53:52 +01:00
Jordi Boggiano bcd862c3dc
Add support for @php <abs path to binary from PATH>, fixes #9726 2021-03-09 10:38:46 +01:00
Jordi Boggiano d0b399b788
Merge branch '2.0' 2021-03-09 09:54:39 +01:00
John Stevenson 4f47a4c667
Proxy handling docs and tweaks (#9735) 2021-03-05 20:05:36 +01:00
John Stevenson 07f59a9162
Preserve file permissions on Windows self-update (#9733)
Windows file operations result in different file permissions depending
if the file is copied or moved. A copy operation applies permissions
from the destination folder (or file if it already exists and does not
use inheritance), while a move operation generally preserves the source
file permissions.

Windows PHP `rename` uses MoveFileEx so if the user is running as an
admin and the destination is in a common (non-user) location, then the
permission for other users will be replaced by the admin user. Likewise
for the UAC elevation feature, which uses the cmd.exe `move` command.

This fix uses copy and delete operations on Windows, so that other users
can continue to run composer.phar
2021-03-05 19:57:47 +01:00