Commit Graph

9 Commits

Author SHA1 Message Date
kakaska
84324e9f9c Merge branch 'master' into 3.0.x
# Conflicts:
#	.travis.yml
#	README.md
#	VERSION
#	composer.json
#	src/Bitpay/Client/Client.php
#	src/Bitpay/Client/ClientInterface.php
#	src/Bitpay/Client/Request.php
#	src/Bitpay/Client/Response.php
#	src/Bitpay/Config/Configuration.php
#	src/Bitpay/Currency.php
#	src/Bitpay/DependencyInjection/services.xml
#	src/Bitpay/Invoice.php
#	src/Bitpay/InvoiceInterface.php
#	src/Bitpay/Item.php
#	src/Bitpay/Network/Testnet.php
#	src/Bitpay/PrivateKey.php
#	src/Bitpay/Storage/EncryptedFilesystemStorage.php
#	src/Bitpay/Util/Util.php
#	tests/Bitpay/BitpayTest.php
#	tests/Bitpay/Client/Adapter/CurlAdapterTest.php
#	tests/Bitpay/Client/ClientTest.php
#	tests/Bitpay/Client/RequestTest.php
#	tests/Bitpay/Crypto/McryptExtensionTest.php
#	tests/Bitpay/ItemTest.php
#	tests/Bitpay/Math/BcEngineTest.php
#	tests/Bitpay/Network/LivenetTest.php
#	tests/Bitpay/Network/NetworkAwareTest.php
#	tests/Bitpay/Network/TestnetTest.php
#	tests/Bitpay/Storage/EncryptedFilesystemStorageTest.php
#	tests/DataFixtures/invoices/5NxFkXcJbCSivtQRJa4kHP.json
2019-02-19 13:40:58 +01:00
kakaska
58b99f9c4e Fix testSendRequestWithException() test in CurlAdapterTest 2019-02-14 18:34:05 +01:00
Rich Morgan
cde7566614 Corrected exception type 2015-09-22 12:56:19 -04:00
Rich Morgan
e211ed5834 Updated copyright year and minor refactoring 2015-09-15 19:02:41 -04:00
Alexander Leitner
d80a244f76 Clean up 2014-12-19 15:43:16 -05:00
Alexander Leitner
101f078497 unit tests working 2014-12-18 16:03:47 -05:00
Alexander Leitner
7270d1fa61 Updated integration tests to create invoices 2014-12-18 15:27:02 -05:00
Alexander Leitner
fce2981a97 Port and Curl settings can be changed, along with URI for working with local instance of bitpay 2014-12-03 18:10:50 -05:00
Alexander Leitner
6949086e45 updated CurlAdapter and tests 2014-12-02 13:44:00 -05:00