Skip to content

Commit f073e07

Browse files
lizkenyonlizkenyon
authored
Merge branch 'main' into Add-rest-resource-guide
2 parents 2f2ae8d + cc11f01 commit f073e07

File tree

153 files changed

+29960
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+29960
-27
lines changed

‎.github/workflows/api_update_reminder.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
reminder:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
12-
- uses: JasonEtco/create-an-issue@e6b4b190af80961b6462c725454e7828d0247a68 # v2.4.0
11+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12+
- uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
1313
env:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
with:

‎.github/workflows/api_update_reminder_on_release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
reminder:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
12-
- uses: JasonEtco/create-an-issue@e6b4b190af80961b6462c725454e7828d0247a68 # v2.4.0
11+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12+
- uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
1313
env:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
with:

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- "8.1"
1313
- "8.2"
1414
steps:
15-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616

1717
- name: Install PHP with extensions
18-
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # 2.33.0
18+
uses: shivammathur/setup-php@20529878ed81ef8e78ddf08b480401e6101a850f # 2.35.3
1919
with:
2020
php-version: ${{ matrix.php-version }}
2121
tools: composer:v2, phpcs

‎.github/workflows/close-waiting-for-response-issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: close-issues
11-
uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3.6.0
11+
uses: actions-cool/issues-helper@50068f49b7b2b3857270ead65e2d02e4459b022c # v3.6.2
1212
with:
1313
actions: 'close-issues'
1414
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/markdown_link_checker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
markdown-link-check:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
10-
- uses: gaurav-nelson/github-action-markdown-link-check@499c1e7f3637c131334fa8e937c45144f79d72d2 # v1
9+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
10+
- uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368 # v1
1111
with:
1212
folder-path: 'docs/'
1313
use-verbose-mode: 'yes'

‎.github/workflows/remove-labels-on-activity.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
remove-labels-on-activity:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
10+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1111
- uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.2.0
1212
if: contains(github.event.issue.labels.*.name, 'Waiting for Response')
1313
with:

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

88
## Unreleased
99

10+
## v5.11.0 - 2025-07-10
11+
- [#418](https://github.com/Shopify/shopify-api-php/pull/416) [Minor] Add support for 2025-07 API version
12+
1013
## v5.10.0 - 2025-04-03
1114
- [#292](https://github.com/Shopify/shopify-api-php/pull/292) [Patch] Fix bug where null can be passed to param 3 of setcookie()
1215
- [#405](https://github.com/Shopify/shopify-api-php/pull/405) [Minor] Add support for 2025-04 API version

‎src/ApiVersion.php‎

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,68 @@
66

77
class ApiVersion
88
{
9-
/** @var string */
9+
/**
10+
* @var string
11+
*/
1012
public const UNSTABLE = "unstable";
11-
/** @var string */
13+
/**
14+
* @var string
15+
*/
1216
public const APRIL_2022 = "2022-04";
13-
/** @var string */
17+
/**
18+
* @var string
19+
*/
1420
public const JULY_2022 = "2022-07";
15-
/** @var string */
21+
/**
22+
* @var string
23+
*/
1624
public const OCTOBER_2022 = "2022-10";
17-
/** @var string */
25+
/**
26+
* @var string
27+
*/
1828
public const JANUARY_2023 = "2023-01";
19-
/** @var string */
29+
/**
30+
* @var string
31+
*/
2032
public const APRIL_2023 = "2023-04";
21-
/** @var string */
33+
/**
34+
* @var string
35+
*/
2236
public const JULY_2023 = "2023-07";
23-
/** @var string */
37+
/**
38+
* @var string
39+
*/
2440
public const OCTOBER_2023 = "2023-10";
25-
/** @var string */
41+
/**
42+
* @var string
43+
*/
2644
public const JANUARY_2024 = "2024-01";
27-
/** @var string */
45+
/**
46+
* @var string
47+
*/
2848
public const APRIL_2024 = "2024-04";
29-
/** @var string */
49+
/**
50+
* @var string
51+
*/
3052
public const JULY_2024 = "2024-07";
31-
/** @var string */
53+
/**
54+
* @var string
55+
*/
3256
public const OCTOBER_2024 = "2024-10";
33-
/** @var string */
57+
/**
58+
* @var string
59+
*/
3460
public const JANUARY_2025 = "2025-01";
35-
/** @var string */
61+
/**
62+
* @var string
63+
*/
3664
public const APRIL_2025 = "2025-04";
37-
/** @var string */
38-
public const LATEST = self::APRIL_2025;
65+
/**
66+
* @var string
67+
*/
68+
public const JULY_2025 = "2025-07";
69+
/**
70+
* @var string
71+
*/
72+
public const LATEST = self::JULY_2025;
3973
}

‎src/Rest/Admin2025_07/AbandonedCheckout.php‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?php
2+
3+
/***********************************************************************************************************************
4+
* This file is auto-generated. If you have an issue, please create a GitHub issue. *
5+
***********************************************************************************************************************/
6+
7+
declare(strict_types=1);
8+
9+
namespace Shopify\Rest\Admin2025_07;
10+
11+
use Shopify\Auth\Session;
12+
use Shopify\Rest\Base;
13+
14+
/**
15+
* @property string|null $abandoned_checkout_url
16+
* @property array|null $billing_address
17+
* @property bool|null $buyer_accepts_marketing
18+
* @property bool|null $buyer_accepts_sms_marketing
19+
* @property string|null $cart_token
20+
* @property string|null $closed_at
21+
* @property string|null $completed_at
22+
* @property string|null $created_at
23+
* @property Currency|null $currency
24+
* @property Customer|null $customer
25+
* @property string|null $customer_locale
26+
* @property int|null $device_id
27+
* @property DiscountCode[]|null $discount_codes
28+
* @property string|null $email
29+
* @property string|null $gateway
30+
* @property int|null $id
31+
* @property string|null $landing_site
32+
* @property array|null $line_items
33+
* @property int|null $location_id
34+
* @property string|null $note
35+
* @property string|null $phone
36+
* @property string|null $presentment_currency
37+
* @property string|null $referring_site
38+
* @property array|null $shipping_address
39+
* @property array|null $shipping_lines
40+
* @property string|null $sms_marketing_phone
41+
* @property string|null $source_name
42+
* @property string|null $subtotal_price
43+
* @property array|null $tax_lines
44+
* @property bool|null $taxes_included
45+
* @property string|null $token
46+
* @property string|null $total_discounts
47+
* @property string|null $total_duties
48+
* @property string|null $total_line_items_price
49+
* @property string|null $total_price
50+
* @property string|null $total_tax
51+
* @property int|null $total_weight
52+
* @property string|null $updated_at
53+
* @property int|null $user_id
54+
*/
55+
class AbandonedCheckout extends Base
56+
{
57+
public static string $API_VERSION = "2025-07";
58+
protected static array $HAS_ONE = [
59+
"currency" => Currency::class,
60+
"customer" => Customer::class
61+
];
62+
protected static array $HAS_MANY = [
63+
"discount_codes" => DiscountCode::class
64+
];
65+
protected static array $PATHS = [
66+
["http_method" => "get", "operation" => "checkouts", "ids" => [], "path" => "checkouts.json"],
67+
["http_method" => "get", "operation" => "checkouts", "ids" => [], "path" => "checkouts.json"]
68+
];
69+
70+
/**
71+
* @param Session $session
72+
* @param array $urlIds
73+
* @param mixed[] $params Allowed indexes:
74+
* since_id,
75+
* created_at_min,
76+
* created_at_max,
77+
* updated_at_min,
78+
* updated_at_max,
79+
* status,
80+
* limit
81+
*
82+
* @return array|null
83+
*/
84+
public static function checkouts(
85+
Session $session,
86+
array $urlIds = [],
87+
array $params = []
88+
): ?array {
89+
$response = parent::request(
90+
"get",
91+
"checkouts",
92+
$session,
93+
[],
94+
$params,
95+
[],
96+
);
97+
98+
return $response->getDecodedBody();
99+
}
100+
101+
}

‎src/Rest/Admin2025_07/AccessScope.php‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
3+
/***********************************************************************************************************************
4+
* This file is auto-generated. If you have an issue, please create a GitHub issue. *
5+
***********************************************************************************************************************/
6+
7+
declare(strict_types=1);
8+
9+
namespace Shopify\Rest\Admin2025_07;
10+
11+
use Shopify\Auth\Session;
12+
use Shopify\Rest\Base;
13+
14+
/**
15+
* @property string $handle
16+
* @property array[]|null $access_scopes
17+
*/
18+
class AccessScope extends Base
19+
{
20+
public static string $API_VERSION = "2025-07";
21+
protected static array $HAS_ONE = [];
22+
protected static array $HAS_MANY = [];
23+
protected static ?string $CUSTOM_PREFIX = "/admin/oauth";
24+
protected static array $PATHS = [
25+
["http_method" => "get", "operation" => "get", "ids" => [], "path" => "access_scopes.json"]
26+
];
27+
28+
/**
29+
* @param Session $session
30+
* @param array $urlIds
31+
* @param mixed[] $params
32+
*
33+
* @return AccessScope[]
34+
*/
35+
public static function all(
36+
Session $session,
37+
array $urlIds = [],
38+
array $params = []
39+
): array {
40+
return parent::baseFind(
41+
$session,
42+
[],
43+
$params,
44+
);
45+
}
46+
47+
}

0 commit comments

Comments
 (0)