Pádraic Brady
30c6aa3183
Merge branch 'master' of github.com:composer/composer into tls-config
2014-02-25 18:49:33 +00:00
Nils Adermann
b808ff5e28
Don't hardcode the URL to an https one either
2014-02-25 15:57:35 +01:00
Nils Adermann
edfaf727e5
When using the github driver with no-api don't reset to an ssh url
2014-02-25 15:55:44 +01:00
Jordi Boggiano
665a2bd0c0
Tweak error message and make TransportException extend from RuntimeException, refs #2753
2014-02-25 13:34:39 +01:00
Jordi Boggiano
a612b2affe
Merge remote-tracking branch 'naderman/download-failover'
2014-02-25 13:25:27 +01:00
Jordi Boggiano
c698c8655c
Merge pull request #2754 from naderman/github-no-api
...
Make the github driver behave like git if "no-api" is specified.
2014-02-25 13:19:03 +01:00
Jordi Boggiano
e4a3078685
Merge pull request #2751 from sndpl/issue/1966
...
Fix for #1966 , use the preferred-install from the rootPackage
2014-02-25 13:13:23 +01:00
Pádraic Brady
83d4e3a940
Fixes from functional testing (need to automate this stuff!)
2014-02-24 20:59:04 +00:00
Pádraic Brady
600b6c8cb3
TLS support for Factory::createComposer() - for JsonFile remotes
2014-02-24 20:07:18 +00:00
Pádraic Brady
a2bf14e381
Make disableTls a core RemoteFilesystem option - per method invites human error
2014-02-24 19:15:54 +00:00
Pádraic Brady
3cd979b324
Merge remote-tracking branch 'upstream/master' into tls-config
2014-02-24 18:56:45 +00:00
Nils Adermann
31fd6c233c
Rethrow download exceptions when no options left & clean up code
2014-02-24 19:52:20 +01:00
Nils Adermann
1ccf4b0fc3
Correct the tests for dist urls for github
2014-02-24 19:51:03 +01:00
Nils Adermann
a80fde97d5
Make the github driver behave like git if "no-api" is specified.
2014-02-24 19:36:56 +01:00
Nils Adermann
35fbe3fd42
Download failover means we can now always try github zip urls for dist
2014-02-24 18:53:34 +01:00
Nils Adermann
5ed18d9aa2
Fail over from source to dist and vice versa when downloads fail
...
Any RuntimeException descendent will be caught and cause another
download attempt using either source or dist depending on what was
attempted first.
2014-02-24 18:40:33 +01:00
Sandy Pleyte
ee62ec60f0
Remove old comment
2014-02-24 16:22:44 +01:00
Sandy Pleyte
ab8f67e8cf
Always use rootPackage config
2014-02-24 16:20:10 +01:00
Sandy Pleyte
9af5eaa574
Refactored the code with the switch statement.
2014-02-24 15:27:41 +01:00
Sandy Pleyte
bc7c93ae85
Fix for #1966 , use the preferred-install from the rootPackage config to install the dependencies.
2014-02-24 13:34:50 +01:00
Jordi Boggiano
234be0b5e3
CS fixes, refs #2750
2014-02-24 12:49:09 +01:00
Jordi Boggiano
d607432c75
Merge remote-tracking branch 'parsingphase/avoidFalseWildcardUpdateWarning'
2014-02-24 12:45:39 +01:00
Richard George
2c01c9dd05
Avoid "Package foo/* listed for update is not installed" error
...
Previously 'compose update foo/*' gave an error
"Package foo/* listed for update is not installed. Ignoring" even if some foo/*
packages were present; however the packages *would* then be updated as
requested. This removes the false error iff foo/SOMEPACKAGE is required.
2014-02-24 11:28:08 +00:00
Jordi Boggiano
5eafcf155a
Merge pull request #2748 from sndpl/issue/1849
...
Updated the troubleshooting doc with a chapter for the proc_fork errors
2014-02-24 10:36:33 +01:00
Sandy Pleyte
eed5ba7752
Updated the troubleshooting doc with a chapter for the proc_fork errors that happen on a tiny VPS with no swap space. Also added the solution provided in #1849 , #1101 , #945 .
2014-02-24 09:40:02 +01:00
Nils Adermann
e8a3fc5c1c
Run tests on PHP 5.6 on travis too
2014-02-24 08:24:01 +01:00
Pádraic Brady
49590af656
$originUrl passed to RemoteFilesystem is actually a HOST string already (so far!)
2014-02-23 22:49:26 +00:00
Pádraic Brady
0a8180674e
Adding some HTTPS check to diagnose command (stash)
2014-02-23 21:32:17 +00:00
Jordi Boggiano
714a47ef93
Fix detached head handling for non-committish sources, fixes #2732
2014-02-23 17:15:02 +01:00
Jordi Boggiano
3fb216b703
Merge pull request #2743 from cebe/patch-1
...
Update aliases.md
2014-02-23 16:41:29 +01:00
Pádraic Brady
2a552df315
Fix openssl_x509_parse() function namespace issue under PHP 5.3.3
2014-02-23 15:28:07 +00:00
Pádraic Brady
bdad4f2b0c
Small test fix to RemoteFilesystemMock
2014-02-23 14:51:03 +00:00
Pádraic Brady
2648064e5a
Some typos/corrections
2014-02-23 14:15:24 +00:00
Pádraic Brady
1e1e713329
Added test for RemoteFilesystem TLS options setup
2014-02-23 13:33:29 +00:00
Pádraic Brady
fa54b7054c
Put CN matching above the final recursive option merge
2014-02-23 13:15:05 +00:00
Pádraic Brady
9412bb427a
Add CN_match and SNI_server_name setup to RemoteFilesystem
2014-02-23 13:12:44 +00:00
Pádraic Brady
4d5515190f
Reorder self-update opts and correct requirements
2014-02-23 12:48:17 +00:00
Pádraic Brady
fa6c8eb6c0
Add disable-tls to self-update command as a defined option
2014-02-23 12:40:01 +00:00
Pádraic Brady
ca4b4696b0
Added Exceptions, errors and info messages for self-update command and TLS defaults to RemoteFilesystem
2014-02-23 12:36:27 +00:00
Pádraic Brady
d081aa0784
Restructure self-update http/https decision
...
Error on non-openssl and warn user about setting disable-tls to disable error.
If disable-tls is true, ad an info message about running in non-TLS mode.
2014-02-23 10:47:36 +00:00
Pádraic Brady
7e30c67827
Add config.json default config option for "disable-tls" (FALSE by default)
2014-02-23 10:20:48 +00:00
Carsten Brandt
4af421bce1
Update aliases.md
...
added another example to make clear how it works.
fixes #2741
2014-02-22 17:30:47 +01:00
Nils Adermann
aa74818fe0
Handle array candidates in whatProvides
2014-02-21 16:53:59 +01:00
Nils Adermann
eb5c785dcd
Remove superfluous string casts
2014-02-21 14:22:38 +01:00
Nils Adermann
33e872d7d3
Merge pull request #2733 from naderman/limit-replace-provide
...
Whitelist packages with names matching those specified before generating rules
2014-02-21 13:46:50 +01:00
Nils Adermann
5b80144ad0
Resolve job packages after whitelist generation
2014-02-21 13:41:21 +01:00
Nils Adermann
bc7008270f
Properly limit to name matches only if necessary
2014-02-21 13:15:54 +01:00
Nils Adermann
ec12b8a675
Add tests for the changes in #2690
2014-02-21 13:15:07 +01:00
Nils Adermann
3148ffd355
Whitelist packages with names matching those specified before generating rules
...
Addresses #2690 doesn't do any performance optimisations yet which we
could do now
2014-02-21 12:25:15 +01:00
Jordi Boggiano
eb3384445b
Merge pull request #2188 from Danack/GetRootComposerJson
...
Find root composer.json in zip artifact more reliably.
2014-02-21 11:33:01 +01:00