Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-38563

Author: AndriyNasinnyk

.php_cs

@@ -19,7 +19,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('lib/internal/Credis')
     ->exclude('lib/internal/Less')
     ->exclude('lib/internal/LinLibertineFont')
-    ->exclude('lib/internal/phpseclib')
     ->exclude('pub/media')
     ->exclude('pub/static')
     ->exclude('setup/vendor')

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -34,10 +34,10 @@ public function __construct(
     /**
      * Renders grid column
      *
-     * @param   \Magento\Framework\Object $row
+     * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\Object $row)
+    public function render(\Magento\Framework\DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
             'Read Details'

app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

@@ -12,10 +12,10 @@ class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
     /**
      * Renders grid column
      *
-     * @param   \Magento\Framework\Object $row
+     * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\Object $row)
+    public function render(\Magento\Framework\DataObject $row)
     {
         return '<span class="grid-row-title">' .
             $row->getTitle() .

app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

@@ -33,10 +33,10 @@ public function __construct(
     /**
      * Renders grid column
      *
-     * @param   \Magento\Framework\Object $row
+     * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\Object $row)
+    public function render(\Magento\Framework\DataObject $row)
     {
         $class = '';
         $value = '';

app/code/Magento/Authorization/Model/Resource/Rules.php

@@ -99,7 +99,7 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
 
                 // If all was selected save it only and nothing else.
                 if ($postedResources === [$this->_rootResource->getId()]) {
-                    $insertData = $this->_prepareDataForTable(new \Magento\Framework\Object($row), $this->getMainTable());
+                    $insertData = $this->_prepareDataForTable(new \Magento\Framework\DataObject($row), $this->getMainTable());
 
                     $connection->insert($this->getMainTable(), $insertData);
                 } else {
@@ -109,7 +109,7 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
                         $row['permission'] = in_array($resourceId, $postedResources) ? 'allow' : 'deny';
                         $row['resource_id'] = $resourceId;
 
-                        $insertData = $this->_prepareDataForTable(new \Magento\Framework\Object($row), $this->getMainTable());
+                        $insertData = $this->_prepareDataForTable(new \Magento\Framework\DataObject($row), $this->getMainTable());
                         $connection->insert($this->getMainTable(), $insertData);
                     }
                 }

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

@@ -11,7 +11,7 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Response\Http;
 use Magento\Framework\Json\Helper\Data as JsonHelper;
-use Magento\Framework\Object;
+use Magento\Framework\DataObject;
 use Magento\Framework\Registry;
 use Magento\Payment\Model\IframeConfigProvider;
 use Magento\Quote\Api\CartManagementInterface;
@@ -113,7 +113,7 @@ public function execute()
      */
     protected function placeCheckoutOrder()
     {
-        $result = new Object();
+        $result = new DataObject();
         $response = $this->getResponse();
         try {
             $this->cartManagement->placeOrder($this->_getCheckout()->getQuote()->getId());

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

@@ -188,7 +188,7 @@ public function convertMessagesToMessage($messages)
      * @param \Magento\Payment\Model\InfoInterface $payment
      * @param string $requestType
      * @param string $lastTransactionId
-     * @param \Magento\Framework\Object $card
+     * @param \Magento\Framework\DataObject $card
      * @param bool|float $amount
      * @param bool|string $exception
      * @param bool|string $additionalMessage

app/code/Magento/Authorizenet/Model/Authorizenet.php

@@ -194,13 +194,13 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
      * Fetch fraud details
      *
      * @param string $transactionId
-     * @return \Magento\Framework\Object
+     * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function fetchTransactionFraudDetails($transactionId)
     {
         $responseXmlDocument = $this->getTransactionDetails($transactionId);
-        $response = new \Magento\Framework\Object();
+        $response = new \Magento\Framework\DataObject();
 
         if (empty($responseXmlDocument->transaction->FDSFilters->FDSFilter)) {
             return $response;
@@ -257,14 +257,14 @@ protected function getRequest()
     /**
      * Prepare request to gateway
      *
-     * @param \Magento\Framework\Object|\Magento\Payment\Model\InfoInterface $payment
+     * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @return \Magento\Authorizenet\Model\Request
      * @link http://www.authorize.net/support/AIM_guide.pdf
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    protected function buildRequest(\Magento\Framework\Object $payment)
+    protected function buildRequest(\Magento\Framework\DataObject $payment)
     {
         /** @var \Magento\Sales\Model\Order $order */
         $order = $payment->getOrder();
@@ -435,7 +435,7 @@ protected function isGatewayActionsLocked($payment)
      * This function returns full transaction details for a specified transaction ID.
      *
      * @param string $transactionId
-     * @return \Magento\Framework\Object
+     * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
      * @link http://www.authorize.net/support/ReportingGuide_XML.pdf
      * @link http://developer.authorize.net/api/transaction_details/
@@ -444,7 +444,7 @@ protected function getTransactionResponse($transactionId)
     {
         $responseXmlDocument = $this->getTransactionDetails($transactionId);
 
-        $response = new \Magento\Framework\Object();
+        $response = new \Magento\Framework\DataObject();
         $response->setXResponseCode((string)$responseXmlDocument->transaction->responseCode)
             ->setXResponseReasonCode((string)$responseXmlDocument->transaction->responseReasonCode)
             ->setTransactionStatus((string)$responseXmlDocument->transaction->transactionStatus);

app/code/Magento/Authorizenet/Model/Directpost.php

@@ -205,7 +205,7 @@ public function validate()
     /**
      * Send authorize request to gateway
      *
-     * @param \Magento\Framework\Object|\Magento\Payment\Model\InfoInterface $payment
+     * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @param  float $amount
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -218,7 +218,7 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
     /**
      * Send capture request to gateway
      *
-     * @param \Magento\Framework\Object|\Magento\Payment\Model\InfoInterface $payment
+     * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -298,7 +298,7 @@ protected function processCapture($result, $payment)
     /**
      * Void the payment through gateway
      *
-     * @param \Magento\Framework\Object|\Magento\Payment\Model\InfoInterface $payment
+     * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -342,7 +342,7 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
      * Refund the amount
      * Need to decode last 4 digits for request.
      *
-     * @param \Magento\Framework\Object|\Magento\Payment\Model\InfoInterface $payment
+     * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @param float $amount
      * @return $this
      * @throws \Exception
@@ -364,12 +364,12 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     /**
      * Refund the amount with transaction id
      *
-     * @param \Magento\Framework\Object $payment
+     * @param \Magento\Framework\DataObject $payment
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function processRefund(\Magento\Framework\Object $payment, $amount)
+    protected function processRefund(\Magento\Framework\DataObject $payment, $amount)
     {
         if ($amount <= 0) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Invalid amount for refund.'));
@@ -450,7 +450,7 @@ public function getResponse()
      * Instantiate state and set it to state object
      *
      * @param string $paymentAction
-     * @param \Magento\Framework\Object $stateObject
+     * @param \Magento\Framework\DataObject $stateObject
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -580,10 +580,10 @@ public function process(array $responseData)
     /**
      * Fill payment with credit card data from response from Authorize.net.
      *
-     * @param \Magento\Framework\Object $payment
+     * @param \Magento\Framework\DataObject $payment
      * @return void
      */
-    protected function fillPaymentByResponse(\Magento\Framework\Object $payment)
+    protected function fillPaymentByResponse(\Magento\Framework\DataObject $payment)
     {
         $response = $this->getResponse();
         $payment->setTransactionId($response->getXTransId())
@@ -870,13 +870,13 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
 
     /**
      * @param \Magento\Sales\Model\Order\Payment $payment
-     * @param \Magento\Framework\Object $response
+     * @param \Magento\Framework\DataObject $response
      * @param string $transactionId
      * @return $this
      */
     protected function addStatusCommentOnUpdate(
         \Magento\Sales\Model\Order\Payment $payment,
-        \Magento\Framework\Object $response,
+        \Magento\Framework\DataObject $response,
         $transactionId
     ) {
         if ($payment->getIsTransactionApproved()) {

app/code/Magento/Authorizenet/Model/Directpost/Response.php

@@ -6,6 +6,7 @@
 namespace Magento\Authorizenet\Model\Directpost;
 
 use Magento\Authorizenet\Model\Response as AuthorizenetResponse;
+use Magento\Framework\Encryption\Helper\Security;
 
 /**
  * Authorize.net response model for DirectPost model
@@ -26,6 +27,7 @@ public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transact
         if (!$amount) {
             $amount = '0.00';
         }
+
         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
     }
 
@@ -39,7 +41,8 @@ public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transact
     public function isValidHash($merchantMd5, $merchantApiLogin)
     {
         $hash = $this->generateHash($merchantMd5, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
-        return $hash == $this->getData('x_MD5_Hash');
+
+        return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
     }
 
     /**

app/code/Magento/Authorizenet/Model/Request.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\Authorizenet\Model;
 
-use Magento\Framework\Object;
+use Magento\Framework\DataObject;
 
 /**
  * Request object
  */
-class Request extends Object
+class Request extends DataObject
 {
 }

app/code/Magento/Authorizenet/Model/Response.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\Authorizenet\Model;
 
-use Magento\Framework\Object;
+use Magento\Framework\DataObject;
 
 /**
  * Response object
  */
-class Response extends Object
+class Response extends DataObject
 {
 }

app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php

@@ -251,7 +251,7 @@ public function testExecuteFailedPlaceOrder(
      */
     public function textExecuteDataProvider()
     {
-        $objectSuccess = new \Magento\Framework\Object();
+        $objectSuccess = new \Magento\Framework\DataObject();
         $objectSuccess->setData('success', true);
 
         return [
@@ -277,7 +277,7 @@ public function textExecuteDataProvider()
      */
     public function textExecuteFailedPlaceOrderDataProvider()
     {
-        $objectFailed = new \Magento\Framework\Object();
+        $objectFailed = new \Magento\Framework\DataObject();
         $objectFailed->setData('error', true);
         $objectFailed->setData('error_messages', __('Cannot place order.'));
 

app/code/Magento/Authorizenet/Test/Unit/Helper/DataTest.php

@@ -62,7 +62,7 @@ public function testGetTransactionMessage($type, $amount, $exception, $additiona
         $payment->expects($this->any())
             ->method('getOrder')
             ->will($this->returnValue($order));
-        $card = new \Magento\Framework\Object(['cc_last_4' => self::LAST4]);
+        $card = new \Magento\Framework\DataObject(['cc_last_4' => self::LAST4]);
         $message = $this->dataHelper->getTransactionMessage(
             $payment,
             $type,

app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ObserverTest.php

@@ -53,7 +53,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     protected $actionMock;
 
     /**
-     * @var \Magento\Framework\Object|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultMock;
 
@@ -85,7 +85,7 @@ protected function setUp()
         $this->actionMock = $this->getMockBuilder('Magento\Checkout\Controller\Onepage\SaveOrder')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultMock = $this->getMockBuilder('Magento\Framework\Object')
+        $this->resultMock = $this->getMockBuilder('Magento\Framework\DataObject')
             ->disableOriginalConstructor()
             ->getMock();
 

app/code/Magento/Authorizenet/etc/frontend/di.xml

@@ -23,13 +23,13 @@
             <argument name="session" xsi:type="object">Magento\Checkout\Model\Session</argument>
         </arguments>
     </type>
-    <virtualType name="AuthorizenetCcConfigProvider" type="Magento\Payment\Model\CcGenericConfigProvider">
+    <type name="Magento\Payment\Model\CcGenericConfigProvider">
         <arguments>
             <argument name="methodCodes" xsi:type="array">
                 <item name="directpost" xsi:type="const">Magento\Authorizenet\Model\Directpost::METHOD_CODE</item>
             </argument>
         </arguments>
-    </virtualType>
+    </type>
     <virtualType name="DirectpostIframeCcConfigProvider" type="Magento\Payment\Model\IframeConfigProvider">
         <arguments>
             <argument name="methodCode" xsi:type="const">Magento\Authorizenet\Model\Directpost::METHOD_CODE</argument>
@@ -38,7 +38,6 @@
     <type name="Magento\Checkout\Model\CompositeConfigProvider">
         <arguments>
             <argument name="configProviders" xsi:type="array">
-                <item name="authorizenet_cc_config_provider" xsi:type="object">AuthorizenetCcConfigProvider</item>
                 <item name="authorizenet_iframe_cc_config_provider" xsi:type="object">DirectpostIframeCcConfigProvider</item>
             </argument>
         </arguments>

app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php

@@ -13,18 +13,18 @@ class Searchquery extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abs
     /**
      * String helper
      *
-     * @var \Magento\Framework\Stdlib\String
+     * @var \Magento\Framework\Stdlib\StringUtils
      */
     protected $stringHelper;
 
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Framework\Stdlib\String $stringHelper
+     * @param \Magento\Framework\Stdlib\StringUtils $stringHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Stdlib\String $stringHelper,
+        \Magento\Framework\Stdlib\StringUtils $stringHelper,
         array $data = []
     ) {
         $this->stringHelper = $stringHelper;
@@ -34,10 +34,10 @@ public function __construct(
     /**
      * Renders a column
      *
-     * @param   \Magento\Framework\Object $row
+     * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\Object $row)
+    public function render(\Magento\Framework\DataObject $row)
     {
         $value = $row->getData($this->getColumn()->getIndex());
         if ($this->stringHelper->strlen($value) > 30) {