Commit Graph

11 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
Chris Kleeschulte
7dd352355f EncryptedFilesystemStorage Passwords
- if it is a valid string, then it should now be a valid password for encrypting key files.
2016-06-10 12:17:22 -04:00
Rich Morgan
87614cf494 Fix to load test 2015-09-16 18:13:15 -04:00
Rich Morgan
a360bdeeee Uncommented file creation test 2015-09-16 17:54:26 -04:00
Rich Morgan
9668ccdb93 Moved stream create order 2015-09-16 17:44:24 -04:00
Rich Morgan
2611175288 Update tests to use class-level vars 2015-09-16 17:38:45 -04:00
Rich Morgan
effcee7a15 Updated copyright year and minor refactoring 2015-09-15 18:28:12 -04:00
Sam Bohler
c15083d309 Replaced full-text licenses with references 2014-09-29 09:16:06 -04:00
Joshua Estes
b51180515a Made sure everything is PSR1 and PSR2 standard 2014-09-23 15:47:39 -04:00
Joshua Estes
25fa219259 Updated docs and changed default storage method to encrypted filesystem 2014-09-19 13:12:06 -04:00
Joshua Estes
b9ee2eed11 Working on allowing keys to be saved on filesystem using a password 2014-09-18 15:21:26 -04:00