🔀 Merge branch '2.2-develop' of github.com:magento/magento2 into 2.2-develop

Andreas Schrammel · Andreas Schrammel · commit f5a89e82e4ce · 2018-03-19T07:54:47.000+01:00
diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php
@@ -20,16 +20,19 @@
 class Image extends \Magento\Framework\View\Element\Template
 {
     /**
+     * @deprecated Property isn't used
      * @var \Magento\Catalog\Helper\Image
      */
     protected $imageHelper;
 
     /**
+     * @deprecated Property isn't used
      * @var \Magento\Catalog\Model\Product
      */
     protected $product;
 
     /**
+     * @deprecated Property isn't used
      * @var array
      */
     protected $attributes = [];
diff --git a/app/code/Magento/Customer/view/frontend/web/js/action/login.js b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
@@ -7,8 +7,9 @@ define([
     'jquery',
     'mage/storage',
     'Magento_Ui/js/model/messageList',
-    'Magento_Customer/js/customer-data'
-], function ($, storage, globalMessageList, customerData) {
+    'Magento_Customer/js/customer-data',
+    'mage/translate'
+], function ($, storage, globalMessageList, customerData, $t) {
     'use strict';
 
     var callbacks = [],
@@ -48,7 +49,7 @@ define([
                 }
             }).fail(function () {
                 messageContainer.addErrorMessage({
-                    'message': 'Could not authenticate. Please try again later'
+                    'message': $t('Could not authenticate. Please try again later')
                 });
                 callbacks.forEach(function (callback) {
                     callback(loginData);
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
-use Magento\Framework\Convert\ConvertArray;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -182,7 +182,7 @@ protected function _construct()
                     'class' => __('unhold'),
                     'id' => 'order-view-unhold-button',
                     'data_attribute' => [
-                        'url' => $this->getUnHoldUrl()
+                        'url' => $this->getUnholdUrl()
                     ]
                 ]
             );
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
@@ -24,8 +24,6 @@ class Order extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
     protected function _prepareForm()
     {
         parent::_prepareForm();
-        $form = $this->getForm();
-        $htmlIdPrefix = $form->getHtmlIdPrefix();
         /** @var \Magento\Framework\Data\Form\Element\Fieldset $fieldset */
         $fieldset = $this->getForm()->getElement('base_fieldset');
 
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -84,7 +84,6 @@ public function displayPriceAttribute($dataObject, $code, $strong = false, $sepa
      */
     public function displayPrices($dataObject, $basePrice, $price, $strong = false, $separator = '<br/>')
     {
-        $order = false;
         if ($dataObject instanceof \Magento\Sales\Model\Order) {
             $order = $dataObject;
         } else {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -425,23 +425,6 @@ public function canCancel()
     public function canVoid()
     {
         return false;
-        $canVoid = false;
-        if ($this->getState() == self::STATE_REFUNDED) {
-            $canVoid = $this->getCanVoidFlag();
-            /**
-             * If we not retrieve negative answer from payment yet
-             */
-            if ($canVoid === null) {
-                $canVoid = $this->getOrder()->getPayment()->canVoid();
-                if ($canVoid === false) {
-                    $this->setCanVoidFlag(false);
-                    $this->_saveBeforeDestruct = true;
-                }
-            } else {
-                $canVoid = (bool)$canVoid;
-            }
-        }
-        return $canVoid;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
@@ -7,7 +7,6 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Sales\Model\ResourceModel\Order\Creditmemo as Resource;
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Sales\Api\Data\CreditmemoSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php
@@ -8,17 +8,14 @@
 class Grand extends AbstractTotal
 {
     /**
+     * Collect invoice grand total
+     *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
-        /**
-         * Check order grand total and invoice amounts
-         */
-        if ($invoice->isLast()) {
-            //
-        }
         return $this;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/ItemRepository.php b/app/code/Magento/Sales/Model/Order/ItemRepository.php
@@ -15,7 +15,6 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\Sales\Api\Data\OrderItemSearchResultInterface;
 use Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory;
 use Magento\Sales\Api\OrderItemRepositoryInterface;
 use Magento\Sales\Model\ResourceModel\Metadata;
diff --git a/app/code/Magento/Sales/Model/Order/OrderValidator.php b/app/code/Magento/Sales/Model/Order/OrderValidator.php
@@ -6,7 +6,6 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Exception\DocumentValidationException;
 
 /**
  * Class OrderValidator
diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
@@ -48,7 +48,6 @@ protected function _construct()
     /**
      * Returns connection
      *
-     * @todo: make method protected
      * @return AdapterInterface
      */
     public function getConnection()
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -58,7 +58,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title""><?= /* @escapeNotVerified */ __('Child Transactions') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Child Transactions') ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
         <?= $block->getChildHtml('child_grid') ?>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -11,8 +11,6 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
@@ -9,7 +9,6 @@
 use Magento\Store\Model\Store;
 use Magento\Customer\Model\Address;
 use Magento\Tax\Model\Config;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Tax\Api\OrderTaxManagementInterface;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Order\Creditmemo;
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Tax\Model\Calculation\Rule;
 
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Model\ClassModel as TaxClassModel;
 use Magento\Tax\Model\ClassModelRegistry;
diff --git a/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php b/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
@@ -10,7 +10,6 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterfaceFactory as TaxDetailsDataObjectFactory;
 use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface as AppliedTax;
-use Magento\Tax\Model\Sales\Order\Tax;
 use Magento\Sales\Model\Order\Tax\Item;
 
 class TaxManagement implements \Magento\Tax\Api\OrderTaxManagementInterface
diff --git a/app/code/Magento/Tax/Model/TaxRuleCollection.php b/app/code/Magento/Tax/Model/TaxRuleCollection.php
@@ -27,14 +27,14 @@ class TaxRuleCollection extends AbstractServiceCollection
     /**
      * Initialize dependencies.
      *
-     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
+     * @param EntityFactory $entityFactory
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param SortOrderBuilder $sortOrderBuilder
      * @param TaxRuleRepositoryInterface $ruleService
      */
     public function __construct(
-        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
+        EntityFactory $entityFactory,
         FilterBuilder $filterBuilder,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         SortOrderBuilder $sortOrderBuilder,

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ protected function _construct()`
`182`	`182`	`'class' => __('unhold'),`
`183`	`183`	`'id' => 'order-view-unhold-button',`
`184`	`184`	`'data_attribute' => [`
`185`		`- 'url' => $this->getUnHoldUrl()`
	`185`	`+ 'url' => $this->getUnholdUrl()`
`186`	`186`	`]`
`187`	`187`	`]`
`188`	`188`	`);`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ class Order extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form`
`24`	`24`	`protected function _prepareForm()`
`25`	`25`	`{`
`26`	`26`	`parent::_prepareForm();`
`27`		`- $form = $this->getForm();`
`28`		`- $htmlIdPrefix = $form->getHtmlIdPrefix();`
`29`	`27`	`/** @var \Magento\Framework\Data\Form\Element\Fieldset $fieldset */`
`30`	`28`	`$fieldset = $this->getForm()->getElement('base_fieldset');`
`31`	`29`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ public function displayPriceAttribute($dataObject, $code, $strong = false, $sepa`
`84`	`84`	`*/`
`85`	`85`	`public function displayPrices($dataObject, $basePrice, $price, $strong = false, $separator = '<br/>')`
`86`	`86`	`{`
`87`		`- $order = false;`
`88`	`87`	`if ($dataObject instanceof \Magento\Sales\Model\Order) {`
`89`	`88`	`$order = $dataObject;`
`90`	`89`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,14 @@`
`8`	`8`	`class Grand extends AbstractTotal`
`9`	`9`	`{`
`10`	`10`	`/**`
	`11`	`+ * Collect invoice grand total`
	`12`	`+ *`
`11`	`13`	`* @param \Magento\Sales\Model\Order\Invoice $invoice`
`12`	`14`	`* @return $this`
	`15`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`13`	`16`	`*/`
`14`	`17`	`public function collect(\Magento\Sales\Model\Order\Invoice $invoice)`
`15`	`18`	`{`
`16`		`- /**`
`17`		`- * Check order grand total and invoice amounts`
`18`		`- */`
`19`		`- if ($invoice->isLast()) {`
`20`		`- //`
`21`		`- }`
`22`	`19`	`return $this;`
`23`	`20`	`}`
`24`	`21`	`}`