Merge pull request #1664 from spryker-shop/bugfix/frw-9641/master-adj…

…usted-glue-message Auto-merge based on green CI result.
spryker-shop · Dec 19, 2024 · eaa4b58 · eaa4b58
2 parents fe63bd5 + 58ddec5
commit eaa4b58
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 24 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/config_default-development-heroku.php b/config/Shared/config_default-development-heroku.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This is the global runtime configuration for Yves and Generated_Yves_Zed in a development environment.
  */
@@ -72,7 +74,7 @@
     '=',
     STR_PAD_RIGHT,
 );
-$ELASTICA_PORT = ($ENV_ELASTICA_CONNECTION_DATA['scheme'] == 'https' ? 443 : 80);
+$ELASTICA_PORT = ($ENV_ELASTICA_CONNECTION_DATA['scheme'] === 'https' ? 443 : 80);
 $config[SearchConstants::ELASTICA_PARAMETER__AUTH_HEADER]
     = $config[SearchElasticsearchConstants::AUTH_HEADER] = $ELASTICA_AUTH_HEADER;
 $config[SearchConstants::ELASTICA_PARAMETER__HOST]

diff --git a/src/Pyz/Glue/CustomersRestApi/Validation/customers.validation.yaml b/src/Pyz/Glue/CustomersRestApi/Validation/customers.validation.yaml
@@ -7,6 +7,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:
             - 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();