Fixed static test failures

Author: engcom-Hotel

app/code/Magento/Captcha/Block/CaptchaLayoutProcessor.php

@@ -28,12 +28,16 @@ public function __construct(
      */
     public function process($jsLayout): array
     {
-        if(!$this->helper->getConfig('enable')) {
+        if (!$this->helper->getConfig('enable')) {
             if (isset($jsLayout['components']['checkout']['children']['authentication']['children']['captcha'])) {
                 unset($jsLayout['components']['checkout']['children']['authentication']['children']['captcha']);
             }
-            if (isset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']['children']['captcha'])) {
-                unset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']['children']['captcha']);
+            if (isset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
+                ['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']
+                ['children']['captcha'])) {
+                unset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
+                    ['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']
+                    ['children']['captcha']);
             }
             if (isset($jsLayout['components']['authenticationPopup']['children']['captcha'])) {
                 unset($jsLayout['components']['authenticationPopup']['children']['captcha']);

app/code/Magento/Customer/Block/Account/AuthenticationPopup.php

@@ -5,9 +5,11 @@
  */
 namespace Magento\Customer\Block\Account;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Customer\Model\Form;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Customer\Model\Context;
+use Magento\Framework\App\Http\Context as HttpContext;
 
 /**
  * @api
@@ -25,21 +27,29 @@ class AuthenticationPopup extends \Magento\Framework\View\Element\Template
      */
     private $serializer;
 
+    /**
+     * @var HttpContext
+     */
+    private $httpContext;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param HttpContext $httpContext
      * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         array $data = [],
-        ?\Magento\Framework\Serialize\Serializer\Json $serializer = null
+        ?\Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        HttpContext $httpContext = null
     ) {
         parent::__construct($context, $data);
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->httpContext = $httpContext ?: ObjectManager::getInstance()->get(HttpContext::class);
     }
 
     /**
@@ -54,7 +64,7 @@ public function getJsLayout()
             Form::XML_PATH_CUSTOMER_CAPTCHA_ENABLED,
             ScopeInterface::SCOPE_STORE
         ) && !$this->isLoggedIn()) {
-            if(isset($this->jsLayout['components']['authenticationPopup']['children']['captcha'])) {
+            if (isset($this->jsLayout['components']['authenticationPopup']['children']['captcha'])) {
                 unset($this->jsLayout['components']['authenticationPopup']['children']['captcha']);
             }
         }