Skip to content

Commit

Permalink
Merge pull request #93 from aligent/release/1.6.2
Browse files Browse the repository at this point in the history
Release/1.6.2
  • Loading branch information
jswift authored Sep 7, 2021
2 parents a78e28f + bd7d05a commit 437612a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'

- name: Validate composer.json and composer.lock
run: composer validate

Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea/
vendor/
vendor/
.phpdoc
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ $brands = $api->catalog()->brands()->getAll()->getBrands();
## Development

- Running tests: `composer run-script test`
- Checking PHP style rules: `composer run-scruot check-style`
- Checking PHP style rules: `composer run-script check-style`
- Auto fix code style rules: `composer run-script fix-style`

### Writing Tests
Expand Down
8 changes: 3 additions & 5 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
### Changes
### Fixes

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

### New Features

- Implement Store Information endpoints
4 changes: 2 additions & 2 deletions src/BigCommerceLegacyApi/ResourceModels/Order/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Order extends ResourceModel
public int $status_id;
public string $base_handling_cost;
public string $base_shipping_cost;
public string|float|int $base_wrapping_cost;
public string $base_wrapping_cost;

public OrderBillingAddress $billing_address;

Expand All @@ -68,7 +68,7 @@ class Order extends ResourceModel
public int $items_total;
public bool $order_is_digital;
public string $payment_method;
public string|int|float $payment_provider_id;
public string $payment_provider_id;
public string $refunded_amount;
public string $shipping_cost_ex_tax;
public string $shipping_cost_inc_tax;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace BigCommerce\Tests\Api\CustomTemplateAssociation;
namespace BigCommerce\Tests\Api\CustomTemplateAssociations;

use BigCommerce\ApiV3\Api\CustomTemplateAssociations\CustomTemplateAssociationsApi;
use BigCommerce\ApiV3\ResourceModels\CustomTemplateAssociation\CustomTemplateAssociation;
Expand Down

0 comments on commit 437612a

Please sign in to comment.