Skip to content
This repository was archived by the owner on Oct 24, 2023. It is now read-only.

Commit f77bbc9

Browse files
authored
Merge pull request #688 from commercetools/php-mantainance2
2 parents a91eee3 + 0807975 commit f77bbc9

23 files changed

+636
-13
lines changed

src/Core/Builder/Request/CustomerRequestBuilder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// phpcs:disable Generic.Files.LineLength
33
namespace Commercetools\Core\Builder\Request;
44

5-
use Commercetools\Core\Model\Cart\CartReference;
65
use Commercetools\Core\Request\Customers\CustomerByEmailTokenGetRequest;
76
use Commercetools\Core\Request\Customers\CustomerByIdGetRequest;
87
use Commercetools\Core\Request\Customers\CustomerByKeyGetRequest;
@@ -15,6 +14,7 @@
1514
use Commercetools\Core\Request\Customers\CustomerEmailConfirmRequest;
1615
use Commercetools\Core\Request\Customers\CustomerEmailTokenRequest;
1716
use Commercetools\Core\Request\Customers\CustomerLoginRequest;
17+
use Commercetools\Core\Model\Cart\CartReference;
1818
use Commercetools\Core\Request\Customers\CustomerPasswordChangeRequest;
1919
use Commercetools\Core\Request\Customers\CustomerPasswordResetRequest;
2020
use Commercetools\Core\Request\Customers\CustomerPasswordTokenRequest;
@@ -130,16 +130,16 @@ public function createEmailVerificationToken(Customer $customer, $ttlMinutes)
130130
* @param string $email
131131
* @param string $password
132132
* @param bool $updateProductData
133-
* @param CartReference|string $anonymousCartId
133+
* @param CartReference|string $anonymousCart
134134
* @return CustomerLoginRequest
135135
*/
136-
public function login($email, $password, $updateProductData = false, $anonymousCartId = null)
136+
public function login($email, $password, $updateProductData = false, $anonymousCart = null)
137137
{
138138
$request = CustomerLoginRequest::ofEmailPasswordAndUpdateProductData(
139139
$email,
140140
$password,
141141
$updateProductData,
142-
$anonymousCartId
142+
$anonymousCart
143143
);
144144
return $request;
145145
}

src/Core/Builder/Request/OrderRequestBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// phpcs:disable Generic.Files.LineLength
33
namespace Commercetools\Core\Builder\Request;
44

5-
use Commercetools\Core\Model\Cart\CartReference;
65
use Commercetools\Core\Request\Orders\OrderByIdGetRequest;
76
use Commercetools\Core\Request\Orders\OrderByOrderNumberGetRequest;
87
use Commercetools\Core\Request\Orders\OrderCreateFromCartRequest;
98
use Commercetools\Core\Model\Cart\Cart;
9+
use Commercetools\Core\Model\Cart\CartReference;
1010
use Commercetools\Core\Request\Orders\OrderDeleteByOrderNumberRequest;
1111
use Commercetools\Core\Model\Order\Order;
1212
use Commercetools\Core\Request\Orders\OrderDeleteRequest;

src/Core/Builder/Update/OrdersActionBuilder.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
use Commercetools\Core\Request\Orders\Command\OrderSetParcelItemsAction;
4343
use Commercetools\Core\Request\Orders\Command\OrderSetParcelMeasurementsAction;
4444
use Commercetools\Core\Request\Orders\Command\OrderSetParcelTrackingDataAction;
45+
use Commercetools\Core\Request\Orders\Command\OrderSetReturnInfoAction;
4546
use Commercetools\Core\Request\Orders\Command\OrderSetReturnPaymentStateAction;
4647
use Commercetools\Core\Request\Orders\Command\OrderSetReturnShipmentStateAction;
4748
use Commercetools\Core\Request\Orders\Command\OrderSetShippingAddress;
@@ -476,6 +477,17 @@ public function setParcelTrackingData($action = null)
476477
return $this;
477478
}
478479

480+
/**
481+
* @link https://docs.commercetools.com/http-api-projects-orders.html#set-delivery-items
482+
* @param OrderSetReturnInfoAction|callable $action
483+
* @return $this
484+
*/
485+
public function setReturnInfo($action = null)
486+
{
487+
$this->addAction($this->resolveAction(OrderSetReturnInfoAction::class, $action));
488+
return $this;
489+
}
490+
479491
/**
480492
* @link https://docs.commercetools.com/http-api-projects-orders.html#set-returnpaymentstate
481493
* @param OrderSetReturnPaymentStateAction|callable $action

src/Core/Builder/Update/ProjectActionBuilder.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
use Commercetools\Core\Request\Project\Command\ProjectChangeMessagesConfigurationAction;
1212
use Commercetools\Core\Request\Project\Command\ProjectChangeMessagesEnabledAction;
1313
use Commercetools\Core\Request\Project\Command\ProjectChangeNameAction;
14+
use Commercetools\Core\Request\Project\Command\ProjectChangeProductSearchIndexingEnabledAction;
15+
use Commercetools\Core\Request\Project\Command\ProjectChangeShoppingListsConfigurationAction;
1416
use Commercetools\Core\Request\Project\Command\ProjectSetExternalOAuthAction;
1517
use Commercetools\Core\Request\Project\Command\ProjectSetShippingRateInputTypeAction;
1618

@@ -95,6 +97,28 @@ public function changeName($action = null)
9597
return $this;
9698
}
9799

100+
/**
101+
* @link https://docs.commercetools.com/api/projects/project#change-product-search-indexing-enabled
102+
* @param ProjectChangeProductSearchIndexingEnabledAction|callable $action
103+
* @return $this
104+
*/
105+
public function changeProductSearchIndexingEnabled($action = null)
106+
{
107+
$this->addAction($this->resolveAction(ProjectChangeProductSearchIndexingEnabledAction::class, $action));
108+
return $this;
109+
}
110+
111+
/**
112+
* @link https://docs.commercetools.com/http-api-projects-project.html#change-shopping-lists-configuration
113+
* @param ProjectChangeShoppingListsConfigurationAction|callable $action
114+
* @return $this
115+
*/
116+
public function changeShoppingListsConfiguration($action = null)
117+
{
118+
$this->addAction($this->resolveAction(ProjectChangeShoppingListsConfigurationAction::class, $action));
119+
return $this;
120+
}
121+
98122
/**
99123
* @link https://docs.commercetools.com/http-api-projects-project.html#set-externaloauth
100124
* @param ProjectSetExternalOAuthAction|callable $action

src/Core/Builder/Update/ShippingMethodsActionBuilder.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetDescriptionAction;
1717
use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetKeyAction;
1818
use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetLocalizedDescriptionAction;
19+
use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetLocalizedNameAction;
1920
use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetPredicateAction;
2021

2122
class ShippingMethodsActionBuilder
@@ -154,6 +155,17 @@ public function setLocalizedDescription($action = null)
154155
return $this;
155156
}
156157

158+
/**
159+
* @link https://docs.commercetools.com/api/projects/shippingMethods#set-localized-name
160+
* @param ShippingMethodSetLocalizedNameAction|callable $action
161+
* @return $this
162+
*/
163+
public function setLocalizedName($action = null)
164+
{
165+
$this->addAction($this->resolveAction(ShippingMethodSetLocalizedNameAction::class, $action));
166+
return $this;
167+
}
168+
157169
/**
158170
* @link https://docs.commercetools.com/http-api-projects-shippingMethods.html#set-predicate
159171
* @param ShippingMethodSetPredicateAction|callable $action

src/Core/Builder/Update/StagedOrderActionBuilder.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetParcelItemsAction;
6767
use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetParcelMeasurementsAction;
6868
use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetParcelTrackingDataAction;
69+
use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetReturnInfoAction;
6970
use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetReturnPaymentStateAction;
7071
use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetReturnShipmentStateAction;
7172
use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetShippingAddressAction;
@@ -771,6 +772,17 @@ public function setParcelTrackingData($action = null)
771772
return $this;
772773
}
773774

775+
/**
776+
*
777+
* @param StagedOrderSetReturnInfoAction|callable $action
778+
* @return $this
779+
*/
780+
public function setReturnInfo($action = null)
781+
{
782+
$this->addAction($this->resolveAction(StagedOrderSetReturnInfoAction::class, $action));
783+
return $this;
784+
}
785+
774786
/**
775787
*
776788
* @param StagedOrderSetReturnPaymentStateAction|callable $action

src/Core/Helper/Annotate/AnnotationGenerator.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Commercetools\Core\Helper\Annotate;
77

88
use Commercetools\Core\Model\Cart\Cart;
9+
use Commercetools\Core\Model\Cart\CartReference;
910
use Commercetools\Core\Model\Common\Collection;
1011
use Commercetools\Core\Model\Common\JsonObject;
1112
use Commercetools\Core\Model\Common\LocalizedString;
@@ -607,8 +608,9 @@ function ($link) {
607608
break;
608609
case 'createFromCart':
609610
$uses[] = 'use ' . Cart::class . ';';
611+
$uses[] = 'use ' . CartReference::class . ';';
610612
$methodParams[] = [self::PARAM_TYPE => 'Cart', self::PARAM_NAME => '$cart'];
611-
$factoryCall = 'ofCartIdAndVersion($cart->getId(), $cart->getVersion());';
613+
$factoryCall = 'ofCartAndVersion(CartReference::ofId($cart->getId()), $cart->getVersion());';
612614
break;
613615
case 'emailToken':
614616
$methodName = 'createEmailVerificationToken';
@@ -622,6 +624,7 @@ function ($link) {
622624
$factoryCall = 'ofToken($tokenValue);';
623625
break;
624626
case 'login':
627+
$uses[] = 'use ' . CartReference::class . ';';
625628
$methodParams[] = [self::PARAM_DOC_TYPE => 'string', self::PARAM_NAME => '$email'];
626629
$methodParams[] = [self::PARAM_DOC_TYPE => 'string', self::PARAM_NAME => '$password'];
627630
$methodParams[] = [
@@ -630,15 +633,15 @@ function ($link) {
630633
self::PARAM_DEFAULT => 'false'
631634
];
632635
$methodParams[] = [
633-
self::PARAM_DOC_TYPE => 'string',
634-
self::PARAM_NAME => '$anonymousCartId',
636+
self::PARAM_DOC_TYPE => 'CartReference|string',
637+
self::PARAM_NAME => '$anonymousCart',
635638
self::PARAM_DEFAULT => 'null'
636639
];
637640
$factoryCall = 'ofEmailPasswordAndUpdateProductData(
638641
$email,
639642
$password,
640643
$updateProductData,
641-
$anonymousCartId
644+
$anonymousCart
642645
);';
643646
break;
644647
case 'passwordChange':
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
3+
namespace Commercetools\Core\Model\Message;
4+
5+
use Commercetools\Core\Model\Common\DateTimeDecorator;
6+
use Commercetools\Core\Model\Common\Reference;
7+
use Commercetools\Core\Model\Customer\Customer;
8+
use DateTime;
9+
10+
/**
11+
* @package Commercetools\Core\Model\Message
12+
* @link https://docs.commercetools.com/http-api-projects-messages.html#customerdeleted-message
13+
* @method string getId()
14+
* @method CustomerDeletedMessage setId(string $id = null)
15+
* @method DateTimeDecorator getDeletedAt()
16+
* @method CustomerDeletedMessage setDeletedAt(DateTime $createdAt = null)
17+
* @method int getSequenceNumber()
18+
* @method CustomerDeletedMessage setSequenceNumber(int $sequenceNumber = null)
19+
* @method Reference getResource()
20+
* @method CustomerDeletedMessage setResource(Reference $resource = null)
21+
* @method int getResourceVersion()
22+
* @method CustomerDeletedMessage setResourceVersion(int $resourceVersion = null)
23+
* @method string getType()
24+
* @method CustomerDeletedMessage setType(string $type = null)
25+
* @method int getVersion()
26+
* @method CustomerDeletedMessage setVersion(int $version = null)
27+
* @method DateTimeDecorator getLastModifiedAt()
28+
* @method CustomerDeletedMessage setLastModifiedAt(DateTime $lastModifiedAt = null)
29+
* @method UserProvidedIdentifiers getResourceUserProvidedIdentifiers()
30+
* phpcs:disable
31+
* @method CustomerDeletedMessage setResourceUserProvidedIdentifiers(UserProvidedIdentifiers $resourceUserProvidedIdentifiers = null)
32+
* phpcs:enable
33+
* @method DateTimeDecorator getCreatedAt()
34+
* @method CustomerDeletedMessage setCreatedAt(DateTime $createdAt = null)
35+
*/
36+
class CustomerDeletedMessage extends Message
37+
{
38+
const MESSAGE_TYPE = 'CustomerDeleted';
39+
40+
public function fieldDefinitions()
41+
{
42+
$definitions = parent::fieldDefinitions();
43+
44+
return $definitions;
45+
}
46+
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
namespace Commercetools\Core\Model\Message;
4+
5+
use Commercetools\Core\Model\Common\DateTimeDecorator;
6+
use Commercetools\Core\Model\Common\Reference;
7+
use Commercetools\Core\Model\Order\ReturnInfoCollection;
8+
use DateTime;
9+
10+
/**
11+
* @package Commercetools\Core\Model\Message
12+
* @link https://docs.commercetools.com/http-api-projects-messages.html#orderreturninfoset-message
13+
* @method string getId()
14+
* @method OrderReturnInfoSetMessage setId(string $id = null)
15+
* @method DateTimeDecorator getCreatedAt()
16+
* @method OrderReturnInfoSetMessage setCreatedAt(DateTime $createdAt = null)
17+
* @method int getSequenceNumber()
18+
* @method OrderReturnInfoSetMessage setSequenceNumber(int $sequenceNumber = null)
19+
* @method Reference getResource()
20+
* @method OrderReturnInfoSetMessage setResource(Reference $resource = null)
21+
* @method int getResourceVersion()
22+
* @method OrderReturnInfoSetMessage setResourceVersion(int $resourceVersion = null)
23+
* @method string getType()
24+
* @method OrderReturnInfoSetMessage setType(string $type = null)
25+
* @method string getOrderState()
26+
* @method OrderReturnInfoSetMessage setOrderState(string $orderState = null)
27+
* @method int getVersion()
28+
* @method OrderReturnInfoSetMessage setVersion(int $version = null)
29+
* @method DateTimeDecorator getLastModifiedAt()
30+
* @method OrderReturnInfoSetMessage setLastModifiedAt(DateTime $lastModifiedAt = null)
31+
* @method UserProvidedIdentifiers getResourceUserProvidedIdentifiers()
32+
* phpcs:disable
33+
* @method OrderReturnInfoSetMessage setResourceUserProvidedIdentifiers(UserProvidedIdentifiers $resourceUserProvidedIdentifiers = null)
34+
* phpcs:enable
35+
* @method ReturnInfoCollection getReturnInfo()
36+
* @method OrderReturnInfoSetMessage setReturnInfo(ReturnInfoCollection $returnInfo = null)
37+
*/
38+
class OrderReturnInfoSetMessage extends Message
39+
{
40+
const MESSAGE_TYPE = 'ReturnInfoSet';
41+
42+
public function fieldDefinitions()
43+
{
44+
$definitions = parent::fieldDefinitions();
45+
$definitions['returnInfo'] = [static::TYPE => ReturnInfoCollection::class];
46+
47+
return $definitions;
48+
}
49+
}

src/Core/Model/Project/Project.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/**
1515
* @package Commercetools\Core\Model\Project
1616
* @link https://docs.commercetools.com/http-api-projects-project.html#project
17+
*
1718
* @method string getKey()
1819
* @method Project setKey(string $key = null)
1920
* @method string getName()
@@ -38,6 +39,10 @@
3839
* @method Project setExternalOAuth(ExternalOAuth $externalOAuth = null)
3940
* @method CartsConfiguration getCarts()
4041
* @method Project setCarts(CartsConfiguration $carts = null)
42+
* @method ShoppingListsConfiguration getShoppingLists()
43+
* @method Project setShoppingLists(ShoppingListsConfiguration $shoppingLists = null)
44+
* @method SearchIndexingConfiguration getSearchIndexing()
45+
* @method Project setSearchIndexing(SearchIndexingConfiguration $searchIndexing = null)
4146
*/
4247
class Project extends JsonObject
4348
{
@@ -61,7 +66,9 @@ public function fieldDefinitions()
6166
'messages' => [static::TYPE => MessagesConfiguration::class],
6267
'shippingRateInputType' => [static::TYPE => ShippingRateInputType::class],
6368
'externalOAuth' => [static::TYPE => ExternalOAuth::class],
64-
'carts' => [static::TYPE => CartsConfiguration::class]
69+
'carts' => [static::TYPE => CartsConfiguration::class],
70+
'shoppingLists' => [static::TYPE => ShoppingListsConfiguration::class],
71+
'searchIndexing' => [static::TYPE => SearchIndexingConfiguration::class]
6572
];
6673
}
6774
}

0 commit comments

Comments
 (0)