Skip to content

Use constructor property promotion in module Search #37223

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

Open
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 3 additions & 8 deletions app/code/Magento/Search/Adapter/Query/Preprocessor/Synonyms.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,14 @@

class Synonyms implements PreprocessorInterface
{
/**
* @var SynonymAnalyzerInterface
*/
private $synonymsAnalyzer;

/**
* Constructor
*
* @param SynonymAnalyzerInterface $synonymsAnalyzer
*/
public function __construct(SynonymAnalyzerInterface $synonymsAnalyzer)
{
$this->synonymsAnalyzer = $synonymsAnalyzer;
public function __construct(
private readonly SynonymAnalyzerInterface $synonymsAnalyzer
) {
}

/**
Expand Down
40 changes: 25 additions & 15 deletions app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,36 @@
*/
namespace Magento\Search\Block\Adminhtml\Dashboard;

use Exception;
use Magento\Backend\Block\Dashboard\Grid as DashboardGrid;
use Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery;
use Magento\Backend\Block\Template\Context as TemplateContext;
use Magento\Backend\Helper\Data as BackendHelper;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Module\Manager as ModuleManager;
use Magento\Search\Model\ResourceModel\Query\Collection as QueryCollection;
use Magento\Search\Model\ResourceModel\Query\CollectionFactory as QueryCollectionFactory;

/**
* Dashboard last search keywords block
* @api
* @SuppressWarnings(PHPMD.DepthOfInheritance)
* @since 100.0.2
*/
class Last extends \Magento\Backend\Block\Dashboard\Grid
class Last extends DashboardGrid
{
/**
* @var \Magento\Search\Model\ResourceModel\Query\Collection
* @var QueryCollection
*/
protected $_collection;

/**
* @var \Magento\Search\Model\ResourceModel\Query\CollectionFactory
* @var QueryCollectionFactory
*/
protected $_queriesFactory;

/**
* @var \Magento\Framework\Module\Manager
* @var ModuleManager
*/
protected $_moduleManager;

Expand All @@ -34,17 +44,17 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
protected $_template = 'Magento_Backend::dashboard/grid.phtml';

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
* @param TemplateContext $context
* @param BackendHelper $backendHelper
* @param ModuleManager $moduleManager
* @param QueryCollectionFactory $queriesFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory,
TemplateContext $context,
BackendHelper $backendHelper,
ModuleManager $moduleManager,
QueryCollectionFactory $queriesFactory,
array $data = []
) {
$this->_moduleManager = $moduleManager;
Expand All @@ -67,7 +77,7 @@ protected function _construct()
* Prepare collection.
*
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
* @throws LocalizedException
*/
protected function _prepareCollection()
{
Expand All @@ -93,7 +103,7 @@ protected function _prepareCollection()
* Prepare columns.
*
* @return $this
* @throws \Exception
* @throws Exception
*/
protected function _prepareColumns()
{
Expand All @@ -103,7 +113,7 @@ protected function _prepareColumns()
'header' => __('Search Term'),
'sortable' => false,
'index' => 'query_text',
'renderer' => \Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery::class,
'renderer' => Searchquery::class,
'header_css_class' => 'col-search-query',
'column_css_class' => 'col-search-query'
]
Expand Down
34 changes: 21 additions & 13 deletions app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,34 @@
*/
namespace Magento\Search\Block\Adminhtml\Dashboard;

use Magento\Backend\Block\Dashboard\Grid as DashboardGrid;
use Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery;
use Magento\Backend\Block\Template\Context as TemplateContext;
use Magento\Backend\Helper\Data as BackendHelper;
use Magento\Framework\Module\Manager as ModuleManager;
use Magento\Search\Model\ResourceModel\Query\Collection as QueryCollection;
use Magento\Search\Model\ResourceModel\Query\CollectionFactory as QueryCollectionFactory;

/**
* Dashboard last search keywords block
* @api
* @SuppressWarnings(PHPMD.DepthOfInheritance)
* @since 100.0.2
*/
class Top extends \Magento\Backend\Block\Dashboard\Grid
class Top extends DashboardGrid
{
/**
* @var \Magento\Search\Model\ResourceModel\Query\Collection
* @var QueryCollection
*/
protected $_collection;

/**
* @var \Magento\Search\Model\ResourceModel\Query\CollectionFactory
* @var QueryCollectionFactory
*/
protected $_queriesFactory;

/**
* @var \Magento\Framework\Module\Manager
* @var ModuleManager
*/
protected $_moduleManager;

Expand All @@ -34,17 +42,17 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
protected $_template = 'Magento_Backend::dashboard/grid.phtml';

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
* @param TemplateContext $context
* @param BackendHelper $backendHelper
* @param ModuleManager $moduleManager
* @param QueryCollectionFactory $queriesFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory,
TemplateContext $context,
BackendHelper $backendHelper,
ModuleManager $moduleManager,
QueryCollectionFactory $queriesFactory,
array $data = []
) {
$this->_moduleManager = $moduleManager;
Expand Down Expand Up @@ -98,7 +106,7 @@ protected function _prepareColumns()
'header' => __('Search Term'),
'sortable' => false,
'index' => 'query_text',
'renderer' => \Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery::class,
'renderer' => Searchquery::class,
'header_css_class' => 'col-search-query',
'column_css_class' => 'col-search-query'
]
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Search/Block/Adminhtml/Reports/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
*/
namespace Magento\Search\Block\Adminhtml\Reports;

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

/**
* Adminhtml search report page content block
*
* @api
* @since 100.0.2
*/
class Search extends \Magento\Backend\Block\Widget\Grid\Container
class Search extends Container
{
/**
* Initialize Grid Container
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Search/Block/Adminhtml/Synonyms.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
*/
namespace Magento\Search\Block\Adminhtml;

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

/**
* Adminhtml synonym group content block
*/
class Synonyms extends \Magento\Backend\Block\Widget\Grid\Container
class Synonyms extends Container
{
/**
* @return void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
*/
namespace Magento\Search\Block\Adminhtml\Synonyms\Edit;

use Magento\Backend\Block\Widget\Context as WidgetContext;
use Magento\Framework\Registry;
use Magento\Framework\UrlInterface;
use Magento\Search\Controller\RegistryConstants;

/**
Expand All @@ -15,29 +18,21 @@ class GenericButton
/**
* Url Builder
*
* @var \Magento\Framework\UrlInterface
* @var UrlInterface
*/
protected $urlBuilder;

/**
* Registry
*
* @var \Magento\Framework\Registry
*/
protected $registry;

/**
* Constructor
*
* @param \Magento\Backend\Block\Widget\Context $context
* @param \Magento\Framework\Registry $registry
* @param WidgetContext $context
* @param Registry $registry Registry
*/
public function __construct(
\Magento\Backend\Block\Widget\Context $context,
\Magento\Framework\Registry $registry
WidgetContext $context,
protected readonly Registry $registry
) {
$this->urlBuilder = $context->getUrlBuilder();
$this->registry = $registry;
}

/**
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Search/Block/Adminhtml/Term.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
*/
namespace Magento\Search\Block\Adminhtml;

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

/**
* @api
* @since 100.0.2
*/
class Term extends \Magento\Backend\Block\Widget\Grid\Container
class Term extends Container
{
/**
* @return void
Expand Down
19 changes: 12 additions & 7 deletions app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,34 @@
*/
namespace Magento\Search\Block\Adminhtml\Term;

use Magento\Backend\Block\Widget\Context as WidgetContext;
use Magento\Backend\Block\Widget\Form\Container;
use Magento\Framework\Phrase;
use Magento\Framework\Registry;

/**
* Admin term edit block
*
* @api
* @since 100.0.2
*/
class Edit extends \Magento\Backend\Block\Widget\Form\Container
class Edit extends Container
{
/**
* Core registry
*
* @var \Magento\Framework\Registry
* @var Registry
*/
protected $coreRegistry;

/**
* @param \Magento\Backend\Block\Widget\Context $context
* @param \Magento\Framework\Registry $registry
* @param WidgetContext $context
* @param Registry $registry
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Widget\Context $context,
\Magento\Framework\Registry $registry,
WidgetContext $context,
Registry $registry,
array $data = []
) {
$this->coreRegistry = $registry;
Expand All @@ -50,7 +55,7 @@ protected function _construct()
}

/**
* @return \Magento\Framework\Phrase
* @return Phrase
*/
public function getHeaderText()
{
Expand Down
Loading