diff --git a/composer.lock b/composer.lock index 48df873879..dba77ea2e1 100644 --- a/composer.lock +++ b/composer.lock @@ -31844,16 +31844,16 @@ }, { "name": "spryker/customers-rest-api", - "version": "1.23.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/spryker/customers-rest-api.git", - "reference": "01e9fa1a4cbd041dabb86f6e59588816c09be9f5" + "reference": "d741881522f69f8794c47edbb6c1d085c0f7f185" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/customers-rest-api/zipball/01e9fa1a4cbd041dabb86f6e59588816c09be9f5", - "reference": "01e9fa1a4cbd041dabb86f6e59588816c09be9f5", + "url": "https://api.github.com/repos/spryker/customers-rest-api/zipball/d741881522f69f8794c47edbb6c1d085c0f7f185", + "reference": "d741881522f69f8794c47edbb6c1d085c0f7f185", "shasum": "" }, "require": { @@ -31900,9 +31900,9 @@ ], "description": "CustomersRestApi module", "support": { - "source": "https://github.com/spryker/customers-rest-api/tree/1.23.0" + "source": "https://github.com/spryker/customers-rest-api/tree/1.24.0" }, - "time": "2024-12-11T18:16:27+00:00" + "time": "2024-12-19T12:22:15+00:00" }, { "name": "spryker/customers-rest-api-extension", @@ -71832,16 +71832,16 @@ }, { "name": "spryker/user-merchant-portal-gui", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/spryker/user-merchant-portal-gui.git", - "reference": "6275ff338884fd0b10222180ac7c357314c9085f" + "reference": "0218ade7a7cb7e8ea9bc0574623ff41173337fb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/user-merchant-portal-gui/zipball/6275ff338884fd0b10222180ac7c357314c9085f", - "reference": "6275ff338884fd0b10222180ac7c357314c9085f", + "url": "https://api.github.com/repos/spryker/user-merchant-portal-gui/zipball/0218ade7a7cb7e8ea9bc0574623ff41173337fb4", + "reference": "0218ade7a7cb7e8ea9bc0574623ff41173337fb4", "shasum": "" }, "require": { @@ -71880,9 +71880,9 @@ ], "description": "UserMerchantPortalGui module", "support": { - "source": "https://github.com/spryker/user-merchant-portal-gui/tree/3.1.0" + "source": "https://github.com/spryker/user-merchant-portal-gui/tree/3.1.1" }, - "time": "2024-12-11T18:16:27+00:00" + "time": "2024-12-19T12:22:15+00:00" }, { "name": "spryker/user-merchant-portal-gui-extension", @@ -83089,12 +83089,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/robotframework-suite-tests.git", - "reference": "343f718a259cb9313ab3b496988ee3a2c8c996e8" + "reference": "c037371922f33f8085f6a8579730873ab0750c6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/343f718a259cb9313ab3b496988ee3a2c8c996e8", - "reference": "343f718a259cb9313ab3b496988ee3a2c8c996e8", + "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/c037371922f33f8085f6a8579730873ab0750c6c", + "reference": "c037371922f33f8085f6a8579730873ab0750c6c", "shasum": "" }, "default-branch": true, @@ -83108,7 +83108,7 @@ "issues": "https://github.com/spryker/robotframework-suite-tests/issues", "source": "https://github.com/spryker/robotframework-suite-tests/tree/master" }, - "time": "2024-12-17T18:11:45+00:00" + "time": "2024-12-19T12:22:03+00:00" }, { "name": "spryker/silex", diff --git a/config/Shared/config_default-development-heroku.php b/config/Shared/config_default-development-heroku.php index 3cf4ffcfd7..8317928e5b 100644 --- a/config/Shared/config_default-development-heroku.php +++ b/config/Shared/config_default-development-heroku.php @@ -1,5 +1,7 @@ .,\/?\\~])[A-Za-z\d!@#$%^&*()\_\-\=\+\[\]\{\}\|;:<>.,\/?\\~]+$/' + message: 'Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.' - NotCompromisedPassword confirmPassword: - NotBlank @@ -22,6 +23,7 @@ customers: max: 128 - Regex: pattern: '/^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()\_\-\=\+\[\]\{\}\|;:<>.,\/?\\~])[A-Za-z\d!@#$%^&*()\_\-\=\+\[\]\{\}\|;:<>.,\/?\\~]+$/' + message: 'Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.' - NotCompromisedPassword confirmPassword: @@ -42,6 +44,7 @@ customer-password: max: 128 - Regex: pattern: '/^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()\_\-\=\+\[\]\{\}\|;:<>.,\/?\\~])[A-Za-z\d!@#$%^&*()\_\-\=\+\[\]\{\}\|;:<>.,\/?\\~]+$/' + message: 'Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.' - NotCompromisedPassword confirmPassword: - NotBlank @@ -58,6 +61,7 @@ customer-restore-password: max: 128 - Regex: pattern: '/^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()\_\-\=\+\[\]\{\}\|;:<>.,\/?\\~])[A-Za-z\d!@#$%^&*()\_\-\=\+\[\]\{\}\|;:<>.,\/?\\~]+$/' + message: 'Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.' - NotCompromisedPassword confirmPassword: - NotBlank diff --git a/src/Pyz/Yves/ExampleProductSalePage/Controller/SaleController.php b/src/Pyz/Yves/ExampleProductSalePage/Controller/SaleController.php index 365792a2d7..88665879cd 100644 --- a/src/Pyz/Yves/ExampleProductSalePage/Controller/SaleController.php +++ b/src/Pyz/Yves/ExampleProductSalePage/Controller/SaleController.php @@ -22,12 +22,12 @@ class SaleController extends AbstractController { /** - * @param string $categoryPath + * @param string|null $categoryPath * @param \Symfony\Component\HttpFoundation\Request $request * * @return \Spryker\Yves\Kernel\View\View */ - public function indexAction(string $categoryPath, Request $request): View + public function indexAction(?string $categoryPath, Request $request): View { $parameters = $request->query->all(); diff --git a/tests/PyzTest/Glue/Customer/RestApi/CustomerPasswordCest.php b/tests/PyzTest/Glue/Customer/RestApi/CustomerPasswordCest.php index f9628dd708..aab098a823 100644 --- a/tests/PyzTest/Glue/Customer/RestApi/CustomerPasswordCest.php +++ b/tests/PyzTest/Glue/Customer/RestApi/CustomerPasswordCest.php @@ -227,7 +227,7 @@ protected function requestPatchCustomerPasswordFailsValidationDataProvider(): ar [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, RestErrorMessageTransfer::STATUS => Response::HTTP_UNPROCESSABLE_ENTITY, - RestErrorMessageTransfer::DETAIL => 'newPassword => This value is not valid.', + RestErrorMessageTransfer::DETAIL => 'newPassword => Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.', ], [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, diff --git a/tests/PyzTest/Glue/Customer/RestApi/CustomerRegistrationCest.php b/tests/PyzTest/Glue/Customer/RestApi/CustomerRegistrationCest.php index 71328d8f4c..6c71a3cf63 100644 --- a/tests/PyzTest/Glue/Customer/RestApi/CustomerRegistrationCest.php +++ b/tests/PyzTest/Glue/Customer/RestApi/CustomerRegistrationCest.php @@ -313,7 +313,7 @@ protected function requestPostCustomerFailsValidationDataProvider(): array [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, RestErrorMessageTransfer::STATUS => Response::HTTP_UNPROCESSABLE_ENTITY, - RestErrorMessageTransfer::DETAIL => 'password => This value is not valid.', + RestErrorMessageTransfer::DETAIL => 'password => Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.', ], [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, diff --git a/tests/PyzTest/Glue/Customer/RestApi/CustomerRestorePasswordCest.php b/tests/PyzTest/Glue/Customer/RestApi/CustomerRestorePasswordCest.php index 4ea84e0c51..1ef0d4d32f 100644 --- a/tests/PyzTest/Glue/Customer/RestApi/CustomerRestorePasswordCest.php +++ b/tests/PyzTest/Glue/Customer/RestApi/CustomerRestorePasswordCest.php @@ -188,7 +188,7 @@ protected function requestPatchCustomerPasswordFailsValidationDataProvider(): ar [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, RestErrorMessageTransfer::STATUS => Response::HTTP_UNPROCESSABLE_ENTITY, - RestErrorMessageTransfer::DETAIL => 'password => This value is not valid.', + RestErrorMessageTransfer::DETAIL => 'password => Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.', ], [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, diff --git a/tests/PyzTest/Glue/Customer/RestApi/CustomerUpdateCest.php b/tests/PyzTest/Glue/Customer/RestApi/CustomerUpdateCest.php index c9a0d8c9c6..fd6e6ba822 100644 --- a/tests/PyzTest/Glue/Customer/RestApi/CustomerUpdateCest.php +++ b/tests/PyzTest/Glue/Customer/RestApi/CustomerUpdateCest.php @@ -391,7 +391,7 @@ protected function requestPatchCustomerFailsValidationDataProvider(): array [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, RestErrorMessageTransfer::STATUS => Response::HTTP_UNPROCESSABLE_ENTITY, - RestErrorMessageTransfer::DETAIL => 'password => This value is not valid.', + RestErrorMessageTransfer::DETAIL => 'password => Your password must include at least one uppercase letter, one lowercase letter, one number, and one special character from the following list: !@#$%^&*()_-+=[]{}|;:<>.,/?\~. Non-Latin and other special characters are not allowed.', ], [ RestErrorMessageTransfer::CODE => RestRequestValidatorConfig::RESPONSE_CODE_REQUEST_INVALID, diff --git a/tests/PyzTest/Yves/Application/Controller/HomepageCest.php b/tests/PyzTest/Yves/Application/Controller/HomepageCest.php index 23aef7a5f2..aa6661559a 100644 --- a/tests/PyzTest/Yves/Application/Controller/HomepageCest.php +++ b/tests/PyzTest/Yves/Application/Controller/HomepageCest.php @@ -5,6 +5,8 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ +declare(strict_types = 1); + namespace PyzTest\Yves\Application\Controller; use PyzTest\Yves\Application\ApplicationControllerTester; diff --git a/tests/PyzTest/Zed/DataImport/Business/Model/ProductStock/ProductStockPdoTest.php b/tests/PyzTest/Zed/DataImport/Business/Model/ProductStock/ProductStockPdoTest.php index d284df6b18..dcd11a9726 100644 --- a/tests/PyzTest/Zed/DataImport/Business/Model/ProductStock/ProductStockPdoTest.php +++ b/tests/PyzTest/Zed/DataImport/Business/Model/ProductStock/ProductStockPdoTest.php @@ -38,7 +38,7 @@ class ProductStockPdoTest extends AbstractProductStockWriterTest public function testProductStockWriter(): void { // This will be fixed in next release - $this->markTestSkipped(true); + $this->markTestSkipped(); $writer = $this->getDataImportBusinessFactoryStub()->createProductStockBulkPdoWriter(); $product = $this->tester->haveProduct();