From 08838f646f758f1f32ec1a1873c4e0559aad1d4b Mon Sep 17 00:00:00 2001 From: Artem Siminenko Date: Fri, 6 Oct 2023 11:16:03 +0200 Subject: [PATCH 1/2] CC-31029 Fixed exception for deactivated products in cart. (#8196) CC-31029 Fixed exception for deactivated products in cart. --- composer.lock | 75 ++++++++++--------- .../CartPage/CartPageDependencyProvider.php | 4 +- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/composer.lock b/composer.lock index 70d5cb3d08..6a5815c485 100644 --- a/composer.lock +++ b/composer.lock @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.282.0", + "version": "3.283.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "79a3ed5bb573f592823f8b1cffe0dbac3132e6b4" + "reference": "0d1857ca3392ec9f8ee0b1605ba09842cced6351" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/79a3ed5bb573f592823f8b1cffe0dbac3132e6b4", - "reference": "79a3ed5bb573f592823f8b1cffe0dbac3132e6b4", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0d1857ca3392ec9f8ee0b1605ba09842cced6351", + "reference": "0d1857ca3392ec9f8ee0b1605ba09842cced6351", "shasum": "" }, "require": { @@ -335,9 +335,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.282.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.283.1" }, - "time": "2023-09-28T18:09:20+00:00" + "time": "2023-10-05T18:07:42+00:00" }, { "name": "brick/math", @@ -3471,16 +3471,16 @@ }, { "name": "nette/di", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "9c8a52dac6d7130e658df5cd819d17e1fde715ea" + "reference": "00ea0afa643b3b4383a5cd1a322656c989ade498" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/9c8a52dac6d7130e658df5cd819d17e1fde715ea", - "reference": "9c8a52dac6d7130e658df5cd819d17e1fde715ea", + "url": "https://api.github.com/repos/nette/di/zipball/00ea0afa643b3b4383a5cd1a322656c989ade498", + "reference": "00ea0afa643b3b4383a5cd1a322656c989ade498", "shasum": "" }, "require": { @@ -3537,9 +3537,9 @@ ], "support": { "issues": "https://github.com/nette/di/issues", - "source": "https://github.com/nette/di/tree/v3.1.4" + "source": "https://github.com/nette/di/tree/v3.1.5" }, - "time": "2023-09-29T12:04:58+00:00" + "time": "2023-10-02T19:58:38+00:00" }, { "name": "nette/neon", @@ -3746,16 +3746,16 @@ }, { "name": "nette/schema", - "version": "v1.2.4", + "version": "v1.2.5", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab" + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/c9ff517a53903b3d4e29ec547fb20feecb05b8ab", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab", + "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a", + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a", "shasum": "" }, "require": { @@ -3802,9 +3802,9 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.4" + "source": "https://github.com/nette/schema/tree/v1.2.5" }, - "time": "2023-08-05T18:56:25+00:00" + "time": "2023-10-05T20:37:59+00:00" }, { "name": "nette/utils", @@ -5598,12 +5598,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/evaluator.git", - "reference": "050b1bb60ab60e415f91664b2efb2809eb6d541f" + "reference": "62527613291264f342ccc10e27792e814d803128" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/050b1bb60ab60e415f91664b2efb2809eb6d541f", - "reference": "050b1bb60ab60e415f91664b2efb2809eb6d541f", + "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/62527613291264f342ccc10e27792e814d803128", + "reference": "62527613291264f342ccc10e27792e814d803128", "shasum": "" }, "require": { @@ -5664,9 +5664,9 @@ "description": "The tool for evaluating Spryker shops", "support": { "issues": "https://github.com/spryker-sdk/evaluator/issues", - "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.9" + "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.10" }, - "time": "2023-09-26T07:43:13+00:00" + "time": "2023-10-04T06:40:13+00:00" }, { "name": "spryker-sdk/security-checker", @@ -6162,7 +6162,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "18a9101c7d706aec29f8d4cf702322a6cd2e0cec" + "reference": "bf2fe8d35346730084ef69facae3836df4f2c442" }, "require": { "php": ">=8.0" @@ -7208,7 +7208,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2023-10-02T10:21:06+00:00" + "time": "2023-10-06T09:11:06+00:00" }, { "name": "spryker/spryker-shop", @@ -7216,7 +7216,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker-shop.git", - "reference": "bdb49f1262e3b611b0cbcbaadf5721aedb5e09f8" + "reference": "136cbd0567b8f2c3fdd9c89cdf12801346cacb98" }, "require": { "php": ">=8.0" @@ -7389,6 +7389,7 @@ "spryker-shop/store-widget": "*", "spryker-shop/tabs-widget": "*", "spryker-shop/tabs-widget-extension": "*", + "spryker-shop/url-page": "*", "spryker-shop/web-profiler-widget": "*", "spryker-shop/wishlist-page": "*", "spryker-shop/wishlist-page-extension": "*", @@ -7409,7 +7410,7 @@ "proprietary" ], "description": "Spryker Shop page and widget modules", - "time": "2023-10-02T10:12:51+00:00" + "time": "2023-10-06T09:11:10+00:00" }, { "name": "spryker/synchronization-behavior", @@ -17946,7 +17947,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/commerce-k6-performance-tests.git", - "reference": "ebc111768efef0593bfdec3adcf9efdef876bafa" + "reference": "d77d785e2beaa74e0ccdebc3e9c2d875fca95d22" }, "default-branch": true, "type": "library", @@ -17954,7 +17955,7 @@ "MIT" ], "description": "K6 performance tests", - "time": "2023-09-25T08:35:37+00:00" + "time": "2023-10-06T09:11:12+00:00" }, { "name": "spryker/development-core", @@ -18073,16 +18074,16 @@ "source": { "type": "git", "url": "https://github.com/spryker/git-hook.git", - "reference": "424930449f30cc8889b9bea60a1f430292753adb" + "reference": "0d9bd609de02618a1aa58610db95cbd2f79cbfad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/git-hook/zipball/424930449f30cc8889b9bea60a1f430292753adb", - "reference": "424930449f30cc8889b9bea60a1f430292753adb", + "url": "https://api.github.com/repos/spryker/git-hook/zipball/0d9bd609de02618a1aa58610db95cbd2f79cbfad", + "reference": "0d9bd609de02618a1aa58610db95cbd2f79cbfad", "shasum": "" }, "require": { - "php": ">=7.4", + "php": ">=8.0", "spryker/laminas": "^1.0.0", "symfony/console": "^4.0.0 || ^5.0.0 || ^6.0.0", "symfony/process": "^4.0.0 || ^5.0.0 || ^6.0.0", @@ -18122,7 +18123,7 @@ "issues": "https://github.com/spryker/git-hook/issues", "source": "https://github.com/spryker/git-hook" }, - "time": "2023-01-19T13:32:54+00:00" + "time": "2023-10-04T08:31:58+00:00" }, { "name": "spryker/profiler", @@ -18184,7 +18185,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/robotframework-suite-tests.git", - "reference": "037a5389089ee6c1970ae25cf938d08d616e17da" + "reference": "745eb21144e746b7c3fc86d93ac2698e239ede9e" }, "default-branch": true, "type": "library", @@ -18192,7 +18193,7 @@ "MIT" ], "description": "Automated tests for the Robot Framework", - "time": "2023-10-03T13:17:56+00:00" + "time": "2023-10-06T09:10:15+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -18854,5 +18855,5 @@ "platform-overrides": { "php": "8.0.19" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/src/Pyz/Yves/CartPage/CartPageDependencyProvider.php b/src/Pyz/Yves/CartPage/CartPageDependencyProvider.php index e9947804c8..fe6f3983fe 100644 --- a/src/Pyz/Yves/CartPage/CartPageDependencyProvider.php +++ b/src/Pyz/Yves/CartPage/CartPageDependencyProvider.php @@ -12,16 +12,18 @@ use SprykerShop\Yves\MerchantProductOfferWidget\Plugin\CartPage\MerchantProductOfferPreAddToCartPlugin; use SprykerShop\Yves\MerchantProductWidget\Plugin\CartPage\MerchantProductPreAddToCartPlugin; use SprykerShop\Yves\ProductBundleWidget\Plugin\CartPage\ProductBundleCartItemTransformerPlugin; +use SprykerShop\Yves\UrlPage\Plugin\CartPage\UrlCartItemTransformerPlugin; class CartPageDependencyProvider extends SprykerCartPageDependencyProvider { /** - * @return array<\SprykerShop\Yves\CartPage\Dependency\Plugin\CartItemTransformerPluginInterface> + * @return array<\SprykerShop\Yves\CartPageExtension\Dependency\Plugin\CartItemTransformerPluginInterface> */ protected function getCartItemTransformerPlugins(): array { return [ new ProductBundleCartItemTransformerPlugin(), + new UrlCartItemTransformerPlugin(), ]; } From 3110b53adcf4953d7f0931bdb27f7631a915ba96 Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Fri, 6 Oct 2023 09:23:06 +0000 Subject: [PATCH 2/2] CC-31029 Update core modules. --- composer.json | 1 + composer.lock | 121 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 85 insertions(+), 37 deletions(-) diff --git a/composer.json b/composer.json index 07cb547dc8..9d32e3803b 100644 --- a/composer.json +++ b/composer.json @@ -186,6 +186,7 @@ "spryker-shop/store-widget": "^1.0.0", "spryker-shop/tabs-widget": "^1.0.0", "spryker-shop/tabs-widget-extension": "^1.0.0", + "spryker-shop/url-page": "^1.0.0", "spryker-shop/wishlist-page": "^1.10.0", "spryker-shop/wishlist-page-extension": "^1.0.0", "spryker-shop/wishlist-widget": "^1.0.0", diff --git a/composer.lock b/composer.lock index e9183e338a..af8bae03ca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7543e4bc0b1fac8e0d8dce4e63616870", + "content-hash": "278b870079b58ae7cbd73edeae75deb9", "packages": [ { "name": "async-aws/core", @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.283.0", + "version": "3.283.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5084c03431ecda0003e35d7fc7a12eeca4242685" + "reference": "0d1857ca3392ec9f8ee0b1605ba09842cced6351" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5084c03431ecda0003e35d7fc7a12eeca4242685", - "reference": "5084c03431ecda0003e35d7fc7a12eeca4242685", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0d1857ca3392ec9f8ee0b1605ba09842cced6351", + "reference": "0d1857ca3392ec9f8ee0b1605ba09842cced6351", "shasum": "" }, "require": { @@ -335,9 +335,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.283.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.283.1" }, - "time": "2023-10-04T18:08:32+00:00" + "time": "2023-10-05T18:07:42+00:00" }, { "name": "behat/gherkin", @@ -8127,21 +8127,21 @@ }, { "name": "spryker-shop/cart-page", - "version": "3.38.0", + "version": "3.39.0", "source": { "type": "git", "url": "https://github.com/spryker-shop/cart-page.git", - "reference": "978afbbb44e56ef2994ee1a4ee74d0a33c7763b0" + "reference": "36f9d8fd5b8d9c9dcd0930c234ddf04cd66d958a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/cart-page/zipball/978afbbb44e56ef2994ee1a4ee74d0a33c7763b0", - "reference": "978afbbb44e56ef2994ee1a4ee74d0a33c7763b0", + "url": "https://api.github.com/repos/spryker-shop/cart-page/zipball/36f9d8fd5b8d9c9dcd0930c234ddf04cd66d958a", + "reference": "36f9d8fd5b8d9c9dcd0930c234ddf04cd66d958a", "shasum": "" }, "require": { "php": ">=8.0", - "spryker-shop/cart-page-extension": "^1.1.0", + "spryker-shop/cart-page-extension": "^1.2.0", "spryker-shop/comment-widget-extension": "^1.0.0", "spryker-shop/product-configurator-gateway-page-extension": "^0.1.0 || ^0.2.0 || ^1.0.0", "spryker-shop/product-group-widget-extension": "^1.0.0", @@ -8213,26 +8213,26 @@ ], "description": "CartPage module", "support": { - "source": "https://github.com/spryker-shop/cart-page/tree/3.38.0" + "source": "https://github.com/spryker-shop/cart-page/tree/3.39.0" }, - "time": "2023-09-18T09:59:02+00:00" + "time": "2023-10-06T09:11:10+00:00" }, { "name": "spryker-shop/cart-page-extension", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/spryker-shop/cart-page-extension.git", - "reference": "d96f527c830dba824b229c9f61bf678d3877733f" + "reference": "92ac0e2892d4ecf4e38755527712a264316e73ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/cart-page-extension/zipball/d96f527c830dba824b229c9f61bf678d3877733f", - "reference": "d96f527c830dba824b229c9f61bf678d3877733f", + "url": "https://api.github.com/repos/spryker-shop/cart-page-extension/zipball/92ac0e2892d4ecf4e38755527712a264316e73ef", + "reference": "92ac0e2892d4ecf4e38755527712a264316e73ef", "shasum": "" }, "require": { - "php": ">=7.4" + "php": ">=8.0" }, "require-dev": { "spryker/code-sniffer": "*" @@ -8254,9 +8254,9 @@ ], "description": "CartPageExtension module", "support": { - "source": "https://github.com/spryker-shop/cart-page-extension/tree/1.1.0" + "source": "https://github.com/spryker-shop/cart-page-extension/tree/1.2.0" }, - "time": "2022-02-01T08:28:45+00:00" + "time": "2023-10-06T09:11:10+00:00" }, { "name": "spryker-shop/catalog-page", @@ -16305,6 +16305,53 @@ }, "time": "2018-11-23T16:11:33+00:00" }, + { + "name": "spryker-shop/url-page", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker-shop/url-page.git", + "reference": "566a52f5426a3047c63dce2c1b22a0d3453e3b99" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-shop/url-page/zipball/566a52f5426a3047c63dce2c1b22a0d3453e3b99", + "reference": "566a52f5426a3047c63dce2c1b22a0d3453e3b99", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "spryker-shop/cart-page-extension": "^1.2.0", + "spryker/kernel": "^3.52.0", + "spryker/transfer": "^3.25.0", + "spryker/url": "^3.0.0", + "spryker/url-storage": "^1.0.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerShop\\": "src/SprykerShop/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "UrlPage module", + "support": { + "source": "https://github.com/spryker-shop/url-page/tree/1.0.0" + }, + "time": "2023-10-06T09:11:10+00:00" + }, { "name": "spryker-shop/wishlist-page", "version": "1.11.0", @@ -45510,16 +45557,16 @@ }, { "name": "spryker/product-approval", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/spryker/product-approval.git", - "reference": "a53d1049bd24958023829ede6fbd937550c8fa60" + "reference": "2301ee8795d7c7f97560f8eed7623cded0f5fb72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-approval/zipball/a53d1049bd24958023829ede6fbd937550c8fa60", - "reference": "a53d1049bd24958023829ede6fbd937550c8fa60", + "url": "https://api.github.com/repos/spryker/product-approval/zipball/2301ee8795d7c7f97560f8eed7623cded0f5fb72", + "reference": "2301ee8795d7c7f97560f8eed7623cded0f5fb72", "shasum": "" }, "require": { @@ -45557,9 +45604,9 @@ ], "description": "ProductApproval module", "support": { - "source": "https://github.com/spryker/product-approval/tree/1.1.0" + "source": "https://github.com/spryker/product-approval/tree/1.1.1" }, - "time": "2023-02-20T10:18:53+00:00" + "time": "2023-10-06T09:11:06+00:00" }, { "name": "spryker/product-approval-data-import", @@ -76174,16 +76221,16 @@ }, { "name": "nette/schema", - "version": "v1.2.4", + "version": "v1.2.5", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab" + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/c9ff517a53903b3d4e29ec547fb20feecb05b8ab", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab", + "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a", + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a", "shasum": "" }, "require": { @@ -76230,9 +76277,9 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.4" + "source": "https://github.com/nette/schema/tree/v1.2.5" }, - "time": "2023-08-05T18:56:25+00:00" + "time": "2023-10-05T20:37:59+00:00" }, { "name": "nette/utils", @@ -77806,12 +77853,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/robotframework-suite-tests.git", - "reference": "037a5389089ee6c1970ae25cf938d08d616e17da" + "reference": "745eb21144e746b7c3fc86d93ac2698e239ede9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/037a5389089ee6c1970ae25cf938d08d616e17da", - "reference": "037a5389089ee6c1970ae25cf938d08d616e17da", + "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/745eb21144e746b7c3fc86d93ac2698e239ede9e", + "reference": "745eb21144e746b7c3fc86d93ac2698e239ede9e", "shasum": "" }, "default-branch": true, @@ -77825,7 +77872,7 @@ "issues": "https://github.com/spryker/robotframework-suite-tests/issues", "source": "https://github.com/spryker/robotframework-suite-tests/tree/master" }, - "time": "2023-10-03T13:17:56+00:00" + "time": "2023-10-06T09:10:15+00:00" }, { "name": "spryker/silex",