Jordi Boggiano
4392be4d29
Fix some more inconsistencies in json manipulation
2014-04-10 16:11:43 +02:00
Jordi Boggiano
d742ffca4f
Fix removal of missing keys
2014-04-10 15:55:05 +02:00
Jordi Boggiano
a023c7929a
Merge pull request #2895 from SlikNL/classmap-warning-example
...
Improve ambiguity warning test coverage and avoid ambiguity warning for example directories
2014-04-10 15:28:36 +02:00
Denis Sokolov
836534067b
Avoid ambiguity warning for example directories as well
...
In particular, PEAR repositories use a classmap and example directories trigger
multiple false positive warnings.
2014-04-10 21:03:35 +09:00
Denis Sokolov
65b9cca7b5
Fix ClassMapGenerator unambiguousReference test coverage
...
Without this fix the test only covers having files in "test", the "fixture"
portion it is not covered at all, because all fixtures in phpunit tests
are already in "test" directory
2014-04-10 21:03:26 +09:00
Nils Adermann
e93eeca13a
Merge pull request #2894 from naderman/update-no-dev
...
Add an --update-no-dev option to the require command
2014-04-09 20:29:46 -07:00
Nils Adermann
8aac44d57d
Merge pull request #2893 from naderman/require-delete-duplicate
...
When requiring a package remove it from require-dev and vice versa
2014-04-09 20:13:34 -07:00
Nils Adermann
a2b227740a
Add an --update-no-dev option to the require command
2014-04-09 20:08:10 -07:00
Nils Adermann
f479db6934
Merge pull request #2892 from ptarjan/patch-1
...
use HHVM_VERSION
2014-04-09 19:53:38 -07:00
Nils Adermann
465f0e3761
When requiring a package remove it from require-dev and vice versa
2014-04-09 19:46:24 -07:00
Paul Tarjan
ddec582ca1
use HHVM_VERSION
...
this one is better (they are the same)
2014-04-09 15:40:12 -07:00
Nils Adermann
78f2ad95a9
Correctly add decision reason to transaction
2014-04-09 12:08:13 -07:00
Jordi Boggiano
e7b82cdd88
Only check in require and for non-platform packages, add flag to make this warning optional, refs #2320
2014-04-09 15:37:50 +02:00
Jordi Boggiano
e0004d0656
Merge remote-tracking branch 'stof/validate_unbound_constraints'
2014-04-09 14:51:14 +02:00
Jordi Boggiano
f6bf7e4a7b
Add dev-master example
2014-04-09 14:50:55 +02:00
Jordi Boggiano
d540a2fc2c
Merge remote-tracking branch 'origin/master'
2014-04-09 14:47:04 +02:00
Jordi Boggiano
a099591735
Adjustments to unbound constraint docs
2014-04-09 14:46:32 +02:00
Jordi Boggiano
99cfb42b8f
Merge remote-tracking branch 'stof/doc_unbound'
2014-04-09 14:21:21 +02:00
Jordi Boggiano
b7f45b688d
Merge pull request #2891 from igorw/skip-bin-log-msg
...
Clarify log messages when skipping existing bins
2014-04-09 13:49:44 +02:00
Igor Wiedler
c0086ba1e3
Clarify log messages when skipping existing bins
2014-04-09 13:40:55 +02:00
Jordi Boggiano
1efa02a7ab
Merge pull request #2888 from BreiteSeite/master
...
fixed: dead symlink breaks gc
2014-04-07 17:37:10 +02:00
Michael Kühn
5b7e39e919
fixed: dead symlink breaks gc
2014-04-07 14:57:45 +02:00
Jordi Boggiano
d99212da52
Fix integration tests
2014-04-07 11:10:57 +02:00
Jordi Boggiano
3c0edd8c7f
Process remove ops first, fixes #2874
2014-04-07 11:10:26 +02:00
Jordi Boggiano
a931faaa34
Fix boolean check fail from a8ec134c2c
2014-04-06 22:44:56 +02:00
Jordi Boggiano
abc34cc62a
Merge pull request #2883 from dzuelke/dev-suggestions
...
Only print suggestions in dev mode
2014-04-06 00:28:38 +02:00
David Zuelke
a8ec134c2c
Only print suggestions in dev mode
...
There is no need to clutter the screen/logs/whatever with suggestions in production installs. If someone didn't care about them in dev mode, they certainly won't in production :)
2014-04-06 00:07:20 +02:00
Jordi Boggiano
b580ad66a0
Merge pull request #2868 from zeke/master
...
update homebrew instructions
2014-04-02 09:35:48 +02:00
Jordi Boggiano
fa084998d5
Merge pull request #2870 from pierredup/patch-1
...
Fix typo
2014-04-02 09:31:34 +02:00
Pierre du Plessis
244e865a35
Fix typo
2014-04-02 08:54:24 +02:00
zeke
c16f83a8c8
use php 5.5 in homebrew instructions
2014-04-01 13:07:50 -07:00
zeke
8c382d4929
forget a homebrew step that's required for php installation
2014-04-01 09:46:16 -07:00
zeke
dbbe91135e
update homebrew instructions
2014-04-01 09:20:11 -07:00
Jordi Boggiano
0902305196
Fix classmap generator warnings and tests
2014-04-01 14:38:31 +02:00
Jordi Boggiano
8974a1ac92
Ignore ambiguous classes in tests/fixtures dirs, fixes #2858
2014-03-31 21:36:48 +02:00
Jordi Boggiano
355dc67038
Tweak wording a bit
2014-03-31 16:33:11 +02:00
Jordi Boggiano
d97d77b656
Merge remote-tracking branch 'hkdobrev/tilde-examples'
2014-03-31 16:25:09 +02:00
Jordi Boggiano
f56d315036
Ensure both bash and stty are present to assume cygwin, fixes #2857
2014-03-31 15:14:47 +02:00
Jordi Boggiano
6e16d53def
Also use rawurlencode in git downloader, refs #2859
2014-03-31 14:59:00 +02:00
Jordi Boggiano
03567dfde7
Merge remote-tracking branch 'WARrior-Alex/master'
2014-03-31 14:57:40 +02:00
Alex Romanenko
5078d7c4fb
Fix space in password for git auth
2014-03-31 09:39:58 +04:00
Haralan Dobrev
aa1745ce2a
Specify how ~ constraints handle pre-releases
...
The "next significant release" a.k.a as the tilde version constraint
would not install a pre-release (alpha, beta, RC) which is not in the same
version namespace.
But in the examples so far it was shown as `~1.2` equals `>=1.2,<2.0` which
would actually install `2.0-beta.1`, because it the pre-release is before
the `2.0` release.
See https://github.com/composer/getcomposer.org/issues/64
2014-03-30 23:33:30 +03:00
Jordi Boggiano
321bd3e1f7
Merge pull request #2855 from karptonite/patchambiguous
...
Bugfix: Don't show Ambiguous class resolution warning when not ambiguous
2014-03-30 19:55:37 +02:00
Daniel Karp
e3be04c443
Don't show Ambiguous class resolution warning if class when not ambiguous
...
if a class or interface is defined twice in the same class, this should not produce a warning
2014-03-30 12:53:15 -04:00
Jordi Boggiano
7daf876d70
Fix test because the order of filesystem iteration is non deterministic
2014-03-29 18:10:32 +01:00
Jordi Boggiano
781c97fa9b
Refactor to avoid global static state
2014-03-29 17:46:55 +01:00
Jordi Boggiano
c3ab09750d
Merge remote-tracking branch 'johnikx/ambiguous-reference-warning'
2014-03-29 17:29:55 +01:00
Jordi Boggiano
3e8a767f8a
Attempt using bash on windows if it is available, fixes #2831
2014-03-29 17:26:43 +01:00
Jordi Boggiano
07b8fe8109
Refactor code so it works cross-platform, refs #2825
2014-03-29 14:16:13 +01:00
Jordi Boggiano
01bf61fede
Merge remote-tracking branch 'sebbrandt87/master'
2014-03-29 14:10:46 +01:00