diff --git a/composer.json b/composer.json index c5386244..29bd1154 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "guzzlehttp/guzzle": "^6.3", "ext-json": "^1.5", "ext-reflection": "*", - "symfony/yaml": "^4.3" + "symfony/yaml": "^3.0 || ^4.3" }, "authors": [ { diff --git a/composer.lock b/composer.lock index 7adcbbf3..1f054906 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7a5d225017cd9ff41bdd25ed63a20a77", + "content-hash": "a54038a9842f8776f6679ea1d030209f", "packages": [ { "name": "bitpay/key-utils", @@ -385,7 +385,7 @@ }, { "name": "symfony/yaml", - "version": "v4.3.6", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -446,16 +446,16 @@ "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "a2c590166b2133a4633738648b6b064edae0814a" + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", - "reference": "a2c590166b2133a4633738648b6b064edae0814a", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", "shasum": "" }, "require": { @@ -498,7 +498,7 @@ "constructor", "instantiate" ], - "time": "2019-03-17T17:37:11+00:00" + "time": "2019-10-21T16:45:58+00:00" }, { "name": "myclabs/deep-copy", diff --git a/examples/ConfigGenerator.php b/examples/ConfigGenerator.php index e149dfa8..f63af951 100644 --- a/examples/ConfigGenerator.php +++ b/examples/ConfigGenerator.php @@ -204,20 +204,20 @@ "BitPayConfiguration" => [ "Environment" => $env, "EnvConfig" => [ - $env => [ - "PrivateKeyPath" => $privateKeyname, - "PrivateKeySecret" => $yourMasterPassword, + 'Test' => [ + "PrivateKeyPath" => $isProd ? null : __DIR__."/".$privateKeyname, + "PrivateKeySecret" => $isProd ? null : $yourMasterPassword, "ApiTokens" => [ - "merchant" => $merchantToken, - "payroll" => $payrolToken, + "merchant" => $isProd ? null : $merchantToken, + "payroll" => $isProd ? null : $payrolToken, ], ], 'Prod' => [ - "PrivateKeyPath" => $privateKeyname, - "PrivateKeySecret" => $yourMasterPassword, + "PrivateKeyPath" => $isProd ? __DIR__."/".$privateKeyname : null, + "PrivateKeySecret" => $isProd ? $yourMasterPassword : null, "ApiTokens" => [ - "merchant" => $merchantToken, - "payroll" => $payrolToken, + "merchant" => $isProd ? $merchantToken : null, + "payroll" => $isProd ? $payrolToken : null, ], ], ], diff --git a/src/BitPaySDK/Client.php b/src/BitPaySDK/Client.php index 7542db74..d75b9b70 100644 --- a/src/BitPaySDK/Client.php +++ b/src/BitPaySDK/Client.php @@ -44,9 +44,9 @@ * Class Client * @package Bitpay * @author Antonio Buedo - * @version 3.2.1911 + * @version 3.3.1911 * See bitpay.com/api for more information. - * date 05.11.2019 + * date 15.11.2019 */ class Client { diff --git a/src/BitPaySDK/Env.php b/src/BitPaySDK/Env.php index 147400c3..07fafccc 100644 --- a/src/BitPaySDK/Env.php +++ b/src/BitPaySDK/Env.php @@ -11,5 +11,5 @@ interface Env const TestUrl = "https://test.bitpay.com/"; const ProdUrl = "https://bitpay.com/"; const BitpayApiVersion = "2.0.0"; - const BitpayPluginInfo = "BitPay_PHP_Client_v3.2.1911"; + const BitpayPluginInfo = "BitPay_PHP_Client_v3.3.1911"; } \ No newline at end of file