Skip to content

Commit 21216b2

Browse files
authored
Merge branch 'master' into opentelemetry-integration
2 parents ef7a972 + 65512f0 commit 21216b2

File tree

160 files changed

+787
-923
lines changed

Some content is hidden

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

160 files changed

+787
-923
lines changed

changes.md

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,8 @@
1-
**Api changes**
2-
3-
<details>
4-
<summary>Added Type(s)</summary>
5-
6-
- added type `ApprovalRuleSetCustomFieldAction`
7-
- added type `ApprovalRuleSetCustomTypeAction`
8-
- added type `SearchNotReadyError`
9-
- added type `GraphQLSearchNotReadyError`
10-
- added type `ProductTailoringAttribute`
11-
- added type `ProductTailoringSetAttributeAction`
12-
- added type `ProductTailoringSetAttributeInAllVariantsAction`
13-
- added type `ImageProcessingOngoingWarning`
14-
- added type `WarningObject`
15-
</details>
16-
17-
18-
<details>
19-
<summary>Removed Type(s)</summary>
20-
21-
- :warning: removed type `ProductSearchStatus`
22-
</details>
23-
24-
25-
<details>
26-
<summary>Added Property(s)</summary>
27-
28-
- added property `custom` to type `ApprovalRule`
29-
- added property `staged` to type `ProductVariantDeletedMessage`
30-
- added property `staged` to type `ProductVariantDeletedMessagePayload`
31-
- added property `warnings` to type `ProductTailoring`
32-
- added property `attributes` to type `ProductVariantTailoring`
33-
- added property `attributes` to type `ProductVariantTailoringDraft`
34-
- added property `attributes` to type `ProductTailoringAddVariantAction`
35-
- added property `warnings` to type `Product`
36-
- added property `customers` to type `SearchIndexingConfiguration`
37-
- added property `source` to type `EventBridgeDestination`
38-
</details>
39-
40-
41-
<details>
42-
<summary>Added Enum(s)</summary>
43-
44-
- added enum `customer-group` to type `ExtensionResourceTypeId`
45-
- added enum `product-tailoring` to type `MessageSubscriptionResourceTypeId`
46-
- added enum `approval-rule` to type `CustomFieldReferenceValue`
47-
- added enum `approval-rule` to type `ResourceTypeId`
48-
- added enum `product-tailoring` to type `ResourceTypeId`
49-
</details>
50-
51-
52-
<details>
53-
<summary>Added Method(s)</summary>
54-
55-
- added method `$apiRoot->withProjectKey()->productTailoring()->head()`
56-
</details>
57-
581
**Import changes**
592

603
<details>
61-
<summary>Added Type(s)</summary>
62-
63-
- added type `InvalidFieldsUpdateError`
64-
- added type `NewMasterVariantAdditionNotAllowedError`
65-
</details>
66-
67-
**History changes**
68-
69-
<details>
70-
<summary>Required Property(s)</summary>
4+
<summary>Removed Type(s)</summary>
715

72-
- changed property `id` of type `ModifiedBy` to be optional
6+
- :warning: removed type `ReferencedResourceNotFound`
737
</details>
748

lib/commercetools-api-tests/test/unit/Client/Resource/ResourceByProjectKeyProductSelectionsByIDProductsTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,19 @@ public function testExecuteServerException(callable $builderFunction)
9090
public function getRequests()
9191
{
9292
return [
93+
'ByProjectKeyProductSelectionsByIDProductsGet_withWhere' => [
94+
function (ApiRequestBuilder $builder): RequestInterface {
95+
return $builder
96+
->withProjectKey('test_projectKey')
97+
->productSelections()
98+
->withId('test_ID')
99+
->products()
100+
->get()
101+
->withWhere('where');
102+
},
103+
'get',
104+
'test_projectKey/product-selections/test_ID/products?where=where',
105+
],
93106
'ByProjectKeyProductSelectionsByIDProductsGet_withExpand' => [
94107
function (ApiRequestBuilder $builder): RequestInterface {
95108
return $builder

lib/commercetools-api-tests/test/unit/Client/Resource/ResourceByProjectKeyProductSelectionsKeyByKeyProductsTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,19 @@ public function testExecuteServerException(callable $builderFunction)
9090
public function getRequests()
9191
{
9292
return [
93+
'ByProjectKeyProductSelectionsKeyByKeyProductsGet_withWhere' => [
94+
function (ApiRequestBuilder $builder): RequestInterface {
95+
return $builder
96+
->withProjectKey('test_projectKey')
97+
->productSelections()
98+
->withKey('test_key')
99+
->products()
100+
->get()
101+
->withWhere('where');
102+
},
103+
'get',
104+
'test_projectKey/product-selections/key=test_key/products?where=where',
105+
],
93106
'ByProjectKeyProductSelectionsKeyByKeyProductsGet_withExpand' => [
94107
function (ApiRequestBuilder $builder): RequestInterface {
95108
return $builder

lib/commercetools-api/docs/RequestBuilder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3260,7 +3260,7 @@ $request = $builder
32603260
```
32613261
## `withProjectKey("projectKey")->graphql()->post(null)`
32623262

3263-
Execute a GraphQL query
3263+
Execute a GraphQL request.
32643264

32653265
### Example
32663266
```php

lib/commercetools-api/src/Client/Resource/ByProjectKeyProductSelectionsByIDProductsGet.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,15 @@ function (RequestException $e) use ($resultType) {
146146
);
147147
}
148148

149+
/**
150+
*
151+
* @psalm-param scalar|scalar[] $where
152+
*/
153+
public function withWhere($where): ByProjectKeyProductSelectionsByIDProductsGet
154+
{
155+
return $this->withQueryParam('where', $where);
156+
}
157+
149158
/**
150159
*
151160
* @psalm-param scalar|scalar[] $expand

lib/commercetools-api/src/Client/Resource/ByProjectKeyProductSelectionsKeyByKeyProductsGet.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,15 @@ function (RequestException $e) use ($resultType) {
146146
);
147147
}
148148

149+
/**
150+
*
151+
* @psalm-param scalar|scalar[] $where
152+
*/
153+
public function withWhere($where): ByProjectKeyProductSelectionsKeyByKeyProductsGet
154+
{
155+
return $this->withQueryParam('where', $where);
156+
}
157+
149158
/**
150159
*
151160
* @psalm-param scalar|scalar[] $expand

lib/commercetools-api/src/Models/Error/GraphQLErrorObject.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface GraphQLErrorObject extends JsonObject
1818
public const FIELD_PATTERN1 = '//';
1919

2020
/**
21-
* <p>Error identifier.</p>
21+
* <p>One of the error codes that is listed on the <a href="/errors">Errors</a> page.</p>
2222
*
2323
2424
* @return null|string

lib/commercetools-api/src/Models/Error/GraphQLErrorObjectModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function __construct(
120120
}
121121

122122
/**
123-
* <p>Error identifier.</p>
123+
* <p>One of the error codes that is listed on the <a href="/errors">Errors</a> page.</p>
124124
*
125125
*
126126
* @return null|string

lib/commercetools-api/src/Models/Error/GraphQLInsufficientScopeErrorModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(
3737
}
3838

3939
/**
40-
* <p>Error identifier.</p>
40+
* <p>One of the error codes that is listed on the <a href="/errors">Errors</a> page.</p>
4141
*
4242
*
4343
* @return null|string

lib/commercetools-api/src/Models/Error/GraphQLInvalidSubjectErrorModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(
3737
}
3838

3939
/**
40-
* <p>Error identifier.</p>
40+
* <p>One of the error codes that is listed on the <a href="/errors">Errors</a> page.</p>
4141
*
4242
*
4343
* @return null|string

0 commit comments

Comments
 (0)