Commit 103a2c21 authored by Henrique Mendes's avatar Henrique Mendes Committed by Paulo Henrique Cota Starling
Browse files

Issue #2894929 by baikho, jayvolk, paulocs: Instructions unclear for... 

Issue #2894929 by baikho, jayvolk, paulocs: Instructions unclear for constraint of Uppercase and Lowercase Characters
parent 83631f3f

password_policy_characters/src/Plugin/PasswordConstraint/PasswordCharacter.php

+10 −10
Original line number Diff line number Diff line
@@ -60,31 +60,31 @@ class PasswordCharacter extends PasswordConstraintBase { 
    switch ($configuration['character_type']) {

      case 'uppercase':

        if ($count_upper < $configuration['character_count']) {

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 uppercase character.', 'Password must contain at least @count uppercase characters.'));

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 uppercase character.', 'Password must contain at least @count unique uppercase characters.'));

        }

        break;



      case 'lowercase':

        if ($count_lower < $configuration['character_count']) {

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 lowercase character.', 'Password must contain at least @count lowercase characters.'));

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 lowercase character.', 'Password must contain at least @count unique lowercase characters.'));

        }

        break;



      case 'letter':

        if ($count_letter < $configuration['character_count']) {

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 letter character.', 'Password must contain at least @count letter characters.'));

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 letter character.', 'Password must contain at least @count unique letter characters.'));

        }

        break;



      case 'special':

        if ($count_special < $configuration['character_count']) {

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 special character.', 'Password must contain at least @count special characters.'));

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 special character.', 'Password must contain at least @count unique special characters.'));

        }

        break;



      case 'numeric':

        if ($count_numeric < $configuration['character_count']) {

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 numeric character.', 'Password must contain at least @count numeric characters.'));

          $validation->setErrorMessage($this->formatPlural($configuration['character_count'], 'Password must contain at least 1 numeric character.', 'Password must contain at least @count unique numeric characters.'));

        }

        break;

    }
@@ -155,7 +155,7 @@ class PasswordCharacter extends PasswordConstraintBase { 
      case 'uppercase':

        $summary = $this->formatPlural($configuration['character_count'],

          'Password must contain 1 uppercase character',

          'Password must contain @count uppercase characters',

          'Password must contain at least @count unique uppercase characters',

          ['@count' => $configuration['character_count']]

         );
@@ -164,7 +164,7 @@ class PasswordCharacter extends PasswordConstraintBase { 
      case 'lowercase':

        $summary = $this->formatPlural($configuration['character_count'],

          'Password must contain 1 lowercase character',

          'Password must contain @count lowercase characters',

          'Password must contain at least @count unique lowercase characters',

          ['@count' => $configuration['character_count']]

        );

        break;
@@ -172,7 +172,7 @@ class PasswordCharacter extends PasswordConstraintBase { 
      case 'letter':

        $summary = $this->formatPlural($configuration['character_count'],

          'Password must contain 1 letter character',

          'Password must contain @count letter characters',

          'Password must contain at least @count unique letter characters',

          ['@count' => $configuration['character_count']]

        );

        break;
@@ -180,7 +180,7 @@ class PasswordCharacter extends PasswordConstraintBase { 
      case 'special':

        $summary = $this->formatPlural($configuration['character_count'],

          'Password must contain 1 special character',

          'Password must contain @count special characters',

          'Password must contain at least @count unique special characters',

          ['@count' => $configuration['character_count']]

        );

        break;
@@ -188,7 +188,7 @@ class PasswordCharacter extends PasswordConstraintBase { 
      case 'numeric':

        $summary = $this->formatPlural($configuration['character_count'],

          'Password must contain 1 numeric character',

          'Password must contain @count numeric characters',

          'Password must contain at least @count unique numeric characters',

          ['@count' => $configuration['character_count']]

        );

        break;

password_policy_characters/tests/src/Functional/PasswordCharacterOperations.php

+4 −4
Original line number Diff line number Diff line
@@ -51,19 +51,19 @@ class PasswordCharacterOperations extends BrowserTestBase { 
    $this->assertSession()->pageTextContains('Character type');



    $this->submitForm(['character_type' => 'special', 'character_count' => 2], 'Save');

    $this->assertSession()->pageTextContains('Password must contain 2 special characters');

    $this->assertSession()->pageTextContains('Password must contain at least 2 unique special characters');



    $this->drupalGet('admin/config/system/password_policy/constraint/add/test_policy/password_policy_character_constraint');

    $this->submitForm(['character_type' => 'numeric', 'character_count' => 3], 'Save');

    $this->assertSession()->pageTextContains('Password must contain 3 numeric characters');

    $this->assertSession()->pageTextContains('Password must contain at least 3 unique numeric characters');



    $this->drupalGet('admin/config/system/password_policy/constraint/add/test_policy/password_policy_character_constraint');

    $this->submitForm(['character_type' => 'lowercase', 'character_count' => 4], 'Save');

    $this->assertSession()->pageTextContains('Password must contain 4 lowercase characters');

    $this->assertSession()->pageTextContains('Password must contain at least 4 unique lowercase characters');



    $this->drupalGet('admin/config/system/password_policy/constraint/add/test_policy/password_policy_character_constraint');

    $this->submitForm(['character_type' => 'uppercase', 'character_count' => 5], 'Save');

    $this->assertSession()->pageTextContains('Password must contain 5 uppercase characters');

    $this->assertSession()->pageTextContains('Password must contain at least 5 unique uppercase characters');



    $this->drupalGet('admin/config/system/password_policy/constraint/add/test_policy/password_policy_character_constraint');

    $this->submitForm(['character_type' => 'special', 'character_count' => ''], 'Save');