1
0
Fork 0
Commit Graph

4877 Commits (e0ce559838e0cd7a01404b4b85d2a2768d0ec1e9)

Author SHA1 Message Date
Jordi Boggiano e0ce559838 Merge remote-tracking branch 'alcohol/write-errors-to-stderr'
Conflicts:
	src/Composer/Command/LicensesCommand.php
2015-02-25 18:02:49 +00:00
Jordi Boggiano c573ae5781 Add missing LICENSE files from dependencies, fixes #3776 2015-02-25 17:48:01 +00:00
Jordi Boggiano ad40dbf941 Merge remote-tracking branch 'origin/master' 2015-02-25 17:31:43 +00:00
Jordi Boggiano 182cfbc249 Merge remote-tracking branch 'SofHad/licenses'
Conflicts:
	src/Composer/Command/LicensesCommand.php
2015-02-25 17:30:34 +00:00
Jordi Boggiano 475c84d4b1 Merge pull request #3775 from rantonmattei/patch-1
VCS section: add requirements for the branch name
2015-02-25 16:53:56 +00:00
Raphael Antonmattei 7b635f835d VCS section: add requirements for the branch name
If you want to use a custom branch in your requirements in your `composer.json`, that branch must be prefixed with "dev-" or you'll get an error:
```sh
[UnexpectedValueException]
  Could not parse version constraint some-branch: Invalid version string "some-branch".
```

It took me a while to find that info, so I figured I'd rather edit the doc.
Let me know.
2015-02-25 11:46:36 -05:00
Jordi Boggiano 3ba581f0df Improve error messages for required hhvm/php versions, fixes #3767 2015-02-25 16:24:39 +00:00
Jordi Boggiano 2426788cdc Merge pull request #3774 from xabbuh/update-table
remove unused method argument
2015-02-25 14:59:53 +00:00
Jordi Boggiano c2f2ddfa5c Merge remote-tracking branch 'GromNaN/prophecy'
Conflicts:
	composer.lock
2015-02-25 12:03:58 +00:00
Christian Flothmann fa3ea2a626 remove unused method argument
Unlike the `TableHelper`, the `render()` method of the `Table` class
does not make use of an `$output` argument. The actual `OutputInterface`
to send the table to is passed in the constructor instead.
2015-02-25 11:54:18 +01:00
Rob Bast 3d329622d7 overwrite -> overwriteError 2015-02-25 11:00:35 +01:00
Rob Bast 3c7a617753 overwriteError + ask[X]() to stderr 2015-02-25 11:00:35 +01:00
Rob Bast ec434e4576 Formatting only 2015-02-25 11:00:35 +01:00
Rob Bast cb336a5416 Implement writeError throughout Composer 2015-02-25 11:00:35 +01:00
Jordi Boggiano 84d4594278 Merge remote-tracking branch 'alcohol/update-tablehelper-to-table' 2015-02-24 14:23:33 +00:00
Jordi Boggiano 0b4a9235f4 CS fixes 2015-02-24 14:22:54 +00:00
Jordi Boggiano 3cff4a3bb9 Check for homepages in local repo first if available to make the home command faster 2015-02-24 13:07:40 +00:00
Jordi Boggiano 01476214da Tweak satis/toran/packagist docs 2015-02-24 12:49:14 +00:00
Jordi Boggiano c291b07abd Merge pull request #3764 from alcohol/retry-slow-test
retry slow test if timeout occurs
2015-02-23 22:41:42 +00:00
Jordi Boggiano 09da587ee2 Forward args 2015-02-23 16:37:50 +00:00
Jordi Boggiano 074a748675 missing use statements :s 2015-02-23 16:35:54 +00:00
Jordi Boggiano 3efed220a6 Clean up event dispatching code and make package events extend installer events 2015-02-23 15:34:49 +00:00
Jordi Boggiano 235b0cf84e Merge pull request #3758 from qw3rtman/follow-symfony-coding-standards
Conform with Symfony Coding Standards
2015-02-23 15:33:31 +00:00
Rob Bast 85955d82a6 Raise timeout to 5 minutes 2015-02-23 09:57:54 +01:00
Jérôme Tamarelle 9c58fd725f Update deps 2015-02-21 11:08:47 +01:00
Jérôme Tamarelle b91be79137 Update PHPUnit version to get prophecy 2015-02-21 11:08:35 +01:00
Rob Bast 85182cf7e1 Update dependency version constraint 2015-02-20 13:57:16 +01:00
Rob Bast 3dd93c91b8 TableHelper is deprecated, switched to Table 2015-02-19 13:56:07 +01:00
Nimit Kalra b2b9688c92 Conform with Symfony Coding Standards
According to Symfony Coding Standards, a single space must be added around binary operators excluding the concatenation operator.

"Add a single space around binary operators (==, &&, ...), with the exception of the concatenation (.) operator" (http://symfony.com/doc/current/contributing/code/standards.html)
2015-02-18 15:06:36 -06:00
Jordi Boggiano 833ce98426 Merge pull request #3747 from vkartaviy/patch
Added missing $learnedWhy property
2015-02-17 21:55:44 +00:00
Jordi Boggiano 5744981795 Merge pull request #3702 from alcohol/feature/list-scripts
Added --list to run-script command, closes #3671
2015-02-17 20:23:05 +00:00
Jordi Boggiano 0e977e3fde Add more docs to config command 2015-02-17 20:06:02 +00:00
Jordi Boggiano efcd1e4247 Merge pull request #3749 from alcohol/allow-setting-packagist-to-false-through-config-command
composer config repositories.packagist false
2015-02-17 19:41:03 +00:00
Jordi Boggiano 306f5518d6 Merge pull request #3750 from DavidPrevot/git
Config Git repository user
2015-02-17 15:34:19 +00:00
Jordi Boggiano 5d3c7ab6b7 Rename test files and descriptions 2015-02-17 14:43:09 +00:00
Jordi Boggiano b4698568d2 Adjust tests and fix installer code to create the pool using locked requirements and not the composer.json reqs 2015-02-17 14:37:33 +00:00
Jordi Boggiano df23836a0e Merge remote-tracking branch 'bestform/replaced-packages-should-not-be-installed-in-a-different-version' 2015-02-17 13:38:46 +00:00
Jordi Boggiano fb562ceb65 Merge pull request #3752 from felixkiss/patch-1
Update RootPackageInterface.php
2015-02-17 10:50:55 +00:00
Jordi Boggiano 01a244d3c8 Merge pull request #3753 from felixkiss/patch-2
Update why-are-unbound-version-constraints-a-bad-idea.md
2015-02-17 10:50:44 +00:00
Felix Kiss 65f8d1c247 Update why-are-unbound-version-constraints-a-bad-idea.md
Minor text improvement
2015-02-17 02:46:15 +01:00
Felix Kiss b86f9bf4ba Update RootPackageInterface.php
Fix typo
2015-02-17 01:20:56 +01:00
David Prévot e5ede671d2 Config Git repository user
One can’t assume a Git user is already setup for the tests.
2015-02-16 11:55:56 -04:00
Rob Bast 47d75f77d5 Let's be gentle and allow FALSE too 2015-02-16 16:54:52 +01:00
Rob Bast ef92a06205 composer config repositories.packagist false
closes #3728, closes #3713, closes #3290, not sure about #3025
2015-02-16 16:44:13 +01:00
Vladimir Kartaviy 813fd0b703 Added missing $learnedWhy property 2015-02-16 15:23:06 +02:00
Matthias Derer 1425bb7fc3 added tests to reproduce the bug 2015-02-16 13:46:59 +01:00
Jordi Boggiano 781d8cb925 Merge pull request #3740 from bestform/ignore-root-requirements-in-installer
Ignore root requirements in installer when installing from locked state
2015-02-14 17:12:21 +00:00
Jordi Boggiano 53925295c3 Merge pull request #3699 from trivago/non_feature_branches
added non-feature-branches
2015-02-14 15:44:45 +00:00
Matthias Derer c9cff6387a removed requirements from the root package should we install from the lock file 2015-02-13 16:15:34 +01:00
rkerner 38d546da45 * added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
* added documentation to doc/04-schema.md
* fixed indentation and styling
2015-02-11 16:03:17 +01:00