Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-96427

Author: mcahriman

.travis.yml

@@ -64,6 +64,6 @@ script:
 
   # The scripts for grunt/phpunit type tests
   - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js"] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
+  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
   - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
   - if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

@@ -7,6 +7,8 @@
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
 /**
+ * Media synchronization error message class.
+ *
  * @api
  * @since 100.0.2
  */
@@ -27,7 +29,7 @@ class Error extends \Magento\AdminNotification\Model\System\Message\Media\Abstra
     protected function _shouldBeDisplayed()
     {
         $data = $this->_syncFlag->getFlagData();
-        return isset($data['has_errors']) && true == $data['has_errors'];
+        return !empty($data['has_errors']);
     }
 
     /**

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

@@ -6,6 +6,8 @@
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
 /**
+ * Media synchronization success message class.
+ *
  * @api
  * @since 100.0.2
  */
@@ -27,8 +29,8 @@ protected function _shouldBeDisplayed()
     {
         $state = $this->_syncFlag->getState();
         $data = $this->_syncFlag->getFlagData();
-        $hasErrors = isset($data['has_errors']) && true == $data['has_errors'] ? true : false;
-        return false == $hasErrors && \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED == $state;
+        $hasErrors = !empty($data['has_errors']);
+        return !$hasErrors && \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED == $state;
     }
 
     /**

app/code/Magento/Analytics/Model/Cryptographer.php

@@ -129,7 +129,12 @@ private function getInitializationVector()
      */
     private function validateCipherMethod($cipherMethod)
     {
-        $methods = openssl_get_cipher_methods();
+        $methods = array_map(
+            'strtolower',
+            openssl_get_cipher_methods()
+        );
+        $cipherMethod = strtolower($cipherMethod);
+
         return (false !== array_search($cipherMethod, $methods));
     }
 }

app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php

@@ -76,7 +76,7 @@ public function getColumns(SelectBuilder $selectBuilder, $entityConfig)
             $columnName = $this->nameResolver->getName($attributeData);
             if (isset($attributeData['function'])) {
                 $prefix = '';
-                if (isset($attributeData['distinct']) && $attributeData['distinct'] == true) {
+                if (!empty($attributeData['distinct'])) {
                     $prefix = ' DISTINCT ';
                 }
                 $expression = new ColumnValueExpression(

app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php

@@ -191,7 +191,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
             ->with(
                 $archiveSource,
                 $archiveAbsolutePath,
-                $isArchiveSourceDirectory ? true : false
+                $isArchiveSourceDirectory
             );
 
         $fileContent = 'Some text';
@@ -222,7 +222,7 @@ public function prepareExportDataDataProvider()
     {
         return [
             'Data source for archive is directory' => [true],
-            'Data source for archive doesn\'t directory' => [false],
+            'Data source for archive isn\'t directory' => [false],
         ];
     }
 

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

@@ -707,6 +707,7 @@ protected function processOrder(\Magento\Sales\Model\Order $order)
             //decline the order (in case of wrong response code) but don't return money to customer.
             $message = $e->getMessage();
             $this->declineOrder($order, $message, false);
+
             throw $e;
         }
 
@@ -777,7 +778,7 @@ protected function processPaymentFraudStatus(\Magento\Sales\Model\Order\Payment
     }
 
     /**
-     * Add status comment
+     * Add status comment to history
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return $this
@@ -832,6 +833,7 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
                       ->void($response);
             }
             $order->registerCancellation($message)->save();
+            $this->_eventManager->dispatch('order_cancel_after', ['order' => $order ]);
         } catch (\Exception $e) {
             //quiet decline
             $this->getPsrLogger()->critical($e);
@@ -866,7 +868,7 @@ public function getConfigInterface()
      * Getter for specified value according to set payment method code
      *
      * @param mixed $key
-     * @param int|string|null|\Magento\Store\Model\Store $storeId
+     * @param mixed $storeId
      * @return mixed
      */
     public function getValue($key, $storeId = null)
@@ -930,7 +932,7 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
     }
 
     /**
-     * Add statuc comment on update.
+     * Add status comment on update
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @param \Magento\Framework\DataObject $response

app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

@@ -4,14 +4,13 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Backend\Block\Widget\Form\Element;
+
 /**
  * Form element dependencies mapper
  * Assumes that one element may depend on other element values.
  * Will toggle as "enabled" only if all elements it depends from toggle as true.
- */
-namespace Magento\Backend\Block\Widget\Form\Element;
-
-/**
+ *
  * @api
  * @since 100.0.2
  */
@@ -117,6 +116,7 @@ public function addConfigOptions(array $options)
 
     /**
      * HTML output getter
+     *
      * @return string
      */
     protected function _toHtml()
@@ -139,7 +139,8 @@ protected function _toHtml()
     }
 
     /**
-     * Field dependences JSON map generator
+     * Field dependencies JSON map generator
+     *
      * @return string
      */
     protected function _getDependsJson()

app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

@@ -7,6 +7,7 @@
 namespace Magento\Backend\Block\Widget\Grid\Massaction;
 
 use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker;
+use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\DataObject;
 
 /**
@@ -52,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -217,6 +218,7 @@ public function getGridJsObjectName()
      * Retrieve JSON string of selected checkboxes
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSelectedJson()
     {
@@ -231,6 +233,7 @@ public function getSelectedJson()
      * Retrieve array of selected checkboxes
      *
      * @return string[]
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSelected()
     {
@@ -252,6 +255,8 @@ public function getApplyButtonHtml()
     }
 
     /**
+     * Get mass action javascript code.
+     *
      * @return string
      */
     public function getJavaScript()
@@ -268,6 +273,8 @@ public function getJavaScript()
     }
 
     /**
+     * Get grid ids in JSON format.
+     *
      * @return string
      */
     public function getGridIdsJson()
@@ -284,6 +291,11 @@ public function getGridIdsJson()
             $massActionIdField = $this->getParentBlock()->getMassactionIdField();
         }
 
+        if ($allIdsCollection instanceof AbstractDb) {
+            $allIdsCollection->getSelect()->limit();
+            $allIdsCollection->clear();
+        }
+
         $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
         if (!empty($gridIds)) {
             return join(",", $gridIds);
@@ -292,6 +304,8 @@ public function getGridIdsJson()
     }
 
     /**
+     * Get Html id.
+     *
      * @return string
      */
     public function getHtmlId()

app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml

@@ -13,10 +13,9 @@
             <argument name="adminUser" defaultValue="_ENV"/>
         </arguments>
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-        <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
         <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
         <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
         <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
         <closeAdminNotification stepKey="closeAdminNotification"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>