Commit 10b06add authored by Paulo Henrique Cota Starling's avatar Paulo Henrique Cota Starling
Browse files

Issue #2877040 by hmendes, hswong3i, lucassc, andregp, elber: Remove dependency on CTools

parent cc0bca47

composer.json

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
    "source": "https://git.drupalcode.org/project/password_policy"

  },

  "require": {

    "drupal/core": "^8 || ^9",

    "drupal/ctools": "^3.1"

    "drupal/core": "^8 || ^9"

  }

}
 
 No newline at end of file

password_policy.info.yml

+0 −1
Original line number Diff line number Diff line
@@ -5,6 +5,5 @@ type: module 
core: 8.x

core_version_requirement: ^8 || ^9

dependencies:

  - ctools:ctools (>=8.x-3.1)

  - drupal:datetime

configure: entity.password_policy.collection

password_policy.links.action.yml

+2 −2
Original line number Diff line number Diff line 
entity.password_constraint.add_form:

  route_name: 'entity.password_policy.wizard.add'

entity.password_policy.add_form:

  title: 'Add Policy'

  route_name: entity.password_policy.add_form

  appears_on:

    - entity.password_policy.collection

password_policy.routing.yml

+16 −24
Original line number Diff line number Diff line
@@ -14,43 +14,35 @@ password_policy.reset: 
  requirements:

    _permission: 'manage password reset'



entity.password_policy.collection:

  path: '/admin/config/security/password-policy'

  defaults:

    _entity_list: 'password_policy'

    _title: 'Password Policies'

  requirements:

    _permission: 'administer site configuration'



entity.password_policy.wizard.add:

  path: '/admin/config/security/password-policy/add'

entity.password_policy.delete_form:

  path: '/admin/config/security/password-policy/policy/delete/{password_policy}'

  defaults:

    _entity_wizard: 'password_policy.add'

    tempstore_id: 'password_policy.password_policy'

    _title: Delete policy

    _entity_form: 'password_policy.delete'

  requirements:

    _permission: 'administer site configuration'



entity.password_policy.wizard.edit:

  path: '/admin/config/security/password-policy/{machine_name}/{step}'

entity.password_policy.collection:

  path: '/admin/config/security/password-policy'

  defaults:

    _entity_wizard: 'password_policy.edit'

    tempstore_id: 'password_policy.password_policy'

    _entity_list: 'password_policy'

    _title: 'Password Policies'

  requirements:

    _permission: 'administer site configuration'



entity.password_policy.edit_form:

  path: '/admin/config/security/password-policy/{password_policy}'

  defaults:

    _entity_list: 'password_policy'

    _title: 'Password Policies'

    _entity_form: 'password_policy.edit'

    _title: 'Edit password_policy'

  requirements:

    _permission: 'administer site configuration'



entity.password_policy.delete_form:

  path: '/admin/config/security/password-policy/policy/delete/{password_policy}'

entity.password_policy.add_form:

  path: '/admin/config/security/password-policy/add'

  defaults:

    _title: Delete policy

    _entity_form: 'password_policy.delete'

    _entity_form: 'password_policy.add'

    _title: 'Add Password Policy'

  requirements:

    _permission: 'administer site configuration'
@@ -62,14 +54,14 @@ entity.password_policy.constraint.add: 
    _permission: 'administer site configuration'



entity.password_policy.constraint.edit:

  path: '/admin/config/system/password_policy/constraint/edit/{machine_name}/{constraint_id}'

  path: '/admin/config/system/password_policy/constraint/edit/{password_policy_id}/{machine_name}/{constraint_id}'

  defaults:

    _form: '\Drupal\password_policy\Form\ConstraintEdit'

  requirements:

    _permission: 'administer site configuration'



entity.password_policy.constraint.delete:

  path: '/admin/config/system/password_policy/constraint/delete/{machine_name}/{id}'

  path: '/admin/config/system/password_policy/constraint/delete/{password_policy_id}/{machine_name}/{id}'

  defaults:

    _form: '\Drupal\password_policy\Form\ConstraintDelete'

  requirements:

password_policy_character_types/tests/src/Functional/PasswordCharacterTypesOperations.php

+4 −1
Original line number Diff line number Diff line
@@ -50,19 +50,22 @@ class PasswordCharacterTypesOperations extends BrowserTestBase { 
  public function testPasswordCharacterTypesManagement() {

    // Create a policy and add a "character_types" constraint.

    $this->drupalGet('admin/config/security/password-policy/add');

    $this->submitForm(['label' => 'Test policy', 'id' => 'test_policy'], 'Next');

    $this->submitForm(['label' => 'Test policy', 'id' => 'test_policy'], 'Save');

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

    $this->assertSession()->pageTextContains('Minimum number of character types');



    $this->submitForm(['character_types' => 2], 'Save');

    $this->drupalGet('/admin/config/security/password-policy/test_policy');

    $this->assertSession()->pageTextContains('Minimum password character types: 2');



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

    $this->submitForm(['character_types' => 3], 'Save');

    $this->drupalGet('/admin/config/security/password-policy/test_policy');

    $this->assertSession()->pageTextContains('Minimum password character types: 3');



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

    $this->submitForm(['character_types' => 4], 'Save');

    $this->drupalGet('/admin/config/security/password-policy/test_policy');

    $this->assertSession()->pageTextContains('Minimum password character types: 4');

  }