MAGETWO-51898: [Github] Incorrect CAPTCHA by user loses form entries. #4138

Author: Bohdan Korablov

app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php

@@ -39,7 +39,7 @@ class CheckContactUsFormObserver implements ObserverInterface
     /**
      * @var DataPersistorInterface
      */
-    protected $dataPersistor;
+    private $dataPersistor;
 
     /**
      * @param \Magento\Captcha\Helper\Data $helper
@@ -95,6 +95,7 @@ private function getDataPersistor()
             $this->dataPersistor = ObjectManager::getInstance()
                 ->get(DataPersistorInterface::class);
         }
+
         return $this->dataPersistor;
     }
 }

app/code/Magento/Contact/Controller/Index/Post.php

@@ -14,7 +14,7 @@ class Post extends \Magento\Contact\Controller\Index
     /**
      * @var DataPersistorInterface
      */
-    protected $dataPersistor;
+    private $dataPersistor;
 
     /**
      * Post user question
@@ -98,6 +98,7 @@ private function getDataPersistor()
             $this->dataPersistor = ObjectManager::getInstance()
                 ->get(DataPersistorInterface::class);
         }
+
         return $this->dataPersistor;
     }
 }

app/code/Magento/Contact/Helper/Data.php

@@ -33,12 +33,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @var DataPersistorInterface
      */
-    protected $dataPersistor;
+    private $dataPersistor;
 
     /**
      * @var array
      */
-    protected $postData = [];
+    private $postData = null;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
@@ -82,6 +82,7 @@ public function getUserName()
          * @var \Magento\Customer\Api\Data\CustomerInterface $customer
          */
         $customer = $this->_customerSession->getCustomerDataObject();
+
         return trim($this->_customerViewHelper->getCustomerName($customer));
     }
 
@@ -99,6 +100,7 @@ public function getUserEmail()
          * @var CustomerInterface $customer
          */
         $customer = $this->_customerSession->getCustomerDataObject();
+
         return $customer->getEmail();
     }
 
@@ -110,7 +112,7 @@ public function getUserEmail()
      */
     public function getPostValue($key)
     {
-        if (!$this->postData) {
+        if (null === $this->postData) {
             $this->postData = (array) $this->getDataPersistor()->get('contact_us');
             $this->getDataPersistor()->clear('contact_us');
         }
@@ -133,6 +135,7 @@ private function getDataPersistor()
             $this->dataPersistor = ObjectManager::getInstance()
                 ->get(DataPersistorInterface::class);
         }
+
         return $this->dataPersistor;
     }
 }