From 10afb076c45ab4612cabfa976cd3dd7ea4d2efc7 Mon Sep 17 00:00:00 2001
From: bscheshirwork <bscheshir.work@gmail.com>
Date: Mon, 15 Oct 2018 18:29:03 +0300
Subject: [PATCH] Rename gdprdelete action to gdpr-delete

---
 CHANGELOG.md                                                | 1 +
 docs/installation/available-actions.md                      | 2 +-
 src/User/Controller/SettingsController.php                  | 6 +++---
 .../views/settings/{gdprdelete.php => gdpr-delete.php}      | 3 ++-
 src/User/resources/views/settings/privacy.php               | 2 +-
 tests/functional/GdprCest.php                               | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)
 rename src/User/resources/views/settings/{gdprdelete.php => gdpr-delete.php} (93%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a02da8..a5766f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
  - Fix #242: Add POST filter for `admin/force-password-change` action (bscheshirwork)
  - Fix #252: Delete check for unexpected property `allowPasswordRecovery` for resend email by admin (bscheshirwork)
  - Fix #254: Rename `GDPR` properties to `lowerCamelCase` style (bscheshirwork)
+ - Fix #258: Rename `GDPR` delete action to `lowerCamelCase`/`dash` style (bscheshirwork)
 
 ## 1.1.4 - February 19, 2018
 - Enh: Check enableEmailConfirmation on registration (faenir)
diff --git a/docs/installation/available-actions.md b/docs/installation/available-actions.md
index b388507..8fe7408 100644
--- a/docs/installation/available-actions.md
+++ b/docs/installation/available-actions.md
@@ -20,7 +20,7 @@ The following is the list of action provided by the module:
 | **/user/settings/delete** | Delete self account | | POST only
 | **/user/settings/disconnect** | Disconnect social account | | POST only
 | **/user/settings/export** | Download personal data in a comma separated values format
-| **/user/settings/gdprdelete** | Displays delete personal data page |
+| **/user/settings/gdpr-delete** | Displays delete personal data page |
 | **/user/settings/networks** | Displays social network accounts settings page
 | **/user/settings/privacy** | Displays GDPR data page
 | **/user/settings/profile** | Displays profile settings form
diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php
index d28af88..0f77e9e 100644
--- a/src/User/Controller/SettingsController.php
+++ b/src/User/Controller/SettingsController.php
@@ -107,7 +107,7 @@ class SettingsController extends Controller
                             'export',
                             'networks',
                             'privacy',
-                            'gdprdelete',
+                            'gdpr-delete',
                             'disconnect',
                             'delete',
                             'two-factor',
@@ -167,7 +167,7 @@ class SettingsController extends Controller
         ]);
     }
 
-    public function actionGdprdelete()
+    public function actionGdprDelete()
     {
         if (!$this->module->enableGdprCompliance)
             throw new NotFoundHttpException();
@@ -220,7 +220,7 @@ class SettingsController extends Controller
 
         }
 
-        return $this->render('gdprdelete', [
+        return $this->render('gdpr-delete', [
             'model' => $form,
         ]);
     }
diff --git a/src/User/resources/views/settings/gdprdelete.php b/src/User/resources/views/settings/gdpr-delete.php
similarity index 93%
rename from src/User/resources/views/settings/gdprdelete.php
rename to src/User/resources/views/settings/gdpr-delete.php
index a849352..5aa0e60 100644
--- a/src/User/resources/views/settings/gdprdelete.php
+++ b/src/User/resources/views/settings/gdpr-delete.php
@@ -10,6 +10,7 @@
 
 use yii\widgets\ActiveForm;
 use yii\helpers\Html;
+
 /* @var $model \Da\User\Form\GdprDeleteForm */
 ?>
 
@@ -46,7 +47,7 @@ use yii\helpers\Html;
                 <hr>
                 <div class="row">
                     <div class="col-md-12 text-center">
-                        <?= Html::a(Yii::t('usuario','Back to privacy settings'),['/user/settings/privacy'],['class'=>'btn btn-info']) ?>
+                        <?= Html::a(Yii::t('usuario', 'Back to privacy settings'), ['/user/settings/privacy'], ['class' => 'btn btn-info']) ?>
                     </div>
                 </div>
                 <?php
diff --git a/src/User/resources/views/settings/privacy.php b/src/User/resources/views/settings/privacy.php
index fca9612..e72bba2 100644
--- a/src/User/resources/views/settings/privacy.php
+++ b/src/User/resources/views/settings/privacy.php
@@ -54,7 +54,7 @@ $this->title = Yii::t('usuario', 'Privacy settings');
                             ) ?>
                         <?php else:
                             echo Html::a(Yii::t('usuario', 'Delete'),
-                                ['/user/settings/gdprdelete'],
+                                ['/user/settings/gdpr-delete'],
                                 [
                                     'class' => 'btn btn-danger',
                                     'id' => 'gdpr-del-button',
diff --git a/tests/functional/GdprCest.php b/tests/functional/GdprCest.php
index 230dc13..b0de920 100644
--- a/tests/functional/GdprCest.php
+++ b/tests/functional/GdprCest.php
@@ -141,7 +141,7 @@ class GdprCest
         $I->amOnRoute('/user/settings/privacy');
         $I->see('Export my data', 'h3');
         $I->see('Delete my account', 'h3');
-        $I->amOnRoute('/user/settings/gdprdelete');
+        $I->amOnRoute('/user/settings/gdpr-delete');
         $I->fillField('#gdprdeleteform-password','wrongpassword');
         $I->click('Delete');
         $I->see('Invalid password');