Small code cleanup

excelwebzone · excelwebzone · commit ee1ba4b795e8 · 2020-11-03T17:21:45.000-08:00
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -36,7 +36,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('api_host')->defaultValue('www.google.com')->end()
                 ->booleanNode('locale_from_request')->defaultFalse()->end()
                 ->integerNode('timeout')->min(0)->defaultNull()->end()
-				->arrayNode('trusted_roles')->prototype('scalar')->treatNullLike(array())->end()
+                ->arrayNode('trusted_roles')->prototype('scalar')->treatNullLike(array())->end()
             ->end()
         ;
 
diff --git a/src/DependencyInjection/EWZRecaptchaExtension.php b/src/DependencyInjection/EWZRecaptchaExtension.php
@@ -2,11 +2,11 @@
 
 namespace EWZ\Bundle\RecaptchaBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -68,8 +68,9 @@ protected function registerWidget(ContainerBuilder $container)
 
     private function getTwigFormResources(ContainerBuilder $container)
     {
-        if (!$container->hasParameter('twig.form.resources'))
+        if (!$container->hasParameter('twig.form.resources')) {
             return [];
+        }
 
         return $container->getParameter('twig.form.resources');
     }
diff --git a/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php b/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php
@@ -37,7 +37,7 @@ class ProxyPost implements RequestMethod
     private $cache;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param array    $httpProxy
      * @param string   $recaptchaVerifyServer
diff --git a/src/Form/Type/EWZRecaptchaType.php b/src/Form/Type/EWZRecaptchaType.php
@@ -3,10 +3,10 @@
 namespace EWZ\Bundle\RecaptchaBundle\Form\Type;
 
 use EWZ\Bundle\RecaptchaBundle\Locale\LocaleResolver;
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -16,14 +16,14 @@ class EWZRecaptchaType extends AbstractType
 {
     /**
      * The reCAPTCHA server URL.
-     * 
+     *
      * @var string
      */
     protected $recaptchaApiServer;
-    
+
     /**
      * The reCAPTCHA JS server URL.
-     * 
+     *
      * @var string
      */
     protected $recaptchaApiJsServer;
@@ -86,7 +86,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars = array_replace($view->vars, array(
             'ewz_recaptcha_enabled' => $this->enabled,
             'ewz_recaptcha_ajax' => $this->ajax,
-            'ewz_recaptcha_apihost' => $this->apiHost
+            'ewz_recaptcha_apihost' => $this->apiHost,
         ));
 
         if (!$this->enabled) {
diff --git a/src/Resources/views/Form/ewz_recaptcha_widget.html.php b/src/Resources/views/Form/ewz_recaptcha_widget.html.php
@@ -1,7 +1,7 @@
 <?php if ($ewz_recaptcha_enabled): ?>
     <?php if (!$ewz_recaptcha_ajax): ?>
-        <?php if ($attr['options']['size'] == 'invisible' && !isset($attr['options']['callback'])): ?>
-            <?php $attr['options']['callback'] = 'onReCaptchaSuccess' ?>
+        <?php if ('invisible' == $attr['options']['size'] && !isset($attr['options']['callback'])): ?>
+            <?php $attr['options']['callback'] = 'onReCaptchaSuccess'; ?>
 
             <script>
                 var onReCaptchaSuccess = function() {
@@ -26,23 +26,23 @@
                     }
                 };
             </script>
-        <?php endif ?>
+        <?php endif; ?>
 
-        <script src="<?php echo $url_challenge ?>"
-            <?php if (isset($attr['options']['defer']) && $attr['options']['defer']): ?> defer<?php endif ?>
-            <?php if (isset($attr['options']['async']) && $attr['options']['async']): ?> async<?php endif ?>
+        <script src="<?php echo $url_challenge; ?>"
+            <?php if (isset($attr['options']['defer']) && $attr['options']['defer']): ?> defer<?php endif; ?>
+            <?php if (isset($attr['options']['async']) && $attr['options']['async']): ?> async<?php endif; ?>
         ></script>
-        <div class="g-recaptcha" data-theme="<?php echo $attr['options']['theme'] ?>" data-size="<?php echo $attr['options']['size'] ?>" data-type="<?php echo $attr['options']['type'] ?>" data-sitekey="<?php echo $public_key ?>"
-            <?php if (isset($attr['options']['callback'])): ?>data-callback="<?php echo $attr['options']['callback'] ?>"<?php endif ?>
-            <?php if (isset($attr['options']['expiredCallback'])): ?>data-expired-callback="<?php echo $attr['options']['expiredCallback'] ?>"<?php endif ?>
-            <?php if (isset($attr['options']['bind'])): ?>data-bind="<?php echo $attr['options']['bind'] ?>"<?php endif ?>
-            <?php if (isset($attr['options']['badge'])): ?>data-badge="<?php echo $attr['options']['badge'] ?>"<?php endif ?>
+        <div class="g-recaptcha" data-theme="<?php echo $attr['options']['theme']; ?>" data-size="<?php echo $attr['options']['size']; ?>" data-type="<?php echo $attr['options']['type']; ?>" data-sitekey="<?php echo $public_key; ?>"
+            <?php if (isset($attr['options']['callback'])): ?>data-callback="<?php echo $attr['options']['callback']; ?>"<?php endif; ?>
+            <?php if (isset($attr['options']['expiredCallback'])): ?>data-expired-callback="<?php echo $attr['options']['expiredCallback']; ?>"<?php endif; ?>
+            <?php if (isset($attr['options']['bind'])): ?>data-bind="<?php echo $attr['options']['bind']; ?>"<?php endif; ?>
+            <?php if (isset($attr['options']['badge'])): ?>data-badge="<?php echo $attr['options']['badge']; ?>"<?php endif; ?>
         ></div>
         <noscript>
             <div style="width: 302px; height: 352px;">
                 <div style="width: 302px; height: 352px; position: relative;">
                     <div style="width: 302px; height: 352px; position: absolute;">
-                        <iframe src="https://<?php echo $ewz_recaptcha_apihost ?>/recaptcha/api/fallback?k=<?php echo $public_key ?>"
+                        <iframe src="https://<?php echo $ewz_recaptcha_apihost; ?>/recaptcha/api/fallback?k=<?php echo $public_key; ?>"
                                 style="width: 302px; height:352px; border-style: none; overflow: hidden;"
                         >
                         </iframe>
@@ -65,13 +65,13 @@ class="g-recaptcha-response"
             var script = document.createElement('script');
             script.type = 'text/javascript';
             script.onload = function() {
-                Recaptcha.create('<?php echo $public_key ?>', 'ewz_recaptcha_div', <?php echo json_encode($attr['options']) ?>);
+                Recaptcha.create('<?php echo $public_key; ?>', 'ewz_recaptcha_div', <?php echo json_encode($attr['options']); ?>);
             };
-            script.src = '<?php echo $url_api ?>';
-            <?php if (isset($attr['options']['defer']) && $attr['options']['defer']): ?>script.defer = true;<?php endif ?>
-            <?php if (isset($attr['options']['async']) && $attr['options']['async']): ?>script.async = true;<?php endif ?>
+            script.src = '<?php echo $url_api; ?>';
+            <?php if (isset($attr['options']['defer']) && $attr['options']['defer']): ?>script.defer = true;<?php endif; ?>
+            <?php if (isset($attr['options']['async']) && $attr['options']['async']): ?>script.async = true;<?php endif; ?>
             document.getElementsByTagName('head')[0].appendChild(script);
         })();
         </script>
-    <?php endif ?>
-<?php endif ?>
+    <?php endif; ?>
+<?php endif; ?>
diff --git a/src/Resources/views/Form/ewz_recaptcha_widget.html.twig b/src/Resources/views/Form/ewz_recaptcha_widget.html.twig
@@ -1,84 +1,84 @@
 {% block ewz_recaptcha_widget %}
 {% apply spaceless %}
-    {% if form.vars.ewz_recaptcha_enabled %}
-        {% if not form.vars.ewz_recaptcha_ajax %}
-            {% if attr.options.size == 'invisible' and attr.options.callback is not defined %}
-                {% set options = attr.options|merge({'callback': 'onReCaptchaSuccess'}) %}
-                {% set attr = attr|merge({'options': options}) %}
+  {% if form.vars.ewz_recaptcha_enabled %}
+    {% if not form.vars.ewz_recaptcha_ajax %}
+      {% if attr.options.size == 'invisible' and attr.options.callback is not defined %}
+        {% set options = attr.options|merge({'callback': 'onReCaptchaSuccess'}) %}
+        {% set attr = attr|merge({'options': options}) %}
 
-                <script>
-                    var onReCaptchaSuccess = function() {
-                        var errorDivs = document.getElementsByClassName('recaptcha-error');
-                        if (errorDivs.length) {
-                            errorDivs[0].className = '';
-                        }
+        <script>
+          var onReCaptchaSuccess = function() {
+            var errorDivs = document.getElementsByClassName('recaptcha-error');
+            if (errorDivs.length) {
+              errorDivs[0].className = '';
+            }
 
-                        var errorMsgs = document.getElementsByClassName('recaptcha-error-message');
-                        if (errorMsgs.length) {
-                            errorMsgs[0].parentNode.removeChild(errorMsgs[0]);
-                        }
+            var errorMsgs = document.getElementsByClassName('recaptcha-error-message');
+            if (errorMsgs.length) {
+              errorMsgs[0].parentNode.removeChild(errorMsgs[0]);
+            }
 
-                        var forms = document.getElementsByClassName('recaptcha-form');
-                        if (forms.length) {
-                          var recaptchaSubmitEvent = document.createEvent('Event');
-                          recaptchaSubmitEvent.initEvent('submit', true, true);
-                          forms[0].addEventListener('submit', function (e) {
-                            e.target.submit();
-                          }, false);
-                          forms[0].dispatchEvent(recaptchaSubmitEvent);
-                        }
-                    };
-                </script>
-            {% endif %}
+            var forms = document.getElementsByClassName('recaptcha-form');
+            if (forms.length) {
+              var recaptchaSubmitEvent = document.createEvent('Event');
+              recaptchaSubmitEvent.initEvent('submit', true, true);
+              forms[0].addEventListener('submit', function (e) {
+              e.target.submit();
+              }, false);
+              forms[0].dispatchEvent(recaptchaSubmitEvent);
+            }
+          };
+        </script>
+      {% endif %}
 
-            <script src="{{ form.vars.url_challenge }}"
-                {%- if attr.options.defer is defined and attr.options.defer %} defer{% endif -%}
-                {%- if attr.options.async is defined and attr.options.async %} async{% endif -%}
-            ></script>
-            <div class="g-recaptcha" data-theme="{{ attr.options.theme }}" data-size="{{ attr.options.size }}" data-type="{{ attr.options.type }}" data-sitekey="{{ form.vars.public_key }}"
-                 {%- if attr.options.callback is defined %} data-callback="{{ attr.options.callback }}"{% endif -%}
-                 {%- if attr.options.errorCallback is defined %} data-error-callback="{{ attr.options.errorCallback }}"{% endif -%}
-                 {%- if attr.options.expiredCallback is defined %} data-expired-callback="{{ attr.options.expiredCallback }}"{% endif -%}
-                 {%- if attr.options.bind is defined %} data-bind="{{ attr.options.bind }}"{% endif -%}
-                 {%- if attr.options.badge is defined %} data-badge="{{ attr.options.badge }}"{% endif -%}
-            ></div>
-            <noscript>
-                <div style="width: 302px; height: 352px;">
-                    <div style="width: 302px; height: 352px; position: relative;">
-                        <div style="width: 302px; height: 352px; position: absolute;">
-                            <iframe src="https://{{ form.vars.ewz_recaptcha_apihost }}/recaptcha/api/fallback?k={{ form.vars.public_key }}"
-                                    style="width: 302px; height:352px; border-style: none; overflow: hidden;"
-                            >
-                            </iframe>
-                        </div>
-                        <div style="width: 250px; height: 80px; position: absolute; border-style: none; bottom: 21px; left: 25px; margin: 0; padding: 0; right: 25px;">
-                            <textarea id="g-recaptcha-response" name="g-recaptcha-response"
-                                      class="g-recaptcha-response"
-                                      style="width: 250px; height: 80px; border: 1px solid #c1c1c1; margin: 0; padding: 0; resize: none;"
-                            >
-                            </textarea>
-                        </div>
-                    </div>
-                </div>
-            </noscript>
-        {% else %}
-            <div id="ewz_recaptcha_div"></div>
+      <script src="{{ form.vars.url_challenge }}"
+        {%- if attr.options.defer is defined and attr.options.defer %} defer{% endif -%}
+        {%- if attr.options.async is defined and attr.options.async %} async{% endif -%}
+      ></script>
+      <div class="g-recaptcha" data-theme="{{ attr.options.theme }}" data-size="{{ attr.options.size }}" data-type="{{ attr.options.type }}" data-sitekey="{{ form.vars.public_key }}"
+         {%- if attr.options.callback is defined %} data-callback="{{ attr.options.callback }}"{% endif -%}
+         {%- if attr.options.errorCallback is defined %} data-error-callback="{{ attr.options.errorCallback }}"{% endif -%}
+         {%- if attr.options.expiredCallback is defined %} data-expired-callback="{{ attr.options.expiredCallback }}"{% endif -%}
+         {%- if attr.options.bind is defined %} data-bind="{{ attr.options.bind }}"{% endif -%}
+         {%- if attr.options.badge is defined %} data-badge="{{ attr.options.badge }}"{% endif -%}
+      ></div>
+      <noscript>
+        <div style="width: 302px; height: 352px;">
+          <div style="width: 302px; height: 352px; position: relative;">
+            <div style="width: 302px; height: 352px; position: absolute;">
+              <iframe src="https://{{ form.vars.ewz_recaptcha_apihost }}/recaptcha/api/fallback?k={{ form.vars.public_key }}"
+                  style="width: 302px; height:352px; border-style: none; overflow: hidden;"
+              >
+              </iframe>
+            </div>
+            <div style="width: 250px; height: 80px; position: absolute; border-style: none; bottom: 21px; left: 25px; margin: 0; padding: 0; right: 25px;">
+              <textarea id="g-recaptcha-response" name="g-recaptcha-response"
+                    class="g-recaptcha-response"
+                    style="width: 250px; height: 80px; border: 1px solid #c1c1c1; margin: 0; padding: 0; resize: none;"
+              >
+              </textarea>
+            </div>
+          </div>
+        </div>
+      </noscript>
+    {% else %}
+      <div id="ewz_recaptcha_div"></div>
 
-            <script>
-            (function() {
-                var script = document.createElement('script');
-                script.type = 'text/javascript';
-                script.onload = function() {
-                    Recaptcha.create('{{ form.vars.public_key }}', 'ewz_recaptcha_div', {{ attr.options|default({})|json_encode|raw }});
-                };
-                script.src = '{{ form.vars.url_api }}';
-                {% if attr.options.defer is defined and attr.options.defer %}script.defer = true;{% endif %}
-                {% if attr.options.async is defined and attr.options.async %}script.async = true;{% endif %}
-                document.getElementsByTagName('head')[0].appendChild(script);
-            })();
-            </script>
-        {% endif %}
+      <script>
+      (function() {
+        var script = document.createElement('script');
+        script.type = 'text/javascript';
+        script.onload = function() {
+          Recaptcha.create('{{ form.vars.public_key }}', 'ewz_recaptcha_div', {{ attr.options|default({})|json_encode|raw }});
+        };
+        script.src = '{{ form.vars.url_api }}';
+        {% if attr.options.defer is defined and attr.options.defer %}script.defer = true;{% endif %}
+        {% if attr.options.async is defined and attr.options.async %}script.async = true;{% endif %}
+        document.getElementsByTagName('head')[0].appendChild(script);
+      })();
+      </script>
     {% endif %}
+  {% endif %}
 {% endapply %}
 {% endblock ewz_recaptcha_widget %}
 
diff --git a/src/Validator/Constraints/IsTrueValidator.php b/src/Validator/Constraints/IsTrueValidator.php
@@ -2,8 +2,6 @@
 
 namespace EWZ\Bundle\RecaptchaBundle\Validator\Constraints;
 
-use EWZ\Bundle\RecaptchaBundle\Extension\ReCaptcha\RequestMethod\Post;
-use EWZ\Bundle\RecaptchaBundle\Extension\ReCaptcha\RequestMethod\ProxyPost;
 use ReCaptcha\ReCaptcha;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
@@ -42,14 +40,14 @@ class IsTrueValidator extends ConstraintValidator
     protected $verifyHost;
 
     /**
-     * Authorization Checker
+     * Authorization Checker.
      *
      * @var AuthorizationChecker
      */
     protected $authorizationChecker;
 
     /**
-     * Trusted Roles
+     * Trusted Roles.
      *
      * @var array
      */
diff --git a/tests/DependencyInjection/EWZRecaptchaExtensionTest.php b/tests/DependencyInjection/EWZRecaptchaExtensionTest.php
@@ -146,6 +146,6 @@ private function assertDefinitionHasReferenceArgument($id, $index, $expectedArgu
         $argumentValue = $definition->getArgument($index);
 
         $this->assertInstanceOf(Reference::class, $argumentValue);
-        $this->assertSame($expectedArgumentValue, (string)$argumentValue);
+        $this->assertSame($expectedArgumentValue, (string) $argumentValue);
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -4,10 +4,10 @@
 date_default_timezone_set('UTC');
 
 // Ensure that composer has installed all dependencies
-if (!file_exists(dirname(__DIR__) . '/composer.lock')) {
+if (!file_exists(dirname(__DIR__).'/composer.lock')) {
     die("Dependencies must be installed using composer:\n\nphp composer.phar install\n\n"
-        . "See http://getcomposer.org for help with installing composer\n");
+        ."See http://getcomposer.org for help with installing composer\n");
 }
 
 // Include the composer autoloader
-$loader = require dirname(__DIR__) . '/vendor/autoload.php';
+$loader = require dirname(__DIR__).'/vendor/autoload.php';

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function getConfigTreeBuilder()`
`36`	`36`	`->scalarNode('api_host')->defaultValue('www.google.com')->end()`
`37`	`37`	`->booleanNode('locale_from_request')->defaultFalse()->end()`
`38`	`38`	`->integerNode('timeout')->min(0)->defaultNull()->end()`
`39`		`- ->arrayNode('trusted_roles')->prototype('scalar')->treatNullLike(array())->end()`
	`39`	`+ ->arrayNode('trusted_roles')->prototype('scalar')->treatNullLike(array())->end()`
`40`	`40`	`->end()`
`41`	`41`	`;`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class ProxyPost implements RequestMethod`
`37`	`37`	`private $cache;`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * Constructor`
	`40`	`+ * Constructor.`
`41`	`41`	`*`
`42`	`42`	`* @param array $httpProxy`
`43`	`43`	`* @param string $recaptchaVerifyServer`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,6 @@ private function assertDefinitionHasReferenceArgument($id, $index, $expectedArgu`
`146`	`146`	`$argumentValue = $definition->getArgument($index);`
`147`	`147`
`148`	`148`	`$this->assertInstanceOf(Reference::class, $argumentValue);`
`149`		`- $this->assertSame($expectedArgumentValue, (string)$argumentValue);`
	`149`	`+ $this->assertSame($expectedArgumentValue, (string) $argumentValue);`
`150`	`150`	`}`
`151`	`151`	`}`