Skip to content
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.

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

Remove forbidden @author tag from Magento_Catalog* (part 5) and Magento_Checkout #36991

Open
wants to merge 7 commits into
base: 2.4-develop
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
/**
* Catalog Product Eav Attributes abstract indexer resource model
*
* @author Magento Core Team <[email protected]>
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

/**
* Catalog Product Eav Decimal Attributes Indexer resource model
*
* @author Magento Core Team <[email protected]>
*/
class Decimal extends AbstractEav
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* For correctly work need define product type id
*
* @api
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
* @deprecated 102.0.6 Not used anymore for price indexation. Class left for backward compatibility
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
* Catalog Product Type Price Indexer interface
*
* @api
*
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
interface PriceInterface
Expand Down
5 changes: 0 additions & 5 deletions app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Catalog product link resource model
*
* @author Magento Core Team <[email protected]>
*/
class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand All @@ -22,14 +20,11 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
protected $_attributesTable;

/**
* Catalog product relation
*
* @var Relation
*/
protected $_catalogProductRelation;

/**
* Link constructor.
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
* @param Relation $catalogProductRelation
* @param string|null $connectionName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Catalog product links collection
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
protected $_config;

/**
* Class constructor
*
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Catalog product option values collection
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

/**
* Catalog Product Relations Resource model
*
*/
class Relation extends AbstractDb
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Catalog/Model/ResourceModel/Url.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Catalog url rewrite resource model
*
* @author Magento Core Team <[email protected]>
*/
use Magento\Catalog\Api\Data\CategoryInterface;
use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
Expand Down
3 changes: 0 additions & 3 deletions app/code/Magento/Catalog/Model/Template/Filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
/**
* Catalog Template Filter Model
*
* @author Magento Core Team <[email protected]>
* @todo Needs to be reimplemented to get rid of the copypasted methods
*/
namespace Magento\Catalog\Model\Template;
Expand Down Expand Up @@ -38,8 +37,6 @@ class Filter extends \Magento\Framework\Filter\Template
protected $_assetRepo;

/**
* Store manager
*
* @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Catalog Inventory Backorders Config Backend Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogInventory\Model\Config\Backend;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@

/**
* Catalog Inventory Manage Stock Config Backend Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogInventory\Model\Config\Backend;

class Managestock extends AbstractValue
{
/**
* After change Catalog Inventory Manage Stock value process
*
* @return $this
*/
public function afterSave()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,19 @@
* See COPYING.txt for license details.
*/

/**
* Catalog price rules
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogRule\Block\Adminhtml\Promo;

/**
* Catalog price rules
*
* @api
* @since 100.0.2
*/
class Catalog extends \Magento\Backend\Block\Widget\Grid\Container
{
/**
* Initialise the block
*
* @return void
*/
protected function _construct()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
* See COPYING.txt for license details.
*/

/**
* Adminhtml sales order create search products block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogRule\Block\Adminhtml\Promo\Widget\Chooser;

use Magento\Backend\Block\Widget\Grid;
use Magento\Backend\Block\Widget\Grid\Column;

/**
* Adminhtml sales order create search products block
*/
class Sku extends \Magento\Backend\Block\Widget\Grid\Extended
{
/**
Expand Down Expand Up @@ -59,6 +57,8 @@ public function __construct(
}

/**
* Initialise the block
*
* @return void
*/
protected function _construct()
Expand All @@ -83,6 +83,8 @@ protected function _construct()
}

/**
* Add a column filter to the collection
*
* @param Column $column
* @return $this
*/
Expand Down Expand Up @@ -202,6 +204,8 @@ protected function _prepareColumns()
}

/**
* Return grid URL
*
* @return string
*/
public function getGridUrl()
Expand All @@ -213,6 +217,8 @@ public function getGridUrl()
}

/**
* Return selected products
*
* @return mixed
*/
protected function _getSelectedProducts()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,41 @@
* See COPYING.txt for license details.
*/

/**
* Backend Catalog Price Rules controller
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogRule\Controller\Adminhtml\Promo;

use Magento\Backend\App\Action;
use Magento\Backend\App\Action\Context;
use Magento\Framework\Registry;
use Magento\Framework\Stdlib\DateTime\Filter\Date;

/**
* Backend Catalog Price Rules controller
*/
abstract class Catalog extends Action
{
/**
* Authorization level of a basic admin session
*
* @see _isAllowed()
*/
const ADMIN_RESOURCE = 'Magento_CatalogRule::promo_catalog';
public const ADMIN_RESOURCE = 'Magento_CatalogRule::promo_catalog';

/**
* Dirty rules notice message
*
*
* @var string
*/
protected $_dirtyRulesNoticeMessage;

/**
* Core registry
*
* @var Registry
*/
protected $_coreRegistry = null;

/**
* Date filter instance
*
* @var \Magento\Framework\Stdlib\DateTime\Filter\Date
*/
protected $_dateFilter;

/**
* Constructor
*
* @param Context $context
* @param Registry $coreRegistry
* @param Date $dateFilter
Expand Down
17 changes: 11 additions & 6 deletions app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<?php

/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* Catalog rules resource model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogRule\Model\ResourceModel;

use Magento\Catalog\Model\Product;
Expand All @@ -18,6 +14,8 @@
use Magento\Framework\Pricing\PriceCurrencyInterface;

/**
* Catalog rules resource model
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
Expand Down Expand Up @@ -87,7 +85,6 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
protected $_associatedEntitiesMap = [];

/**
* Rule constructor.
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Product\ConditionFactory $conditionFactory
Expand All @@ -101,6 +98,7 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
* @param string|null $connectionName
* @param EntityManager|null $entityManager
* @param \Magento\Framework\DataObject|null $associatedEntityMap
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
Expand Down Expand Up @@ -154,6 +152,7 @@ protected function _construct()
* @param int $wId
* @param int $gId
* @param int $pId
*
* @return float|false
*/
public function getRulePrice($date, $wId, $gId, $pId)
Expand All @@ -175,6 +174,7 @@ public function getRulePrice($date, $wId, $gId, $pId)
* @param int $websiteId
* @param int $customerGroupId
* @param array $productIds
*
* @return array
*/
public function getRulePrices(\DateTimeInterface $date, $websiteId, $customerGroupId, $productIds)
Expand All @@ -197,6 +197,7 @@ public function getRulePrices(\DateTimeInterface $date, $websiteId, $customerGro
* @param int $websiteId
* @param int $customerGroupId
* @param int $productId
*
* @return array
*/
public function getRulesFromProduct($date, $websiteId, $customerGroupId, $productId)
Expand All @@ -205,6 +206,7 @@ public function getRulesFromProduct($date, $websiteId, $customerGroupId, $produc
if (is_string($date)) {
$date = strtotime($date);
}

$select = $connection->select()
->from($this->getTable('catalogrule_product'))
->where('website_id = ?', $websiteId)
Expand Down Expand Up @@ -240,7 +242,9 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
* Delete the object
*
* @param \Magento\Framework\Model\AbstractModel $object
*
* @return $this
*
* @throws \Exception
*/
public function delete(AbstractModel $object)
Expand All @@ -253,6 +257,7 @@ public function delete(AbstractModel $object)
* Get product ids matching specified rules
*
* @param array $ruleIds
*
* @return array
*/
public function getProductIdsByRuleIds(array $ruleIds): array
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Catalog Rule Product Aggregated Price per date Resource Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogRule\Model\ResourceModel\Rule\Product;

Expand All @@ -32,7 +30,7 @@ protected function _construct()
* @param string $entityId
* @param string $customerGroupId
* @param string $websiteId
* @param array $updateFields the array of fields for compare with rule price and update
* @param array $updateFields the array of fields for compare with rule price and update
* @param string $websiteDate
* @return \Magento\CatalogRule\Model\ResourceModel\Rule\Product\Price
*/
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/CatalogRule/Model/Rule/Job.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
* @method bool hasSuccess()
* @method bool hasError()
*
* @author Magento Core Team <[email protected]>
*
* @api
* @since 100.0.2
*/
Expand Down
Loading