960607afc8
Merge branch '1.2' of github.com:composer/composer
...
* '1.2' of github.com:composer/composer:
semver.mwl.be moved to HTTPS
2016-12-02 10:09:28 +01:00
a9e5be2b17
Merge pull request #5928 from Slamdunk/patch-1
...
semver.mwl.be moved to HTTPS
2016-12-02 09:13:15 +01:00
35a5036c3e
semver.mwl.be moved to HTTPS
2016-12-02 09:09:31 +01:00
3a3fd68b68
Merge pull request #5927 from lovett/patch-1
...
Clean up a merge conflict in repositories doc
2016-12-01 20:44:52 +01:00
9e16882d12
Clean up a merge conflict in repositories doc
...
A merge conflict slipped through recently, corrupting the page a bit.
2016-12-01 09:44:35 -05:00
9b730183a6
Merge branch '1.2'
2016-12-01 14:33:34 +01:00
f3f063e3e2
Merge pull request #5888 from alcohol/array-default
...
use array as default value
2016-12-01 14:24:41 +01:00
0f276e3890
Merge pull request #5907 from Rudloff/feature/status-code
...
Non-zero status code when there are outdated packages (fixes #5901 )
2016-12-01 14:22:22 +01:00
873f17261c
try to fix test instead of guarding implementation
2016-12-01 14:03:20 +01:00
df29bbc98e
Merge pull request #5924 from alcohol/support-libressl
...
support libressl
2016-12-01 13:37:45 +01:00
bcba1399c5
support libressl
...
closes #5917
2016-12-01 13:36:43 +01:00
193d53921b
Merge branch '1.2'
2016-12-01 00:00:32 +01:00
8a2f597db3
Fix tests
2016-11-30 23:56:43 +01:00
ce4d941b3e
Prepare 1.2.3 changelog
2016-11-30 23:56:38 +01:00
91e7372c6e
Backport update packagist default repo to be packagist.org
2016-11-30 22:57:11 +01:00
7259630cbe
Fix support for partial provider repos
2016-11-30 22:53:59 +01:00
ecf267530d
Merge pull request #5910 from debugteam/patch-1
...
disabling packagist.org did not work
2016-11-30 07:35:46 +01:00
2333a0120e
disabling packagist.org did not work
...
While testing i found that
"packagist.org": false
didn't work to disable packagist.
I have read following issue
https://github.com/composer/composer/issues/3713
afterwards i've testet
"composer config repositories.packagist false"
did the review on the composer.json and found that
"packagist": false
actually disabled packagist.
2016-11-29 18:02:38 +01:00
7d52bd6ed5
Non-zero status code when there are outdated packages ( fixes #5901 )
2016-11-28 13:06:53 +01:00
f1eb787013
Merge pull request #5882 from johnstevenson/xdebug-handler-ini
...
Use random name for tmp ini and delete after use
2016-11-21 13:39:07 +01:00
c1058cf37c
Fix XdebugHandler test
2016-11-21 11:52:56 +00:00
7d67da3ffa
guard against non array value
2016-11-21 10:45:26 +01:00
611d6a0364
use array as default value
...
rather than assigning empty array in constructor. the latter can cause
issues with mocks in some scenarios (if constructor does not get called)
2016-11-21 10:00:05 +01:00
0762aa1e2c
Merge pull request #5887 from sectus/windows_remote_paths
...
windows remote path treats as remote now
2016-11-21 09:40:38 +01:00
2717e115c8
windows remote path treats as remote now
2016-11-21 15:41:15 +08:00
75f8954e2c
Merge pull request #5886 from alcohol/fix-5884
...
mardown issue + move urls to footnotes
2016-11-21 08:19:14 +01:00
4abb02dbe8
fix #5884 - mardown issues + move urls to footnotes
2016-11-21 08:19:10 +01:00
379fb70ad9
Use random name for tmp ini and delete after use
...
Thanks to Patrick Rose for reporting this issue.
2016-11-20 10:59:05 +00:00
de9f333ec6
Merge pull request #5846 from markingman/master
...
Fixing local file VCS URLs with encoded characters
2016-11-18 19:45:28 +01:00
b2e1d4cb9d
Merge remote-tracking branch 'tflori/feature-getFileContent'
2016-11-18 19:37:33 +01:00
fd5fca615d
Merge pull request #5876 from copitz/patch-1
...
Add documentation for providers option
2016-11-18 14:33:33 +01:00
96540d4139
apply proper word wrapping
2016-11-18 14:33:42 +01:00
cc932e5bda
Add documentation for providers option
...
With composer/satis#295 an option for dumping provider includes was added which is missing here in the docs
2016-11-18 11:48:26 +01:00
30e8845b1e
Add security email for sensitive reports
2016-11-17 14:40:36 +01:00
7896b1ffab
cache only rendered composer information
...
As suggested we cache now only composer information and also the rendered version again. Perforce is using the same property cache as others and the `Util\Perforce::getComposerInformation()` is using the newly created methods.
2016-11-15 07:52:17 +01:00
ec27777341
code improvements as suggested
...
Thanks for your input!
2016-11-12 11:10:13 +01:00
d70dfd2df3
revert style changes
2016-11-12 10:48:19 +01:00
33d026bb06
fix code style to be PSR-2 conform
...
I tried to solve all PSR-2 style guide violations in files that I changed. One I could not solve: const can not concatenate in php 5.3.
2016-11-12 09:33:05 +01:00
597f834ae9
add getFileContent function
...
This function is very similar to a part from getComposerInformation - so we can use this function in getComposerInformation too. And because it is almost everywhere the same we can put it to abstract class.
By implementing getComposerInformation in abstract class we need to add the getChangeDate to interface too. Only Problem: perforce seems not to support a ChangeDate. For this we use 'now' to have at least something.
2016-11-11 09:06:03 +01:00
a330d27b10
Code formatting
...
Updating variable name and whitespace formats inline with the project’s
standards
2016-11-06 21:32:46 +00:00
0a3145821f
Merge remote-tracking branch 'composer/master'
2016-11-06 21:01:07 +00:00
8ad6385ffb
Merge remote-tracking branch 'fabpot/more-debug'
2016-11-06 18:18:52 +01:00
f3af3da16f
Add more comments in ConsoleIO, closes #5836
2016-11-06 18:16:45 +01:00
43903a3979
Merge branch '1.2'
2016-11-06 17:38:53 +01:00
98a599d6c3
Merge pull request #5843 from stof/enforce_map_types
...
Enhance the json schema with validation for map objects
2016-11-06 17:02:38 +01:00
027de2960b
Merge pull request #5794 from andrewjt71/issue-5769
...
Issue 5769 dev mode varaible
2016-11-06 16:58:41 +01:00
9801d831ed
Merge pull request #5852 from fabpot/io-fix
...
Remove usage of echo when executing Composer script
2016-11-06 16:49:08 +01:00
adfdb888f0
Merge pull request #5851 from szepeviktor/patch-1
...
Make download shell script PSR-2 compatible
2016-11-06 16:47:47 +01:00
d6499b7c4a
Merge pull request #5748 from kassner/hgdriver-bitbucket
...
HgDriver does not identify bitbucket mercurial repos correctly
2016-11-06 12:36:13 +01:00
103624d4ed
Remove usage of echo when executing Composer script
2016-11-05 22:10:39 -07:00
Rob Bast