Code cleanup

ctlabvn · Oct 18, 2023 · 7d42673 · 7d42673
1 parent 508c116
commit 7d42673
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 28 deletions.
diff --git a/src/Controller/Component/RecaptchaComponent.php b/src/Controller/Component/RecaptchaComponent.php
@@ -40,16 +40,10 @@ class RecaptchaComponent extends Component
     public function initialize(array $config = []): void
     {
         if (empty($config)) {
-            $config = Configure::read('Recaptcha', []);
+            $this->setConfig(Configure::read('Recaptcha', []));
         }
 
-        $this->setConfig($config);
-
-        $method = 'setHelpers';
-        if (method_exists($this->getController()->viewBuilder(), 'addHelpers')) {
-            $method = 'addHelpers';
-        }
-        $this->getController()->viewBuilder()->{$method}(['Recaptcha.Recaptcha' => $this->_config]);
+        $this->getController()->viewBuilder()->addHelpers(['Recaptcha.Recaptcha' => $this->_config]);
     }
 
     /**

diff --git a/src/View/Helper/RecaptchaHelper.php b/src/View/Helper/RecaptchaHelper.php
@@ -10,17 +10,6 @@
  */
 class RecaptchaHelper extends Helper
 {
-    /**
-     * Constructor.
-     *
-     * @param array $config The settings for this helper.
-     * @return void
-     */
-    public function initialize(array $config = []): void
-    {
-        $this->setConfig($config);
-    }
-
     /**
      * Display recaptcha function
      *

diff --git a/tests/TestCase/Controller/Component/RecaptchaComponentTest.php b/tests/TestCase/Controller/Component/RecaptchaComponentTest.php
@@ -35,7 +35,7 @@ public function setUp(): void
             ->getMock();
     }
 
-    public function testVerifyFalse()
+    public function testVerifyFalse(): void
     {
         $this->assertFalse($this->Recaptcha->verify());
 
@@ -48,7 +48,7 @@ public function testVerifyFalse()
         $this->assertFalse($this->Recaptcha->verify());
     }
 
-    public function testVerifyTrue()
+    public function testVerifyTrue(): void
     {
         $this->controller->setRequest($this->controller->getRequest()->withData('g-recaptcha-response', 'foo'));
 

diff --git a/tests/TestCase/View/Helper/RecaptchaHelperTest.php b/tests/TestCase/View/Helper/RecaptchaHelperTest.php
@@ -32,7 +32,7 @@ public function setUp(): void
         );
     }
 
-    public function testDisplay()
+    public function testDisplay(): void
     {
         $result = $this->Recaptcha->display();
         $this->assertTrue(is_string($result));

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,8 +1,6 @@
 <?php
 declare(strict_types=1);
 
-use Cake\Core\Configure;
-
 /*
  * Test suite bootstrap
  *
@@ -24,7 +22,3 @@
 unset($findRoot);
 chdir($root);
 require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
-
-Configure::write('Error.ignoredDeprecationPaths', [
-    'src/TestSuite/Fixture/FixtureInjector.php',
-]);