Pádraic Brady
3cd979b324
Merge remote-tracking branch 'upstream/master' into tls-config
2014-02-24 18:56:45 +00: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
Danack
20a7dcd02c
Added explanation of why loop continues.
2014-02-21 09:54:42 +00:00
Danack
e4d4a7ae17
Added comment for generating files.
2014-02-21 09:49:12 +00:00
Danack
24aba5b51f
Moved file back to correct location. (+1 squashed commit)
...
Squashed commits:
[eec32aa] Updated detection to only allow composer.josn in root or first level dir.
2014-02-21 09:46:12 +00:00
Danack
bc76e0014b
Moved tests that are expected to work into their own directory.
...
Added test for composer.json in incorrect directory.
2014-02-20 17:30:51 +00:00
Jordi Boggiano
0df9c803a5
Merge pull request #2718 from sndpl/issue/2613
...
Fix for #2613
2014-02-20 17:27:31 +01:00
Sandy Pleyte
d788ee7d99
Fixed docblock
2014-02-20 17:18:52 +01:00
Sandy Pleyte
6bdcd9266c
Fixed #2601 , the callback functions expect param 1 to be a reference to the $config
2014-02-20 17:18:44 +01:00
Jordi Boggiano
60bf5633ea
Wording tweaks, refs #2728
2014-02-20 17:14:42 +01:00
Jordi Boggiano
7ac1f1265e
Merge remote-tracking branch 'sndpl/issue/2494'
2014-02-20 17:12:59 +01:00
Sandy Pleyte
40095d980c
Fix for #2494 , don't retrieve svn log when the references don't contain a reference number.
2014-02-20 16:26:34 +01:00
Jordi Boggiano
bbda0434e5
Merge pull request #2584 from Cinderella-Man/version-setter
...
Package version setter
2014-02-20 15:16:32 +01:00
Jordi Boggiano
41afc8324e
Workaround for json schema bug, fixes #2726
2014-02-19 17:21:54 +01:00
Sandy Pleyte
3a2815b778
Added extra unit test from the example in the ticket.
2014-02-19 14:17:23 +01:00
Jordi Boggiano
17ff267505
Update vendors
2014-02-19 13:30:58 +01:00
Jordi Boggiano
a782802e62
Merge pull request #2723 from jmalloc/update-json-schema
...
Updated json-schema version requirement to allow newer versions.
2014-02-19 11:17:46 +01:00
Jordi Boggiano
432ace33d4
Clean up svn environment to fix OSX issues, fixes #2708 , refs #2146
2014-02-19 10:55:00 +01:00
James Harris
9ac4ab1b85
Updated json-schema version requirement to allow newer versions.
2014-02-19 11:05:05 +10:00
Jordi Boggiano
5d4900e79d
Add --no-checkout flag to avoid checking out the default branch first, fixes #2717
2014-02-18 13:28:46 +01:00
Sandy Pleyte
f92f2f45a9
Fix for #2613 , when using php < 5.4 there was an unnecessary backslash before each utf-8 char. The problem was that the regexp matched all utf-8 encoded chars (included the ones that where escaped). The new regexp uses the lookbehind feature to check if the backslash isn't prefixed with an other backslash.
2014-02-18 09:01:12 +01:00