Merge remote-tracking branch 'mainline/develop' into MAGETWO-59184

magento · Feb 9, 2017 · 7aa7ae4 · 7aa7ae4
2 parents b297d62 + 988f3a3
commit 7aa7ae4
Show file tree

Hide file tree

Showing 21 changed files with 561 additions and 70 deletions.
diff --git a/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php
@@ -42,32 +42,33 @@ class VaultDetailsHandler implements HandlerInterface
     protected $config;
 
     /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
+     * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $serializer;
 
     /**
-     * Constructor
+     * VaultDetailsHandler constructor.
      *
      * @param PaymentTokenInterfaceFactory $paymentTokenFactory
      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
      * @param Config $config
      * @param SubjectReader $subjectReader
-     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @throws \RuntimeException
      */
     public function __construct(
         PaymentTokenInterfaceFactory $paymentTokenFactory,
         OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
         Config $config,
         SubjectReader $subjectReader,
-        \Magento\Framework\Serialize\SerializerInterface $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->paymentTokenFactory = $paymentTokenFactory;
         $this->paymentExtensionFactory = $paymentExtensionFactory;
         $this->config = $config;
         $this->subjectReader = $subjectReader;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**

diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
@@ -123,7 +123,7 @@ protected function setUp()
             ->willReturn($mapperArray);
 
         $this->serializer = $this->getMock(
-            \Magento\Framework\Serialize\SerializerInterface::class,
+            \Magento\Framework\Serialize\Serializer\Json::class,
             [],
             [],
             '',

diff --git a/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php b/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php
@@ -10,21 +10,47 @@
 
 class Refresh extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    protected $serializer;
+
+    /**
+     * @var \Magento\Captcha\Helper\Data
+     */
+    protected $captchaHelper;
+
+    /**
+     * Refresh constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Captcha\Helper\Data $captchaHelper
+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Captcha\Helper\Data $captchaHelper,
+        \Magento\Framework\Serialize\Serializer\Json $serializer
+    ) {
+        parent::__construct($context);
+        $this->serializer = $serializer;
+        $this->captchaHelper = $captchaHelper;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function execute()
     {
         $formId = $this->getRequest()->getPost('formId');
-        $captchaModel = $this->_objectManager->get(\Magento\Captcha\Helper\Data::class)->getCaptcha($formId);
+        $captchaModel = $this->captchaHelper->getCaptcha($formId);
         $this->_view->getLayout()->createBlock(
             $captchaModel->getBlockName()
         )->setFormId(
             $formId
         )->setIsAjax(
             true
         )->toHtml();
-        $this->getResponse()->representJson(json_encode(['imgSrc' => $captchaModel->getImgSrc()]));
+        $this->getResponse()->representJson($this->serializer->serialize(['imgSrc' => $captchaModel->getImgSrc()]));
         $this->_actionFlag->set('', self::FLAG_NO_POST_DISPATCH, true);
     }
 

diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php
@@ -17,13 +17,25 @@ class Index extends \Magento\Framework\App\Action\Action
      */
     protected $captchaHelper;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    protected $serializer;
+
     /**
      * @param Context $context
      * @param \Magento\Captcha\Helper\Data $captchaHelper
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @throws \RuntimeException
      */
-    public function __construct(Context $context, \Magento\Captcha\Helper\Data $captchaHelper)
-    {
+    public function __construct(
+        Context $context,
+        \Magento\Captcha\Helper\Data $captchaHelper,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+    ) {
         $this->captchaHelper = $captchaHelper;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         parent::__construct($context);
     }
 
@@ -34,23 +46,19 @@ public function execute()
     {
         $formId = $this->_request->getPost('formId');
         if (null === $formId) {
-            try {
-                $params = [];
-                $content = $this->_request->getContent();
-                if ($content) {
-                    $params = \Zend_Json::decode($content);
-                }
-                $formId = isset($params['formId']) ? $params['formId'] : null;
-            } catch (\Zend_Json_Exception $exception) {
-                $formId = null;
+            $params = [];
+            $content = $this->_request->getContent();
+            if ($content) {
+                $params = $this->serializer->unserialize($content);
             }
+            $formId = isset($params['formId']) ? $params['formId'] : null;
         }
         $captchaModel = $this->captchaHelper->getCaptcha($formId);
         $captchaModel->generate();
 
         $block = $this->_view->getLayout()->createBlock($captchaModel->getBlockName());
         $block->setFormId($formId)->setIsAjax(true)->toHtml();
-        $this->_response->representJson(json_encode(['imgSrc' => $captchaModel->getImgSrc()]));
+        $this->_response->representJson($this->serializer->serialize(['imgSrc' => $captchaModel->getImgSrc()]));
         $this->_actionFlag->set('', self::FLAG_NO_POST_DISPATCH, true);
     }
 }
diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
@@ -26,6 +26,11 @@ class AjaxLogin
      */
     protected $resultJsonFactory;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    protected $serializer;
+
     /**
      * @var array
      */
@@ -36,24 +41,28 @@ class AjaxLogin
      * @param SessionManagerInterface $sessionManager
      * @param JsonFactory $resultJsonFactory
      * @param array $formIds
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @throws \RuntimeException
      */
     public function __construct(
         CaptchaHelper $helper,
         SessionManagerInterface $sessionManager,
         JsonFactory $resultJsonFactory,
-        array $formIds
+        array $formIds,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->helper = $helper;
         $this->sessionManager = $sessionManager;
         $this->resultJsonFactory = $resultJsonFactory;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         $this->formIds = $formIds;
     }
 
     /**
      * @param \Magento\Customer\Controller\Ajax\Login $subject
      * @param \Closure $proceed
      * @return $this
-     * @throws \Zend_Json_Exception
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -70,7 +79,7 @@ public function aroundExecute(
         $loginParams = [];
         $content = $request->getContent();
         if ($content) {
-            $loginParams = \Zend_Json::decode($content);
+            $loginParams = $this->serializer->unserialize($content);
         }
         $username = isset($loginParams['username']) ? $loginParams['username'] : null;
         $captchaString = isset($loginParams[$captchaInputName]) ? $loginParams[$captchaInputName] : null;

diff --git a/app/code/Magento/Captcha/Model/ResourceModel/Log.php b/app/code/Magento/Captcha/Model/ResourceModel/Log.php
@@ -66,6 +66,7 @@ protected function _construct()
      *
      * @param string|null $login
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function logAttempt($login)
     {
@@ -78,7 +79,7 @@ public function logAttempt($login)
                     'count' => 1,
                     'updated_at' => $this->_coreDate->gmtDate()
                 ],
-                ['count' => new \Zend_Db_Expr('count+1'), 'updated_at']
+                ['count' => new \Zend\Db\Sql\Expression('count+1'), 'updated_at']
             );
         }
         $ip = $this->_remoteAddress->getRemoteAddress();
@@ -91,7 +92,7 @@ public function logAttempt($login)
                     'count' => 1,
                     'updated_at' => $this->_coreDate->gmtDate()
                 ],
-                ['count' => new \Zend_Db_Expr('count+1'), 'updated_at']
+                ['count' => new \Zend\Db\Sql\Expression('count+1'), 'updated_at']
             );
         }
         return $this;
@@ -102,6 +103,7 @@ public function logAttempt($login)
      *
      * @param string $login
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function deleteUserAttempts($login)
     {
@@ -126,6 +128,7 @@ public function deleteUserAttempts($login)
      * Get count attempts by ip
      *
      * @return null|int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function countAttemptsByRemoteAddress()
     {
@@ -152,6 +155,7 @@ public function countAttemptsByRemoteAddress()
      *
      * @param string $login
      * @return null|int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function countAttemptsByUserLogin($login)
     {
@@ -176,6 +180,7 @@ public function countAttemptsByUserLogin($login)
      * Delete attempts with expired in update_at time
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function deleteOldAttempts()
     {

diff --git a/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php b/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
@@ -47,6 +47,11 @@ class IndexTest extends \PHPUnit_Framework_TestCase
      */
     protected $flagMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $serializerMock;
+
     /**
      * @var \Magento\Captcha\Controller\Refresh\Index
      */
@@ -62,14 +67,25 @@ protected function setUp()
         $this->viewMock = $this->getMock(\Magento\Framework\App\ViewInterface::class);
         $this->layoutMock = $this->getMock(\Magento\Framework\View\LayoutInterface::class);
         $this->flagMock = $this->getMock(\Magento\Framework\App\ActionFlag::class, [], [], '', false);
+        $this->serializerMock = $this->getMock(
+            \Magento\Framework\Serialize\Serializer\Json::class,
+            [],
+            [],
+            '',
+            false
+        );
 
         $this->contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->requestMock));
         $this->contextMock->expects($this->any())->method('getView')->will($this->returnValue($this->viewMock));
         $this->contextMock->expects($this->any())->method('getResponse')->will($this->returnValue($this->responseMock));
         $this->contextMock->expects($this->any())->method('getActionFlag')->will($this->returnValue($this->flagMock));
         $this->viewMock->expects($this->any())->method('getLayout')->will($this->returnValue($this->layoutMock));
 
-        $this->model = new \Magento\Captcha\Controller\Refresh\Index($this->contextMock, $this->captchaHelperMock);
+        $this->model = new \Magento\Captcha\Controller\Refresh\Index(
+            $this->contextMock,
+            $this->captchaHelperMock,
+            $this->serializerMock
+        );
     }
 
     /**
@@ -80,6 +96,7 @@ protected function setUp()
     public function testExecute($formId, $callsNumber)
     {
         $content = ['formId' => $formId];
+        $imgSource = ['imgSrc' => 'source'];
 
         $blockMethods = ['setFormId', 'setIsAjax', 'toHtml'];
         $blockMock = $this->getMock(\Magento\Captcha\Block\Captcha::class, $blockMethods, [], '', false);
@@ -97,8 +114,12 @@ public function testExecute($formId, $callsNumber)
         $blockMock->expects($this->any())->method('setFormId')->with($formId)->will($this->returnValue($blockMock));
         $blockMock->expects($this->any())->method('setIsAjax')->with(true)->will($this->returnValue($blockMock));
         $blockMock->expects($this->once())->method('toHtml');
-        $this->responseMock->expects($this->once())->method('representJson')->with(json_encode(['imgSrc' => 'source']));
+        $this->responseMock->expects($this->once())->method('representJson')->with(json_encode($imgSource));
         $this->flagMock->expects($this->once())->method('set')->with('', 'no-postDispatch', true);
+        $this->serializerMock->expects($this->exactly($callsNumber))
+            ->method('unserialize')->will($this->returnValue($content));
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')->will($this->returnValue(json_encode($imgSource)));
 
         $this->model->execute();
     }