public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code
8,547 Commits
3 Branches
209 Tags
54 MiB
Commit Graph

5619 Commits (1c012b74a62c9c6f27cad291a1bc2eb000804b1e)

Author SHA1 Message Date
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 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
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 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 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 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
Jordi Boggiano 7a301d9ad1
Merge pull request #7980 from johnstevenson/safe-junctions2 
Improve safe junction logic
 2019-02-18 14:30:38 +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
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 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 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