1
0
Fork 0
Commit Graph

1851 Commits (607b487295dba0f6b6063d7fdba33f3b5aa6c863)

Author SHA1 Message Date
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
Jordi Boggiano 28b51ccfc5 Merge branch '1.8' 2019-02-10 20:24:43 +01:00
Jordi Boggiano c66bb0b1d0 Fix tests 2019-02-10 13:07:42 +01:00
Jordi Boggiano ff246e3e85 Merge branch '1.8' 2019-02-10 12:59:38 +01: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
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
Fred Emmott bac2ef3dfd
Don't do (new Foo())->bar() - not 5.3-compatible 2019-02-01 11:20:34 -08: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
Jordi Boggiano 71193132a3 Fix test 2019-01-29 14:22:20 +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 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
Sascha Egerer 1845adcfbd Fix update whitelist pattern resolving and add more tests 2019-01-28 17:34:24 +01:00
Sascha Egerer 50cb5fe3da Update all whitelist matching root dependencies
The update command can receive a pattern like `vendor/prefix-*`
to update all matching packages.
This has not worked if multiple packages, depending on each other,
where matched to the given pattern. No package has been updated
in this case as only the first package matching the pattern was
added to the whitelist.
2019-01-28 17:34:08 +01:00
Nils Adermann 386382503d Add a test for autoloading if a package is only required via replacing name 2019-01-28 17:08:51 +01:00
Den Girnyk 3b6b63784f Fix: Keep replaced packages for autoload dumping with --no-dev 2019-01-28 17:02:32 +01:00
Jordi Boggiano 2200043a43
Merge pull request #7900 from Great-Antique/fix-dumpautoload-no-dev-packages-resolving
Fix: Keep replaced packages for autoload dumping with --no-dev
2019-01-28 15:52:43 +01:00
Jordi Boggiano b7d1f87848 Fix tests 2019-01-28 15:44:21 +01:00
Jordi Boggiano 0b928b2a42 Merge branch 'master' into 2.0 2019-01-28 14:33:10 +01:00
Jordi Boggiano f54237159d Cleanups 2019-01-18 12:14:47 +01:00
Den Girnyk 5b78ea529a
Fix: Keep replaced packages for autoload dumping with --no-dev 2019-01-18 11:45:35 +02:00
Jordi Boggiano 3dfcae99a9 Add parallel download capability to FileDownloader and derivatives 2019-01-18 08:39:03 +01:00
Jordi Boggiano fd5c5ff6bc Fix implementation of whatProvides for older provider-only repos 2019-01-14 17:29:24 +01:00
Jordi Boggiano b47330adf1 Refactor ComposerRepository to work with combined repos having lazy providers and partial packages 2019-01-14 17:29:24 +01:00
Jordi Boggiano e8c6948770 Deduplicate link instances between versions of a given package 2019-01-14 17:29:24 +01:00
Jordi Boggiano 64384f8b15 Fix tests 2019-01-14 17:29:24 +01:00
Jordi Boggiano fd11cf3618 Port/extract most behavior of RemoteFilesystem to CurlDownloader 2019-01-14 17:29:23 +01:00
Jordi Boggiano 09fd239f24 Fix factory test 2019-01-14 17:29:23 +01:00
Jordi Boggiano 1cd9f4f9db Disable request_fulluri by default for HTTPS connections 2019-01-14 17:29:23 +01:00
Jordi Boggiano f946d8eb5a More RemoteFilesystem usage removals and some repository/vcs driver refactorings 2019-01-14 17:29:23 +01:00
Jordi Boggiano 713bc4de1d Minor fixes and updated the rest of the code/tests to use HttpDownloader 2019-01-14 17:29:23 +01:00
fancyweb a9d6068c57 feat(buffer-io): add the possibility to set user inputs for interactive questions 2019-01-05 11:59:33 +01:00
Jordi Boggiano bf33eec912 Fix tests 2018-12-03 10:59:04 +01:00
Jordi Boggiano 411dd51f20 Merge branch 'master' into 2.0 2018-12-03 10:41:19 +01:00
Jordi Boggiano 85ec111dee Merge remote-tracking branch 'dmanners/add-chat-option-for-support' 2018-11-26 19:47:13 +01:00
Jérôme Deuchnord b0b00ad1fa Call a script recursively with extra parameters (#7720)
* Added support for calling scripts recursively (fixes #7562)
2018-11-26 12:35:41 +01:00
Jordi Boggiano 2e0f31106a Merge remote-tracking branch 'origin/master' into 2.0 2018-11-12 16:01:07 +01:00
Jordi Boggiano 5a56bb6971 Remove BC event and constraint classes 2018-11-12 15:57:44 +01:00
Jordi Boggiano 86f59348f5
Fix TestCase import 2018-11-12 15:24:28 +01:00
Gabriel Caruso 2a13bb2649 Fixes from PHPStan (#7687)
* fix docblocks

* remove redundant conditional

* fix wrong variable name

* fix wrong namespaces

* add missing private members

* remove unused/redundant arguments

* move testcase class

* exclude TestCase.php

* Tweak RuleWatchGraph type hints

* Tweak doc comment
2018-11-12 15:23:32 +01:00
Jordi Boggiano ceb3a7a8e8 Merge branch '1.7' 2018-10-31 18:32:39 +01:00
Jordi Boggiano 42dca2aff5 Remove weird binary file from repo 2018-10-31 18:29:32 +01:00
Jordi Boggiano 2528654c53 Merge branch '1.7' 2018-10-31 18:13:39 +01:00
Jordi Boggiano 9e6a0bff71
Merge pull request #7658 from fooman/fix-non-zip-file-with-zip-ext
Fix regression for artifact repository
2018-10-31 16:12:55 +01:00
Alexey Kopytko aa6d138bdc Check for the actual warning description 2018-10-30 15:56:24 +01:00
Alexey Kopytko 20107dbf77 Ensure that a missing SSL/TLS protection warning does not pollute STDOUT
Fixes #7737
2018-10-30 15:56:24 +01:00
Stephan Vock 819f487b38 Bitbucket: switch to v2 API 2018-10-19 14:31:17 +02:00
David Manners 96347fbea1 composer/composer#7384: add chat to support options
- update schema documents to note that chat is allowed,
 - validate that chat must be a string and a url similar to forum options
2018-10-14 11:15:25 +00:00
Kristof Ringleff, Fooman add71388ca Add failing artifact 2018-10-01 23:03:51 +13:00
Nils Adermann 902cb290e7 Only load package versions which fit the root composer.json constraints 2018-09-12 16:48:17 +02:00
Nils Adermann 81bb8f81ad Set all package ids only once the pool is created
They all get set in one place only and at a specific time when nothing
else will possibly change them anymore
2018-09-12 14:31:40 +02:00
Nils Adermann 5c491ecc9b
Merge pull request #7625 from naderman/repository-set
Separate RepositorySet from Package Pool, load only metadata of packages directly required
2018-09-12 14:22:01 +02:00
Nils Adermann 96c812fb24 Properly buffer installer test output to display as errors if necessary 2018-09-12 13:27:10 +02:00
Nils Adermann c0f19f6c57 Move construction of pool from repo set into a pool builder
Pool construction depends on the install request now, so only required
packages get loaded, add some structure for future asynchronously
loading composer repositories
2018-09-12 11:49:09 +02:00
Nils Adermann b6e2d60c9e Create the pool in the installer before giving it to the solver 2018-09-11 15:49:08 +02:00
Nils Adermann 1228bcdffc Internalize pool creation in repository set, store root aliases in set
The pool is still exposed too early in a few places which will require
further refactoring
2018-09-11 13:34:18 +02:00
Nils Adermann 6ef65e5319 Add a new RepositorySet class and restrict pool usage to the solver
Breaking change for the plugin interface so bumping the version of
composer-plugin-api to 2.0.0

First step for a refactoring of the package metadata loading mechanism
2018-09-10 15:27:54 +02:00
Gabriel Caruso 71c8735e11 Use combined assignment operators 2018-09-10 14:24:41 +02:00
Gabriel Caruso a17f051e29 Remove useless parentheses 2018-09-10 14:24:24 +02:00
Christophe Coevoet 8c3898aa57 Update tests for replace conflicts
This reverts the test changes done in b4698568d2 to the original tests added
in 1425bb7fc3.
2018-08-27 12:14:34 +02:00
Jordi Boggiano bf125295df Fix escaping of URLs in Perforce and Subversion drivers 2018-08-25 18:48:56 +02:00
Jordi Boggiano 3d01ef28fa Revert "Do not dump source and dist for metapackages"
The source/dist reference is needed to operate composer outdated and other functionality

Fixes #7546

This reverts commit 42739e7959.
2018-08-22 09:45:54 +02:00
Alexander Kurilo e1a6bd5ff1 Make JSON formatter test clearer 2018-08-10 08:54:34 +02:00
Alexander Kurilo 5a22a4f1f3 Make surrogate sequences in JSON work on PHP 5.3
Fixes #7510
2018-08-10 08:54:27 +02:00
Rafael Kassner 42739e7959 Do not dump source and dist for metapackages 2018-07-29 16:16:02 +02:00
Jordi Boggiano ff59bbdab0 CS fixer 2018-07-24 14:32:52 +02:00
Jordi Boggiano c5fa3bdde0 Migrate to repo.packagist.org for package metadata 2018-07-24 09:30:06 +02:00
Jordi Boggiano 16af52be8a Merge remote-tracking branch 'origin/1.6' 2018-07-20 11:39:44 +02:00
Théo FIDRY 87646ae689
Hide suggest reason when there is not one 2018-06-09 15:18:21 +01:00
Jordi Boggiano 0a27ca7b65 Make sure circular dependencies do not break the autoload dumper, refs #7316, refs #7348 2018-06-06 14:51:52 +02:00
Jordi Boggiano eedbd218f5 Make sure circular dependencies do not break the autoload dumper, refs #7316, refs #7348 2018-05-31 17:02:04 +02:00
Jordi Boggiano 46f973e213 Merge branch '1.6' 2018-05-15 16:07:05 +02:00
Philipp Fritsche b0be87177d
Filter dev-dependencies from "dump-autoload --no-dev" , fixes #4343 2018-05-08 02:57:26 +02:00
Jordi Boggiano 4ebb747e12 Merge branch '1.6' 2018-05-04 11:18:18 +02:00
Jordi Boggiano 78ae0a97f7 Terminate quoted strings 2018-05-04 11:02:12 +02:00
Jordi Boggiano 3b9d6769bf Fix class names in comments being parsed in short_open_tags files, fixes #7289 2018-05-04 11:02:12 +02:00
Jordi Boggiano 464daeebe2 Merge branch '1.6' 2018-05-03 17:38:09 +02:00
Jordi Boggiano 43e33be79f Fix regression in 036fc44c25, fixes #7268 2018-05-03 17:30:33 +02:00
Jordi Boggiano 38866ba310 Merge remote-tracking branch 'johnstevenson/external-xdebug' 2018-04-13 15:38:27 +02:00
Jordi Boggiano c917865fe9 Fix handling of dev versions and consolidate logic, refs #7119 2018-04-13 13:55:02 +02:00
Jordi Boggiano 24ad6307a7 Merge remote-tracking branch 'austris-argalis/issue-7085' 2018-04-13 13:11:46 +02:00
Jordi Boggiano ea78712822 Merge branch '1.6' 2018-04-13 10:52:23 +02:00
Edwin Rodríguez 9dc6222288 Allow using fossil dependency in a fossil repository, fixes #7125, closes #7126 2018-04-13 09:00:03 +02:00
Jordi Boggiano 35ebb8b93f Merge branch '1.6' 2018-04-12 19:22:50 +02:00
Filippo Tessarotto 277f32d388 Lock _readme: remove outdated hashtag link part, closes #7096 2018-04-12 18:00:01 +02:00
Jordi Boggiano 2bd34c0534 Merge branch '1.6' 2018-04-12 17:01:00 +02:00
Jordi Boggiano 9041622b86 Fix version guessing regression and a few other issues, fixes #7127 2018-04-12 15:16:39 +02:00
Jordi Boggiano bfa01285c2 Merge branch '1.6' 2018-04-12 10:25:03 +02:00
Jordi Boggiano 066351c5b9 Remove use of deprecated getMock method 2018-04-12 10:24:56 +02:00
Jordi Boggiano 036fc44c25 Make sure aliased packages are removed correctly from the repository, fixes #7167 2018-04-12 09:51:01 +02:00
Petr /Peggy/ Sládek 8d06832077 Update ClassMapGenerator to work better with symlinks, fixes #7252, closes #7251 2018-04-12 09:37:26 +02:00
johnstevenson ed97c2116c Use external XdebugHandler library 2018-03-08 19:20:16 +00:00
austris argalis 8a5645ffda Wording: Downgrading instead of Updating #7085 2018-02-16 00:38:41 +02:00
Jordi Boggiano 16dcb04e1d Merge branch '1.6' 2018-01-24 10:28:44 +01:00