rkerner
abc9d60fcc
added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
2015-02-02 14:36:50 +01:00
Nicolas Toniazzi
865eab602f
Merge remote-tracking branch 'parent/master'
...
Conflicts:
src/Composer/Factory.php
2015-02-02 14:03:13 +01:00
Jordi Boggiano
8d6ab70ae5
Merge pull request #3697 from hannesvdvreken/patch-1
...
Add notion of autoloader skipping autoload-dev rules
2015-02-01 14:00:06 +00:00
Jordi Boggiano
8b46880f42
Avoid failing on composer show of lazy providers
2015-01-31 21:24:50 +00:00
Jordi Boggiano
777f2e81a3
Show more info when a download fails
2015-01-31 21:24:48 +00:00
Hannes Van De Vreken
955e3f776a
Add notion of autoloader skipping autoload-dev rules
2015-01-30 21:51:12 +01:00
Jordi Boggiano
be23cbfa6e
Merge pull request #3691 from bragento/master
...
add check for remote Repository in GitDriver::supports
2015-01-30 20:24:26 +00:00
Jordi Boggiano
cee89b5be4
Merge pull request #3694 from TaeL/master
...
remove unused statements
2015-01-30 10:58:26 +00:00
SofHad
f9777bc70a
Check if input is interactive
2015-01-30 11:53:42 +01:00
Jordi Boggiano
ccd4e03967
Merge pull request #3695 from dragoonis/patch-2
...
Satis grammar fix.
2015-01-30 10:40:40 +00:00
Paul Dragoonis
2bd9cef799
Satis grammar fix.
2015-01-30 10:35:39 +00:00
SofHad
1a82ecad91
Refactor the loop + add private method isInteractive
2015-01-30 11:29:58 +01:00
Jordi Boggiano
b39e0a271f
Merge pull request #3517 from WouterJ/patch-2
...
Added deprecated warning for the dev option
2015-01-30 10:00:15 +00:00
TaeL Kim
0ec4505401
remove unused statements
2015-01-30 16:39:55 +09:00
Padraic Brady
939a4aa9c2
Get tests running to prep for fixes
2015-01-29 20:59:27 +00:00
Padraic Brady
510ec6b91c
A couple of minor omissions from the merge
2015-01-29 20:57:23 +00:00
Padraic Brady
6ce20d36b6
Resolve final conflicts
2015-01-29 20:34:05 +00:00
Padraic Brady
19e24c5804
Merge branch 'master' into tls-config
...
Conflicts:
.travis.yml
doc/03-cli.md
src/Composer/Command/ConfigCommand.php
src/Composer/Command/CreateProjectCommand.php
src/Composer/Command/DiagnoseCommand.php
src/Composer/Command/InstallCommand.php
src/Composer/Command/RequireCommand.php
src/Composer/Command/SelfUpdateCommand.php
src/Composer/Command/ShowCommand.php
src/Composer/Command/UpdateCommand.php
src/Composer/Config.php
src/Composer/Downloader/FileDownloader.php
src/Composer/Factory.php
src/Composer/Repository/ComposerRepository.php
src/Composer/Repository/PearRepository.php
src/Composer/Repository/Vcs/VcsDriver.php
src/Composer/Util/GitHub.php
src/Composer/Util/RemoteFilesystem.php
2015-01-29 20:31:56 +00:00
brandung GmbH & Co. KG
d650f05ddf
removed needless output param
2015-01-29 20:00:49 +01:00
Jordi Boggiano
27ce5ec336
Merge pull request #3688 from jeremy-derusse/improve-selfupdate-chmod
...
Reuse current file permissions in selfupdate
2015-01-29 18:25:30 +00:00
davidverholen
50d068b977
+ limit git ls-remote to heads
...
+ escape repo url
2015-01-29 17:08:32 +01:00
Nils Adermann
2fbce61f6a
Merge pull request #3675 from Shelob9/patch-1
...
Add note about /usr not existing in OSX Yosemite by default.
2015-01-29 16:53:39 +01:00
davidverholen
80d7ab57ed
add check for remote Repository in GitDriver::supports
2015-01-29 15:46:11 +01:00
Nils Adermann
71f83599bb
Merge pull request #3592 from SofHad/show-homepage
...
Only show instead of open the repository or homepage URL
2015-01-29 13:44:11 +01:00
Nils Adermann
c1a722b341
Merge pull request #3678 from arcturial/regex-named-group-fix
...
Add the P character to the regex pattern
2015-01-29 13:42:11 +01:00
shaddag
0b2a31a89d
suppress the prefix
2015-01-29 10:20:31 +01:00
Josh Pollock
76a0e818b5
Improve notice about /usr/local/bin
2015-01-28 21:33:42 -05:00
Jérémy Derussé
e7f4014018
Reuse current file permissions
2015-01-28 20:00:16 +01:00
Chris Brand
87b7de4d0a
Add the P character to the regex pattern
...
According to http://php.net/manual/en/function.preg-match.php and some other sources named groups should contain a 'P' character after the '?'
Without this, I receive the following error when running an update:
[ErrorException]
preg_match(): Compilation failed: unrecognized character after (?< at offset 4
Exception trace:
() at phar:///var/www/git/smmqa/app/admin/composer.phar/src/Composer/Package/Version/VersionParser.php:181
2015-01-28 18:41:54 +02:00
Wouter J
32218e97d1
Added deprecated warning for the dev option
2015-01-28 17:16:58 +01:00
Nils Adermann
2697673666
Merge pull request #3685 from xfornesa/issue3647
...
fix for issue #3647
2015-01-28 16:17:56 +01:00
Xavier Fornes
2936dc0e55
some micro-optimizations made
...
refs issue #3657
2015-01-28 14:43:58 +01:00
Xavier Fornes
a4ffda699f
remove by reference on message parameter
...
refs issue #3657
2015-01-28 13:38:43 +01:00
Xavier Fornes
3f59c007f7
fix implementation for php 5.3
...
refs issue #3657
2015-01-28 11:50:54 +01:00
Xavier Fornes
8ba8580a28
fix test implementation for php 5.3
...
refs issue #3657
2015-01-28 11:46:38 +01:00
Nils Adermann
0543a32d39
Merge pull request #3610 from bd808/feature/classmap-authoritative
...
Add classmap-authoritative config setting
2015-01-28 11:26:28 +01:00
Nils Adermann
25d4b85f06
Merge pull request #3665 from theravel/master
...
#3663 fix error message for config command
2015-01-28 11:19:50 +01:00
Nils Adermann
6d10eb0076
Merge pull request #3684 from findstar/proper-autoload
...
I think 'dump-autoload' command is more proper.
2015-01-28 10:48:52 +01:00
Nils Adermann
6e8e896f56
Merge pull request #3681 from naderman/installer-tests-no-regex
...
Don't use a regex to parse installer tests to allow for longer tests
2015-01-28 10:48:32 +01:00
Xavier Fornes
bb0a2df293
fix for issue #3657
...
ConsoleIO writing a message which contains end of lines characters
2015-01-28 08:49:38 +01:00
findstar
82831bec13
I think 'dump-autoload' command is more proper.
2015-01-28 15:07:44 +09:00
Nils Adermann
5e5eb069dc
Don't use a regex to parse installer tests to allow for longer tests
2015-01-27 17:02:37 +01:00
Josh Pollock
59141c8663
Add note about /usr not existing in OSX Yosemite by default.
...
BTW Seriously Apple?
2015-01-25 17:05:21 -05:00
Dmitry Tarasov
e047ca9944
#3665 fix exception message coding style
2015-01-23 10:52:53 +03:00
Rob Bast
cdcf39b2f0
Don't show download progress
2015-01-22 09:45:26 +01:00
Dmitry Tarasov
506d923e7c
#3663 fix error message for config command
2015-01-22 11:26:25 +03:00
Rob Bast
4038477a7f
Missed a -
2015-01-21 15:44:59 +01:00
Rob Bast
5b8f9b0390
Altered output of diagnose
...
- added some docblocks
- added rate limit check for users that have no oauth token configured
- made it 'scream' less (yellow text instead of yellow background)
- reformatted the php ini checks slightly to be more condensed
2015-01-21 15:40:43 +01:00
Jordi Boggiano
825b4b9c63
Improve error message and fix typo, closes #3657
2015-01-20 16:39:06 +00:00
Jordi Boggiano
c8011af219
Improve message some more, refs #3655
2015-01-20 10:49:03 +00:00