1
0
Fork 0
Commit Graph

5962 Commits (4bb314e4aff0ee3c093fa14bc39e1da0aae42113)

Author SHA1 Message Date
Jordi Boggiano ae9cc3db58
Avoid clearing the error output during removeDirectory execution, losing git error output, fixes #8351 2019-10-30 10:45:40 +01:00
Jordi Boggiano bc2a1d762a
Merge branch 'master' into 2.0 2019-10-30 08:54:44 +01:00
Nils Adermann eaae360ce6 Correcting lock files in test cases and updating output 2019-10-30 00:55:11 +01:00
Nils Adermann 0ff07015a1 Only load package info from lock file for fixed packages
As a result some lock file packages are no longer in the pool, so the
former installed map, now present map cannot use package ids anymore

Need to revisit some more code later to simplify this, todo notes left
2019-10-30 00:24:25 +01:00
Nils Adermann 4481cc4a88 Allow an install request for a package name which is already fixed
Ensures packages get loaded from locked repo correctly. We may not want
to support this particular use-case at all, but for now it fixes the
existing test, so we may want to revisit this later.
2019-10-29 22:28:36 +01:00
Andriy Maletsky ec293adabc make optimized autoloader respect PSR standards 2019-10-29 20:36:29 +02:00
Armando Miani 82d939d7f7 Validate composer show with --tree and --path options set (#8390) 2019-10-29 15:06:07 +01:00
Jordi Boggiano 8bcacc8a3a
Merge branch '1.9' 2019-10-29 14:24:44 +01:00
MichaelKo 99e23d5263
Don't show root warning for docker containers
Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
2019-10-29 14:24:33 +01:00
Markus Staab e47aa38ad4 Added phpdoc for ComposerAutoloaderInit$SHA1::getLoader() (#8393) 2019-10-29 14:08:33 +01:00
Jordi Boggiano eea4098f98
Merge branch '1.9' 2019-10-25 14:17:35 +02:00
Jordi Boggiano 4fc6479837
Fix require command to allow working on network mounts, fixes #8231 2019-10-25 14:08:30 +02:00
Jordi Boggiano 46657a8a7f
5.3 support :/ 2019-10-24 15:26:55 +02:00
Jordi Boggiano 8d92048c8c
Update safeguard code, fixes #8383 2019-10-24 15:20:14 +02:00
xy2z 1a0d5dfacd Now using findPackage() instead of HasPackageName() 2019-10-24 15:13:17 +02:00
Jordi Boggiano 78b8c365cd
Merge branch '1.9' 2019-10-24 15:05:45 +02:00
Jordi Boggiano 18dad48fa6
Merge pull request #8363 from sincilite/feature/error-reporting-for-missing-path
Improve error reporting for missing path in Repository Path
2019-10-24 11:34:55 +02:00
Jordi Boggiano b311b2c077
Merge pull request #8375 from mathiasdonoso/feature/add-homepage-to-package-information-command
added package homepage information to the command 'show'
2019-10-24 11:32:59 +02:00
Jordi Boggiano f2700bbd98
Merge pull request #8377 from TysonAndre/misc-nit
Fix misc phpdoc and strpos arg order nits for suggestions
2019-10-24 11:17:03 +02:00
Jordi Boggiano d73cef3fb4
Avoid calling findPackage for non-platform packages 2019-10-24 11:16:42 +02:00
Jordi Boggiano e85ade3107
Merge pull request #8386 from cedric-anne/bugfix/fix-php74-outdated-command
Fix composer outdated command on PHP 7.4; fixes #8346
2019-10-24 11:13:27 +02:00
Jordi Boggiano 82e0fdccca
Merge pull request #8384 from aboks/no-lock
Config option to disable lockfile generation
2019-10-24 11:06:02 +02:00
Jordi Boggiano 127ba941f1
Merge pull request #8376 from aschempp/bugfix/why-replaces
Consider replaces when checking package dependents
2019-10-24 10:48:09 +02:00
Jordi Boggiano 9082701ccb
Merge pull request #8359 from glaubinix/t/show-used-authentication-in-debug
Debug: display used authentication for http calls
2019-10-24 10:46:03 +02:00
Cédric Anne 9c9ca87537 Fix composer outdated command on PHP 7.4; fixes #8346 2019-10-21 13:04:31 +02:00
Stephan Vock 73b269fade HgDriver: don't run command in non-existing directory 2019-10-21 11:11:10 +02:00
Mikhail Fesenko c2f1a6b643 Added clear cache for windows, fix tests 2019-10-21 11:06:12 +02:00
Arnout Boks 7c5e5e3ede Add option to disable the lock file
When the `lock` option is set to false, composer will not write a
`composer.lock` file to disk. This signals that the package is meant
to be developed with unlocked and always updated dependencies. At the
moment, both `install` and `update` are allowed to install the
dependencies for such a package. If #6822 is implemented, only `update`
should be used for packages without a lockfile.

https://github.com/composer/composer/issues/8354
2019-10-19 21:46:29 +02:00
Andreas Schempp 5f202efa0b Added comment why source link check is necessary 2019-10-16 13:36:28 +02:00
Tyson Andre 4c8e41d9a9 Fix misc phpdoc and strpos arg order nits
https://www.php.net/strpos has the signature
`strpos ( string $haystack , mixed $needle [, int $offset = 0 ] ) : int`
(The needle is usually the constant)

`strpos('/', $suggestion)` would only be `false` for `''` and `'/'`

So the existing check would just not suggest **anything** that was
already installed (from pecl, built-in, or composer).

The intent seems to be to not suggest non-vendored php packages
that were already installed. (b20cc22ebb)
2019-10-15 21:32:02 -04:00
Andreas Schempp 80317eb289 Remove invalid array keys 2019-10-15 10:56:43 +02:00
Andreas Schempp 20eb9e66cf Consider replaces when checking package dependents 2019-10-15 08:26:19 +02:00
Mathías Donoso 07ec3bda3e changed homepage information position 2019-10-15 00:38:24 -03:00
Mathías Donoso 14b3f09cf8 added package homepage information to the command 'show' 2019-10-15 00:19:57 -03:00
xy2z a8abdd9639 Hide installed packages from suggestions when package is not found 2019-10-12 22:22:27 +02:00
Mike van Rooyen e910e06f63 Add details of the path to aid debugging 2019-10-08 16:02:03 +01:00
Mike van Rooyen 18895064ad Check that if the getUrlMatches method returns an empty value which means the path is incorrect 2019-10-08 15:46:35 +01:00
Alexander M. Turek 146aa4938f Command::execute() should always return an integer. 2019-10-07 18:50:18 +02:00
Stephan Vock 0d1d35c346 Debug: display used authentication for http calls 2019-10-07 08:51:53 +01:00
Jordi Boggiano 1843312ddf
Merge pull request #8313 from unkind/feature-require-fixed
Provide `--fixed` option for the `require` command, fixes #8303
2019-10-06 21:39:45 +02:00
Jordi Boggiano 5b4fad9056
Update target version for master branch 2019-10-06 21:39:10 +02:00
Jordi Boggiano 9e2485aa4d
Make gitlab/bitbucket driver checks case insensitive 2019-10-06 21:37:16 +02:00
zakonnic 9f6e45051a Optimize template for striping non-php blocks 2019-09-20 16:59:53 +03:00
zakonnic ec96e5de64 Fix incorrect strip of non-php blocks in the file 2019-09-20 12:58:09 +03:00
Nikita Konstantinov e3b6c67a44 Provide `--fixed` option for the `require` command, fixes #8303 2019-09-18 16:05:25 +03:00
James Ho 91732eee55 8330 Correct issue where permission umask of files were not set when archiving in zip format with ZipArchiver 2019-09-17 15:10:32 +01:00
Nils Adermann 995b4f923e Fix more tests which were lacking lock files for partial updates, display fix jobs in problems 2019-09-07 09:32:06 +02:00
Nils Adermann 3989a1b8ee Restore dev package extraction
New approach is to use only the solved set of packages as input and then
to resolve with only the non-dev requirements and to mark everything as
dev that is not part of the result set, rather than transitioning a
temporary local repo state by uninstalling dev packages.
2019-09-07 08:52:10 +02:00
Nils Adermann a114e26841 Correctly load aliases in lockedRepository to fix alias install output 2019-09-07 07:43:23 +02:00
Nils Adermann 4db325b7b4 Use the old root stack based approach to sorting operations in the transaction 2019-09-07 07:13:34 +02:00
Nils Adermann b700aa3d62 Sort local repo transaction as topological as possible 2019-09-07 06:05:02 +02:00
Nils Adermann f5e18250e6 Merge remote-tracking branch 'github-composer/2.0' into solve-without-installed
* github-composer/2.0: (48 commits)
  Fix missing use/undefined var
  Split up steps on VCS downloaders to allow doing network operations before touching the filesystem on GitDownloader, fixes #7903
  Fix use statement
  Deduplicate findHeaderValue code
  Add install-path to the installed.json for every package, fixes #2174, closes #2424
  Remove unnecessary config from phpstan
  Make sure the directory exists and will not block installation later when downloading
  Avoid wiping the whole target package if download of the new one fails, refs #7929
  Only empty dir before actually installing packages, fixes #7929
  Improve output when installing packages
  Show best possible version in diagnose command
  Remove extra arg
  Allow path repos to point to their own source dir as install target, resulting in noop, fixes #8254
  Fix use of decodeJson
  Fix update mirrors to also update transport-options, fixes #7672
  Fix updating or URLs to include dist type and shasum, fixes #8216
  Fix origin computation
  Improve handling of non-standard ports for GitLab and GitHub installs, fixes #8173
  Load packages from the lock file for check-platform-reqs if no dependencies have been installed yet, fixes #8058
  Fix error_handler return type declaration
  ...
2019-09-07 02:55:21 +02:00
Nils Adermann 06d11f2f38 Fix calculation of lock transaction updates and start updating output in tests 2019-09-07 02:33:50 +02:00
Nils Adermann f1e4ccbe1d Fix handling of reference updates and root references 2019-09-07 01:58:12 +02:00
Grey Baker b09945c3ba Allow for leading slash in path part of GitHub URLs 2019-09-02 22:26:35 +01:00
Jordi Boggiano f0d565bb6d
Avoid transforming the origins when prompting for auth, fixes #8300 2019-08-30 17:52:08 +02:00
Jordi Boggiano d3dc280322
Merge pull request #8296 from rbairwell/fix-php74-accessarray-offset-on-path
Fixes a problem with path based repositories on PHP7.4
2019-08-29 15:16:53 +02:00
Jordi Boggiano 7d99a56332
Combine conditionals in one 2019-08-29 15:16:34 +02:00
Jordi Boggiano 089fcde6cf
Merge remote-tracking branch 'davidszkiba/bugfix/issue-8289' 2019-08-29 15:09:14 +02:00
Jordi Boggiano fd70d9cdc3
Stripe access tokens in a more generic way 2019-08-29 12:22:38 +02:00
Jordi Boggiano 607b487295
Fix missing use/undefined var 2019-08-29 11:45:19 +02:00
Jordi Boggiano 53d2ab2253
Split up steps on VCS downloaders to allow doing network operations before touching the filesystem on GitDownloader, fixes #7903 2019-08-29 11:37:23 +02:00
rbairwell 550c01b471 Fixes a problem with path based repositories on PHP7.4 where an attempt is made to access null as an array 2019-08-27 20:53:57 +01:00
David Szkiba 0500e64f88 Respect COMPOSER_NO_INTERATION for search prompt.
As described in GH-8289, if no `composer.json` file is found in the current
directory, the user is prompted if she wants to use another `composer.json` file
from a parent directory even if the `COMPOSER_NO_INTERACTION` environment
variable is set.  This is fixed here by just moving the check of the environment
variable up in the code so that it is evaluated before the user is prompted.
2019-08-25 17:25:44 +02:00
Stephan Vock f9fccbab1e GitHub: don't display access token in debug log 2019-08-21 10:07:36 +01:00
Jordi Boggiano 4dabc17ec1
Fix use statement 2019-08-02 22:21:52 +02:00
Jordi Boggiano bfee701f9b
Deduplicate findHeaderValue code 2019-08-02 21:54:41 +02:00
Jordi Boggiano 63da7c6b2d
Add install-path to the installed.json for every package, fixes #2174, closes #2424 2019-08-02 21:39:42 +02:00
Jordi Boggiano 8dfadd99d1
Merge branch '2.0' into fix/unused 2019-08-02 16:38:53 +02:00
Jordi Boggiano 9ee345ed29
Make sure the directory exists and will not block installation later when downloading 2019-08-02 16:33:39 +02:00
Jordi Boggiano 6a7220fed8
Avoid wiping the whole target package if download of the new one fails, refs #7929 2019-08-02 15:57:44 +02:00
Jordi Boggiano 898ba6f869
Only empty dir before actually installing packages, fixes #7929 2019-08-02 15:53:19 +02:00
Jordi Boggiano f7c1b04a6c
Improve output when installing packages 2019-08-02 14:26:42 +02:00
Jordi Boggiano 76a2c63bf8
Show best possible version in diagnose command 2019-08-02 14:00:34 +02:00
Jordi Boggiano 08d661ceca
Merge branch 'master' into 2.0 2019-08-02 13:45:56 +02:00
Jordi Boggiano 96ad0aa01f
Remove extra arg 2019-08-02 13:45:43 +02:00
Jordi Boggiano 1002fb12fc
Merge branch 'master' into 2.0 2019-08-02 13:26:03 +02:00
Jordi Boggiano 872604ab36
Allow path repos to point to their own source dir as install target, resulting in noop, fixes #8254 2019-08-02 13:25:11 +02:00
Jordi Boggiano b5014e9aed
Fix use of decodeJson 2019-08-02 12:19:12 +02:00
Jordi Boggiano 300a888470
Merge pull request #7995 from Seldaek/plugin-deactivation
Plugin deactivation/uninstall support
2019-08-01 18:11:49 +02:00
Jordi Boggiano 3ef27cabd6
Merge pull request #7999 from Seldaek/store_dev
Store dev mode in installed.json, fixes #3008
2019-08-01 17:59:09 +02:00
Jordi Boggiano 362ebe4f68
Fix update mirrors to also update transport-options, fixes #7672 2019-07-31 18:43:18 +02:00
Jordi Boggiano db6882b57f
Fix updating or URLs to include dist type and shasum, fixes #8216 2019-07-31 18:36:27 +02:00
Jordi Boggiano 0a152b06d7
Merge branch 'master' into 2.0 2019-07-31 18:12:00 +02:00
Jordi Boggiano 0fe200d6d9
Fix origin computation 2019-07-31 18:01:08 +02:00
Jordi Boggiano 6c4357a7ed
Merge branch 'master' into 2.0 2019-07-31 17:50:01 +02:00
Jordi Boggiano 0261ce8092
Improve handling of non-standard ports for GitLab and GitHub installs, fixes #8173 2019-07-31 17:41:18 +02:00
Jordi Boggiano 5ddc40e93c
Load packages from the lock file for check-platform-reqs if no dependencies have been installed yet, fixes #8058 2019-07-31 15:21:32 +02:00
Thomas Perez 3e66d0514a Fix error_handler return type declaration 2019-07-30 18:45:41 +02:00
Jordi Boggiano 26a3e12c96
Merge pull request #7994 from aschempp/feature/zip-util
Extract the ZIP utility functions from ArtifactRepository
2019-07-30 11:36:10 +02:00
Jordi Boggiano 3f5e4f0399
Add support for defining a {"packagist.org":false} repo in composer init, fixes #8210 2019-07-30 10:58:36 +02:00
Jordi Boggiano 14f2a6dd9a
Fix remove command not working with escaped slashes (e.g. foo\/bar), fixes #8249 2019-07-30 09:48:49 +02:00
Jordi Boggiano 1a391b572c
Prevent require command from allowing a package to require itself, fixes #8247 2019-07-30 09:18:19 +02:00
Jordi Boggiano 5de4a16115
Merge pull request #8221 from magnetik/ignore-platform-reqs-conflicts
Ignore platform reqs now handle conflict rules
2019-07-30 07:27:50 +02:00
Jordi Boggiano 7edd689533
Merge pull request #8243 from carusogabriel/remove-explict-void-return
Remove explicits void returns
2019-07-29 18:08:32 +02:00
Jordi Boggiano d9c2f00891
Merge pull request #8240 from carusogabriel/remove-unused-private-properties
Remove unused private properties
2019-07-29 18:06:55 +02:00
Jordi Boggiano 8958f40f94
Make sure resetting composer also resets the IO and configuration, fixes #8224 2019-07-29 17:57:25 +02:00
Jordi Boggiano 33759d02c4
Fix require command to allow working on network mounts, fixes #8231 2019-07-29 17:42:34 +02:00
Jordi Boggiano 79e4ff4373
Merge pull request #8186 from freality/script_event_originating
allow Composer\Script\Event to reference originating event
2019-07-29 16:46:06 +02:00
Jordi Boggiano 369e8a2247
Fix indenting 2019-07-29 16:44:50 +02:00
Jordi Boggiano 45591597f6
Clarify how check-platform-reqs works, fixes #8191 2019-07-29 16:38:01 +02:00
Gabriel Caruso 8b5be1d08c
Remove explicts void returns 2019-07-24 03:07:25 +02:00
Gabriel Caruso 6c8ddd4d57
Remove unused private properties 2019-07-24 02:53:53 +02:00
Baptiste Lafontaine a4611d511f Ignore platform reqs now handle conflict rules 2019-07-11 16:48:57 +02:00
Nils Adermann 9053d74282 Merge branch '2.0' into solve-without-installed
* 2.0: (101 commits)
  SVN: hide passwords for debug output
  Free $solver asap
  fixes #8179
  [minor] Fixed a typo in the CHANGELOG.md.
  Update deps
  Update changelog
  Revert "Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET" Revert "Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151"
  Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151
  Fix display of HHVM warning appearing when HHVM is not in use, fixes #8138
  Read classmap-authoritative and apcu-autoloader from project config when installing via create-project, fixes #8155
  Use possessive quantifiers
  Update xdebug-handler to 1.3.3
  fixes #8159
  Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET
  flag should come before script name
  use full command name, not abbreviated/alias
  modify text
  Document the alternatives to disable the default script timeout
  Anchor pattern
  Fix URL resolution for Composer repositories
  ...
2019-06-27 14:35:36 +02:00
Nils Adermann d2fa1e1319 Merge branch 'master' into 2.0
* master: (48 commits)
  SVN: hide passwords for debug output
  Free $solver asap
  fixes #8179
  [minor] Fixed a typo in the CHANGELOG.md.
  Update deps
  Update changelog
  Revert "Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET" Revert "Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151"
  Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151
  Fix display of HHVM warning appearing when HHVM is not in use, fixes #8138
  Read classmap-authoritative and apcu-autoloader from project config when installing via create-project, fixes #8155
  Use possessive quantifiers
  Update xdebug-handler to 1.3.3
  fixes #8159
  Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET
  flag should come before script name
  use full command name, not abbreviated/alias
  modify text
  Document the alternatives to disable the default script timeout
  Anchor pattern
  Fix URL resolution for Composer repositories
  ...
2019-06-27 14:08:00 +02:00
Nils Adermann e022c07370 Merge branch '1.8'
* 1.8:
  SVN: hide passwords for debug output
2019-06-27 14:06:49 +02:00
Jordi Boggiano 32ca426e38
Merge remote-tracking branch 'origin/1.8' 2019-06-25 11:29:25 +02:00
Stephan Vock 8da046e4e9 SVN: hide passwords for debug output 2019-06-23 18:59:36 +01:00
Nicolas Grekas 89d5d8f182 Free $solver asap 2019-06-21 18:34:16 +02:00
Rob Bast 7399638e43 fixes #8179 2019-06-17 10:48:19 +02:00
Ken Love b51cfce8e6 return the upper-most event in chain 2019-06-13 14:51:27 -04:00
Ken Love 81a4f74b5b Composer\Script\Event should have access to originating event details 2019-06-12 16:54:09 -04:00
Jordi Boggiano 3d88108dea
Merge branch '1.8' 2019-06-07 17:25:54 +02:00
Jordi Boggiano b4e5db1c70
Revert "Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET"
Revert "Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151"

This reverts commit e7eecc6901.
This reverts commit faa7c5eea2.
2019-06-07 17:25:09 +02:00
Jordi Boggiano 79a300eaac
Merge branch '1.8' 2019-06-07 16:58:37 +02:00
Jordi Boggiano 088fb56c3d
Fix display of HHVM warning appearing when HHVM is not in use, fixes #8138 2019-06-07 16:55:22 +02:00
Jordi Boggiano 9d642fe9af
Merge pull request #8085 from danepowell/issue-8065-2
Fixes #8065: Sort plugins deterministically before loading.
2019-06-07 16:53:49 +02:00
Jordi Boggiano de10fef39c
Merge pull request #8160 from alcohol/fix-8159
fixes #8159
2019-06-07 16:50:51 +02:00
Jordi Boggiano 4afd50fec6
Merge pull request #8151 from naderman/self-update-target
Allow overriding self-update target file with env var COMPOSER_SELF_UPDATE_TARGET
2019-06-07 16:47:39 +02:00
Jordi Boggiano 472348a708
Merge pull request #8136 from pfofi/fix-urlCanon
Fix URL resolution for Composer repositories
2019-06-07 15:46:06 +02:00
Jordi Boggiano fbb964888d
Merge branch '1.8' 2019-06-07 13:12:21 +02:00
Jordi Boggiano 659c72f9c8
Read classmap-authoritative and apcu-autoloader from project config when installing via create-project, fixes #8155 2019-06-07 13:12:10 +02:00
Jordi Boggiano a8609ecf88
Merge pull request #8097 from ShiraNai7/fixStaticAutoloadPharPaths
Handle absolute phar:// paths in autoload_static.php
2019-06-07 12:26:49 +02:00
pfofi 82825ccc74 Use possessive quantifiers 2019-06-07 09:13:11 +02:00
Rob Bast bd6b758a1b
fixes #8159
expand interface and add missing methods to aliaspackage
2019-05-29 08:48:51 +02:00
Nils Adermann faa7c5eea2 Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET
Useful if Composer is provided on a read-only filesystems, to allow
self-update to work with a different destination
2019-05-19 21:10:15 +02:00
pfofi e7f02be9ff Anchor pattern 2019-05-11 16:27:39 +02:00
pfofi c751914410 Fix URL resolution for Composer repositories
Composer was unable canonicalize URLs in non-HTTP(S) Composer
repositories. For example it was not possible to use a `providers-url`
in a repository loaded via the `file://` scheme.

See also: #8115
2019-05-10 13:55:31 +02:00
Sam L 8288d2c456 Display branches and tags if verbose is specified 2019-05-09 08:38:34 +02:00
Rob Bast 51753bc08c fixes #8131 2019-05-08 15:02:59 +02:00
Stephan Vock e37ffb2a44 Fix: Bitbucket getChangeDate throws exception for branches containing a slash 2019-04-30 21:39:30 +02:00
Nicolas Grekas 794234946c Let curl handle proxy and cipher list itself 2019-04-15 16:23:38 +02:00
ShiraNai7 a2b647a99e Handle absolute phar:// paths in autoload_static.php 2019-04-11 20:23:31 +02:00
Dane Powell 188e2b0044
Merge branch 'master' into issue-8065-2 2019-04-09 11:15:33 -07:00
Dane Powell 3501423eab
Undo previous change. 2019-04-09 11:15:19 -07:00
Dane Powell d4150cafc4
Move sortPackages to static helper class. 2019-04-09 10:59:02 -07:00
Dane Powell 266a41e046
Refactor sortPackageMap to depend on separate sortPackage function. 2019-04-09 10:58:47 -07:00
Marc Würth d2ab4f66fd
Extract job packageName & constraint to variables 2019-04-09 13:06:33 +02:00
Jordi Boggiano 2b421a94cb
Merge branch '1.8' 2019-04-09 13:05:02 +02:00
Elan Ruusamäe 12e683e2ee
ext-imagick: support version string from ImageMagick 6.x 2019-04-09 12:49:25 +02:00
Jordi Boggiano 17810b2621
Revert composer.json changes if update process throws, fixes #8062 2019-04-09 12:47:24 +02:00
Kevin Boyd 5633a68689 Add a helper to disable process timeouts
The helper can be included in custom script definitions by calling
"Composer\\Config::disableProcessTimeout".

Example:

{
  "scripts": {
    "watch": [
      "Composer\\Config::disableProcessTimeout",
      "vendor/bin/long-running-script --watch"
    ]
  }
}
2019-04-08 22:44:08 -07:00
Dane Powell a908e22a91
Fixed code style issues. 2019-04-06 08:53:32 -07:00
Dane Powell 3e6300b5e8
code style fix. 2019-04-06 08:49:45 -07:00
Dane Powell 043b33ed38
Fixes #8065: Sort plugins deterministically before loading. 2019-04-06 08:44:23 -07:00
Jordi Boggiano 717c21b78a
Merge remote-tracking branch 'PReimers/issue-8004' 2019-04-05 16:03:26 +02:00
Rob Bast 4ea8e48bf8 leading whitespace is optional, but newline is not 2019-04-04 08:45:08 +02:00
Rob Bast 25e3f6d4b9 expand regex and testcases 2019-04-04 08:31:26 +02:00
Rob Bast 971528916b fix regex for heredoc/nowdoc
* take into account relaxed changes introduced in php 7.3
  * see: 4887357269
* allow " as well as ', which was introduced in php 5.3

closes #8080
2019-04-03 10:46:35 +02:00
Jordi Boggiano 0317199507
Merge branch 'master' into 2.0 2019-04-01 18:03:34 +02:00
Jordi Boggiano a186620210
Merge branch '1.8' 2019-04-01 18:01:19 +02:00
Jordi Boggiano 625bcee63a
Fix handling of warnings to incl all 4xx responses 2019-04-01 18:01:09 +02:00
Marc Würth fb8b06edef Remove unused local variable 2019-03-21 19:44:49 +01:00
Jordi Boggiano f5e1a36f57
Merge pull request #8042 from Novicaine/patch-1
Fix for UNC Windows paths
2019-03-19 11:34:39 +01:00
Jordi Boggiano 8944627245
Fix syntax and backslash escaping 2019-03-19 11:34:23 +01:00
Novicaine 486b25fd30
Fix for UNC Windows paths
Made isAbsolutePath recognize Windows UNC-style absolute paths starting with \\
2019-03-15 13:15:01 -05:00
Christian Ego 7c64300a1b using emptyDirectory instead of remove for clearing the cache 2019-03-11 10:24:39 +01:00
Patrick Reimers 8ae8d131d5
Add deprecation warning for name attribute 2019-03-05 10:44:55 +01:00
Jordi Boggiano 522ea033a3
Merge branch '1.8' 2019-03-04 17:26:35 +01:00
Markus Staab c876613d5c Added "Read more at" links to all commands (#8019) 2019-03-04 12:55:38 +01:00
Jordi Boggiano e3f68016ac
Merge branch '1.8' 2019-03-04 11:59:16 +01:00
Jordi Boggiano d96d046209
Fix require of platform packages with --ignore-platform-reqs, fixes #8012 2019-03-04 11:38:58 +01:00
Andreas Schempp 0e2215dc6c Added full unit test coverage 2019-03-04 11:08:59 +01:00
Andreas Schempp a91fd20673 Return the composer.json content instead of a zip:// path 2019-03-04 09:54:35 +01:00
Jordi Boggiano 9d139cb694
Merge branch '1.8' 2019-03-04 08:53:46 +01:00
Jordi Boggiano 6bce9da8c8
Only keep track of empty references that returned a 404 2019-03-04 08:53:18 +01:00
Patrick Reimers 627a832cc1
Return non zero exit code on deprecation 2019-03-01 19:39:07 +01:00
Andreas Schempp 0d0cb53f31 Adjust Zip Util to only find the root composer.json 2019-03-01 11:06:03 +01:00
Jordi Boggiano ba1e5c213c
Merge branch '1.8' 2019-02-27 15:07:33 +01:00
Jordi Boggiano 6473dd9185
Minor improvements to VersionCacheInterface 2019-02-27 15:03:25 +01:00
Andreas Schempp 05d6b21785 Use self:: for private method 2019-02-25 08:02:04 +01:00
Andreas Schempp 9de07bed1b Fixed docblocks 2019-02-25 08:01:38 +01:00
Jordi Boggiano f77285916a
Clean up temp file on curl request failure and make sure the response body is avaiable on 3xx/4xx/5xx responses 2019-02-21 15:28:50 +01:00
Jordi Boggiano d37642d9f2
Add missing use 2019-02-21 14:59:28 +01:00
Jordi Boggiano 3f5a986170
Show warning in all 400/500 responses if available, fixes #7814 2019-02-21 14:49:06 +01:00
Jordi Boggiano 5f988a34a6
Merge branch 'master' into 2.0 2019-02-21 14:08:56 +01:00
Jordi Boggiano 60f198c17d
Update target version 2019-02-21 14:06:41 +01:00
Jordi Boggiano 43a43f3cdf
Merge branch '1.8' 2019-02-21 14:06:17 +01:00
Jordi Boggiano 0f36a42d61
Allow filtering of warning/info msgs by composer version 2019-02-21 14:05:56 +01:00
Jordi Boggiano 4271167495
Improve version reporting 2019-02-21 14:05:12 +01:00
Jordi Boggiano ba346ef04d
Add forward compatibility for upcoming v2 installed.json format, refs #7999 2019-02-21 12:57:27 +01:00
Jordi Boggiano 60df892517
Store dev mode in installed.json, fixes #3008 2019-02-21 12:46:02 +01:00
Jordi Boggiano bdf1f7f82b
Fix loading of aliased packages in ComposerRepository when filtering by callback 2019-02-20 13:24:44 +01:00
Jordi Boggiano 2e204b0161
Remove support for the first version of the compression algo (#7906) 2019-02-20 11:10:44 +01:00
Jordi Boggiano 177f21ec5c
Fix loading of dev providers, refs #6415 2019-02-20 10:51:07 +01:00
Jordi Boggiano ff82334124
Load ~dev files as well as main provider files for new v2 protocol, fixes #6415 2019-02-20 09:24:13 +01:00
Jordi Boggiano d3873a0565
Merge branch '1.8' 2019-02-20 08:43:56 +01:00
Jordi Boggiano 61cd8664e5
Avoid creating empty bitbucket files if there was no composer.json present in the original branch/tag 2019-02-20 08:43:40 +01:00
Matthew Brown 65903aacfd Fix type issues (#7996)
* Fix type issues found by Psalm
2019-02-19 15:35:48 +01:00
Jordi Boggiano ab945a6ec1
Clean up RepositoryInterface, fixes #5464 2019-02-19 11:11:55 +01:00
Jordi Boggiano 6c782599f1
Make IOInterface implement psr-4 LoggerInterface, fixes #5180 2019-02-19 10:54:42 +01:00
Jordi Boggiano 3fc9ede24b
Add plugin callbacks for deactivation and uninstall, fixes #3000 2019-02-18 18:14:46 +01:00
Jordi Boggiano 1b7e957cc1
Add EventDispatcher::removeListener to allow deregistration of listeners 2019-02-18 18:12:38 +01:00
Jordi Boggiano d381b3a781
Fix variable name 2019-02-18 16:59:09 +01:00
Jordi Boggiano 7a301d9ad1
Merge pull request #7980 from johnstevenson/safe-junctions2
Improve safe junction logic
2019-02-18 14:30:38 +01:00
CZechBoY a062cd1a31
added phpstan on level 0 2019-02-18 13:05:14 +01:00
Jordi Boggiano 0fd74d1cc4
Fix PerforceDownloader, fixes #7979 2019-02-18 12:28:21 +01:00
Jordi Boggiano 9957807990
Merge branch 'master' into 2.0 2019-02-18 12:25:44 +01:00
Andreas Schempp 4d85e217c3 Extract the ZIP utility functions from ArtifactRepository 2019-02-16 18:46:59 +01:00
Jordi Boggiano 69745745b3
Merge branch '1.8' 2019-02-16 17:56:20 +01:00
Nils Adermann c875f538ea Make root alias behaviour consistent, add root ref handling, lock to newest metadata
root aliases during install should come from the lock file only, for
better reproducibility we don't reuse the value from update for the
following install
2019-02-14 17:57:29 +01:00
Markus Staab 0aa030f09d
Fixed typo introduced in recent fix 2019-02-13 07:26:14 +01:00
johnstevenson 4cf069535f Improve safe junction logic 2019-02-12 15:18:06 +00:00
Markus Staab fc2c445c06 Make sure we properly usleep() on windows rmdir/unlink
usleep() returns void, therefore the previous code didn't work
2019-02-12 13:57:21 +01:00
johnstevenson 6212eadcb0 Only use junctions if they can be safely removed 2019-02-11 22:23:23 +00:00
johnstevenson d1cf69fa92 Remove junctions with PHP rather than system rmdir
PHP will happily remove junctions using its `rmdir` function (tested on
versions back to 5.2.17). This saves invoking system `rmdir` through
cmd.exe.
2019-02-11 13:32:52 +00:00
Jordi Boggiano d788c67547
Merge branch '1.8' 2019-02-11 10:52:53 +01:00
Jordi Boggiano 5ce6ae34a4
Merge pull request #7941 from johnstevenson/junctions
Fix mode bitmask when detecting a Windows junction
2019-02-11 10:18:10 +01:00
Nils Adermann 10ada7bf82 Refactor Installer class into separate install and update processes
- Introduce separate Lock and LocalRepo transactions, one for changes
  to the lock file, one for changes to locally installed packages based
  on lock file
- Remove various hacks to keep dev dependencies updated and
  incorporated the functionality into the transaction classes
- Remove installed repo, there are now local repo, locked repo and
  platform repo
- Remove access to local repo from solver, only supply locked packages
- Update can now be run to modify the lock file but not install packages
  to local repo
2019-02-11 01:00:02 +01:00
Nils Adermann 1211ba1d51 BC break: Remove workaround for loading lock files without dev requires 2019-02-10 20:28:45 +01:00
Nils Adermann 287419f6a0 Merge branch 'master' into 2.0
* master:
  Follow up to #7946 test: add solver flag to assert path execution
  Fix tests
  Make sure config command output is also output on --quiet so that warnings can be hidden, fixes #7963
  Recognize composer-plugin-api as a platform package, fixes #7951
  Quote wildcards to avoid issues in some shells, fixes #7960
  Avoid dumping null values for dist reference/shasum and source reference, fixes #7955
  Soften hard exit after revert of composer file
  Make unixy proxy code POSIX compatible
  Update aliases.md
  Same but for Problem.php
  Better error message for present but incompatible versions
  Fix inconsistent casing
  Don't do (new Foo())->bar() - not 5.3-compatible
  Support identifying the HHVM version when not running with HHVM
2019-02-10 20:28:24 +01:00
Nils Adermann 0619fbed58 Merge branch '1.8'
* 1.8:
  Follow up to #7946 test: add solver flag to assert path execution
2019-02-10 20:28:05 +01:00
Nils Adermann 29ff6a40ae Follow up to #7946 test: add solver flag to assert path execution 2019-02-10 20:26:47 +01:00
johnstevenson da0dc74414 Update doc block, remove redundant clearstatcache 2019-02-10 14:41:20 +00:00
Jordi Boggiano ff246e3e85 Merge branch '1.8' 2019-02-10 12:59:38 +01:00
Jordi Boggiano 94df554255 Make sure config command output is also output on --quiet so that warnings can be hidden, fixes #7963 2019-02-10 12:57:39 +01:00
Jordi Boggiano e1ac0c7948 Recognize composer-plugin-api as a platform package, fixes #7951 2019-02-10 12:49:29 +01:00
Jordi Boggiano 408df4b878 Avoid dumping null values for dist reference/shasum and source reference, fixes #7955 2019-02-10 12:39:00 +01:00
Michael Telgmann eee98018f7 Soften hard exit after revert of composer file 2019-02-10 11:38:47 +01:00
johnstevenson f4b9bbbf42 Make unixy proxy code POSIX compatible 2019-02-08 17:33:13 +00:00
Jordi Boggiano f2cc666c2c
Merge pull request #7913 from fredemmott/hhvm-version
Support identifying the HHVM version when not running with HHVM
2019-02-08 16:13:32 +01:00
Fred Emmott 41c7f4d2bf
Same but for Problem.php 2019-02-06 13:11:04 -08:00
Fred Emmott 17788c76f6
Better error message for present but incompatible versions
hhvm-nightly (and next week's release) now report 4.x, so all the 3.x
constraints are now giving misleading error messages with this patch.

Before:

```
    - facebook/fbexpect v2.3.0 requires hhvm ^3.28 -> you are running this with PHP and not HHVM.
```

After:

```
    - facebook/fbexpect v2.3.0 requires hhvm ^3.28 -> your HHVM version (4.0.0-dev) does not satisfy that requirement.
```
2019-02-06 12:51:30 -08:00
Nils Adermann 728e57b9e0 Merge branch 'master' into 2.0
* master:
  Fix solver problem exceptions with unexpected contradictory "Conclusions"
  Also load config into IO if not freshly created
  Only load configuration into IO if IO is available
  Fix defaultRepos fallback does not use auth config
  Add warning/info msg when tweaking disable-tls setting to avoid confusion, fixes #7935
2019-02-05 15:35:51 +01:00
Nils Adermann fdcae616b0 Merge branch '1.8'
* 1.8:
  Fix solver problem exceptions with unexpected contradictory "Conclusions"
  Also load config into IO if not freshly created
  Only load configuration into IO if IO is available
  Fix defaultRepos fallback does not use auth config
2019-02-05 15:32:52 +01:00
Nils Adermann 6b2edeae56 Fix solver problem exceptions with unexpected contradictory "Conclusions"
This 5 character fix comes with a solver test as well as a functional
installer test essentially verifying the same thing. The solver test is
more useful when working on the solver. But the functional test is less
likely to be accidentally modified incorrectly during refactoring, as
every single package, version and link in the rather complex test
scenario is essential, and a modified version of the test may very well
still result in a successful installation but no longer verify the bug
described below.

Background:

In commit 451bab1c2c from May 19, 2012 I
refactored literals from complex objects into pure integers to reduce
memory consumption. The absolute value of an integer literal is the id
of the package it refers to in the package pool. The sign indicates
whether the package should be installed (positive) or removed (negative),

So a major part of the refactoring was swapping this call:

$literal->getPackageId()

For this:

abs($literal)

Unintentionally in line 554/523 I incorrectly applied this change to the
line:

$this->literalFromId(-$literal->getPackageId());

It was converted to:

-abs($literal);

The function literalFromId used to create a new literal object. By using
the abs() function this change essentially forces the resulting literal
to be negative, while the minus sign previously inverted the literal, so
positive into negative and vice versa.

This particular line is in a function meant to analyze a conflicting
decision during dependency resolution and to draw a conclusion from it,
then revert the state of the solver to an earlier position, and attempt
to solve the rest of the rules again with this new "learned" conclusion.

Because of this bug these conclusions could only ever occur in the
negative, e.g. "don't install package X". This is by far the most likely
scenario when the solver reaches this particular line, but there are
exceptions.

If you experienced a solver problem description that contained a
statement like "Conclusion: don't install vendor/package 1.2.3" which
directly contradicted other statements listed as part of the problem,
this could likely have been the cause.
2019-02-03 16:33:55 +01:00
Arnout Boks 82b010782d Also load config into IO if not freshly created 2019-01-31 13:46:46 +01:00
Arnout Boks e151a6c51c Only load configuration into IO if IO is available 2019-01-31 13:46:45 +01:00
Arnout Boks d1ce9f6246 Fix defaultRepos fallback does not use auth config
When a full 'composer' cannot be constructed (because there is no
local composer.json and no global composer.json), some commands
(e.g. `show -a`) fall back to the default repositories from the
`$COMPOSER_HOME/config.json` file. Without this fix, any auth
configuration from `$COMPOSER_HOME/auth.json` is not used for
these repositories in such a fallback scenario.

Steps to reproduce:

* Configure a password-protected composer repository in
  `$COMPOSER_HOME/config.json`.
* Configure valid credentials for that repository in
  `$COMPOSER_HOME/auth.json`.
* Make sure there is no file `$COMPOSER_HOME/composer.json`.
* Ensure the current working directory has no `composer.json`.
* Run `composer show -a some/package`.

Expected: Information about `some/package` is shown without
needing to enter credentials.

Actual: A prompt "Authentication required" is shown for the
private repository. When running the same command in a dir
that has a `composer.json`, or when `$COMPOSER_HOME/composer.json`
exists, things work as expected.
2019-01-31 13:46:45 +01:00
johnstevenson e085a72f64 Fix mode bitmask when detecting a Windows junction 2019-01-31 11:23:48 +00:00
Jordi Boggiano 19ba2edd5c Add warning/info msg when tweaking disable-tls setting to avoid confusion, fixes #7935 2019-01-30 08:58:38 +01:00
Jordi Boggiano 9c32808782 Merge branch 'master' into 2.0 2019-01-30 08:33:13 +01:00
Jordi Boggiano e05fa2368f Merge branch '1.8' 2019-01-30 08:31:38 +01:00
Fred Emmott 1b196720bf
Support identifying the HHVM version when not running with HHVM
hhvm-nightly (and the next release) are no longer able to execute
Composer. Support executing Composer with PHP to install dependencies
for hack projects.

The goal is for this to be temporary, until Hack identifies a new
package manager, given that Composer does not aim to be a multi-language
package manager.

fixes #7734
2019-01-29 09:48:15 -08:00
Hans-Christian Otto 85617aa740
Installer: Initialize $nameMatchesRequiredPackage
We had a case where we got `Undefined variable: nameMatchesRequiredPackage` — I think it should be initialized with false, right?
2019-01-29 17:26:59 +01:00
Jordi Boggiano f42d4d9ede Merge branch '1.8' 2019-01-29 15:02:53 +01:00
Jordi Boggiano 585535a01d Fix platform package regex 2019-01-29 14:58:37 +01:00
Jordi Boggiano 4517c00d40 Merge branch 'master' into 2.0 2019-01-29 14:01:28 +01:00
Jordi Boggiano 79af9d45af Merge branch '1.8' 2019-01-29 13:49:25 +01:00
Jordi Boggiano acea4a4d4d Warn on invalid package name or require/provide/.., fixes #7874 2019-01-29 13:46:23 +01:00
Jordi Boggiano 98a15bc93c Add output for metapackage installs/updates/.. fixes #7586 2019-01-29 11:38:18 +01:00
Jordi Boggiano 11bfe9970f
Merge pull request #7912 from kathyoungaligent/feature/no-api-config
Feature/no api config
2019-01-29 10:57:15 +01:00
Andrew Gillis dec2b5cd50 add gitlab token auth for git clone 2019-01-29 10:45:02 +01:00
Kath Young fbb9d20c33 Adjusted config name to be more descriptive, added documentation 2019-01-29 07:26:38 +10:30
Jordi Boggiano b89720b52a Merge branch 'master' into 2.0 2019-01-28 18:00:52 +01:00
Jordi Boggiano 81de5f82aa Merge branch '1.8' 2019-01-28 17:57:31 +01:00
Michael Käfer e0c44f2a25 Another MB to MiB 2019-01-28 17:55:17 +01:00
Michael Käfer 4765a8f21b MB to MiB
I did not study computer science, so correct me if I'm wrong. But I think you are calculating mebibyte (MiB) not megabyte (MB). Megabyte would be:
... round($valueInByte / 1000 / 1000, 2).'MB ...
Or is there some specific standard you follow? According to https://en.wikipedia.org/wiki/Binary_prefix both calculations (yours and mine) are correct in a way but I find yours to be not completely clear.
2019-01-28 17:55:13 +01:00
Jordi Boggiano 1f97ffdcd7 Add some docs 2019-01-28 17:54:32 +01:00