Skip to content

Commit 437612a

Browse files
authored
Merge pull request #93 from aligent/release/1.6.2
Release/1.6.2
2 parents a78e28f + bd7d05a commit 437612a

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

.github/workflows/php.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515

16+
- name: Setup PHP
17+
uses: shivammathur/setup-php@v2
18+
with:
19+
php-version: '7.4'
20+
1621
- name: Validate composer.json and composer.lock
1722
run: composer validate
1823

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.idea/
2-
vendor/
2+
vendor/
3+
.phpdoc

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ $brands = $api->catalog()->brands()->getAll()->getBrands();
162162
## Development
163163

164164
- Running tests: `composer run-script test`
165-
- Checking PHP style rules: `composer run-scruot check-style`
165+
- Checking PHP style rules: `composer run-script check-style`
166166
- Auto fix code style rules: `composer run-script fix-style`
167167

168168
### Writing Tests

RELEASE_NOTES.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
### Changes
1+
### Fixes
22

3-
- The JSON output from ResourceModels will no longer include the `$optionObject` that was used to construct them.
3+
- Fix invalid namespace in a test class (@AymericPlanche)
4+
- Fix PHP compatibility issue in LegacyAPI class #90 (@AymericPlanche)
45

5-
### New Features
6-
7-
- Implement Store Information endpoints

src/BigCommerceLegacyApi/ResourceModels/Order/Order.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Order extends ResourceModel
4545
public int $status_id;
4646
public string $base_handling_cost;
4747
public string $base_shipping_cost;
48-
public string|float|int $base_wrapping_cost;
48+
public string $base_wrapping_cost;
4949

5050
public OrderBillingAddress $billing_address;
5151

@@ -68,7 +68,7 @@ class Order extends ResourceModel
6868
public int $items_total;
6969
public bool $order_is_digital;
7070
public string $payment_method;
71-
public string|int|float $payment_provider_id;
71+
public string $payment_provider_id;
7272
public string $refunded_amount;
7373
public string $shipping_cost_ex_tax;
7474
public string $shipping_cost_inc_tax;

tests/BigCommerce/Api/CustomTemplateAssociations/CustomTemplateAssociationsApiTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace BigCommerce\Tests\Api\CustomTemplateAssociation;
3+
namespace BigCommerce\Tests\Api\CustomTemplateAssociations;
44

55
use BigCommerce\ApiV3\Api\CustomTemplateAssociations\CustomTemplateAssociationsApi;
66
use BigCommerce\ApiV3\ResourceModels\CustomTemplateAssociation\CustomTemplateAssociation;

0 commit comments

Comments
 (0)