Michael Dowling fa8f06609a Merge branch 'ring' into 5-0 ...

Conflicts:
	src/Adapter/Curl/CurlAdapter.php
	src/Adapter/Curl/CurlFactory.php
	src/Adapter/Curl/MultiAdapter.php
	src/Adapter/MockAdapter.php
	src/Adapter/StreamAdapter.php
	src/Event/HeadersEvent.php
	tests/Adapter/Curl/CurlAdapterTest.php
	tests/Adapter/Curl/CurlFactoryTest.php
	tests/Adapter/Curl/MultiAdapterTest.php
	tests/Adapter/Curl/RequestMediatorTest.php
	tests/Adapter/FakeParallelAdapterTest.php
	tests/Adapter/MockAdapterTest.php
	tests/Adapter/StreamAdapterTest.php
	tests/Adapter/StreamingProxyAdapterTest.php
	tests/Adapter/TransactionIteratorTest.php

2014-10-12 19:47:31 -07:00

..

CookieJarTest.php

CS fixes

2014-10-01 22:07:32 +01:00

FileCookieJarTest.php

Getting tests working again. Removing more fluent interfaces.

2014-09-08 21:35:11 -07:00

SessionCookieJarTest.php

…

SetCookieTest.php

Getting tests working again. Removing more fluent interfaces.

2014-09-08 21:35:11 -07:00