Rob Bast
593af4b1bf
add license file during autoload dumping
...
closes #4288
2015-08-14 12:00:21 +02:00
Rob Bast
a4fb4dbcea
Merge branch 'jeskew-feature/document-need-to-require-autoloader-in-script-hooks'
...
* jeskew-feature/document-need-to-require-autoloader-in-script-hooks:
"No files" was inaccurate; amend to specify "no files except"
House style requires concatenation in examples
Reiterate the disclaimer in the context of callbacks
Add a line and example to the documentation covering the need to require the autoloader file in order to use autoloaded files
2015-08-12 13:50:07 +02:00
Rob Bast
91336a8312
Merge branch 'feature/document-need-to-require-autoloader-in-script-hooks' of git://github.com/jeskew/composer into jeskew-feature/document-need-to-require-autoloader-in-script-hooks
...
* 'feature/document-need-to-require-autoloader-in-script-hooks' of git://github.com/jeskew/composer:
"No files" was inaccurate; amend to specify "no files except"
House style requires concatenation in examples
Reiterate the disclaimer in the context of callbacks
Add a line and example to the documentation covering the need to require the autoloader file in order to use autoloaded files
2015-08-12 13:48:55 +02:00
Jordi Boggiano
a979cc78ed
Suppress warnings on touch() failures of the vendor dir, refs #4070
2015-08-11 11:20:39 +01:00
Jordi Boggiano
2f69faf252
Merge pull request #4347 from alcohol/code-of-conduct
...
updated code of conduct and minor addition in contrib
2015-08-11 09:52:51 +01:00
Rob Bast
df10a80501
updated code of conduct and minor addition in contrib
2015-08-11 10:41:34 +02:00
Jordi Boggiano
cedbe7f1a0
Bump vcs verbosity output to very verbose, refs #4330
2015-08-10 12:58:58 +01:00
Jordi Boggiano
0457ec6fb3
Remove deadcode, fixes #4345 , fixes #4268
2015-08-10 12:42:51 +01:00
Jordi Boggiano
812523f1ab
Add more debug info on cache write failure, refs #4249
2015-08-10 10:07:48 +01:00
Jordi Boggiano
65bb8d99f4
Fix global switch regression on config command, fixes #4344
2015-08-10 08:35:31 +01:00
Jordi Boggiano
5a26b7c102
Merge pull request #4299 from webberwu/master
...
show change if package directory have changed to symbolic link
2015-08-10 01:17:02 +01:00
Jordi Boggiano
4824b4504e
Remove typo
2015-08-10 01:05:32 +01:00
Jordi Boggiano
33badac0a8
Include full error message in debug mode
2015-08-10 00:57:13 +01:00
Jordi Boggiano
b16c5fbeb9
Shorten ternary and reuse config file instead of the null argument to figure out path to auth.json
2015-08-10 00:56:55 +01:00
Jordi Boggiano
cdeb7621ba
Merge remote-tracking branch 'Tehem/issue-4302'
2015-08-10 00:52:39 +01:00
Jordi Boggiano
a782dab2cd
Merge remote-tracking branch 'iamluc/git-diff'
2015-08-09 23:26:55 +01:00
Jordi Boggiano
bd23ce672a
Merge pull request #4324 from MalteWunsch/getCanonicalPackages-with-different-versions
...
Improve documentation for WritableRepositoryInterface::getCanonicalPackages
2015-08-09 17:36:21 +01:00
iamluc
d02ab54be1
Add a new option to view local modifications (git diff)
2015-08-09 17:30:32 +02:00
Jordi Boggiano
976491d865
Rewrap markdown, refs #4329
2015-08-09 15:09:34 +01:00
Jordi Boggiano
2238692250
Merge pull request #4329 from emersonthis/patch-1
...
Clarified instructions
2015-08-09 15:08:50 +01:00
emersonthis
5508bb8725
Clarified instructions
2015-08-04 16:54:43 -04:00
Jordi Boggiano
c83650f299
Merge pull request #4327 from nicolas-grekas/revert-pr-3975
...
Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
2015-08-04 14:59:03 +01:00
Nicolas Grekas
fbae6b1589
Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
...
This reverts commit bdb6ecb29e
, reversing
changes made to 8a12e50a16
.
2015-08-04 10:34:54 +02:00
Malte Wunsch
70ff00c9de
Reverted inadvertent API change, improved API documentation
2015-08-04 09:32:23 +02:00
Tehem
9e592f19a1
Used shorthand version for ternary operator
2015-08-03 23:36:05 +02:00
Malte Wunsch
767279b41a
getCanonicalPackages returns packages with same name in different versions
2015-08-03 18:28:04 +02:00
Jordi Boggiano
06feb19b2c
Merge pull request #4169 from remicollet/patch-1
...
Set this test as slow
2015-08-02 12:10:47 +01:00
Thomas Marcon
b35e762354
Updated configFile parsing to first look into -f parameter, then COMPOSER environment variable, then default to composer.json
2015-07-31 12:01:49 +02:00
Nils Adermann
bd2d7eba05
Merge pull request #4321 from alcohol/4319-fix-php-platform-version-error
...
make sure php version errors are less misleading
2015-07-31 10:06:09 +02:00
Rob Bast
51ef7b5eef
instead of generic be more verbose about possible causes
2015-07-31 10:01:58 +02:00
Rob Bast
77f1d5945f
make sure php version errors are less misleading
...
* determine conflicting version in problem using pool package
* hide version in rule to keep it generic rather than possibly misleading
fixes #4319
2015-07-31 09:58:34 +02:00
Jordi Boggiano
a67eaf04c7
Merge pull request #4316 from alcohol/1508-simplify-tests
...
closes #1508 - updated tests
2015-07-30 13:14:55 +01:00
Rob Bast
ef37b86c81
closes #1508 - updated tests
2015-07-30 13:37:12 +02:00
Tehem
9392adef79
Fixes #4302 allow COMPOSER env with config statements (overrides --file)
2015-07-28 00:01:01 +02:00
Webber Wu
92530e374b
Merge remote-tracking branch 'upstream/master'
2015-07-26 12:33:39 +08:00
Kocsis Máté
87c16073ec
Merge branch 'master' of https://github.com/composer/composer into feature-bin-compat
2015-07-22 15:54:20 +02:00
Nicolas Toniazzi
e8a6cb536b
Change detection of config/cache/data dirs
2015-07-22 10:38:12 +02:00
Jordi Boggiano
c6cc6dd607
Advise the use of absolute paths, fixes #4259
2015-07-21 14:46:38 +01:00
Jordi Boggiano
00c26791fa
Merge pull request #4264 from alcohol/use-composer-spdx
...
remove spdx files, introduce external library
2015-07-20 18:29:14 +01:00
Jordi Boggiano
b260a9972f
Timeouts are not necessarily cause for alarm
2015-07-20 17:50:56 +01:00
Jordi Boggiano
dafa9efa8f
Remove whitespace
2015-07-20 17:50:34 +01:00
Jordi Boggiano
bbf959ac34
Do not retry failures once degraded mode is already enabled
2015-07-20 17:44:03 +01:00
Jordi Boggiano
ff84b32097
Add degraded mode to try and bypass ipv6/gzip issues, refs #4142 , refs #4121
2015-07-20 17:33:53 +01:00
Rob Bast
2553f5f7d4
throw error when file is loaded
2015-07-20 12:10:30 +02:00
Rob Bast
56f0d82207
get resources dir from spdxlicenses
2015-07-20 11:42:20 +02:00
Rob Bast
ab08e4be62
update spdx-licenses to 1.1.0
...
includes latest licenses and exceptions list
2015-07-17 08:19:33 +02:00
Rob Bast
616585e0cc
spdxlicense extends spdxlicenses, add depr error
2015-07-16 13:21:18 +02:00
Rob Bast
bb1e1b0160
update lock file
2015-07-16 12:03:35 +02:00
Remi Collet
9b9cbfe111
fix for changes in justinrainbow/json-schema 1.4.4
2015-07-16 12:03:35 +02:00
Remi Collet
c014e0882f
ignore this test with 'jsonc'
2015-07-16 12:03:35 +02:00