Merge branch 'no-author/import-export' of github.com:fredden/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -14,14 +14,13 @@
 /**
  * Export Advanced Pricing
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
 {
-    const ENTITY_ADVANCED_PRICING = 'advanced_pricing';
+    public const ENTITY_ADVANCED_PRICING = 'advanced_pricing';
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
@@ -568,10 +567,10 @@ protected function getTierPrices(array $listSku, $table)
                 if (isset($price[0]) && !empty($price[0]) || isset($price[1]) && !empty($price[1])) {
                     $select->orWhere('ap.percentage_value IS NOT NULL');
                 }
-                if (isset($updatedAtFrom) && !empty($updatedAtFrom)) {
+                if (isset($updatedAtFrom)) {
                     $select->where('cpe.updated_at >= ?', $updatedAtFrom);
                 }
-                if (isset($updatedAtTo) && !empty($updatedAtTo)) {
+                if (isset($updatedAtTo)) {
                     $select->where('cpe.updated_at <= ?', $updatedAtTo);
                 }
                 $exportData = $this->_connection->fetchAll($select);

app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php

@@ -6,8 +6,6 @@
 
 /**
  * Import proxy product model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\CatalogImportExport\Model\Import\Proxy;
 
@@ -17,6 +15,7 @@ class Product extends \Magento\Catalog\Model\Product
      * DO NOT Initialize resources.
      *
      * @return void
+     * @phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedFunction
      */
     protected function _construct()
     {

app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php

@@ -6,8 +6,6 @@
 
 /**
  * Import proxy product resource
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\CatalogImportExport\Model\Import\Proxy\Product;
 

app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php

@@ -6,8 +6,6 @@
 
 /**
  * Export edit block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\ImportExport\Block\Adminhtml\Export;
 

app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php

@@ -6,8 +6,6 @@
 
 /**
  * Export edit form block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\ImportExport\Block\Adminhtml\Export\Edit;
 

app/code/Magento/ImportExport/Block/Adminhtml/History.php

@@ -9,7 +9,6 @@
  * Adminhtml import history page content block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class History extends \Magento\Backend\Block\Widget\Grid\Container

app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php

@@ -6,8 +6,6 @@
 
 /**
  * Import edit block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\ImportExport\Block\Adminhtml\Import;
 

app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php

@@ -6,8 +6,6 @@
 
 /**
  * Block before edit form
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\ImportExport\Block\Adminhtml\Import\Edit;
 

app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php

@@ -11,8 +11,6 @@
 
 /**
  * Import edit form block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {

app/code/Magento/ImportExport/Model/AbstractModel.php

@@ -9,8 +9,6 @@
 
 /**
  * Operation abstract class
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 abstract class AbstractModel extends \Magento\Framework\DataObject
 {
@@ -62,9 +60,11 @@ public function __construct(
 
     /**
      * Log debug data to file.
+     *
      * Log file dir: var/log/import_export/%Y/%m/%d/%time%_%operation_type%_%entity_type%.log
      *
      * @param mixed $debugData
+     *
      * @return $this
      */
     public function addLogComment($debugData)
@@ -91,9 +91,11 @@ public function getFormatedLogTrace()
     {
         $trace = '';
         $lineNumber = 1;
+
         foreach ($this->_logTrace as &$info) {
-            $trace .= $lineNumber++ . ': ' . $info . "\n";
+            $trace .= ($lineNumber++) . ': ' . $info . "\n";
         }
+
         return $trace;
     }
 }