1
0
Fork 0
Commit Graph

5987 Commits (64d653ad92c5e3f28fbc0a51013f7feef7f74b15)

Author SHA1 Message Date
Jordi Boggiano 0081964428 Merge remote-tracking branch 'colinodell/fix-tag-ambiguity'
Conflicts:
	src/Composer/Downloader/GitDownloader.php
	tests/Composer/Test/Downloader/GitDownloaderTest.php
2015-05-31 12:52:27 +01:00
Jordi Boggiano ce0f617ee1 Merge pull request #4083 from nevvermind/php-dox
Added phpdocs + change to yoda comparison
2015-05-31 12:45:02 +01:00
Jordi Boggiano 1753c275ff Handle deprecation notices softer 2015-05-31 12:26:57 +01:00
nevvermind 8e79a3766d Added phpdocs + change to yoda comparison 2015-05-30 01:38:14 +01:00
Jordi Boggiano e64470c987 Merge pull request #4071 from nevvermind/patch-2
Update 02-libraries.md
2015-05-28 15:52:12 +01:00
Jordi Boggiano b181822e90 Fix case where touch() fails due to incorrect ownership, fixes #4070 2015-05-28 15:26:56 +01:00
Jordi Boggiano fbc0fa9688 Fix line endings 2015-05-28 14:54:42 +01:00
Jordi Boggiano 27aac31970 Fix tests for autocrlf=true checkouts, fixes #4049 2015-05-28 14:43:52 +01:00
Jordi Boggiano ac17e4a32f Merge pull request #4077 from alcohol/force-lf-eol-for-functional-test-fixtures
force eol LF style, php diff, and some whitespace flags
2015-05-28 14:20:53 +01:00
Rob Bast 899d9e5134 enable blank-at-eof check 2015-05-28 15:20:26 +02:00
Rob Bast 0c288ed39b composer doesn't use tabs 2015-05-28 14:38:07 +02:00
Rob Bast bd476ca201 added/disabled whitespace error flags 2015-05-28 14:36:38 +02:00
Jordi Boggiano 8cae147572 Merge pull request #4076 from alcohol/force-lf-eol-for-functional-test-fixtures
apply .gitattributes much more widely
2015-05-28 13:30:23 +01:00
Rob Bast bbef618d08 apply .gitattributes much more widely 2015-05-28 14:18:36 +02:00
Jordi Boggiano d286143d72 Merge pull request #4074 from alcohol/force-lf-eol-for-functional-test-fixtures
Make sure the .test files always have LF eol in the working directory
2015-05-28 12:53:53 +01:00
Jordi Boggiano eef1294123 Merge pull request #4075 from alcohol/add-docs-to-support-in-schema
Add docs to composer schema in support section - closes #4055
2015-05-28 12:17:36 +01:00
Rob Bast 782cce376a make sure the .test files always have LF eol in the working directory, fixes #4049 2015-05-28 13:17:27 +02:00
Rob Bast 95dbb6d9db add docs to support section in composer schema, closes #4055
Note that this does not yet add this attribute @ packagist though
2015-05-28 13:15:56 +02:00
nevvermind baf6ba06be Update 02-libraries.md
Small copy text fix.
2015-05-27 20:02:06 +01:00
Jordi Boggiano 69210d5bc1 Move deprecation notice where it belongs, closes #4065 2015-05-25 14:29:26 +01:00
Jordi Boggiano eea42c4df7 Merge pull request #4064 from Maks3w/patch-1
[travis-ci] Enable PHPUnit color output
2015-05-25 11:30:12 +01:00
Jordi Boggiano 98b339e87a Make --keep-vcs imply --prefer-source, closes #4063 2015-05-25 11:28:07 +01:00
Maks3w bc08940724 [travis-ci] Enable PHPUnit color output 2015-05-25 10:31:23 +02:00
coderstephen 8534d881f9 Fix non-feature-branches schema example not syntax highlighted 2015-05-24 16:02:58 -05:00
Jordi Boggiano bc45d91855 Merge pull request #4019 from reiz/master
Adding dependency badge and reference badge
2015-05-11 15:49:39 +01:00
Robert Reiz 26d869f77d Adding dependency badge and reference badge
All dependencies are up-to-date and ~400 other packages are referencing composer. Keep up the good work.
2015-05-11 13:32:10 +02:00
Jordi Boggiano 4eb8ecff9c Merge pull request #4018 from olavmrk/fix-link-to-installerinterface
Fix link to Composer\Installer\InstallerInterface.
2015-05-10 20:56:28 +01:00
Olav Morken b0a7c2612d Fix link to Composer\Installer\InstallerInterface.
The link was pointing to Composer\Plugin\PluginInterface since
commit 98e5eab. Fix the link by updating the reference from
`[3]` to `[4]`.
2015-05-10 20:34:05 +02:00
Jordi Boggiano c8c452de13 Add code of conduct to contrib docs as well 2015-05-10 15:20:27 +01:00
Jordi Boggiano 1c190cb181 Update readme 2015-05-10 15:17:42 +01:00
Jordi Boggiano 723babbb15 Merge pull request #4012 from hhamon/fix-licence-references
[Pear] replaces "licence" to "license".
2015-05-09 18:18:12 +01:00
Hugo Hamon e51ff60f59 [Pear] replaces "licence" to "license". 2015-05-08 06:42:59 -04:00
Jordi Boggiano 4d5d524704 Clear stat cache after a git failure as it might have modified the filesystem 2015-05-07 16:28:18 +01:00
Jordi Boggiano 9df08ec82f Merge pull request #4010 from joshdifabio/patch-1
Add GitHub compare links to CHANGELOG.md
2015-05-07 10:57:08 +01:00
Josh Di Fabio e753d174fd Correct format of alpha1 heading in CHANGELOG.md 2015-05-07 09:23:03 +01:00
Josh Di Fabio ae261c04e9 Fix dates in CHANGELOG.md 2015-05-07 09:08:27 +01:00
Josh Di Fabio ab2ea5dee5 Add GitHub compare links to CHANGELOG.md 2015-05-07 09:05:06 +01:00
Jordi Boggiano 52d290f5f2 trim token just in case and update tests 2015-05-07 00:37:08 +01:00
Jordi Boggiano 41f4451c20 take care of retry-auth-failure:false in case of 403 as well 2015-05-07 00:29:45 +01:00
Jordi Boggiano e16d53893e Remove password prompt for github tokens and require the user creates a token themselves 2015-05-07 00:29:20 +01:00
Jordi Boggiano 8825ed9a59 Update lockfile hash 2015-05-06 15:26:48 +01:00
Jordi Boggiano 6c63fe9f22 Merge pull request #4006 from joshdifabio/patch-1
Fix typo in composer-schema.json
2015-05-06 14:24:06 +01:00
Jordi Boggiano 48d8cc6465 Avoid errors when invoking composer global config and there is no global composer.json yet, refs #4002 2015-05-06 11:48:45 +01:00
Josh Di Fabio 03b7388eb2 Fix typo in composer-schema.json 2015-05-06 09:57:35 +01:00
Jordi Boggiano 4d8b371908 Highlight failures in travis test output 2015-05-05 21:30:10 +01:00
Jordi Boggiano 6b94f6faf3 Merge pull request #4003 from SpacePossum/simplify_php_version_check
PHP version checks tweaking
2015-05-05 19:41:50 +01:00
Nils Adermann 67f10c1601 PHP 5.3 this/that compatibility 2015-05-05 20:32:05 +02:00
Nils Adermann 63e96a41f8 Add proper docblocks in composer repo 2015-05-05 20:30:57 +02:00
Nils Adermann cfd0e44312 Move private function further down in pool 2015-05-05 20:28:22 +02:00
Nils Adermann aa7d145dd0 PHP 5.3 compatible function invokation 2015-05-05 20:24:04 +02:00