1
0
Fork 0
Commit Graph

6471 Commits (18009af023071abc7d179e6280661fadee390e53)

Author SHA1 Message Date
Markus Staab 61e0bf1cb5 fix typo 2020-03-02 13:23:33 +01:00
Jordi Boggiano 6d3d7c39ac
Merge pull request #8621 from remorhaz/master
Fix incorrect --no-dev handling of replaced packages
2020-02-28 23:49:09 +01:00
Jordi Boggiano 6cf54170cc
Avoid mixing write/writeError which causes issues on some terminals, fixes #8656 2020-02-28 22:42:52 +01:00
Jordi Boggiano 2285a79c63
Merge pull request #8641 from souweb22/delete_return
delete 'return' and 'spaces' in Filesystem.php
2020-02-28 22:28:14 +01:00
Jordi Boggiano c5ce4de89e
Consistently return void 2020-02-28 22:27:53 +01:00
Jordi Boggiano eb56c8dcd4
Merge pull request #8640 from souweb22/fix_doc
add 'array' to document in ConfigSourceInterface.php
2020-02-28 22:04:28 +01:00
Jordi Boggiano 5d970022e8
Normalize output of create-project target path, refs #8609, refs #8412 2020-02-28 17:02:15 +01:00
Jordi Boggiano 919fa60579
Merge pull request #8611 from ol0lll/fix/create-project-with-absolute-path
Create project with absolute path(fixes #8609)
2020-02-28 16:59:29 +01:00
Jordi Boggiano c6969756e8
Make sure $_SERVER is updated when putenv updates environment variables, fixes #8298 2020-02-28 16:27:06 +01:00
Jordi Boggiano 7a270955f5
Fix issues handling branch names with pipes in them 2020-02-28 16:00:45 +01:00
Jordi Boggiano 80875e896d
Merge branch 'master' into 2.0 2020-02-28 14:54:09 +01:00
Jordi Boggiano 05737a46fb
Improve funding info parsing 2020-02-28 14:52:29 +01:00
Jordi Boggiano 9cab8c10cc
Merge branch 'master' into 2.0 2020-02-28 13:31:56 +01:00
Jordi Boggiano 0b9c658bef
Add plugin-api-version used to generate a lock file in itself 2020-02-28 10:21:24 +01:00
Jordi Boggiano c4f19e51d8
Rework the funding info parsing to avoid requiring graphql permissions 2020-02-28 09:09:23 +01:00
remorhaz 339ee953e5 Fix incorrect --no-dev handling of replaced packages 2020-02-26 17:39:26 +02:00
Markus Staab 30b1dfb8a9 report ambiguous classes across all classmaps 2020-02-25 16:09:36 +01:00
arai e61b559eb2 delete 'return' in Filesystem.php 2020-02-23 21:38:14 +09:00
arai 766c8d448c add 'array' to document in ConfigSourceInterface.php 2020-02-23 21:31:28 +09:00
Jordi Boggiano a2eb0bab12
Abort loop correctly when package is a match 2020-02-18 08:28:35 +01:00
Jordi Boggiano 5b41b78809
Optimize findPackagesWithReplacersAndProviders to avoid multiple loops over replace/provide links 2020-02-18 08:10:54 +01:00
Jordi Boggiano 20e4cc3b6f
Fix finding replacers/providers to check constraints correctly 2020-02-17 11:23:15 +01:00
arai 1f08138379 Delete variable 2020-02-16 13:34:08 +09:00
Volker Killesreiter e532e70b22 Revert "Chore: Use consistent directory path"
This reverts commit 43e0321ee7.
2020-02-14 19:54:18 +01:00
Jordi Boggiano 2e82e34fe0
Merge branch 'master' into 2.0 2020-02-14 17:03:29 +01:00
Jordi Boggiano 4f59162827
Fix class name of caught exception 2020-02-14 17:03:22 +01:00
Jordi Boggiano 0ad322e51f
Fix tests 2020-02-14 16:55:21 +01:00
Jordi Boggiano ee2252c6ac
Add lint check after phar is built
The initial 1.10.0-RC build (593b8dfb29)
had what looks like a bit flip of one > into a :, causing a parse error as $foo->bar became $foo-:bar in some class.

This is quite unpleasant and easy to miss as it requires including the file in question before the error is spotted.

It was quite lucky I ran a composer install with the new phar right after to do something else and spotted the error.

Linting all files covers this problem mostly, at least for the PHP files.
2020-02-14 16:36:14 +01:00
Jordi Boggiano bc002ae1fb
Merge branch 'master' into 2.0 2020-02-14 15:42:17 +01:00
Jordi Boggiano 055a179cc5
Merge pull request #8453 from naderman/funding
Add funding field to composer.json and composer fund command
2020-02-14 14:27:12 +01:00
Jordi Boggiano 8dc055bec7
Fix 5.3 syntax 2020-02-14 14:18:26 +01:00
Jordi Boggiano 653e62f201
Merge pull request #8605 from guilliamxavier/fix-validate-strict-warnings
Fix validate strict warnings
2020-02-14 14:14:21 +01:00
Jordi Boggiano 4ebc318510
Fix 5.3/5.4 builds 2020-02-14 14:10:42 +01:00
Jordi Boggiano 77a477fb57
Add FundCommand 2020-02-14 14:08:38 +01:00
Jordi Boggiano f171d1fd89
Avoid requiring auth for the funding API access 2020-02-14 11:50:56 +01:00
Guilliam Xavier a17e7e9bd3
ValidateCommand: fix array syntax for PHP 5.3 2020-02-14 10:57:19 +01:00
Jordi Boggiano b033a2ae81
Retrieve funding info from github into composer.json if not declared there 2020-02-14 10:55:22 +01:00
Jordi Boggiano ff8bf0ab82
Clarify code
Co-Authored-By: Guilliam Xavier <guilliamxavier@users.noreply.github.com>
2020-02-14 10:45:35 +01:00
Guilliam Xavier a222ec5b36
ValidateCommand: remove actually unused code 2020-02-14 10:19:27 +01:00
Nils Adermann d665ea7ea9
After update and install commands display how many packages want funding 2020-02-14 10:08:36 +01:00
Nils Adermann 5c4f524d6a
Add funding field to composer.json
You can specify a list of funding options each with a type and URL. The
type is used to specify the kind of funding or the platform through
which funding is possible.
2020-02-14 10:08:35 +01:00
Jordi Boggiano 8fd70d2dc4
Target ClassMapGenerator ignoring of invalid PSR classes for 2.0 2020-02-14 10:07:51 +01:00
Jordi Boggiano fe5b4fa4cc
Merge pull request #8597 from glaubinix/t/log-git-sync-mirror-error
Git: log error for sync mirror with existing local copy
2020-02-14 09:58:28 +01:00
Jordi Boggiano 850bfcddfa
Fix json manipulation fallback handling of empty objects, fixes #8600 2020-02-14 09:33:53 +01:00
Jordi Boggiano 71005091f0
Fix invalid access to private prop 2020-02-13 22:19:32 +01:00
Jordi Boggiano 2d8a8ed7e3
Add InstalledRepository to clean up some concepts and usages, remove BaseRepository 2020-02-13 21:44:24 +01:00
Jordi Boggiano 78885c556a
Add missing use statement 2020-02-13 18:05:04 +01:00
Jordi Boggiano c5c6d44a0b
Refactor away some unnecessary RepositorySet usages 2020-02-13 17:51:22 +01:00
Jordi Boggiano f35cd8948a
Minor refactoring of RootPackageRepo 2020-02-13 16:29:57 +01:00
Jordi Boggiano 44d1e15294
Simplify suggester output when updating, refactor suggest command to reuse SuggestedPackagesReporter and make smarter defaults, fixes #6267 2020-02-13 16:13:29 +01:00
Guilliam Xavier 35562dcd49
ValidateCommand: add a comment that we didn't forget $lockErrors 2020-02-13 15:48:36 +01:00
Guilliam Xavier 2f4bd85219
ValidateCommand: de-invert if-elseif-else to reduce code duplication 2020-02-13 14:57:38 +01:00
Guilliam Xavier 901d177179
ValidateCommand: factorize $printSchemaUrl code 2020-02-13 14:46:50 +01:00
Guilliam Xavier b5e41d6792
ValidateCommand: always display all warnings, independently of --strict 2020-02-13 14:43:26 +01:00
Guilliam Xavier 7e2679ffc1
ValidateCommand: pass $isStrict to outputResult() of with-dependencies too 2020-02-13 14:37:08 +01:00
Jordi Boggiano d52ce3c37f
Replace pre/post-dependencies-solving by a pre-operations-exec event happening only on install from lock 2020-02-12 14:35:31 +01:00
Stephan Vock 243ee9b1e4 Git: log error for sync mirror with existing local copy 2020-02-12 10:17:21 +00:00
Jordi Boggiano 835a91532d
Add PRE_POOL_CREATE event, fixes #8348 2020-02-12 10:41:04 +01:00
Jordi Boggiano 71855e6430
Restore PRE/POST_DEPENDENCY_SOLVING events 2020-02-12 10:41:03 +01:00
Jordi Boggiano 4d74f5ba95
Fix exclude-from-classmap handling to avoid foo matching foo* directories, fixes #8563, refs #8575 2020-02-12 10:23:03 +01:00
Jordi Boggiano 7e142b5d6b
Use Upgrading for package installs too 2020-02-11 17:51:02 +01:00
Jordi Boggiano 02433c3659
Merge pull request #8565 from glaubinix/t/create-project-add-repository
Create project: add option to add the repository to the composer.json
2020-02-11 13:47:34 +01:00
Jordi Boggiano 9609729de7
Change update to upgrade for package update operations which are upgrades, refs #8594 2020-02-11 13:43:38 +01:00
Jordi Boggiano be8dd528b8
Merge remote-tracking branch 'origin/master' into 2.0 2020-02-11 11:33:52 +01:00
Jordi Boggiano ef249ef6b6
Add support for lib-zip platform package 2020-02-11 11:01:20 +01:00
Ion Bazan a180f48921 Distinguish between updates and downgrades in dry-run 2020-02-11 16:35:35 +08:00
Stephan Vock 2a564a9f36 Create project: add option to add the repository to the composer.json 2020-02-10 16:46:28 +00:00
Jordi Boggiano 5843a282bc
Merge pull request #8562 from adrianosferreira/fix-archive-format-cli
Uses config data from Composer object whenever possible on ArchiveCommand
2020-02-10 17:26:26 +01:00
Adriano Ferreira 97d077c43b Uses config data from Composer object whenever possible on ArchiveCommand
It was previously blindly getting a new instance from the factory thus ignoring what is on Composer object config data.
2020-02-10 13:15:58 -02:00
Jordi Boggiano 589abb06a3
PHPStan fixes 2020-02-07 23:10:10 +01:00
Jordi Boggiano c56886ac36
Avoid checking for .dockerenv if open_basedir is set, fixes #8585 2020-02-07 22:33:39 +01:00
Jordi Boggiano 45ecbae8f5
Merge branch 'master' into 2.0 2020-02-07 22:20:51 +01:00
Ion Bazan 2ff73a8797 respect `notify-on-install` option 2020-02-05 15:52:14 +08:00
Jordi Boggiano 4e4304ae7d
Fix 2020-02-04 13:22:46 +01:00
Jordi Boggiano 0b4763e6c7
Make it clear which package the error is for when detecting uncommitted changes 2020-02-04 13:06:20 +01:00
Jordi Boggiano 006c3de542
Fix tests and make TTY usage on ProcessExecutor cleaner 2020-01-31 16:33:34 +01:00
Jordi Boggiano f572636628
Add support for TTY mode on Linux/OSX in script handlers when running in interactive mode, fixes #5856, fixes #3299, closes #4036 2020-01-31 15:45:33 +01:00
Jérôme Billiras 58e2956b95
Allow referencing scripts to extends @composer 2020-01-31 14:56:22 +01:00
Jordi Boggiano d14d411fa4
Add --dry-run to require and remove commands, fixes #7793 2020-01-31 14:34:10 +01:00
Nils Adermann fdfdee03c1 Remove unused argument to pool->match 2020-01-30 22:54:59 +01:00
Nils Adermann 4f44b7b221 Remove unused policy function findUpdatePackages 2020-01-30 22:49:15 +01:00
Jordi Boggiano a1fe64152d
Minor Installer cleanups 2020-01-30 21:03:35 +01:00
Jordi Boggiano 2f4ea3a463
Fix show command, refactor RepositorySet constructor 2020-01-30 20:21:17 +01:00
Jordi Boggiano 38f6ae2c4e
Fix react/promise usage for v2 2020-01-30 17:30:38 +01:00
Jordi Boggiano 189d5adab0
Fix reporting of replace conflicts to not mention provides 2020-01-30 17:13:12 +01:00
Jordi Boggiano ec90c17e3b
Fix conflict order to be more accurate 2020-01-30 15:55:37 +01:00
Jordi Boggiano 1e68555e0a
Sanitize URLs in getRepoName and centralize the Url sanitization process 2020-01-30 15:50:46 +01:00
Jordi Boggiano c41df325d8
Remove RepositorySet from Solver and remove getPool from RepositorySet 2020-01-30 15:23:22 +01:00
Jordi Boggiano 1d4cdb60d0
Improve error reporting for conflicts/replaces of various kinds, fixes #7254 2020-01-30 14:43:56 +01:00
Jordi Boggiano 6c9d9e775c
Clean up and deduplicate the output of RULE_LEARNED 2020-01-30 14:43:56 +01:00
Jordi Boggiano 29efc473a1
Suggest which providers could be required to fulfill a virtual package requirement, fixes #2811 2020-01-30 14:43:55 +01:00
Jordi Boggiano 3fc7e10c5c
Improve error reporting of solver issues, refs #7779
Fixes #8525
Fixes #6513
2020-01-30 14:43:54 +01:00
Jordi Boggiano f611c641db
Merge pull request #8561 from Seldaek/allow-providers-even-on-match
Allow providers which are selected to be installed in place of existing packages which do not satisfy requirements
2020-01-30 14:22:42 +01:00
Jordi Boggiano 46e35bc8d7
Fix 5.3/undef var issues 2020-01-30 14:17:49 +01:00
Jordi Boggiano 8a41f1a5ca
Allow providers which are selected to be installed in place of existing packages which do not satisfy requirements, fixes #6753 2020-01-30 14:09:55 +01:00
Jordi Boggiano 2901995fc8
Fix issue excluding unstable packages when stabilityFlags are empty 2020-01-30 10:17:42 +01:00
Jordi Boggiano 8f09f3764b
Avoid fetching non-existing files multiple times 2020-01-30 08:40:35 +01:00
Jordi Boggiano 39fb2cc51c
Fix case 2020-01-28 16:04:11 +01:00
Jordi Boggiano 3f48acf56a
Add test checking references update to latest and remove TODO 2020-01-28 16:01:17 +01:00
Jordi Boggiano 41720e9b70
Show abandoned warnings from the locked repo 2020-01-28 15:56:52 +01:00
Jordi Boggiano 292d4b3c8f
Make sure a lock file is always written and things work well even without any dependencies in the require/require-dev 2020-01-28 15:14:58 +01:00
Jordi Boggiano 173b96de2d
Make sure the first require does not fail due to a missing lock file 2020-01-28 15:13:35 +01:00
Jordi Boggiano 8584d15e8c
Merge branch 'master' into 2.0 2020-01-28 14:04:27 +01:00
Jordi Boggiano 94dce37424
Avoid use of refs and avoid a false path when showing the root package, refs #8545 2020-01-28 13:52:34 +01:00
Jordi Boggiano 9db08f9883
Merge remote-tracking branch 'Serializator/feature/show-package-json' 2020-01-28 12:57:34 +01:00
Jordi Boggiano e9c7e253f4
Merge pull request #8529 from vitalyzhakov/master
Change only modified files for docker caching
2020-01-28 11:31:40 +01:00
Jordi Boggiano 1287a7a611
Merge pull request #8538 from adrianosferreira/add-vendor-bin-for-each-event
Append the bin dir on each listener iteration
2020-01-28 11:29:22 +01:00
Julian van den Berkmortel 933fe27cd5 Add support for "composer show --format=json <package>" #8544 2020-01-21 23:07:54 +01:00
Жаков Виталий ccd8be382b comments for #2764 2020-01-21 11:10:18 +05:00
Жаков Виталий 415cf9fd50 Merge branch 'master' of https://github.com/composer/composer 2020-01-21 11:06:56 +05:00
Жаков Виталий 48c7442b63 should be || not OR 2020-01-20 16:25:38 +05:00
Adriano Ferreira acc040f745 Append the bin dir on each listener iteration
The "composer install" can create the vendor/dir folders and be used as a script item on composer.json. Having another script running after it that relies on vendor/bir binaries (such as phpunit) will cause it to not find the binary. This fix addresses the issue by trying to append the path on each script iteration.
2020-01-20 08:11:08 -02:00
Nils Adermann 8b877eb068 Remove superfluous check in Problem 2020-01-20 10:27:04 +01:00
Nils Adermann 0b4e8952f6 PHP5 disallows require as a function name, use requireName analog to fixPackage 2020-01-19 23:28:00 +01:00
Nils Adermann 5bdc0fc9c5 Request jobs replaced by root require / fixed package
The only type of request job remaining was "install" which is really a
root requirement. The only other kind of input for the solver is now a
set of fixed packages.

Rules have been updated to account for only two kinds of former job
reason: FIXED or ROOT_REQUIRE. The job property has always been
redundant and has been removed, since reasonData suffices.

Problem reasons are always rules, so the unnecessary wrapping in an
array has been removed.

We now only ever generate a single rule per root require or fixed
package, so there is no need for the solver to special handle disabling
"jobs" anymore, the rule can just be disabled as usual.

For consistency special handling of rules for jobs in problems has been
integrated into the rule class like all other rule reasons. As part of
this change the error message for root requirements has been improved a
bit to make it clearer where the package installation request came from.

The word job has also been removed from operations, which are called
operations, not jobs.
2020-01-19 23:21:07 +01:00
Jordi Boggiano 1d31190472
Keep track of unacceptable fixed packages for later to use in error reporting and make sure the pool state is consistent 2020-01-17 15:48:31 +01:00
Жаков Виталий 1e92780600 operations case touch 2020-01-17 19:37:39 +05:00
Jordi Boggiano c6a3f48eaf
Remove some more remove request handling 2020-01-17 15:35:37 +01:00
Patrick Weyck 7d7e3d594b Normalize minimum-stability `rc` to `RC` in `InitCommand`
A `minimum-stability` of `rc` is valid according to
`composer-schema.json` and works fine with install and update and
generally in version comparisons, because it's normalized to `RC`.

This commit makes it work in `InitCommand` and `RequireCommand` too.
2020-01-17 15:34:18 +01:00
Jordi Boggiano 7cc8a4aed8
Avoid checking stability on platform packages too 2020-01-17 15:29:30 +01:00
Jordi Boggiano 6dc576738a
Avoid partial updates from applying changes to packages which are not locked with an acceptable stability 2020-01-17 15:15:46 +01:00
Jordi Boggiano e162cc6f0a
Remove "remove" from request 2020-01-17 14:57:32 +01:00
Jordi Boggiano 304753ff69
Remove callback and pass stabilities all the way instead
This allows optimizing the loading of ~dev files, and cleans up a few things
2020-01-17 14:57:32 +01:00
Jordi Boggiano 98860b8619
Fix show command when no package is found 2020-01-17 14:52:28 +01:00
Jordi Boggiano 8bb472a608
No need to alias platform packages before the repository set as the pool builder already does it 2020-01-17 14:52:28 +01:00
Jordi Boggiano b9d00153d9
Suggest using -p when a platform package can not be found in show command 2020-01-17 14:52:07 +01:00
Jordi Boggiano 56b2e1ae7a
Allow installing an aliased root package 2020-01-17 14:26:52 +01:00
Jordi Boggiano 572ef1add1
Add comment for lockable 2020-01-17 14:25:43 +01:00
Jordi Boggiano cc91e9164a
Stop unrolling the root aliases 2020-01-17 13:54:13 +01:00
Jordi Boggiano 73bc137c3c
Avoid nameConstraints from being collected for fixed packages 2020-01-17 12:20:27 +01:00
Jordi Boggiano e50f78043a
Try to load packages from lock file only and avoid loading other versions for pinned packages 2020-01-17 12:20:03 +01:00
Jordi Boggiano 257d2ce889
Avoid setting the update whitelist in require command on newly created files and when the lock file is disabled 2020-01-17 11:33:47 +01:00
Жаков Виталий 33db6ec71b touch only if update 2020-01-17 10:58:52 +05:00
Jordi Boggiano e6749d8717
Add comment, fix 5.3 build 2020-01-15 16:18:56 +01:00
Jordi Boggiano dd556f989b
Use LockArrayRepository instead of RepositoryInterface to clearly indicate which type of repo it is in some places 2020-01-15 14:56:58 +01:00
Jordi Boggiano 6c24e85e54
Merge pull request #8528 from Seldaek/repo-prio-fix
Avoid loading packages found in a higher prio repo entirely from lower prio repos
2020-01-15 14:55:25 +01:00
Jordi Boggiano f68731e663
Remove package/repo priority concept as it is enforced by the pool builder now 2020-01-15 14:52:44 +01:00
Жаков Виталий f02989ceba revert formatting 2020-01-15 18:27:12 +05:00
Жаков Виталий a4dc076dc8 fix file load errors 2020-01-15 18:09:42 +05:00
Жаков Виталий 8429a48dac Change only modified files 2020-01-15 17:09:44 +05:00
Jordi Boggiano 30b6a41035
Extract MetadataMinifier util 2020-01-15 12:58:30 +01:00
Jordi Boggiano 926afab1f4
Move loadPackages impl out of BaseRepository 2020-01-15 12:37:24 +01:00
Jordi Boggiano 47a94b3a88
Ensure packages that exist in a higher prio repo never get loaded in lower prio repos, fixes #5076 2020-01-15 12:02:12 +01:00
Jordi Boggiano 40f5806a7c
Fix ComposerRepo issue 2020-01-14 16:20:31 +01:00
Jordi Boggiano 13f1924892
Merge branch 'master' into 2.0 2020-01-14 15:46:30 +01:00
Jordi Boggiano e4b495ca16
Fix 5.3 build 2020-01-14 15:42:43 +01:00
Jordi Boggiano a5b178084c
Merge branch 'master' into 2.0 2020-01-14 15:39:35 +01:00
Jordi Boggiano 4b6c25d4bc
Use Authorization header instead of deprecated access_token query param, fixes #8454 2020-01-14 15:35:52 +01:00
Jordi Boggiano c3d3d45903
Merge pull request #8331 from jimmy-ho/bug/issue-8330
8330 Correct issue where permission umask of files were not set when …
2020-01-14 15:09:28 +01:00
Jordi Boggiano 669033f1e7
Collect existing packages only once, refs #8372 2020-01-14 14:45:15 +01:00
Jordi Boggiano c0714e5ff8
Merge remote-tracking branch 'xy2z/has-package-name' 2020-01-14 14:33:01 +01:00
Jordi Boggiano 78217e2313
Merge branch '1.9' 2020-01-14 12:52:32 +01:00
Jordi Boggiano a2dadb91bf
Return two packages in PathRepository when on a feature branch, one for feature branch and one for the source branch it came from, fixes #8498, fixes #8477 2020-01-14 12:52:20 +01:00
Jordi Boggiano 6c795dedc0
Add openssl version to diagnose command, refs #8506 2020-01-14 09:36:53 +01:00
Jordi Boggiano a902279a5b
Merge branch '1.9' 2020-01-14 09:32:27 +01:00
Jordi Boggiano 0b767e0b83
Allow calling getProviderNames multiple times, refs #8516 2020-01-14 09:31:57 +01:00
Maximilian Bösing 3791a574a2
Provide partial packages names if available, closes #8516, fixes #8526 2020-01-14 09:31:57 +01:00
Jordi Boggiano f5dab18b7d
Remove dead code, refs #8517 2020-01-13 18:21:57 +01:00
Jordi Boggiano ee3fd0f745
Merge remote-tracking branch 'adrianosferreira/package-install-method-cli'
Fixed formatting, and handling of config command to be preferred-install.foo value

Refs #8517
2020-01-13 18:18:18 +01:00
Jordi Boggiano e8426d2c01
Adjust config handling of suggest, refs #8520 2020-01-13 17:51:38 +01:00
Jordi Boggiano f203b3eb41
Merge remote-tracking branch 'adrianosferreira/add-suggest-in-json-by-cli' 2020-01-13 17:36:10 +01:00
Jordi Boggiano c43137db3f
Merge branch '1.9' 2020-01-13 15:50:39 +01:00
Jordi Boggiano 8d24b61bef
Tweak and add comments to the working dir fix with global exec, refs #8515 2020-01-13 15:50:34 +01:00
Jordi Boggiano 6b8f1c71b6
Merge remote-tracking branch 'cdayjr/issue-8481' 2020-01-13 15:31:22 +01:00
Jordi Boggiano ef6ef8ac0f
Hint at the partial update command, fixes #8508, refs #8332 2020-01-13 14:19:37 +01:00
Jordi Boggiano 818e16238f
Merge pull request #8510 from glaubinix/t/abandon-archived
VcsRepositories: mark archived repositories as abandoned
2020-01-13 13:47:33 +01:00
Jordi Boggiano a6176a7beb
Add IOInterface methods 2020-01-13 13:36:09 +01:00
Jordi Boggiano 23359f2db6
Merge branch 'master' into 2.0 2020-01-13 13:35:52 +01:00
Jordi Boggiano 3d72b56ed6
Merge branch '1.9' 2020-01-13 13:30:52 +01:00
Jordi Boggiano d3f1c664d4
Avoid formatting output from external processes, fixes #8524 2020-01-13 13:30:46 +01:00
Jordi Boggiano 2bd817acf9
Merge pull request #8444 from Toflar/remove-filters-from-pool
Removed the filters from the pool
2020-01-13 12:47:22 +01:00
Adriano Ferreira 607d491921 Implemented way to add packages into suggest through CLI 2020-01-10 09:13:36 -02:00
Adriano Ferreira 5ea6fd0bcb Implemented way to use preferred-install for defining granular preferences through CLI
Currently, preferred-install accepts the hash of patterns as the value in the composer.json. I've followed the same approach as used in extra and platform for letting the user define install preferences through CLI in the format: `composer config preferred-install my-organization/stable-package.dist`.
2020-01-07 14:25:57 -02:00
Chad Wade Day, Jr 917680e0d4 Make global exec execute commands in working directory 2020-01-06 19:29:00 -08:00
Stephan Vock 731d94a2a3 VcsRepositories: mark archived repositories as abandoned 2020-01-04 17:01:27 +00:00
Tyson Andre 6827105a5b Fix nits on typos 2019-12-29 12:14:38 -05:00
Jordi Boggiano 2dd001132a
Merge pull request #8492 from staabm/putenv
implemented `@putenv` composer script
2019-12-22 12:27:23 +01:00
Markus Staab 3d8c1ebad5 implemented @putenv composer script
@putenv supports setting environment variables in a x-OS compatible way
2019-12-21 19:26:29 +01:00
johnstevenson beacdf4e51 Add Windows OneDrive to platform warnings 2019-12-20 19:01:57 +00:00
Stephan Vock dd2cc3e985 VcsRepository: make transport exceptions during initialize run accessible
* also display the http status code in composer failed to load a composer.json file
2019-12-17 10:26:21 +00:00
Adam Žurek 406a28708f updated phpstan to 0.12 2019-12-16 21:58:05 +01:00
Jordi Boggiano 620497a2ed
Fix usage of DefaultPolicy in show command 2019-12-13 17:21:21 +01:00
Jordi Boggiano 082422f334
Merge pull request #8458 from johnstevenson/noproxy
Rewrite NoProxyPattern to include IPv6
2019-12-13 12:11:50 +01:00
Jordi Boggiano f6b3f12107
Merge branch 'master' into 2.0 2019-12-07 21:10:14 +01:00
Jordi Boggiano 92cc5a821f
Merge pull request #8412 from polarathene/fix/improve-createproject-ux
Fix: Improve the create-project UX
2019-12-07 20:36:04 +01:00
Jordi Boggiano 5fc31716dd
Avoid using CURLPIPE_HTTP1 in php7.4+ 2019-12-07 18:58:17 +01:00
Jordi Boggiano 295cc8bc90
Merge pull request #8462 from BR0kEN-/issues/8461
#8461: [ZipDownloader] Print `unzip` exit code when the command is failed
2019-12-07 18:42:26 +01:00
Sergii Bondarenko bb127aa3e7 Resolves #8461: [ZipDownloader] Print `unzip` exit code when the command is failed 2019-12-03 15:30:08 +04:00
gary houbre 920d690d90 Added new Alias For Clear cache 2019-12-02 18:54:54 +01:00
johnstevenson 74ba9decdf Rewrite NoProxyPattern to include IPv6
This includes two breaking changes:
- the hostname is not resolved in the case of an IP address.
- a hostname with a trailing period (FQDN) is not matched.

This brings the basic implementation in line with curl behaviour, with
the addition of full IP address and range matching (curl does not
differentiate between IP addresses host names).

The NO_PROXY environment variable can be set to either a comma-separated
list of host names that should not use a proxy, or single asterisk `*`
to match all hosts.

- Port numbers can be included by prefixing the port with a colon `:`.
- IP addresses can be used, but must be enclosed in square brackets
`[...]` if they include a port number.
- IP address ranges can specified in CIDR notation, separating the IP
address and prefix-length with a forward slash `/`.
2019-11-29 20:39:08 +00:00
Yanick Witschi d1dc367d86 Removed the filters from the pool 2019-11-27 17:57:24 +01:00
Jordi Boggiano d12c20db4b
Remove async repo interface, closes #7902 2019-11-24 09:41:02 +01:00
Jordi Boggiano f2058680a7
Remove unused use statements 2019-11-24 08:46:23 +01:00
Jordi Boggiano 3b0339802b
Fix install manager usage 2019-11-23 13:12:13 +01:00
Jordi Boggiano 29612e8e8e
Remove dead code 2019-11-23 13:11:19 +01:00
Jordi Boggiano 5c62c7d566
Simplify promise handling 2019-11-23 12:37:17 +01:00
Nils Adermann a732ea5dd8 Display source/dist refs if updates do not change the version
We now output an update when only a source or dist ref changes even if
it's a stable version so in these cases the output needs to contain the
ref to make it clear to users what changed
2019-11-23 12:33:58 +01:00
Jordi Boggiano 88b051c96b
Merge branch 'master' into 2.0
Update deps
2019-11-23 12:27:41 +01:00
Jordi Boggiano 67e170eaa8
Merge branch '1.9' 2019-11-23 12:25:23 +01:00
Jordi Boggiano 89f6b2c54c
Merge pull request #8418 from glaubinix/f/github-authentication-behaviour
Git: fix authentication handling for private GitHub repositories
2019-11-23 12:24:41 +01:00
Cyril VERLOOP 0bd3f27693
Do not show commit signature for git log. 2019-11-23 12:23:46 +01:00
Jordi Boggiano 44cdc37c0c
Invalidate map cache when addPackage/removePackage is called 2019-11-23 12:07:29 +01:00
Stephan Vock b847115617 Git: fix authentication handling for private GitHub repositories 2019-11-23 12:02:06 +01:00
Jordi Boggiano f288acb1ca
Execute alias operations still 2019-11-23 11:29:50 +01:00
Jordi Boggiano 5725a2db57
Allow all prepare/cleanup/install/update/uninstall operations to return promises to be executed in parallel as well 2019-11-23 11:25:28 +01:00
Michael Thessel 96af983700 Fixed map initialization 2019-11-21 10:08:09 -08:00
Michael Thessel f8010d5220 Improved hasPackage() performance 2019-11-20 14:58:28 -08:00
Jordi Boggiano 438c45e991
Change UpdateOperation::show to match what the installers output, fixes the dry-run output to be more like real output 2019-11-14 15:41:23 +01:00
Nils Adermann 4e7702598e Always treat changes in dist and source references as updates 2019-11-14 15:33:03 +01:00
Jordi Boggiano 99eb86c506
Avoid outputting "Loading ... from cache" in non-verbose installs 2019-11-14 15:26:25 +01:00
Jordi Boggiano 006985a0ea
Execute all operations at once which lets us download all packages in parallel then install only once all downloads succeeded, fixes #2847
This also changes the PRE/POST_PACKAGE_INSTALL/UPDATE/UNINSTALL events to have less information available on them, repositorySet, request and policy are gone
2019-11-14 15:21:28 +01:00
Jordi Boggiano 3b6d517ce0
Return 404s in ComposerRepository when network is disabled instead of failing hard 2019-11-14 09:57:59 +01:00
Jordi Boggiano eb3e3063b8
Revert "When network is disabled all uncached requests result in 404"
This reverts commit c325112670.
2019-11-14 09:55:57 +01:00
Nils Adermann 28afc4de32 MultiConflictRules cannot be disabled, so no need to check 2019-11-12 23:14:56 +01:00
Nils Adermann 79066931e6 Update exception message for disabling multi conflict rules 2019-11-12 23:14:56 +01:00
Nils Adermann dc0f2e7e46 Ensure multi conflict rules are only used for 3+ literals
Implements the equals method correctly on multi conflict rules. If there
are fewer literals a regular Rule2Literals is enough to represent the
basic conflict rule.
2019-11-12 23:14:56 +01:00
Nils Adermann ed300b9f22 New Multi Conflict Rule for transitive conflicts, to reduce memory 2019-11-12 23:14:56 +01:00
Nils Adermann 6f9b1e76e3 Remove disableRules code from Solver, leftover from original C code
This goes back to an input option to install recommended packages, which
would in turn allow removal of these packages if that was needed to
resolve the rest. This was supported in very early versions of Composer
with suggested packages. We later realized this was not useful in the
context of a project based dependency manager with a lock file, so it
was removed but the solver was never cleaned up.
2019-11-12 23:14:24 +01:00
Nils Adermann c325112670 When network is disabled all uncached requests result in 404 2019-11-12 22:22:03 +01:00
Nils Adermann 7ef3a31de7 Make TransportException in network disabled case clearer
Otherwise it's a bit hard to work out what request triggered the exception
2019-11-12 22:00:02 +01:00
xy2z a91c946e27 Hide not-yet installed packages from "require" and "init" suggestions 2019-11-12 16:32:04 +01:00
Nils Adermann aa6bc75af2 Add a test case for transactions to verify correct sorting 2019-11-08 17:51:18 +01:00
Nils Adermann 3cbe91983c Display Locking instead of Installing for lock file install operations 2019-11-08 16:57:52 +01:00
Nils Adermann 25de5218c3 Reunify lock and local repo transaction code and apply the same sorting 2019-11-08 15:56:46 +01:00
Nils Adermann 97ec2d7b61 Merge remote-tracking branch 'github-composer/2.0' into solve-without-installed
* github-composer/2.0: (63 commits)
  Fix PSR warnings for optimized autoloader, refs #8397, refs #8403
  Prepare 1.9.1 changelog
  Output a hint that maybe you are not in the right directory, fixes #8404
  Fix PSR warnings for optimized autoloader, refs #8397, refs #8403
  Fix tests for PSR-fix in optimized autoloader, refs #8397
  Fix tests for PSR-fix in optimized autoloader, refs #8397
  Change PSR-fix for optimized autoloader to only warn for now, refs #8397
  Fix output of dump-autoload command to avoid interfering with warnings, refs #8397
  Remove credentials from git remotes in cache and vendor dirs
  Avoid overwriting credentials with existing ones from git repos, refs #8293
  Fix github auth to try https with pwd also, fixes #8356
  Fix gitlab support for basic-auth fallback from ssh URLs
  Avoid clearing the error output during removeDirectory execution, losing git error output, fixes #8351
  Move test file parsing into try/catch block to avoid phpunit swallowing errors
  make optimized autoloader respect PSR standards
  Validate composer show with --tree and --path options set (#8390)
  Don't show root warning for docker containers
  Added phpdoc for ComposerAutoloaderInit$SHA1::getLoader() (#8393)
  Validate schema name, type and version
  Fix require command to allow working on network mounts, fixes #8231
  ...
2019-11-08 12:27:13 +01:00
Nils Adermann e26405d858 Clean up comments and output 2019-11-08 12:26:46 +01:00
Nils Adermann 3b26ef0f1b clean up extract dev packages 2019-11-08 12:13:23 +01:00
Nils Adermann 0099f56361 Define property which is later accessed in lock transaction 2019-11-07 22:11:54 +01:00
Nils Adermann 28596d9c12 Define property which is later accessed in local repo transaction 2019-11-07 22:02:35 +01:00
Nils Adermann bf99f1a341 Fix RepositorySet constructor calls to use new signature 2019-11-07 21:56:17 +01:00
Nils Adermann 26da52227e Clean up the Solver tests, no more installed repo input and new sorting
The solver now only calculates a lock file transaction which does not
need to be sorted in order of dependencies. This is only necessary for
the local repo transaction generated without the solver during install
2019-11-07 21:51:53 +01:00
Nils Adermann e6e0723105 Remove unnecessary comments, aliases in lock file are correctly created 2019-11-07 21:25:43 +01:00
Nils Adermann e308f043b9 Fully switch to spl_object_hash in lock transaction
The pool builder tries to be minimal so it's fine for present/locked
packages not be assigned a solver/pool id. Adding a test to verify
correct creation of uninstall jobs
2019-11-07 21:18:09 +01:00
Nils Adermann c50d236378 Correctly load branch aliases from lock file
Root aliases are also stored in the lock file, so on install do not read
them from composer.json.
2019-11-07 20:40:28 +01:00
Nils Adermann cc274ebdf4 Do not reset references on update mirrors if VCS type has changed 2019-11-07 17:42:17 +01:00
Nils Adermann 6925005ac9 Implement update mirrors/nothing/lock as its own installer mode
These special commands no longer (ab)use the partial update mechanism
but rather create a special install request for all current lock file
contents and later override any modified code references to the
originals. This leads to up to date remote metadata but no other
changes.
2019-11-07 17:35:44 +01:00
johnstevenson 7e649fac41 Fix Windows test regression from commit 149250a
Commit: 149250ab92

ProcessExecutor::escape handled a false value inconsistently across
platforms, returning an emtpy string on Windows, otherwise `''`. This
is fixed to return `""` on Windows.

The GitDownloaderTest code has been appropriately updated.
2019-11-07 12:50:42 +00:00
polarathene 43e0321ee7 Chore: Use consistent directory path
Only when a install directory was not specified, was the CWD prepended to `$directory`. This change provides consistency in paths displayed to the user.
2019-11-05 21:14:22 +13:00
polarathene 1b2582ff5b Chore: Improve create-project install UX
Provides feedback output before a potentially long wait on getBestCandidate() call on slow network connections where unresponsiveness/hang may be assumed.
2019-11-05 20:33:20 +13:00
polarathene 5987114f6c Fix: Fail when install location is a file
In the event a file has the same name as the intended install directory, fail fast too.
2019-11-05 20:29:57 +13:00
polarathene 11207a9a2e Fix: Check for null install directory earlier
Allows for failing fast when no install directory was provided to the command(uses package name instead).
2019-11-05 20:26:30 +13:00
polarathene e5e8736383 Fix: Fail fast when the project directory is not empty
Avoid waiting until after `getBestCandidate()` has finished, as it can add notably delay on slow connections due to downloading megabytes of data. Only to fail if the install location is invalid.
2019-11-05 20:26:21 +13:00
Andreas Möller f7f7883a5e
Fix: Xdebug vs xdebug 2019-11-03 14:08:14 +01:00
Jordi Boggiano aaead1bb88
Merge branch 'master' into 2.0 2019-11-01 17:13:09 +01:00
Jordi Boggiano 3496431a6c
Fix PSR warnings for optimized autoloader, refs #8397, refs #8403 2019-11-01 17:13:02 +01:00
Jordi Boggiano 0ea06de286
Merge branch 'master' into 2.0 2019-11-01 16:41:48 +01:00
Jordi Boggiano 6a7f8ac335
Merge branch '1.9' 2019-11-01 16:41:16 +01:00
Jordi Boggiano af86ca1fb3
Output a hint that maybe you are not in the right directory, fixes #8404 2019-11-01 16:32:34 +01:00
Jordi Boggiano d059d90ecf
Fix PSR warnings for optimized autoloader, refs #8397, refs #8403 2019-11-01 16:18:42 +01:00
Jordi Boggiano 502b68967a
Fix tests for PSR-fix in optimized autoloader, refs #8397 2019-11-01 15:31:55 +01:00
Jordi Boggiano f6b8643dcd
Change PSR-fix for optimized autoloader to only warn for now, refs #8397 2019-11-01 14:50:15 +01:00
Jordi Boggiano 050707ed0c
Fix output of dump-autoload command to avoid interfering with warnings, refs #8397 2019-10-30 16:35:13 +01:00
Jordi Boggiano 3a0d05c148
Merge remote-tracking branch 'and800/fix-autoload-opts' 2019-10-30 16:22:44 +01:00
Jordi Boggiano f867c407c7
Merge branch 'master' into 2.0 2019-10-30 15:40:26 +01:00
Jordi Boggiano a0690525b5
Merge branch '1.9' 2019-10-30 15:25:57 +01:00
Jordi Boggiano 149250ab92
Remove credentials from git remotes in cache and vendor dirs
This only removes the credentials if they are managed by composer auth.json or equivalent, if the credentials were present in the package URL to begin with they might remain

Refs #8293
Fixes #3644
Closes #3608
2019-10-30 15:24:53 +01:00
Jordi Boggiano 4e43f849c7
Avoid overwriting credentials with existing ones from git repos, refs #8293 2019-10-30 12:56:08 +01:00
Jordi Boggiano 12184aa9c5
Fix github auth to try https with pwd also, fixes #8356 2019-10-30 12:01:23 +01:00
Jordi Boggiano b925d06861
Fix gitlab support for basic-auth fallback from ssh URLs 2019-10-30 11:25:00 +01:00
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