1
0
Fork 0
Commit Graph

8303 Commits (de0251953d6196a5931fc991d9e2a595d20ac46c)

Author SHA1 Message Date
Jordi Boggiano de0251953d
Update composer deps 2019-04-09 17:46:33 +02:00
Jordi Boggiano 974a3305ae
Update changelog 2019-04-09 17:41:09 +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
Jordi Boggiano 9dc49a30de
Merge pull request #8082 from alcohol/fix-8080
Fix #8080 Support for PHP7.3 flexible heredoc/nowdoc syntax
2019-04-05 16:23:31 +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 625bcee63a
Fix handling of warnings to incl all 4xx responses 2019-04-01 18:01:09 +02:00
Markus Staab c876613d5c Added "Read more at" links to all commands (#8019) 2019-03-04 12:55:38 +01:00
Jordi Boggiano d96d046209
Fix require of platform packages with --ignore-platform-reqs, fixes #8012 2019-03-04 11:38:58 +01:00
Jordi Boggiano 6bce9da8c8
Only keep track of empty references that returned a 404 2019-03-04 08:53:18 +01:00
Jordi Boggiano 6473dd9185
Minor improvements to VersionCacheInterface 2019-02-27 15:03:25 +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 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
Jordi Boggiano 7a301d9ad1
Merge pull request #7980 from johnstevenson/safe-junctions2
Improve safe junction logic
2019-02-18 14:30:38 +01:00
Jordi Boggiano d9f873d00e
Abort when HHVM 4.0 is detected to output a clear user message, refs #7990 2019-02-16 17:40:47 +01:00
Jordi Boggiano 723308a1e7
Merge pull request #7982 from staabm/patch-1
Fixed typo introduced in recent fix
2019-02-13 09:07:45 +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
Jordi Boggiano f7f0a978bb
Merge pull request #7978 from staabm/win-usleep
Make sure we properly usleep() on windows rmdir/unlink
2019-02-12 14:16:15 +01: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
Jordi Boggiano 4d26198dde
Merge pull request #7971 from johnstevenson/safe-junctions
Only use junctions if they can be safely removed
2019-02-12 11:20:39 +01:00
johnstevenson 6212eadcb0 Only use junctions if they can be safely removed 2019-02-11 22:23:23 +00:00
Jordi Boggiano 603fe500f9
Merge pull request #7969 from johnstevenson/remove-junction-tweak
Remove junctions with PHP rather than system rmdir
2019-02-11 17:50:42 +01: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 875a7dd924
Merge pull request #7928 from johnstevenson/appveyor
Update appveyor to PHP 7.3
2019-02-11 11:27:41 +01:00
johnstevenson c903a63f10 Update appveyor to PHP 7.3 2019-02-11 10:20:47 +00:00
Jordi Boggiano a5cd912c02
Update changelog 2019-02-11 10:51:32 +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 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 c66bb0b1d0 Fix tests 2019-02-10 13:07:42 +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
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 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 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
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