public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code
5,226 Commits
3 Branches
206 Tags
52 MiB
Commit Graph

5226 Commits (3e1b7ee2958630c7ea05459009a67cf6581134b2)

Author SHA1 Message Date
Jordi Boggiano 80b0a35a68 Merge remote-tracking branch 'HuffAndPuff/ignore-platform' 
Conflicts:
	src/Composer/Config.php
	src/Composer/Repository/PlatformRepository.php
 2015-04-29 21:03:51 +01:00
Jordi Boggiano fd7e28b8b4 Restore special handling of conflict/provide/replace 2015-04-29 20:57:00 +01:00
Vadim Tyukov b02bdb4c7a [alias] RootAliasPackage manages the requirements correctly 2015-04-29 20:56:58 +01:00
Jordi Boggiano a811142ff2 Merge pull request #3978 from marc-mabe/hotfix/3976 
fixes #3976: drop ext/ctype dependency
 2015-04-29 20:38:10 +01:00
Marc Bennewitz ff1ce78e6b fixes #3976: drop ext/ctype dependency 2015-04-29 21:19:15 +02:00
Jordi Boggiano ddfa8ed5f2 Merge pull request #3977 from staabm/phpvers 
added the actual phpversion into the error message when phpversion doesn...
 2015-04-29 19:58:13 +01:00
Jordi Boggiano af83c767a0 Merge pull request #3970 from fabschurt/fix-typo 
[Docs] [Typo] Correct a misused article in the docs
 2015-04-29 19:57:46 +01:00
Markus Staab c9bdf3a07a added the actual phpversion into the error message when phpversion doesn satisfy the requirement 2015-04-29 18:21:18 +02:00
Fabien Schurter e392d1d039 Replace "an" with "a" in the docs 2015-04-28 14:42:17 +02:00
Anael Ollier 27074083cc Replaced join() by implode() 2015-04-28 13:23:00 +02:00
Anael Ollier 2f82ed7035 Fixed the fix :) 2015-04-28 11:19:29 +02:00
Anael Ollier b2efb95f33 Fixed svn update command (fails before attempting to use authentication provided in auth.json) 2015-04-27 15:26:32 +02:00
Jordi Boggiano 1cb427ff5c Force http1.1 protocol 2015-04-26 22:18:04 +01:00
Jordi Boggiano ea03730549 Merge pull request #3963 from deviantintegral/fix-large-class-syntax 
Fix test classes with invalid PHP.
 2015-04-24 11:08:11 +01:00
Andrew Berry 5b7c5cf41e Fix missing semicolons. 2015-04-23 12:56:11 -04:00
Andrew Berry 59e14ff098 Fix test classes with invalid PHP. 2015-04-23 12:45:27 -04:00
Josh Di Fabio 051b7bd44b Touch access time only when reading from cache 2015-04-23 16:08:03 +01:00
Jordi Boggiano 2e73811211 Fix process timeout not being initialized correctly when loading a config without creating a full composer instance, closes #3952, fixes #3946 2015-04-21 21:02:17 +01:00
Jordi Boggiano 35a9b5dbf9 Merge pull request #3953 from alcohol/allow-numeric-author-name 
Allow numeric author name
 2015-04-21 20:47:49 +01:00
Jordi Boggiano 68b5bc3560 Merge pull request #3531 from aaemnnosttv/feat/init-cmd 
allow package type to be set with init command
 2015-04-21 19:03:18 +01:00
Evan Mattson ec9eb2b799 update init type question 2015-04-21 13:19:18 -04:00
Evan Mattson 5ed001765f allow package type to be set with init command 2015-04-21 13:19:18 -04:00
Adrian Dragus 7834dacb88 Forgot to remove the actual calls 2015-04-21 01:26:09 +01:00
Adrian Dragus 96ff1c5014 Use PHPUnit pre-conditions 
See https://phpunit.de/manual/current/en/incomplete-and-skipped-tests.html#incomplete-and-skipped-tests.requires.tables.api
 2015-04-21 01:15:28 +01:00
Rob Bast c7d387f599 Allow numeric characters 2015-04-20 13:09:25 +02:00
Rob Bast b99d9465c1 Added testcase 2015-04-20 13:09:18 +02:00
Jordi Boggiano a32c919145 Return null instead of false 2015-04-18 19:11:12 +01:00
Jordi Boggiano 921b3a0eba Fix regression with non-SPDX licenses in show command, refs #3885 2015-04-15 19:27:04 +01:00
Jordi Boggiano 99694a0381 Merge pull request #3940 from phansys/ticket_3859 
[bugfix] Fixed undefined var in DiagnoseCommand::execute().
 2015-04-15 19:14:17 +01:00
Jordi Boggiano 4aa431025b Merge pull request #3845 from vlakoff/empty-composer.json 
Avoid parser error if composer.json existing but empty
 2015-04-15 02:51:00 +01:00
Jordi Boggiano ec6d727af8 Add comment about --, refs #3853 2015-04-15 02:48:10 +01:00
Jordi Boggiano e50b5fe990 Merge pull request #3853 from hakre/fix/git-checkout 
Git Checkout Branch / File Differentiation
 2015-04-15 02:46:16 +01:00
Jordi Boggiano 46924cf5f5 Merge pull request #3854 from hakre/fix/symlink-missing 
Prevent fatal error on missing symlink() function in tests
 2015-04-15 02:43:13 +01:00
Javier Spagnoletti 294185d1d3 [bugfix] Fixed undefined var in DiagnoseCommand::execute(). 2015-04-14 22:36:54 -03:00
Jordi Boggiano 05e08889ed Add BC method for old usage, refs #3857 2015-04-15 02:23:46 +01:00
Jordi Boggiano 6b3178b169 Merge remote-tracking branch 'isoroku/fix-misspellings' 
Conflicts:
	doc/articles/handling-private-packages-with-satis.md
 2015-04-15 02:21:44 +01:00
Jordi Boggiano c3ce13c87c Update contributing 2015-04-15 02:16:05 +01:00
Jordi Boggiano 30df3236bd Add multiline_array_tailing_comma fix 2015-04-15 02:13:18 +01:00
Jordi Boggiano 39c912005b Merge pull request #3869 from SchulteMarkus/patch-1 
Explaining how to deal with cyclic dependency problems within Jenkins-bu...
 2015-04-15 02:05:50 +01:00
Jordi Boggiano 1b3ca77bd5 Merge pull request #3878 from jakoch/patch-docu-httpheaderauth 
added "example using a custom HTTP Header field" to docu, issue https://...
 2015-04-15 01:59:55 +01:00
Jordi Boggiano d0695b2a6d Merge pull request #3784 from slbmeh/feature/update-rm-tests 
Use data provider in RepositoryManager tests
 2015-04-15 01:36:01 +01:00
Jordi Boggiano fda4a594f9 Add PHPCSFixer config 2015-04-15 01:22:20 +01:00
Jordi Boggiano dbfd47eeca CS fixes 2015-04-15 01:22:19 +01:00
Jordi Boggiano 8a154d7300 Merge pull request #3891 from geo4orce/patch-1 
Update 04-schema.md
 2015-04-14 23:51:12 +01:00
Jordi Boggiano 3a06e6f036 Merge pull request #3885 from jakoch/patch-spdx 
updated spdx-license handling to include metadata
 2015-04-14 23:37:03 +01:00
Jordi Boggiano 66dc66c283 Merge pull request #3929 from phansys/ticket_3859 
[bugfix] Fix for #3859
 2015-04-14 23:30:15 +01:00
Jordi Boggiano 5fbd4ee0c9 Merge pull request #3923 from mathielen/patch-1 
Silence symlink() error
 2015-04-14 23:12:02 +01:00
Jordi Boggiano f41c1217f5 Merge pull request #3913 from hannesvdvreken/patch-2 
Remove unused variable
 2015-04-14 23:10:39 +01:00
Jordi Boggiano e0ddc25db4 Merge pull request #3911 from hannesvdvreken/patch-1 
Unused variable
 2015-04-14 23:10:17 +01:00
Jordi Boggiano 87f3a0060e Merge pull request #3902 from TomasVotruba/patch-1 
Readme: 00-intro - use __DIR__
 2015-04-14 23:04:31 +01:00