From 755b18716d136676c0f541b8d227bfe54cc63209 Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Fri, 17 Nov 2023 13:35:33 +0000 Subject: [PATCH 1/4] Update composer lock file. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 221dffd1d0..3b2c8239f7 100644 --- a/composer.lock +++ b/composer.lock @@ -6091,7 +6091,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "b266c948c0e63f1fbf2df16580289eb77258437a" + "reference": "67229c9ae59e744aefeedc0e4ab369df65e508cf" }, "require": { "php": ">=8.1" @@ -7142,7 +7142,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2023-11-17T11:31:39+00:00" + "time": "2023-11-17T13:33:28+00:00" }, { "name": "spryker/spryker-shop", @@ -18186,7 +18186,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/robotframework-suite-tests.git", - "reference": "aa889bb3b21627743bcf2d98af4d1f0bc5cd7648" + "reference": "e4ac5f74adae482b5a9c6a74d44da26aad8cc85b" }, "default-branch": true, "type": "library", @@ -18194,7 +18194,7 @@ "MIT" ], "description": "Automated tests for the Robot Framework", - "time": "2023-11-17T09:26:05+00:00" + "time": "2023-11-17T11:36:16+00:00" }, { "name": "squizlabs/php_codesniffer", From 5d72a8909c2e5e2a6e9927065dbf0b9996466a8d Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Fri, 17 Nov 2023 13:42:41 +0000 Subject: [PATCH 2/4] Update composer lock file. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 3b2c8239f7..accd02aeec 100644 --- a/composer.lock +++ b/composer.lock @@ -6091,7 +6091,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "67229c9ae59e744aefeedc0e4ab369df65e508cf" + "reference": "853af563e79752f1356aa5e1fa25d0cc9476c08a" }, "require": { "php": ">=8.1" @@ -7142,7 +7142,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2023-11-17T13:33:28+00:00" + "time": "2023-11-17T13:40:35+00:00" }, { "name": "spryker/spryker-shop", @@ -18186,7 +18186,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/robotframework-suite-tests.git", - "reference": "e4ac5f74adae482b5a9c6a74d44da26aad8cc85b" + "reference": "6b8fb282b1fd6a4f84f41151b8a44ccaab975f0d" }, "default-branch": true, "type": "library", @@ -18194,7 +18194,7 @@ "MIT" ], "description": "Automated tests for the Robot Framework", - "time": "2023-11-17T11:36:16+00:00" + "time": "2023-11-17T13:40:25+00:00" }, { "name": "squizlabs/php_codesniffer", From 6c1fb61954274b6f8993b9c0afd67d8d261711ee Mon Sep 17 00:00:00 2001 From: Svyatoslav Varpikhovsky Date: Mon, 20 Nov 2023 11:40:41 +0200 Subject: [PATCH 3/4] FRW-1162 Fixed docblocks from deprecated to generic syntax. (#8261) FRW-1162 Fixed docblocks from deprecated to generic syntax --- composer.lock | 58 +++++++++---------- .../MerchantUser/MerchantUserWriterStep.php | 2 + .../ProductStockPropelDataSetWriter.php | 2 + .../Condition/IsOrderPaidConditionPlugin.php | 2 + .../ProductConcretePageSearchPublisher.php | 2 + 5 files changed, 37 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index accd02aeec..eabf688567 100644 --- a/composer.lock +++ b/composer.lock @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.286.3", + "version": "3.287.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "29079a62c6a30ac594b50285494b4dec279b4648" + "reference": "06978bfc63111fccd78b364238bf214b4ade8d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/29079a62c6a30ac594b50285494b4dec279b4648", - "reference": "29079a62c6a30ac594b50285494b4dec279b4648", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/06978bfc63111fccd78b364238bf214b4ade8d18", + "reference": "06978bfc63111fccd78b364238bf214b4ade8d18", "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.286.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.287.0" }, - "time": "2023-11-16T19:12:53+00:00" + "time": "2023-11-17T20:03:36+00:00" }, { "name": "brick/math", @@ -2058,16 +2058,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.42.0", + "version": "2.43.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "a5221732b2ff6df59908bbf2eb274ed3688665bc" + "reference": "8f6c2f5753dec64df924a86d18036113f3140f2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/a5221732b2ff6df59908bbf2eb274ed3688665bc", - "reference": "a5221732b2ff6df59908bbf2eb274ed3688665bc", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/8f6c2f5753dec64df924a86d18036113f3140f2b", + "reference": "8f6c2f5753dec64df924a86d18036113f3140f2b", "shasum": "" }, "require": { @@ -2138,7 +2138,7 @@ "type": "community_bridge" } ], - "time": "2023-11-06T09:13:00+00:00" + "time": "2023-11-20T01:23:15+00:00" }, { "name": "lcobucci/clock", @@ -6091,7 +6091,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "853af563e79752f1356aa5e1fa25d0cc9476c08a" + "reference": "a76a60834e539ff35364419014915c1002909293" }, "require": { "php": ">=8.1" @@ -7142,7 +7142,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2023-11-17T13:40:35+00:00" + "time": "2023-11-20T09:35:42+00:00" }, { "name": "spryker/spryker-shop", @@ -14934,12 +14934,12 @@ "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "bfb52ab6410d1d06a4162be9fc3a3e3a93233166" + "reference": "a44ec55408b31d0067ee0dc6a7ff17976dce9478" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/bfb52ab6410d1d06a4162be9fc3a3e3a93233166", - "reference": "bfb52ab6410d1d06a4162be9fc3a3e3a93233166", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/a44ec55408b31d0067ee0dc6a7ff17976dce9478", + "reference": "a44ec55408b31d0067ee0dc6a7ff17976dce9478", "shasum": "" }, "require": { @@ -14990,7 +14990,7 @@ "type": "tidelift" } ], - "time": "2023-11-04T14:57:59+00:00" + "time": "2023-11-17T14:06:40+00:00" }, { "name": "phar-io/manifest", @@ -15615,16 +15615,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.2", + "version": "1.24.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bcad8d995980440892759db0c32acae7c8e79442" + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", - "reference": "bcad8d995980440892759db0c32acae7c8e79442", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", "shasum": "" }, "require": { @@ -15656,9 +15656,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3" }, - "time": "2023-09-26T12:28:12+00:00" + "time": "2023-11-18T20:15:32+00:00" }, { "name": "phpstan/phpstan", @@ -18674,16 +18674,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -18712,7 +18712,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -18720,7 +18720,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "webmozart/assert", diff --git a/src/Pyz/Zed/DataImport/Business/Model/MerchantUser/MerchantUserWriterStep.php b/src/Pyz/Zed/DataImport/Business/Model/MerchantUser/MerchantUserWriterStep.php index 6a4a1829cd..2b23b9b113 100644 --- a/src/Pyz/Zed/DataImport/Business/Model/MerchantUser/MerchantUserWriterStep.php +++ b/src/Pyz/Zed/DataImport/Business/Model/MerchantUser/MerchantUserWriterStep.php @@ -108,6 +108,8 @@ protected function getIdUserByUsername(string $username): int } /** + * @psalm-suppress MissingTemplateParam + * * @param int $idUser * * @return \Generated\Shared\Transfer\UserTransfer|null diff --git a/src/Pyz/Zed/DataImport/Business/Model/ProductStock/Writer/ProductStockPropelDataSetWriter.php b/src/Pyz/Zed/DataImport/Business/Model/ProductStock/Writer/ProductStockPropelDataSetWriter.php index 0588bb51ca..de27241583 100644 --- a/src/Pyz/Zed/DataImport/Business/Model/ProductStock/Writer/ProductStockPropelDataSetWriter.php +++ b/src/Pyz/Zed/DataImport/Business/Model/ProductStock/Writer/ProductStockPropelDataSetWriter.php @@ -508,6 +508,8 @@ protected function updateAbstractAvailabilityQuantity( } /** + * @psalm-suppress MissingTemplateParam + * * @return array */ protected function getBundleProductAbstractSkus(): array diff --git a/src/Pyz/Zed/MerchantSalesOrder/Communication/Plugin/Oms/Condition/IsOrderPaidConditionPlugin.php b/src/Pyz/Zed/MerchantSalesOrder/Communication/Plugin/Oms/Condition/IsOrderPaidConditionPlugin.php index 71135ef909..4be1ae39c5 100644 --- a/src/Pyz/Zed/MerchantSalesOrder/Communication/Plugin/Oms/Condition/IsOrderPaidConditionPlugin.php +++ b/src/Pyz/Zed/MerchantSalesOrder/Communication/Plugin/Oms/Condition/IsOrderPaidConditionPlugin.php @@ -29,6 +29,8 @@ class IsOrderPaidConditionPlugin extends AbstractPlugin implements ConditionInte * * @api * + * @psalm-suppress MissingTemplateParam + * * @param \Orm\Zed\Sales\Persistence\SpySalesOrderItem $orderItem * * @return bool diff --git a/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductConcretePageSearchPublisher.php b/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductConcretePageSearchPublisher.php index 2bdf6b58f1..02535fc4ed 100644 --- a/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductConcretePageSearchPublisher.php +++ b/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductConcretePageSearchPublisher.php @@ -113,6 +113,8 @@ public function __construct( } /** + * @psalm-suppress MissingTemplateParam + * * @param array<\Generated\Shared\Transfer\ProductConcreteTransfer> $productConcreteTransfers * @param array<\Generated\Shared\Transfer\ProductConcretePageSearchTransfer> $productConcretePageSearchTransfers * From 0c9c67cc3d22fd7440b64e04dc68defdcb26fa64 Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Mon, 20 Nov 2023 10:00:19 +0000 Subject: [PATCH 4/4] FRW-1162 Merge nonsplit/master. --- composer.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index e837c4cc99..064b62a164 100644 --- a/composer.lock +++ b/composer.lock @@ -66220,16 +66220,16 @@ }, { "name": "spryker/transfer", - "version": "3.34.0", + "version": "3.35.0", "source": { "type": "git", "url": "https://github.com/spryker/transfer.git", - "reference": "dfabe1a4dc33b713cf2487cf42f95d6d2f8d525b" + "reference": "539b53f9da85ccdfeb17f64c18c0c2ba3eac2e79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/transfer/zipball/dfabe1a4dc33b713cf2487cf42f95d6d2f8d525b", - "reference": "dfabe1a4dc33b713cf2487cf42f95d6d2f8d525b", + "url": "https://api.github.com/repos/spryker/transfer/zipball/539b53f9da85ccdfeb17f64c18c0c2ba3eac2e79", + "reference": "539b53f9da85ccdfeb17f64c18c0c2ba3eac2e79", "shasum": "" }, "require": { @@ -66265,9 +66265,9 @@ ], "description": "Transfer module", "support": { - "source": "https://github.com/spryker/transfer/tree/3.34.0" + "source": "https://github.com/spryker/transfer/tree/3.35.0" }, - "time": "2023-11-02T20:09:27+00:00" + "time": "2023-11-20T09:35:42+00:00" }, { "name": "spryker/translator", @@ -74284,16 +74284,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -74322,7 +74322,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -74330,7 +74330,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "twig/twig", @@ -76093,12 +76093,12 @@ "source": { "type": "git", "url": "https://github.com/JetBrains/phpstorm-stubs.git", - "reference": "295a9901918c4e91512a96eef4013c7601f17920" + "reference": "a846e0e43279d2f9ed577d07e4dbe6d216ca23a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/295a9901918c4e91512a96eef4013c7601f17920", - "reference": "295a9901918c4e91512a96eef4013c7601f17920", + "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/a846e0e43279d2f9ed577d07e4dbe6d216ca23a3", + "reference": "a846e0e43279d2f9ed577d07e4dbe6d216ca23a3", "shasum": "" }, "require-dev": { @@ -76134,7 +76134,7 @@ "support": { "source": "https://github.com/JetBrains/phpstorm-stubs/tree/master" }, - "time": "2023-11-17T07:00:23+00:00" + "time": "2023-11-17T15:52:59+00:00" }, { "name": "masterminds/html5", @@ -78115,12 +78115,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/robotframework-suite-tests.git", - "reference": "6b8fb282b1fd6a4f84f41151b8a44ccaab975f0d" + "reference": "7092a24d0dc95871d68d0f7b5f8b3c96504d08cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/6b8fb282b1fd6a4f84f41151b8a44ccaab975f0d", - "reference": "6b8fb282b1fd6a4f84f41151b8a44ccaab975f0d", + "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/7092a24d0dc95871d68d0f7b5f8b3c96504d08cd", + "reference": "7092a24d0dc95871d68d0f7b5f8b3c96504d08cd", "shasum": "" }, "default-branch": true, @@ -78134,7 +78134,7 @@ "issues": "https://github.com/spryker/robotframework-suite-tests/issues", "source": "https://github.com/spryker/robotframework-suite-tests/tree/master" }, - "time": "2023-11-17T13:40:25+00:00" + "time": "2023-11-20T09:44:04+00:00" }, { "name": "spryker/silex",