Merge API Platform 3 to 2.0 branch #16847

GSadee · 2024-09-04T09:06:51Z

Q	A
Branch?	2.0
Bug fix?	no
New feature?	yes
BC breaks?	yes
Deprecations?	no
Related tickets
License	MIT

As the upgrade of our API to API Platform 3 is almost completed, it is high time to merge these changes to branch 2.0 and finish the work there.

…fikooo) This PR was merged into the api-platform-3 branch. Discussion ---------- | Q | A |-----------------|----- | Branch? | api-platform-3  | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no  | License | MIT  Commits ------- [Unit] Update Channels tests to include embedded shop billing data [Unit] Improve channel fixtures with more descriptive data [Unit] Remove obsolete shop billing data response files [Unit] Update channel tests responses to include shop billing data [API] Remove obsolete serialization groups from Channel resource [API] Update serialization groups of ShopBillingData resource [API] Configure ShopBillingData field as embedded Channel's resource [Behat] Update ManagingChannelsBillingDataContext class [Unit] ChannelsTest code refactor [Unit] Add requestPost util function and other related code [Unit] Use requestPost util method in ChannelsTest [Unit] Enable deleting the only channel test

| Q | A |-----------------|----- | Branch? | api-platform-3 | Bug fix? | no | New feature? | somewhat | BC breaks? | no | Deprecations? | no | Related tickets | - | License | MIT

…lation resource

…urce

… resource

| Q | A |-----------------|----- | Branch? | api-platform-3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | n/a | License | MIT

| Q | A |-----------------|----- | Branch? | api-platform-3  | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no  | License | MIT

* 2.0: (64 commits) [Admin] Rename parameter [Admin] Change command handlers and console command ids to dotted notation [Core] Change command handlers and console command ids to dotted notation [Core] Use new services [Core] Rename Message to Command [Admin] Rename Message to Command [Promotion] Remove deprecated commands [Ui] Remove deprecated commands [User] Remove deprecated commands [Admin] Configure and use anonymous view in store component [Admin] Add missing order notes information [Behat] Use test attribute to retrieve order notes [Admin] Render pagination and enabled filter test attributes [Behat] Enable scenarios and improve implementation for filtered pages redirections [Admin] Render view in store button in the variant edit page [CS][DX] Refactor [Behat] Improve view product in store action [Behat] Enable viewing product in store from variant edit page scenarios [Behat] Enable deleting multiple product variants scenario [Behat] Enable remaining managing users scenario ...

* 2.0: [CS][DX] Refactor [CS][DX] Refactor [CS][DX] Refactor [CI] Update Sylius branches in refactor workflow [Behat] Switch another random JS failed scenarios to Chromedriver [Behat] Switch another random JS failed scenarios to Chromedriver [Behat] Switch random JS failed scenarios to Chromedriver [CS][DX] Refactor

| Q | A |-----------------|----- | Branch? | api-platform-3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT

* 2.0: Fix data grid sorting when there are no defaults [Admin][CatalogPromotion] Fix icon for show variants link

github-actions · 2024-09-04T09:12:13Z

Bunnyshell Preview Environment deleted

Available commands:

/bns:deploy to redeploy the environment

diimpp

I'm afraid GH will loose my comments, if I will do it over several days, so here is first batch.

diimpp · 2024-09-04T14:57:32Z

features/admin/taxation/managing_tax_categories/filtering_tax_categories.feature

    Scenario: Filtering tax categories by name
-        When I search by "Food" name
+        When I search by "ood" name


--- When I search by "ood" name +++ When I search by "Food" name

If Food is not a desired search string, then some other human readable word should be used.

diimpp · 2024-09-04T15:08:05Z

UPGRADE-API-2.0.md

+- `Sylius\Bundle\ApiBundle\DataPersister\*DataPersister` => `Sylius\Bundle\ApiBundle\StateProcessor\*Processor`
+- `Sylius\Bundle\ApiBundle\DataProvider\*DataProvider` => `Sylius\Bundle\ApiBundle\StateProvider\*Provider`
+
+* API Platform has also dropped `DataTransformers` in favor of which `some of them` have been refactored into `SerializerContextBuilders` as follows:


Bold or italic would suit better than code for text accent.

--- * API Platform has also dropped `DataTransformers` in favor of which `some of them` have been refactored into `SerializerContextBuilders` as follows: +++ * API Platform has also dropped `DataTransformers` in favor of which **some of them** have been refactored into `SerializerContextBuilders` as follows:

diimpp · 2024-09-04T15:10:55Z

UPGRADE-API-2.0.md

+    +   protected ?string $channelCode,
+    +   protected ?string $localeCode,
+    +   protected ?string $email = null,
+    +   protected ?string $message = null,


While it's a correct sorting order from CS point of view, that's strange from business point of view.

diimpp · 2024-09-04T15:13:27Z

UPGRADE-API-2.0.md

+* The constructor of `Sylius\Bundle\ApiBundle\Command\Account\RequestShopUserVerification` has been created:
+```php
+    public function __construct(
+    +   protected string|int|null $shopUserId,


$shopUserId typehint should be identical between ChangeShopUserPassword and RequestShopUserVerification (Other commands?)

Currently it's

+ protected mixed $shopUserId, + protected string|int|null $shopUserId,

diimpp · 2024-09-04T21:30:30Z

adr/2024_07_15_api_state_providers_structure.md

+
+## Decision Drivers
+
+* Moving from DataProviders to StateProviders


Since previous parts of document highlight these words as code, then this probably should as well.

--- * Moving from DataProviders to StateProviders +++ * Moving from `DataProviders` to `StateProviders`

diimpp · 2024-09-04T21:37:38Z

adr/2024_07_15_api_state_providers_structure.md

+
+## Decision Outcome
+
+Chosen option: `Separate StateProviders by sections and resources`,


I've browsed other ADRs and there is no clear syntax to highlight chosen option, but bold, italic or underline should be better choice.

Chosen option: Separate StateProviders by sections and resources,
Chosen option: Separate StateProviders by sections and resources
Chosen option: Separate StateProviders by sections and resources
Chosen option: Separate StateProviders by sections and resources
Chosen option: Separate StateProviders by sections and resources
Chosen option: Separate StateProviders by sections and resources

diimpp · 2024-09-04T21:41:47Z

adr/2024_07_16_api_query_extensions_directory_structure.md

+Doctrine/ORM/QueryExtension/
+    /Admin
+        /Product
+            ExampleExtension.php


Would be cool to show extension types over here, like

ItemExtension.php
CollectionExtension.php

diimpp · 2024-09-04T21:43:03Z

adr/2024_07_16_state_processors_directory_structure.md

+
+## Decision Drivers
+
+* Migrate from DataPersisters to StateProcessors


--- * Migrate from DataPersisters to StateProcessors +++ * Migrate from `DataPersisters` to `StateProcessors`

diimpp · 2024-09-04T21:45:11Z

adr/2024_07_16_state_processors_directory_structure.md

+
+## Decision Outcome
+
+Chosen option: Separate StateProcessors by sections, resources, and operations, 


Chosen option needs to be highlighted as in two previous ADRs.

Following existing scheme,

--- Chosen option: Separate StateProcessors by sections, resources, and operations, +++ Chosen option: `Separate StateProcessors by sections, resources, and operations`,

Suggested change,

--- Chosen option: Separate StateProcessors by sections, resources, and operations, +++ Chosen option: **<ins>Separate StateProcessors by sections, resources, and operations</ins>**,

diimpp · 2024-09-04T21:54:23Z

tests/Api/Utils/OrderPlacerTrait.php

+            orderTokenValue: $tokenValue,
+            shipmentId: $shipmentId,
+            shippingMethodCode: $shippingMethodCode,
+    );


Spacing issue

--- ); +++ );

diimpp · 2024-09-04T21:57:38Z

tests/Api/Utils/OrderPlacerTrait.php

        $this->addItemToCart($productVariantCode, $quantity, $tokenValue);
        $cart = $this->updateCartWithAddressAndCouponCode($tokenValue, $email, $couponCode);
        $this->dispatchShippingMethodChooseCommand(
            $tokenValue,
            'UPS',
-            (string) $cart->getShipments()->first()->getId(),
+            $cart->getShipments()->first()->getId(),


Similar to getLastPayment, you should use last available shipment, so

--- $cart->getShipments()->first()->getId(), +++ $cart->getShipments()->last()->getId(),

diimpp · 2024-09-04T21:59:07Z

tests/Api/Utils/OrderPlacerTrait.php

@@ -60,12 +60,12 @@ protected function fulfillOrder(
        $this->dispatchShippingMethodChooseCommand(
            $tokenValue,
            'UPS',
-            (string) $cart->getShipments()->first()->getId(),
+            $cart->getShipments()->first()->getId(),


--- $cart->getShipments()->first()->getId(), +++ $cart->getShipments()->last()->getId(),

diimpp · 2024-09-04T22:57:13Z

tests/Api/Shop/ProductImagesTest.php


        /** @var ProductImageInterface $productImage */
        $productImage = $fixtures['product_mug_thumbnail'];
+        /** @var ProductInterface $product */


Outside of scope of current PR, but we should add return type to ProductImage/TaxonImage instead.

diimpp · 2024-09-04T22:59:52Z

tests/Api/Shop/ProductAttributeValuesTest.php

-            'shop/product_attribute/get_product_attribute_value',
-            Response::HTTP_OK,
-        );
+        $this->requestGet('/api/v2/shop/product-attribute-values/' . $attributeValue->getId());


A matter of taste, but would be cool to use same syntax over all tests.

--- $this->requestGet('/api/v2/shop/product-attribute-values/' . $attributeValue->getId()); +++ $this->requestGet(sprintf('/api/v2/shop/product-attribute-values/%s', $attributeValue->getId()));

diimpp · 2024-09-04T23:13:29Z

tests/Api/Shop/OrdersTest.php

+        $order = $this->placeOrder('token', 'guest@doe.com');
+
+        $this->requestGet(
+            uri: sprintf('/api/v2/shop/orders/token/payments/%s/configuration', $order->getPayments()->first()->getId()),


--- uri: sprintf('/api/v2/shop/account/orders/token/payments/%s', $order->getPayments()->first()->getId()), +++ uri: sprintf('/api/v2/shop/account/orders/token/payments/%s', $order->getLastPayment()->getId()),

diimpp · 2024-09-04T23:13:36Z

tests/Api/Shop/OrdersTest.php

+        $order = $this->placeOrder('token', 'guest@doe.com');
+
+        $this->requestGet(
+            uri: sprintf('/api/v2/shop/orders/token/payments/%s/configuration', $order->getPayments()->first()->getId()),


--- uri: sprintf('/api/v2/shop/account/orders/token/payments/%s', $order->getPayments()->first()->getId()), +++ uri: sprintf('/api/v2/shop/account/orders/token/payments/%s', $order->getLastPayment()->getId()),

diimpp · 2024-09-04T23:16:51Z

tests/Api/Shop/OrderItemsTest.php

+        $this->placeOrder('token', $customer->getEmailCanonical());
+
+        $this->requestGet(
+            uri: '/api/v2/shop/orders/token/items',


Why not use nAWw2jewp token, which is commonly used through tests?

diimpp · 2024-09-04T23:18:52Z

tests/Api/Shop/CustomersTest.php

-        );
-
-        $response = $this->client->getResponse();
+        $this->requestGet('/api/v2/shop/customers/' . $customer->getId());


--- $this->requestGet('/api/v2/shop/customers/' . $customer->getId()); +++ $this->requestGet(sprintf('/api/v2/shop/customers/%s', $customer->getId()));

diimpp · 2024-09-04T23:20:57Z

tests/Api/Shop/CustomersTest.php

+        ]);
+
+        $this->requestPatch(
+            '/api/v2/shop/customers/reset-password/valid_token',


--- '/api/v2/shop/customers/reset-password/valid_token', +++ '/api/v2/shop/customers/reset-password/expired_token',

Rafikooo and others added 30 commits August 2, 2024 14:02

[Unit] Use requestPost util method in ChannelsTest

db6a202

[Unit] Enable deleting the only channel test

799557d

[Api] Add AbstractInputContextBuilder

1b44339

[Api] Add default argument name const to attributes

48b0e9e

Review fixes

edff12e

[API][Admin] Upgrade ProductReview (#16662)

41607bc

| Q | A |-----------------|----- | Branch? | api-platform-3 | Bug fix? | no | New feature? | somewhat | BC breaks? | no | Deprecations? | no | Related tickets | - | License | MIT

[Unit] Enable product attributes tests

70233ad

[API] Set product attribute validation groups by operation

6b708f8

[API] Correct product attribute open api context description indentation

f745459

[API] Remove unnecessary product attributes properties configuration

477aaa2

[API] Remove obsolete serialization groups from ProductAttributeTrans…

15ed551

…lation resource

[API] Remove obsolete ProductAttributeDataPersister class

a366ab8

[API] Remove obsolete serialization groups from ProductAttribute reso…

58977f4

…urce

[Unit] Update product attribute tests responses

f70b993

[API] Configure ProductAttributeTranslation resource

54de293

[Unit] Adjust product attribute update test

665325d

[API] Remove obsolete serialization groups from ProductAttributeValue…

3707657

… resource

[Behat] Enable product attribute in use scenario

bea9231

[API] Add product attribute remove processor

c35c3fa

[Behat] Enable product attribute filtering scenarios

a8348c8

[API] Remove obsolete product attribute resources configurations

2d4d7fc

[Behat] Adjust the order of tags for product attribute scenarios

173fc87

[Behat] Implement API product attributes filtering

140b5d0

[API] Implement product attributes filtering

4fa6fda

[Unit] Adjust product attribute get collection response

167a52f

[API] Add separate filter service for sorting product taxons

d142938

[Api] Add AbstractInputContextBuilder (#16671)

1d4789c

| Q | A |-----------------|----- | Branch? | api-platform-3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | n/a | License | MIT

GSadee and others added 18 commits September 3, 2024 07:40

[Shop][Behat] Fix checkout scenarios

f530b00

[API][Serializer] Enable remaining PHPSpecs

e946296

[API] Remove legacy data persisters and providers

c4b0cf5

[API][CommandHandler] Enable remaining PHPSpecs

16d5edc

[API] Remove unused services for merging configurations

6dd4ccf

[API] Remove unused resource input data properties validator

73acdd7

[API] Remove unused filters

69739f1

[API] Enable PostgreSQLDriverExceptionListener

67f61f1

[API] Enable remaining documentation modifiers

058212c

[API] Remove legacy API resources configs

f4b5a10

[Composer][CI] Minor clean up

cd01851

[API] Minor clean up of UPGRADE files

d0d98c3

Merge branch '2.0' into api-platform-3

99417df

* 2.0: Fix data grid sorting when there are no defaults [Admin][CatalogPromotion] Fix icon for show variants link

GSadee requested review from a team as code owners September 4, 2024 09:06

probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Sep 4, 2024

NoResponseMate approved these changes Sep 4, 2024

View reviewed changes

mpysiak approved these changes Sep 4, 2024

View reviewed changes

mpysiak merged commit d366932 into 2.0 Sep 4, 2024
54 checks passed

GSadee deleted the api-platform-3 branch September 4, 2024 10:14

diimpp reviewed Sep 4, 2024

View reviewed changes

diimpp reviewed Sep 6, 2024

View reviewed changes

lchrusciel restored the api-platform-3 branch September 19, 2024 09:18

lchrusciel deleted the api-platform-3 branch September 19, 2024 09:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge API Platform 3 to 2.0 branch #16847

Merge API Platform 3 to 2.0 branch #16847

GSadee commented Sep 4, 2024

github-actions bot commented Sep 4, 2024 •

edited

Loading

diimpp left a comment

diimpp Sep 4, 2024

diimpp Sep 4, 2024 •

edited

Loading

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024 •

edited

Loading

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024 •

edited

Loading

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024

diimpp Sep 4, 2024


		## Decision Drivers

		* Moving from DataProviders to StateProviders


		## Decision Outcome

		Chosen option: `Separate StateProviders by sections and resources`,


		## Decision Drivers

		* Migrate from DataPersisters to StateProcessors


		## Decision Outcome

		Chosen option: Separate StateProcessors by sections, resources, and operations,

Merge API Platform 3 to 2.0 branch #16847

Merge API Platform 3 to 2.0 branch #16847

Conversation

GSadee commented Sep 4, 2024

github-actions bot commented Sep 4, 2024 • edited Loading

Bunnyshell Preview Environment deleted

diimpp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

diimpp Sep 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

diimpp Sep 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

diimpp Sep 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Sep 4, 2024 •

edited

Loading

diimpp Sep 4, 2024 •

edited

Loading

diimpp Sep 4, 2024 •

edited

Loading

diimpp Sep 4, 2024 •

edited

Loading