msiebeneicher
7522a33079
Merge branch 'master' of https://github.com/composer/composer into add_exclude
...
# By Jordi Boggiano (30) and others
# Via Jordi Boggiano (37) and Morgan Campbell (1)
* 'master' of https://github.com/composer/composer : (83 commits)
Update 01-basic-usage.md
Revert 331425bcb3
as well, fixes #3612
Revert "Disable overwrites when no-ansi is present, fixes #3612"
Update deps
Use justinrainbow/json-schema 1.4
Improved wording
Fix docs basic-auth => http-basic
Add test for Generics class
Single variable for traits and enums
Use HHVM_VERSION instead of HPHP_VERSION
Add support for using classmap to autoload Hack enums
Re-use existing autoloader suffix if available, fixes #3701
Report Travis CI build success early
Test on HHVM nightly releases. Allow to fail.
Make parseJson safer
Use get home from Config instead of factory
Fix env override regression, fixes #3820
[create-project] Used no progress value for dependencies
Add docBlock and fix CS
Fix output of first line of progress when output is not decorated, refs #3818
...
2015-03-25 16:27:23 +01:00
Jordi Boggiano
8cfd48c479
Merge pull request #3873 from jmorganc/patch-1
...
Update 01-basic-usage.md
2015-03-25 14:32:49 +00:00
Morgan Campbell
7cb9b9a985
Update 01-basic-usage.md
...
Added a missing "the" so the sentence flows a little better.
2015-03-25 08:32:29 -05:00
Jordi Boggiano
c5cd184767
Revert 331425bcb3
as well, fixes #3612
2015-03-24 01:36:30 +00:00
Jordi Boggiano
66b73ea456
Revert "Disable overwrites when no-ansi is present, fixes #3612"
...
This reverts commit e0d36e19eb
.
Conflicts:
src/Composer/IO/ConsoleIO.php
2015-03-24 01:31:53 +00:00
Jordi Boggiano
17baee4e80
Merge pull request #3866 from khromov/patch-1
...
Improved wording
2015-03-24 00:12:54 +00:00
Jordi Boggiano
ddd6ea1c2f
Update deps
2015-03-24 00:12:43 +00:00
Jordi Boggiano
b1248e1ff6
Merge remote-tracking branch 'salathe/patch-1'
2015-03-23 23:55:43 +00:00
Peter Cowburn
54d61ec486
Use justinrainbow/json-schema 1.4
...
justinrainbow/json-schema version 1.4.0 has been tagged (https://github.com/justinrainbow/json-schema/releases/tag/1.4.0 ), which fixes naming conflicts with Scalar Type Hints in (what will be) PHP 7.
2015-03-23 20:49:40 +00:00
Stanislav Khromov
6c35dd6b2d
Improved wording
...
All other verbs use are in the form of "doing something", ie Installing, Downloading. "connection" is the odd one out.
2015-03-23 19:36:16 +01:00
Jordi Boggiano
ab3622dff1
Merge pull request #3365 from WouterJ/patch-1
...
Updated validator
2015-03-23 11:56:30 +00:00
Jordi Boggiano
829199c053
Merge pull request #3840 from gonimar/patch-1
...
Fix docs basic-auth => http-basic
2015-03-16 13:11:02 +00:00
Sergey Gonimar
c87418099c
Fix docs basic-auth => http-basic
2015-03-13 14:25:55 +05:00
Jordi Boggiano
d571874461
Merge pull request #3831 from fredemmott/autoload-hack-enums
...
Add support for using classmap to autoload Hack enums
2015-03-09 23:06:06 +00:00
Fred Emmott
23d5e30fbc
Add test for Generics class
...
Already worked, just adding a test.
2015-03-09 11:29:04 -07:00
Fred Emmott
bdf51ab16d
Single variable for traits and enums
2015-03-09 10:05:12 -07:00
Fred Emmott
cb1ea889d6
Use HHVM_VERSION instead of HPHP_VERSION
2015-03-09 10:02:10 -07:00
Fred Emmott
33ea86573e
Add support for using classmap to autoload Hack enums
...
fixes composer/composer#3823
Ran tests with both PHP5.5.9-1ubuntu4.5 and HHVM 3.6. Test fails on HHVM only
if I back out the ClassMapGenerator.php change.
2015-03-09 09:38:02 -07:00
Jordi Boggiano
b296e654eb
Re-use existing autoloader suffix if available, fixes #3701
2015-03-09 11:13:01 +00:00
Jordi Boggiano
fed81ee47c
Merge pull request #3829 from hkdobrev/fast-finish-builds
...
Report Travis CI build success early
2015-03-09 11:02:24 +00:00
Haralan Dobrev
8168f69ae7
Report Travis CI build success early
...
This will report the build has succceeded even if allowed to fail jobs are
still running.
See https://github.com/composer/composer/pull/3828 .
Docs: http://docs.travis-ci.com/user/build-configuration/#Fast-finishing
Props to @fonsecas72.
2015-03-09 10:25:47 +02:00
Jordi Boggiano
9f9cff558e
Merge pull request #3825 from fonsecas72/ppp
...
Use get home from Config instead of factory
2015-03-08 18:02:57 +00:00
Jordi Boggiano
ca9fcba5eb
Merge pull request #3828 from hkdobrev/hhvm-nightly
...
Test on HHVM nightly releases. Allow to fail.
2015-03-08 18:01:47 +00:00
Haralan Dobrev
3667e18885
Test on HHVM nightly releases. Allow to fail.
...
Nightly releases could change in unpredictable way.
So they should not fail the whole build.
However we could catch problems and breaking changes
on next versions of HHVM early.
2015-03-08 19:30:56 +02:00
Jordi Boggiano
8956c34da6
Merge pull request #3827 from fonsecas72/fix_test_php7
...
Make parseJson safer
2015-03-08 12:01:37 +00:00
Hugo Fonseca
e79d067690
Make parseJson safer
2015-03-07 19:01:54 +00:00
Hugo Fonseca
c41a187b62
Use get home from Config instead of factory
2015-03-07 13:00:21 +00:00
Jordi Boggiano
b80038804f
Fix env override regression, fixes #3820
2015-03-06 16:21:40 +00:00
Jordi Boggiano
dfd04a9458
Merge pull request #3822 from francisbesset/patch-2
...
[create-project] Used no progress value for dependencies
2015-03-06 15:34:47 +00:00
Francis Besset
4f57fafb8d
[create-project] Used no progress value for dependencies
2015-03-06 14:09:50 +01:00
Jordi Boggiano
b8ac790b4f
Merge pull request #3819 from fonsecas72/fix_doc
...
Add/Fix DocBlock
2015-03-05 22:21:10 +00:00
Hugo Fonseca
1bb871dca8
Add docBlock and fix CS
2015-03-05 22:01:09 +00:00
Jordi Boggiano
2a0da15eb5
Merge pull request #3227 from tobiastom/patch-1
...
Added some details about authentication handling.
2015-03-05 20:53:47 +00:00
Jordi Boggiano
3470cef1f1
Merge pull request #3818 from Hellov/master
...
Duplicate download progress
2015-03-05 14:44:34 +00:00
Jordi Boggiano
331425bcb3
Fix output of first line of progress when output is not decorated, refs #3818
2015-03-05 14:44:15 +00:00
Jordi Boggiano
ad40cdc3fe
Fix overwriteError behavior, fixes #3817
2015-03-05 14:40:29 +00:00
Jordi Boggiano
d9b5c884ba
Detect and warn JSON encoding failures, refs #3786
2015-03-05 14:24:43 +00:00
Jordi Boggiano
8e6f62e769
Bump max memory to 1GB, fixes #3785
2015-03-05 14:16:44 +00:00
Hello
ef0191ee6a
Duplicate download progress
2015-03-05 16:27:27 +03:00
Jordi Boggiano
26799f4244
Update script/plugin docs
2015-03-04 23:50:10 +00:00
Jordi Boggiano
3b018e4276
Merge pull request #3816 from stof/patch-1
...
Switch to the docker-based infrastructure on Travis
2015-03-04 16:50:15 +00:00
Christophe Coevoet
a02f3e79b8
Switch to the docker-based infrastructure on Travis
2015-03-04 16:53:53 +01:00
Jordi Boggiano
462de7bd94
Merge pull request #3813 from nicolas-grekas/language-c
...
Run processes with predictable LANGUAGE=C
2015-03-04 15:44:56 +00:00
Jordi Boggiano
8f170b214c
Merge pull request #3806 from fonsecas72/php7
...
Added php7 to travis
2015-03-04 15:41:55 +00:00
Hugo Fonseca
f35d6ac0e0
Removed php7 to travis allowed_failures
2015-03-03 12:26:47 +00:00
Nicolas Grekas
be22a87d9c
Run processes with predictable LANGUAGE=C
2015-03-03 13:10:41 +01:00
Jordi Boggiano
eadc167b12
Fix BC layer for events
2015-03-02 18:20:22 +00:00
Jordi Boggiano
82b7fdf4c1
Add BC for Script\Event instances, fixes #3811
2015-03-02 17:02:20 +00:00
Jordi Boggiano
b098a2fdde
Fix clear cache when a dir does not exist, fixes #3810
2015-03-02 16:40:05 +00:00
Hugo Fonseca
fe2b2e651a
Added php7 to travis
2015-03-01 20:47:15 +00:00