1
0
Fork 0
Commit Graph

8664 Commits (28596d9c12c43db91f61d69a708dd937531e4722)

Author SHA1 Message Date
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
johnstevenson da0dc74414 Update doc block, remove redundant clearstatcache 2019-02-10 14:41:20 +00: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 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 4de1f021f5 Quote wildcards to avoid issues in some shells, fixes #7960 2019-02-10 12:40:11 +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
Jordi Boggiano 9adcdfcb88
Merge pull request #7962 from TekkCraft/patch-1
Update aliases.md
2019-02-10 11:40:53 +01:00
Michael Telgmann eee98018f7 Soften hard exit after revert of composer file 2019-02-10 11:38:47 +01:00
Jordi Boggiano 6599f46c23
Merge pull request #7949 from johnstevenson/posix-proxy
Make unixy proxy code POSIX compatible
2019-02-10 11:35:58 +01:00
johnstevenson f4b9bbbf42 Make unixy proxy code POSIX compatible 2019-02-08 17:33:13 +00:00
Jordi Boggiano 568081f9b6
Merge pull request #7952 from JakeConnors376W/patch-1
Fix inconsistent casing
2019-02-08 17:02:33 +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
Marc Wilhelm f89f9439e4
Update aliases.md
Add composer command for alias.
2019-02-07 17:26:17 +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 00c395d657
Merge pull request #7946 from naderman/fix-abs-literal
Fix solver problem exceptions with unexpected contradictory "Conclusions"
2019-02-05 15:31:34 +01:00
JakeConnors376W 3b117da6d7
Fix inconsistent casing 2019-02-04 15:59:50 -08: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
Jordi Boggiano 27bdda1fd3
Merge pull request #7937 from aboks/defaultrepos-auth
Fix defaultRepos fallback does not use auth config
2019-01-31 16:09:20 +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
Jordi Boggiano b3182b0f7d Update changelog 2019-01-30 08:31:28 +01:00
Jordi Boggiano 8c93890c48
Merge pull request #7932 from hco/patch-2
Installer: Initialize $nameMatchesRequiredPackage
2019-01-30 08:29:42 +01:00
Jordi Boggiano b75db3ca08
Merge pull request #7934 from IkeLutra/patch-1
Update installer commit to fix SHA384 bug
2019-01-29 21:12:30 +01:00
Will Otterburn 6d58b13ee4
Update installer commit to fix SHA384 bug
Installer linked is affected by #7669
2019-01-29 18:03:03 +00: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 5e35464044 Update changelog 2019-01-29 15:00:48 +01:00
Jordi Boggiano 585535a01d Fix platform package regex 2019-01-29 14:58:37 +01:00
Jordi Boggiano 3d815b288f
Merge pull request #7927 from johnstevenson/update-xdebug-handler
Update xdebug-handler, fixes #7921
2019-01-29 14:24:09 +01: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 1699e948dd Merge branch '1.8' 2019-01-29 13:59:27 +01:00
Jordi Boggiano 9566b97e6e Update changelog 2019-01-29 13:57:47 +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