ENGCOM-2540: [Forwardport] Remove commented code #17133

Author: Stanislav Idolov

app/code/Magento/Backend/Block/Dashboard/Bar.php

@@ -38,14 +38,6 @@ public function getTotals()
      */
     public function addTotal($label, $value, $isQuantity = false)
     {
-        /*if (!$isQuantity) {
-          $value = $this->format($value);
-          $decimals = substr($value, -2);
-          $value = substr($value, 0, -2);
-          } else {
-          $value = ($value != '')?$value:0;
-          $decimals = '';
-          }*/
         if (!$isQuantity) {
             $value = $this->format($value);
         }

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php

@@ -102,7 +102,7 @@ public function getElementHtml()
      */
     public function getImages()
     {
-        return $this->registry->registry('current_product')->getData('media_gallery') ?: null;
+        return $this->getDataObject()->getData('media_gallery') ?: null;
     }
 
     /**

app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php

@@ -67,12 +67,6 @@ public function getModel()
      */
     protected function _prepareLayout()
     {
-        // Load Wysiwyg on demand and Prepare layout
-//        $block = $this->getLayout()->getBlock('head');
-//        if ($this->_wysiwygConfig->isEnabled() && $block) {
-//            $block->setCanLoadTinyMce(true);
-//        }
-
         $this->getToolbar()->addChild(
             'back_button',
             \Magento\Backend\Block\Widget\Button::class,

app/code/Magento/Review/Block/Adminhtml/Add/Form.php

@@ -142,11 +142,6 @@ protected function _prepareForm()
 
         $fieldset->addField('product_id', 'hidden', ['name' => 'product_id']);
 
-        /*$gridFieldset = $form->addFieldset('add_review_grid', array('legend' => __('Please select a product')));
-          $gridFieldset->addField('products_grid', 'note', array(
-          'text' => $this->getLayout()->createBlock(\Magento\Review\Block\Adminhtml\Product\Grid::class)->toHtml(),
-          ));*/
-
         $form->setMethod('post');
         $form->setUseContainer(true);
         $form->setId('edit_form');

app/code/Magento/Sales/Model/Order/Creditmemo.php

@@ -582,13 +582,6 @@ public function getCommentsCollection($reload = false)
     {
         $collection = $this->_commentCollectionFactory->create()->setCreditmemoFilter($this->getId())
             ->setCreatedAtOrder();
-//
-//            $this->setComments($comments);
-//            /**
-//             * When credit memo created with adding comment,
-//             * comments collection must be loaded before we added this comment.
-//             */
-//            $this->getComments()->load();
 
         if ($this->getId()) {
             foreach ($collection as $comment) {

app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml

@@ -7,14 +7,6 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /*$_source = $block->getSource(); ?>
-<?php $block->setPriceDataObject($_source) ?>
-<?php if ($_source): ?>
-<table width="100%">
-    <?= $block->getChildHtml('main') ?>
-    <?= $block->getChildHtml('footer') ?>
-</table>
-<?php endif;*/ ?>
 <table class="data-table admin__table-secondary order-subtotal-table">
     <?php $_totals = $block->getTotals('footer')?>
 

dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php

@@ -232,7 +232,7 @@ private function isItTest($relativeFilePath)
      */
     private function getControllerPath($relativeFilePath)
     {
-        if (preg_match('~(Magento\/.*Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
+        if (preg_match('~(Magento\/[^\/]+\/Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
             if (count($matches) === 2) {
                 $partPath = $matches[1];
                 return $partPath;