nextcloud-server

Author	SHA1	Message	Date
Daniel Calviño Sánchez	00c3a7eb4c	Fix HTTP client given options being overriden by default options According to the array_merge documentation, "If the input arrays have the same string keys, then the later value for that key will overwrite the previous one." Thus, the default options must be the first parameter passed to array_merge. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>	2018-06-14 21:36:04 +07:00
Robin Appelman	9b25ff9fcb	adjust httpclient to guzzle6 Signed-off-by: Robin Appelman <robin@icewind.nl>	2018-02-09 17:13:21 +07:00
Lukas Reschke	5679f04cb1	Rebrand to "Nextcloud" and add 100% coverage Noticed while debugging https://github.com/nextcloud/server/issues/2910 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2017-01-02 14:51:16 +07:00
Roeland Jago Douma	97f6410ac8	Fix getMock Http Client	2016-09-07 20:42:37 +07:00
Joas Schilling	94ad54ec9b	Move tests/ to PSR-4 (#24731 ) * Move a-b to PSR-4 * Move c-d to PSR-4 * Move e+g to PSR-4 * Move h-l to PSR-4 * Move m-r to PSR-4 * Move s-u to PSR-4 * Move files/ to PSR-4 * Move remaining tests to PSR-4 * Remove Test\ from old autoloader	2016-05-20 15:38:20 +07:00