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
95f351271b Fix failed testConfigAbleToPersistAndLoadKeys() test in BitpayTest 2019-02-14 18:29:48 +01:00
kakaska
ec1d1585e1 Remove 'network' parameter from BitpayTest 2019-02-12 21:14:19 +01:00
kakaska
f3563d4675 Remove Network specific unit tests 2019-02-12 20:52:28 +01:00
Rich Morgan
6641f919da Corrected class types 2015-09-16 19:56:26 -04:00
Rich Morgan
91f3a23fe7 Corrected class types 2015-09-16 19:41:53 -04:00
Rich Morgan
6b67fbab84 Updated copyright year and minor refactoring 2015-09-15 18:16:01 -04:00
Joshua Estes
9037183cca Encrypted file storage is default 2014-11-17 14:09:59 -05:00
Joshua Estes
825f20cf16 Trying to figure out merchant issues, added tests and cleaned up code, unable to duplicate 2014-11-17 13:05:12 -05:00