1
0
Fork 0
Commit Graph

1884 Commits (ac3fcfc9ec0caf9d8f244aa61e509f814ee14935)

Author SHA1 Message Date
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 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 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 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
Den Girnyk 5b78ea529a
Fix: Keep replaced packages for autoload dumping with --no-dev 2019-01-18 11:45:35 +02: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 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 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
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
Jordi Boggiano a1bf6890d5 Fix ConsoleIO tests 2018-01-24 10:28:39 +01:00
Jordi Boggiano 96d07e6753 Merge branch '1.6' 2018-01-22 16:44:24 +01:00
Jordi Boggiano 842a7ea922 Fix dev-master not being normalized correctly for the root package, fixes #7007 2018-01-22 16:44:17 +01:00
Jordi Boggiano ad8b44a4c8 Merge branch '1.6' 2018-01-22 15:42:56 +01:00
Jordi Boggiano ea9b7ecbb0
Merge pull request #6982 from carusogabriel/phpstan
Fixes from PHPStan level 0
2018-01-22 14:50:43 +01:00
Jean-Baptiste 595cf4432c Fix Test RepositoryFactory 2018-01-22 14:06:56 +01:00
Martin Hujer bbee0d7c6c Validation warns if script description for nonexistent script is present
Fixes #7010
2018-01-17 19:15:06 +01:00
Gabriel Caruso 3d262bd637 Fixes from PHPStan level 0
More fixes from PHPStan level 0
2018-01-14 11:44:15 -02:00
Tomas Klinkenberg 60106edd32 Added a test to confirm issue #6994.
Added a encapsulated group to the replacement parameter of the `preg_replace` for GitLab in `\Composer\Util\Url::updateDistReference()`. This fixes #6994.
2018-01-09 17:57:22 +01:00
Jordi Boggiano e6114b2ca7 Fix support for replacing dist refs in gitlab URLs and add support for gitlab/github enterprise too 2018-01-05 15:20:30 +01:00
Gabriel Caruso 2ad6f611d7 Allow bin key to receive string 2018-01-02 07:00:55 -02:00
Andreas Möller 79828f7543
Enhancement: Assert that key is removed when value is null 2017-12-28 21:11:54 +01:00
Jordi Boggiano 50665aa18d Simplify check for current revision, refs #6684 2017-12-19 17:50:02 +01:00
Jordi Boggiano 93cd9d874b Merge remote-tracking branch 'RobberPhex/git-repo' 2017-12-19 15:47:58 +01:00
John Stevenson 02fbbd5a42 Skip MockedZipDownloader tests if zip is missing (#6917)
* Skip MockedZipDownloader tests if zip is missing
2017-12-19 11:07:09 +01:00
Jordi Boggiano a1c5754b1f Make sure tests run non-interactively 2017-12-18 17:18:59 +01:00
Jordi Boggiano c8aea719b1 CS fixes 2017-12-18 16:02:48 +01:00
Jordi Boggiano 0a9abeef88 Merge branch '1.5' 2017-12-17 15:05:08 +01:00
Renoir Boulanger 9f723ba381 Support GitLab repositories w/ port over HTTPs
When we have self-hosted GitLab, over HTTPs, on a different port.

rel composer/composer#6894
2017-12-17 13:59:08 +01:00
Alessandro Lai 54adf0b61e Add regression test about VersionGuesser pretty_version handling 2017-12-17 13:49:07 +01:00
Gabriel Caruso 885da4c8ef Refactoring tests 2017-12-03 02:41:58 -02:00
Gabriel Caruso afc9a7643e Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase 2017-11-30 13:44:43 -02:00
Gabriel Caruso a4b220273e Refactoring Tests (#6849) 2017-11-30 15:58:10 +01:00
Jordi Boggiano 6256e17149 Merge branch '1.5' 2017-11-30 15:19:19 +01:00
Jordi Boggiano 5ba6d7d436 Fix pretty guessed versions to show nicely on numeric branches, refs #6845 2017-11-30 15:19:11 +01:00
Alessandro Lai 3cf31da414 Fix root package not having a pretty version when detecting from VCS, fixes #6845, closes #6847 2017-11-30 15:07:08 +01:00
Jordi Boggiano eab826b00b Merge branch '1.5' 2017-11-29 16:37:49 +01:00
Jordi Boggiano 45cd26b2df Fix test and actually check that we get hasAuthentication called for different domains 2017-11-29 16:37:00 +01:00
Jordi Boggiano 9850621c6b
Merge pull request #6788 from GawainLynch/symfony-4
Symfony 4
2017-11-28 18:30:31 +01:00
Jordi Boggiano 0b3bc4ccb9 Merge branch '1.5' 2017-11-28 18:09:36 +01:00
johnstevenson b0922b95af Report multiple inis in php.ini specific messages
Where systems use multiple ini files it is perhaps more useful to
suggest running `php --ini` to see their locations, rather than showing
the loaded php.ini (if one exists).
2017-11-28 18:09:08 +01:00
Nils Adermann 7dffe79a0f Update tests of solver problem message to match new message 2017-11-16 12:41:41 +01:00
Robert Lu 3ce71a55bf fix unittest 2017-11-07 13:54:52 +08:00
Gawain Lynch f74c6f4620
Update tests to handle optional QuestionHelper::setInputStream() availability 2017-11-06 16:32:29 +01:00
Gawain Lynch 157075b996
Migrate ConsoleIO::select to use QuestionHelper and ChoiceQuestion 2017-11-06 16:29:55 +01:00
Jordi Boggiano 26a50b3762 Merge branch '1.5' 2017-11-03 19:53:36 +01:00
Jordi Boggiano 4ab34c22fa
Merge pull request #6740 from croensch/master
also support NO_PROXY
2017-11-03 19:50:28 +01:00
Jérôme Vasseur 71c2ecbace Fix platform package detection in VersionParser 2017-11-03 19:48:52 +01:00
Jordi Boggiano 9a99e86ebc Rename NonRoot to Transitive, refs #6674 2017-11-03 14:35:04 +01:00
Jordi Boggiano 9df22654c3 Merge remote-tracking branch 'grasmash/issue-6661-whitelist-all-deps' 2017-11-03 14:20:38 +01:00
croensch 6da92e98ac also support NO_PROXY
since WINDOWS can only have one case and that is usually upperase
2017-10-12 16:35:05 +02:00
Matthew Grasmick 776977f597 Fixing method name. 2017-09-11 13:53:56 -04:00
Vladimir Reznichenko c8615358cb SCA with PHP Inspections (EA Extended) 2017-09-11 19:40:43 +02:00
Matthew Grasmick 11db6f90c2 Cleaning up comments 2017-09-11 12:56:51 -04:00
Matthew Grasmick 3826e51caa Renaming some methods and props. 2017-09-11 12:38:54 -04:00
Matthew Grasmick ad465aa769 Updating var names. 2017-09-11 11:47:33 -04:00
Matthew Grasmick 21722f6e42 Fixing test version constraints. 2017-09-11 11:32:19 -04:00
Matthew Grasmick f29e98cdf9 Fixes #6661: Allow a given package and its dependencies (including siblings) to be updated. 2017-09-11 11:16:15 -04:00
Jordi Boggiano dae575c197 Merge branch '1.5' 2017-09-11 16:09:36 +02:00
Deamon 3d753b117b add test on remove mainkey at end of file 2017-09-11 16:07:13 +02:00
Jordi Boggiano a8df30c09b Merge branch '1.5' 2017-09-11 12:16:16 +02:00
Mikk Tendermann 2a89d37651 fix gitlab not telling visibilty if user is not logged in 2017-09-11 10:37:32 +02:00
Christian Ramelow f178c340e9 Fixed tests. 2017-09-01 20:47:13 +02:00
Christian Ramelow 39d8104897 Introduces a new method `copy()`.
Some packages, e. g. `tm/tooly-composer-script`, are using the composer classes to e. g. create symlinks or perform other file operations. While there's only a `copyThenRemove()` method this commit introduces a new `copy()` method. `copy()` behaves the same as the copy part of `copyThenRemove()` did with one exception: it returns `true` on success and `false` on failure. Copying a directory may lead to a `false`, while the whole directory or some of its files couldn't been copied. To ensure backwards compatibility `copyThenRemove()` calls `copy()` now. This commit also adds the necessary tests.
2017-08-31 20:19:43 +02:00
Jordi Boggiano e33d00f98e Fix gitlab tests 2017-08-18 14:14:15 +02:00
Jordi Boggiano f420d31233 Fix application test 2017-08-08 10:43:26 +02:00
Jordi Boggiano a6c4fb2dcf Fix gitlab tests 2017-08-08 10:26:35 +02:00
Jordi Boggiano c89f6338c2 CS tweaks, refs #6592 2017-08-08 10:11:35 +02:00
Helmut Januschka ae42e4f8a3 php 5 2017-08-07 22:00:14 +02:00
Helmut Januschka bc4a7834ba php 5 being php5 :/ 2017-08-07 21:56:02 +02:00
Helmut Januschka b847270d08 rename test method 2017-08-07 21:47:41 +02:00
Helmut Januschka b486056066 add tests for gitlab paging 2017-08-07 21:46:43 +02:00
Jordi Boggiano b07be842a0 Remove feature-branches option as it is misnamed and duplicates the non-feature-branches option, refs #6475 2017-08-07 18:14:04 +02:00
Jordi Boggiano 6832eacb01 Update GitLab API usage to v4, fixes #6453 2017-08-07 13:13:24 +02:00
Jordi Boggiano 65d49bf811 Merge branch '1.4' 2017-08-07 10:04:46 +02:00
Jordi Boggiano d2b102ecb9 Merge remote-tracking branch 'svenmuennich/pr/fix-require-command' into 1.4 2017-08-07 09:25:24 +02:00
Sergey Shcherbin 118abacd14 Fix for time format in GitBitbucketDriver test 2017-08-06 12:40:47 +02:00
Jordi Boggiano 34dbde3873 Merge branch '1.4' 2017-07-03 17:00:48 +02:00
Sven Münnich d51ef83a43 Fix case insensitivity of ‘require’ command
When currently executing the `require` command for a package that is already listed in `require(-dev)`, one must use the exact same, case matching package name as written in `composer.json`. That is, if one changes the case of a character in the package name, the `require` command will add a new entry to `require(-dev)`, instead of updating the existing one.

This commit fixes the described behaviour to make it consistent with other commands like `update` that are already case insensitive.
2017-07-03 12:11:24 +02:00
Rob Bast 422a9adb07
images related to new trusty images 2017-06-22 15:20:19 +02:00
Jordi Boggiano ef47d8bf05 Merge pull request #6486 from WilHall/feature/htaccess-protect-option
Add htaccess-protect option for disabling the creation of .htaccess files
2017-06-17 15:39:56 +02:00
Jordi Boggiano 91a4e76958 Merge pull request #6460 from bmax/master
Cache: clear cache using removeDirectory
2017-06-17 15:28:05 +02:00
Brandon Max 24b8fea48a Cache: clear cache using removeDirectory 2017-06-16 16:25:11 -04:00
Wil Hall f0924fb878 Add htaccess-protect option for disabling the creation of .htaccess files 2017-06-15 11:06:13 -04:00
Jordi Boggiano 7cee8e385f Merge branch '1.4' 2017-06-15 16:28:08 +02:00
Jordi Boggiano cc9234562d Merge pull request #6475 from NamelessCoder/featurebranches
Add support for feature-branches setting
2017-06-15 15:49:10 +02:00
Claus Due 965f1f42d1 Add support for feature-branches setting
A negative list of non-feature-branches names
is already supported - this patch adds a list of
branches names which *will* be considered as
feature branches.

Allows changing the currently hardcoded set of
expected feature branch names, from:

* master|trunk|default|develop

To any set of names or patterns that you desire.
2017-06-11 19:02:51 +02:00
Sergey Shcherbin 292882f0d0 Fix for time format in GitBitbucketDriver test 2017-06-07 22:29:15 +03:00
Nils Adermann b1110df873 Merge pull request #6371 from balbuf/balbuf/move-all-plugins
Move all plugins and their dependencies to the front
2017-05-24 13:23:09 +02:00
Stephen Beemsterboer 06bb6c7530 Move plugins with no dependencies to the front, followed by plugins with their dependencies 2017-05-23 20:28:32 -04:00