From 66207959e2afafe9201478d17475705a7da8506e Mon Sep 17 00:00:00 2001
From: Laurent LE CORRE <laurent@thecoredev.fr>
Date: Wed, 13 May 2020 17:44:39 +0200
Subject: [PATCH] =?UTF-8?q?On=20r=C3=A9installe=20ReCaptcha,=20sans=20le?=
 =?UTF-8?q?=20"rearrange"=20de=20code=20de=20PhpStorm.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 local/modules/ReCaptcha/Action/ReCaptchaAction.php | 14 +++++++-------
 local/modules/ReCaptcha/Config/module.xml          |  4 ++--
 local/modules/ReCaptcha/Config/routing.xml         |  4 ++--
 local/modules/ReCaptcha/Config/schema.xml          |  4 ++--
 .../Controller/ConfigurationController.php         | 14 +++++++-------
 local/modules/ReCaptcha/Form/ConfigurationForm.php | 10 +++++-----
 .../default/recaptcha/configuration.html           |  4 ++--
 .../frontOffice/default/recaptcha-js.html          |  2 +-
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/local/modules/ReCaptcha/Action/ReCaptchaAction.php b/local/modules/ReCaptcha/Action/ReCaptchaAction.php
index 5f56a9a4..4f8373cf 100644
--- a/local/modules/ReCaptcha/Action/ReCaptchaAction.php
+++ b/local/modules/ReCaptcha/Action/ReCaptchaAction.php
@@ -18,13 +18,6 @@ class ReCaptchaAction implements EventSubscriberInterface
         $this->request = $request;
     }
 
-    public static function getSubscribedEvents()
-    {
-        return [
-            ReCaptchaEvents::CHECK_CAPTCHA_EVENT => ['checkCaptcha', 128],
-        ];
-    }
-
     public function checkCaptcha(ReCaptchaCheckEvent $event)
     {
         $requestUrl = "https://www.google.com/recaptcha/api/siteverify";
@@ -52,4 +45,11 @@ class ReCaptchaAction implements EventSubscriberInterface
             $event->setHuman(true);
         }
     }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            ReCaptchaEvents::CHECK_CAPTCHA_EVENT => ['checkCaptcha', 128],
+        ];
+    }
 }
diff --git a/local/modules/ReCaptcha/Config/module.xml b/local/modules/ReCaptcha/Config/module.xml
index 29dc4be7..b056ed6c 100644
--- a/local/modules/ReCaptcha/Config/module.xml
+++ b/local/modules/ReCaptcha/Config/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="http://thelia.net/schema/dic/module"
+<module xmlns="http://thelia.net/schema/dic/module"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/module http://thelia.net/schema/dic/module/module-2_2.xsd">
     <fullnamespace>ReCaptcha\ReCaptcha</fullnamespace>
     <descriptive locale="en_US">
diff --git a/local/modules/ReCaptcha/Config/routing.xml b/local/modules/ReCaptcha/Config/routing.xml
index 27717162..adcae397 100644
--- a/local/modules/ReCaptcha/Config/routing.xml
+++ b/local/modules/ReCaptcha/Config/routing.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="http://symfony.com/schema/routing"
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
     <route id="admin.recaptcha.config" path="/admin/module/ReCaptcha">
diff --git a/local/modules/ReCaptcha/Config/schema.xml b/local/modules/ReCaptcha/Config/schema.xml
index 54c0ad06..e42d1ef7 100644
--- a/local/modules/ReCaptcha/Config/schema.xml
+++ b/local/modules/ReCaptcha/Config/schema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<database xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" defaultIdMethod="native"
-          name="thelia"
+<database defaultIdMethod="native" name="thelia"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="../../../vendor/propel/propel/resources/xsd/database.xsd" >
     <!--
     See propel documentation on http://propelorm.org for all information about schema file
diff --git a/local/modules/ReCaptcha/Controller/ConfigurationController.php b/local/modules/ReCaptcha/Controller/ConfigurationController.php
index 63f4b4d5..285d7385 100644
--- a/local/modules/ReCaptcha/Controller/ConfigurationController.php
+++ b/local/modules/ReCaptcha/Controller/ConfigurationController.php
@@ -10,6 +10,13 @@ use Thelia\Core\Translation\Translator;
 
 class ConfigurationController extends BaseAdminController
 {
+    public function viewAction()
+    {
+        return $this->render(
+            "recaptcha/configuration"
+        );
+    }
+
     public function saveAction()
     {
         if (null !== $response = $this->checkAuth(array(AdminResources::MODULE), 'ReCaptcha', AccessManager::VIEW)) {
@@ -40,11 +47,4 @@ class ConfigurationController extends BaseAdminController
 
         return $this->generateSuccessRedirect($form);
     }
-
-    public function viewAction()
-    {
-        return $this->render(
-            "recaptcha/configuration"
-        );
-    }
 }
diff --git a/local/modules/ReCaptcha/Form/ConfigurationForm.php b/local/modules/ReCaptcha/Form/ConfigurationForm.php
index 5afa231d..1d633799 100644
--- a/local/modules/ReCaptcha/Form/ConfigurationForm.php
+++ b/local/modules/ReCaptcha/Form/ConfigurationForm.php
@@ -8,11 +8,6 @@ use Thelia\Form\BaseForm;
 
 class ConfigurationForm extends BaseForm
 {
-    public function getName()
-    {
-        return "recaptcha_configuration_form";
-    }
-
     protected function buildForm()
     {
         $this->formBuilder
@@ -52,4 +47,9 @@ class ConfigurationForm extends BaseForm
                 ]
             );
     }
+
+    public function getName()
+    {
+        return "recaptcha_configuration_form";
+    }
 }
diff --git a/local/modules/ReCaptcha/templates/backOffice/default/recaptcha/configuration.html b/local/modules/ReCaptcha/templates/backOffice/default/recaptcha/configuration.html
index 783e29e8..1821c6d4 100644
--- a/local/modules/ReCaptcha/templates/backOffice/default/recaptcha/configuration.html
+++ b/local/modules/ReCaptcha/templates/backOffice/default/recaptcha/configuration.html
@@ -35,7 +35,7 @@
                     {/if}
 
                     {form_field form=$form field='success_url'}
-                    <input type="hidden" name="{$name}" value="{url path={navigate to="current"}}"/>
+                        <input type="hidden" name="{$name}" value="{url path={navigate to="current"}}"/>
                     {/form_field}
 
                     <div class="panel-body">
@@ -54,7 +54,7 @@
                                 <p>{intl l="These infos are available here : " d='recaptcha.bo.default'}<a href="http://www.google.com/recaptcha/admin">http://www.google.com/recaptcha/admin</a></p>
                             </div>
                             <div class="col-md-12">
-                                <input class="btn btn-success form-control" type="submit">
+                                <input type="submit" class="btn btn-success form-control">
                             </div>
                         </div>
                     </div>
diff --git a/local/modules/ReCaptcha/templates/frontOffice/default/recaptcha-js.html b/local/modules/ReCaptcha/templates/frontOffice/default/recaptcha-js.html
index 22f0e86a..40e662c5 100644
--- a/local/modules/ReCaptcha/templates/frontOffice/default/recaptcha-js.html
+++ b/local/modules/ReCaptcha/templates/frontOffice/default/recaptcha-js.html
@@ -1,4 +1,4 @@
-<script codesrc="https://www.google.com/recaptcha/api.js?hl={lang attr=""}" async defer></script>
+<script src="https://www.google.com/recaptcha/api.js?hl={lang attr="code"}" async defer></script>
 <script>
     window.onload = function() {
         var captchaDiv = document.getElementById("recaptcha-invisible");