Skip to content

Commit 84232c7

Browse files
Merge pull request #42 from vrajroham/5.3.x
Fixed issues, updated deps & corrected typos
2 parents 4cd83a3 + d6f2c60 commit 84232c7

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
LaravelBitPay enables you and your business to transact in Bitcoin, Bitcoin Cash and 10+ other BitPay-supported
1111
cryptocurrencies within your Laravel application.
1212

13-
> Requires PHP ^7.3
13+
> Requires PHP 7.3+
1414
1515
## :warning: Migration From v4 :warning:
1616

@@ -122,7 +122,7 @@ Add the following keys to your `.env` file and update the values to match your
122122
preferences ([read more about configuration](https://support.bitpay.com/hc/en-us/articles/115003001063-How-do-I-configure-the-PHP-BitPay-Client-Library-)):
123123

124124
```dotenv
125-
BITPAY_PRIVATE_KEY_PATH=/tmp/laravel-bitpay.pk
125+
BITPAY_PRIVATE_KEY_PATH=
126126
BITPAY_NETWORK=testnet
127127
BITPAY_KEY_STORAGE_PASSWORD=RandomPasswordForEncryption
128128
BITPAY_ENABLE_MERCHANT=true
@@ -506,7 +506,7 @@ AM, respectively:
506506
```php
507507
// Initialize Subscription
508508
$subscriptionData = LaravelBitpay::Subscription();
509-
$subscriptionData->setSchedule(LaravelBitpay::SUBSCRIPTION_SCHEDULE_MONTHLY);
509+
$subscriptionData->setSchedule(BitPayConstants::SUBSCRIPTION_SCHEDULE_MONTHLY);
510510

511511
// Optional recurring bill data
512512
$billData = [
@@ -921,7 +921,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
921921

922922
## Security
923923

924-
If you discover any security related issues, please email [email protected] instead of using the issue tracker.
924+
If you discover any security related issues, please email [email protected] or [email protected] instead of using the issue tracker.
925925

926926
## Credits
927927

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
],
2525
"require": {
26-
"php": ">=7.3 || ^8.0",
26+
"php": "^7.3 || ^8.0",
2727
"ext-json": "*",
2828
"bitpay/sdk": "~6.0.2"
2929
},

config/laravel-bitpay.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?php
22

3+
$pkPath = 'app' . DIRECTORY_SEPARATOR . 'private' . DIRECTORY_SEPARATOR . 'bitpay' . DIRECTORY_SEPARATOR . 'laravel-bitpay.pk';
4+
35
return [
46
/*
57
* This is the full path and name for the private key.
6-
* The default value is /tmp/laravel-bitpay.pk
8+
* The default value is `storage/app/private/bitpay/laravel-bitpay.pk`
79
*/
8-
'private_key' => env('BITPAY_PRIVATE_KEY_PATH', '/tmp/laravel-bitpay.pk'),
10+
'private_key' => env('BITPAY_PRIVATE_KEY_PATH') ?: storage_path($pkPath),
911

1012
/*
1113
* Specifies using the Live Bitcoin network or
@@ -46,7 +48,7 @@
4648
*
4749
* Default: null
4850
*/
49-
'merchant_token' => env('BITPAY_MERCHANT_TOKEN'),
51+
'merchant_token' => env('BITPAY_MERCHANT_TOKEN'),
5052

5153
/*
5254
* BitPay Payout Token
@@ -66,7 +68,7 @@
6668
*
6769
* Uncomment an entry to enable its auto-population.
6870
*/
69-
'auto_populate_webhook' => [
71+
'auto_populate_webhook' => [
7072
// \Vrajroham\LaravelBitpay\Constants\WebhookAutoPopulate::For_Invoices,
7173
// \Vrajroham\LaravelBitpay\Constants\WebhookAutoPopulate::For_Recipients,
7274
// \Vrajroham\LaravelBitpay\Constants\WebhookAutoPopulate::For_Payouts,

src/LaravelBitpayFacade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ class LaravelBitpayFacade extends Facade
1414
*/
1515
protected static function getFacadeAccessor()
1616
{
17-
return 'laravel-bitpay';
17+
return LaravelBitpay::class;
1818
}
1919
}

0 commit comments

Comments
 (0)