Skip to content

Remove forbidden @author tag from import/export modules #36304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2022
Merged

Remove forbidden @author tag from import/export modules #36304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f90a42e
Remove forbidden @author tag
fredden Oct 14, 2022
5d6159b
Fix static tests
fredden Oct 15, 2022
1a97919
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/im…
fredden Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
/**
* Export Advanced Pricing
*
* @author Magento Core Team <[email protected]>
* @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
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Import proxy product model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogImportExport\Model\Import\Proxy;

Expand All @@ -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()
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/CatalogImportExport/Model/Import/Proxy/Product/ResourceModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Import proxy product resource
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogImportExport\Model\Import\Proxy\Product;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Export edit block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\ImportExport\Block\Adminhtml\Export;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Export edit form block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\ImportExport\Block\Adminhtml\Export\Edit;

Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/ImportExport/Block/Adminhtml/History.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Adminhtml import history page content block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class History extends \Magento\Backend\Block\Widget\Grid\Container
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Import edit block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\ImportExport\Block\Adminhtml\Import;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Before.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Block before edit form
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\ImportExport\Block\Adminhtml\Import\Edit;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

/**
* Import edit form block
*
* @author Magento Core Team <[email protected]>
*/
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
Expand Down
8 changes: 5 additions & 3 deletions app/code/Magento/ImportExport/Model/AbstractModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Operation abstract class
*
* @author Magento Core Team <[email protected]>
*/
abstract class AbstractModel extends \Magento\Framework\DataObject
{
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}
}
1 change: 0 additions & 1 deletion app/code/Magento/ImportExport/Model/Import/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* Import adapter model
* @Deprecated
* @see \Magento\ImportExport\Model\Import\Source\Factory
* @author Magento Core Team <[email protected]>
*/
class Adapter
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Adminhtml tax rates grid item renderer country
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\TaxImportExport\Block\Adminhtml\Rate\Grid\Renderer;

Expand Down