From f90a42eb35d83dad002e53ac615928f7b648f075 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Fri, 14 Oct 2022 17:55:57 +0100 Subject: [PATCH 1/2] Remove forbidden @author tag --- .../Model/Export/AdvancedPricing.php | 1 - .../Magento/CatalogImportExport/Model/Import/Proxy/Product.php | 2 -- .../Model/Import/Proxy/Product/ResourceModel.php | 2 -- app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php | 2 -- .../Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php | 2 -- app/code/Magento/ImportExport/Block/Adminhtml/History.php | 1 - app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php | 2 -- .../Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php | 2 -- .../Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php | 2 -- app/code/Magento/ImportExport/Model/AbstractModel.php | 2 -- app/code/Magento/ImportExport/Model/Import/Adapter.php | 1 - .../Block/Adminhtml/Rate/Grid/Renderer/Country.php | 2 -- 12 files changed, 21 deletions(-) diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php index b63141b510b85..2c6c3cb73cd1e 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php @@ -14,7 +14,6 @@ /** * Export Advanced Pricing * - * @author Magento Core Team * @SuppressWarnings(PHPMD.TooManyFields) * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php index cd7ab79e7b490..7a252ff4a749e 100644 --- a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php +++ b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php @@ -6,8 +6,6 @@ /** * Import proxy product model - * - * @author Magento Core Team */ namespace Magento\CatalogImportExport\Model\Import\Proxy; diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php index c7dc0d0c183ac..86003fdec9b7b 100644 --- a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php +++ b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php @@ -6,8 +6,6 @@ /** * Import proxy product resource - * - * @author Magento Core Team */ namespace Magento\CatalogImportExport\Model\Import\Proxy\Product; diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php index 34136c0c4878e..efce55694ee05 100644 --- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php +++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php @@ -6,8 +6,6 @@ /** * Export edit block - * - * @author Magento Core Team */ namespace Magento\ImportExport\Block\Adminhtml\Export; diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php index de9c80d0c9dcd..8ebd23774e971 100644 --- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php +++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php @@ -6,8 +6,6 @@ /** * Export edit form block - * - * @author Magento Core Team */ namespace Magento\ImportExport\Block\Adminhtml\Export\Edit; diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/History.php b/app/code/Magento/ImportExport/Block/Adminhtml/History.php index e17a59b2f5339..f3bc5f8e2f06a 100644 --- a/app/code/Magento/ImportExport/Block/Adminhtml/History.php +++ b/app/code/Magento/ImportExport/Block/Adminhtml/History.php @@ -9,7 +9,6 @@ * Adminhtml import history page content block * * @api - * @author Magento Core Team * @since 100.0.2 */ class History extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php index 23725879e0904..3fabd57cd78eb 100644 --- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php +++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php @@ -6,8 +6,6 @@ /** * Import edit block - * - * @author Magento Core Team */ namespace Magento\ImportExport\Block\Adminhtml\Import; diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php index f121a84c67699..cf337289b8634 100644 --- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php +++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php @@ -6,8 +6,6 @@ /** * Block before edit form - * - * @author Magento Core Team */ namespace Magento\ImportExport\Block\Adminhtml\Import\Edit; diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php index b24cad16897ac..182eb88e8619d 100644 --- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php +++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php @@ -11,8 +11,6 @@ /** * Import edit form block - * - * @author Magento Core Team */ class Form extends \Magento\Backend\Block\Widget\Form\Generic { diff --git a/app/code/Magento/ImportExport/Model/AbstractModel.php b/app/code/Magento/ImportExport/Model/AbstractModel.php index 4010f3bfcae4c..a7e066c2d8634 100644 --- a/app/code/Magento/ImportExport/Model/AbstractModel.php +++ b/app/code/Magento/ImportExport/Model/AbstractModel.php @@ -9,8 +9,6 @@ /** * Operation abstract class - * - * @author Magento Core Team */ abstract class AbstractModel extends \Magento\Framework\DataObject { diff --git a/app/code/Magento/ImportExport/Model/Import/Adapter.php b/app/code/Magento/ImportExport/Model/Import/Adapter.php index 15fd0525cc78f..3c0d588dc3c59 100644 --- a/app/code/Magento/ImportExport/Model/Import/Adapter.php +++ b/app/code/Magento/ImportExport/Model/Import/Adapter.php @@ -12,7 +12,6 @@ * Import adapter model * @Deprecated * @see \Magento\ImportExport\Model\Import\Source\Factory - * @author Magento Core Team */ class Adapter { diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php index 09e7c27fa9c3a..3a560ac7c1093 100644 --- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php +++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php @@ -6,8 +6,6 @@ /** * Adminhtml tax rates grid item renderer country - * - * @author Magento Core Team */ namespace Magento\TaxImportExport\Block\Adminhtml\Rate\Grid\Renderer; From 5d6159b17ae26090f00b48e51240cf847ccb166f Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Sat, 15 Oct 2022 11:52:40 +0100 Subject: [PATCH 2/2] Fix static tests --- .../Model/Export/AdvancedPricing.php | 6 +++--- .../CatalogImportExport/Model/Import/Proxy/Product.php | 1 + app/code/Magento/ImportExport/Model/AbstractModel.php | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php index 2c6c3cb73cd1e..4db918a000647 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php @@ -20,7 +20,7 @@ */ 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 @@ -567,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); diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php index 7a252ff4a749e..f0a2a5f8094fe 100644 --- a/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php +++ b/app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php @@ -15,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() { diff --git a/app/code/Magento/ImportExport/Model/AbstractModel.php b/app/code/Magento/ImportExport/Model/AbstractModel.php index a7e066c2d8634..ea263f219837d 100644 --- a/app/code/Magento/ImportExport/Model/AbstractModel.php +++ b/app/code/Magento/ImportExport/Model/AbstractModel.php @@ -60,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) @@ -89,9 +91,11 @@ public function getFormatedLogTrace() { $trace = ''; $lineNumber = 1; + foreach ($this->_logTrace as &$info) { - $trace .= $lineNumber++ . ': ' . $info . "\n"; + $trace .= ($lineNumber++) . ': ' . $info . "\n"; } + return $trace; } }