From f7c918f51cc14fff37d9c9ff4aabcc9aa53a9c91 Mon Sep 17 00:00:00 2001 From: tjeujansen Date: Sat, 21 Feb 2026 09:53:26 +0100 Subject: [PATCH] Updated emico/code-quality module and fixed lint issues --- composer.json | 2 +- src/Block/LandingPage/Content.php | 8 +++-- src/Block/OverviewPage/View.php | 8 +++-- .../Adminhtml/OverviewPage/Delete.php | 3 +- .../Adminhtml/OverviewPage/Save.php | 3 +- src/Controller/Adminhtml/Page/Delete.php | 3 +- src/Controller/Adminhtml/Page/Save.php | 4 +-- src/Controller/Adminhtml/Page/UploadImage.php | 3 +- src/Model/Catalog/Layer/State/Plugin.php | 2 +- src/Model/LandingPageRepository.php | 5 +-- src/Model/OverviewPageRepository.php | 5 +-- src/Model/Page/DataProvider.php | 3 +- src/Model/UrlRewriteService.php | 2 +- .../Component/Listing/Column/PageActions.php | 35 +++++++------------ .../Product/Form/Categories/Options.php | 3 +- src/registration.php | 6 ++-- 16 files changed, 50 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index 497f6be..9730c1c 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "magento/module-catalog": "^102.0||^103.0||^104.0" }, "require-dev": { - "emico/code-quality": "^10.5", + "emico/code-quality": "~10.6.0", "symfony/finder": "6.4.0" }, "prefer-stable": true, diff --git a/src/Block/LandingPage/Content.php b/src/Block/LandingPage/Content.php index dead2a8..0715a07 100644 --- a/src/Block/LandingPage/Content.php +++ b/src/Block/LandingPage/Content.php @@ -9,8 +9,10 @@ use Emico\AttributeLanding\Api\Data\LandingPageInterface; use Emico\AttributeLanding\Model\LandingPageContext; +use Exception; use Magento\Cms\Model\Template\FilterProvider; use Magento\Framework\View\Element\Template; +use Magento\Framework\View\Element\Template\Context; use Psr\Log\LoggerInterface; class Content extends Template @@ -32,12 +34,12 @@ class Content extends Template /** * PageContent constructor. - * @param Template\Context $context + * @param Context $context * @param LandingPageContext $landingPageContext * @param FilterProvider $filterProvider */ public function __construct( - Template\Context $context, + Context $context, LandingPageContext $landingPageContext, FilterProvider $filterProvider, LoggerInterface $logger @@ -80,7 +82,7 @@ protected function getFilteredContent(string $content): string { try { return $this->pageFilter->filter($content); - } catch (\Exception $e) { + } catch (Exception $e) { $this->logger->critical($e->getMessage()); return ''; } diff --git a/src/Block/OverviewPage/View.php b/src/Block/OverviewPage/View.php index 2a7f3a2..399145d 100644 --- a/src/Block/OverviewPage/View.php +++ b/src/Block/OverviewPage/View.php @@ -12,6 +12,8 @@ use Emico\AttributeLanding\Api\LandingPageRepositoryInterface; use Emico\AttributeLanding\Model\LandingPageContext; use Emico\AttributeLanding\Model\Page\ImageUploader; +use Exception; +use Magento\Framework\View\Element\Template\Context; use Magento\Theme\Block\Html\Breadcrumbs; use Magento\Cms\Model\Template\FilterProvider; use Magento\Framework\Exception\LocalizedException; @@ -48,7 +50,7 @@ class View extends Template /** * View constructor. - * @param Template\Context $context + * @param Context $context * @param LandingPageContext $landingPageContext * @param LandingPageRepositoryInterface $landingPageRepository * @param ImageUploader $imageUploader @@ -56,7 +58,7 @@ class View extends Template * @param LoggerInterface $logger */ public function __construct( - Template\Context $context, + Context $context, LandingPageContext $landingPageContext, LandingPageRepositoryInterface $landingPageRepository, ImageUploader $imageUploader, @@ -132,7 +134,7 @@ protected function getFilteredContent(string $content): string { try { return $this->pageFilter->filter($content); - } catch (\Exception $e) { + } catch (Exception $e) { $this->logger->critical($e->getMessage()); return ''; } diff --git a/src/Controller/Adminhtml/OverviewPage/Delete.php b/src/Controller/Adminhtml/OverviewPage/Delete.php index 632ee6e..293ea78 100644 --- a/src/Controller/Adminhtml/OverviewPage/Delete.php +++ b/src/Controller/Adminhtml/OverviewPage/Delete.php @@ -4,6 +4,7 @@ use Emico\AttributeLanding\Api\OverviewPageRepositoryInterface; use Emico\AttributeLanding\Controller\Adminhtml\OverviewPage; +use Exception; use Magento\Backend\App\Action\Context; use Magento\Backend\Model\View\Result\Redirect; use Magento\Framework\Controller\ResultInterface; @@ -46,7 +47,7 @@ public function execute() $this->messageManager->addSuccessMessage(__('You deleted the Page.')); return $resultRedirect->setPath('*/*/'); - } catch (\Exception $e) { + } catch (Exception $e) { $this->messageManager->addErrorMessage($e->getMessage()); return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]); diff --git a/src/Controller/Adminhtml/OverviewPage/Save.php b/src/Controller/Adminhtml/OverviewPage/Save.php index 2f5b9b2..a5e33dc 100644 --- a/src/Controller/Adminhtml/OverviewPage/Save.php +++ b/src/Controller/Adminhtml/OverviewPage/Save.php @@ -5,6 +5,7 @@ use Emico\AttributeLanding\Api\Data\OverviewPageInterface; use Emico\AttributeLanding\Api\Data\OverviewPageInterfaceFactory; use Emico\AttributeLanding\Api\OverviewPageRepositoryInterface; +use Exception; use Magento\Backend\App\Action; use Magento\Backend\App\Action\Context; use Magento\Framework\Api\DataObjectHelper; @@ -99,7 +100,7 @@ public function execute() return $resultRedirect->setPath('*/*/'); } catch (LocalizedException $e) { $this->messageManager->addErrorMessage($e->getMessage()); - } catch (\Exception $e) { + } catch (Exception $e) { $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the Page.')); } diff --git a/src/Controller/Adminhtml/Page/Delete.php b/src/Controller/Adminhtml/Page/Delete.php index b14fafe..ec41276 100644 --- a/src/Controller/Adminhtml/Page/Delete.php +++ b/src/Controller/Adminhtml/Page/Delete.php @@ -4,6 +4,7 @@ use Emico\AttributeLanding\Api\LandingPageRepositoryInterface; use Emico\AttributeLanding\Controller\Adminhtml\Page; +use Exception; use Magento\Backend\App\Action\Context; class Delete extends Page @@ -44,7 +45,7 @@ public function execute() $this->messageManager->addSuccessMessage(__('You deleted the Page.')); return $resultRedirect->setPath('*/*/'); - } catch (\Exception $e) { + } catch (Exception $e) { $this->messageManager->addErrorMessage($e->getMessage()); return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]); diff --git a/src/Controller/Adminhtml/Page/Save.php b/src/Controller/Adminhtml/Page/Save.php index 9118830..e32499f 100644 --- a/src/Controller/Adminhtml/Page/Save.php +++ b/src/Controller/Adminhtml/Page/Save.php @@ -5,6 +5,7 @@ use Emico\AttributeLanding\Api\Data\LandingPageInterface; use Emico\AttributeLanding\Api\Data\LandingPageInterfaceFactory; use Emico\AttributeLanding\Api\LandingPageRepositoryInterface; +use Exception; use Magento\Backend\App\Action; use Magento\Backend\App\Action\Context; use Magento\Backend\Model\View\Result\Redirect; @@ -71,7 +72,6 @@ public function execute() $data = $this->getRequest()->getPostValue(); $data[LandingPageInterface::STORE_ID] = (int)$data[LandingPageInterface::STORE_ID]; - /** @phpstan-ignore-next-line */ if (!$data) { return $resultRedirect->setPath('*/*/'); } @@ -113,7 +113,7 @@ public function execute() return $resultRedirect->setPath('*/*/'); } catch (LocalizedException $e) { $this->messageManager->addErrorMessage($e->getMessage()); - } catch (\Exception $e) { + } catch (Exception $e) { $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the Page.')); } diff --git a/src/Controller/Adminhtml/Page/UploadImage.php b/src/Controller/Adminhtml/Page/UploadImage.php index f251af8..806e362 100644 --- a/src/Controller/Adminhtml/Page/UploadImage.php +++ b/src/Controller/Adminhtml/Page/UploadImage.php @@ -8,11 +8,12 @@ namespace Emico\AttributeLanding\Controller\Adminhtml\Page; use Emico\AttributeLanding\Model\Page\ImageUploader; +use Magento\Backend\App\Action; use Magento\Backend\App\Action\Context; use Magento\Framework\Controller\Result\Json; use Magento\Framework\Controller\ResultFactory; -class UploadImage extends \Magento\Backend\App\Action +class UploadImage extends Action { /** * @var ImageUploader diff --git a/src/Model/Catalog/Layer/State/Plugin.php b/src/Model/Catalog/Layer/State/Plugin.php index 4c2d22c..5190e6b 100644 --- a/src/Model/Catalog/Layer/State/Plugin.php +++ b/src/Model/Catalog/Layer/State/Plugin.php @@ -46,7 +46,7 @@ public function __construct(LandingPageContext $landingPageContext, FilterHiderI public function afterGetFilters(State $subject, $result) { /** @phpstan-ignore-next-line */ - if (!\is_array($result) || empty($result)) { + if (!is_array($result) || empty($result)) { return $result; } diff --git a/src/Model/LandingPageRepository.php b/src/Model/LandingPageRepository.php index b72e899..5711f50 100644 --- a/src/Model/LandingPageRepository.php +++ b/src/Model/LandingPageRepository.php @@ -11,6 +11,7 @@ use Emico\AttributeLanding\Api\Data\LandingPageInterface; use Emico\AttributeLanding\Api\LandingPageRepositoryInterface; use Emico\AttributeLanding\Ui\Component\Product\Form\Categories\Options; +use Exception; use Magento\Framework\Api\SearchCriteriaBuilder; use Magento\Framework\Api\SearchCriteriaInterface; use Emico\AttributeLanding\Api\Data\PageSearchResultsInterfaceFactory; @@ -125,7 +126,7 @@ public function save(LandingPageInterface $page): LandingPageInterface /** @phpstan-ignore-next-line */ $page->setPageId($parentLandingPage->getPageId()); $this->resource->saveLandingPageStoreData($page); - } catch (\Exception $exception) { + } catch (Exception $exception) { throw new CouldNotSaveException( __( 'Could not save the page: %1', @@ -237,7 +238,7 @@ public function delete(LandingPageInterface $page): bool try { /** @var LandingPage $page */ $this->resource->delete($page); - } catch (\Exception $exception) { + } catch (Exception $exception) { throw new CouldNotDeleteException( __( 'Could not delete the Page: %1', diff --git a/src/Model/OverviewPageRepository.php b/src/Model/OverviewPageRepository.php index 2f557b2..09cfe6f 100644 --- a/src/Model/OverviewPageRepository.php +++ b/src/Model/OverviewPageRepository.php @@ -5,6 +5,7 @@ use Emico\AttributeLanding\Api\Data\LandingPageInterface; use Emico\AttributeLanding\Api\Data\OverviewPageInterface; use Emico\AttributeLanding\Api\OverviewPageRepositoryInterface; +use Exception; use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface; use Magento\Framework\Api\SearchCriteriaBuilder; use Magento\Framework\Api\SearchCriteriaInterface; @@ -82,7 +83,7 @@ public function save(OverviewPageInterface $page): OverviewPageInterface try { /** @var LandingPage $page */ $this->resource->save($page); // @phpstan-ignore-line - } catch (\Exception $exception) { + } catch (Exception $exception) { throw new CouldNotSaveException( __( 'Could not save the page: %1', @@ -141,7 +142,7 @@ public function delete(OverviewPageInterface $page): bool try { /** @var LandingPage $page */ $this->resource->delete($page); // @phpstan-ignore-line - } catch (\Exception $exception) { + } catch (Exception $exception) { throw new CouldNotDeleteException( __( 'Could not delete the Page: %1', diff --git a/src/Model/Page/DataProvider.php b/src/Model/Page/DataProvider.php index 256b0fb..70c4a56 100644 --- a/src/Model/Page/DataProvider.php +++ b/src/Model/Page/DataProvider.php @@ -13,8 +13,9 @@ use Emico\AttributeLanding\Model\ResourceModel\Page\CollectionFactory; use Magento\Framework\App\Request\DataPersistorInterface; use Magento\Framework\App\Request\Http; +use Magento\Ui\DataProvider\AbstractDataProvider; -class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider +class DataProvider extends AbstractDataProvider { /** * @var array diff --git a/src/Model/UrlRewriteService.php b/src/Model/UrlRewriteService.php index 0a8c3ee..e76f3d2 100644 --- a/src/Model/UrlRewriteService.php +++ b/src/Model/UrlRewriteService.php @@ -276,7 +276,7 @@ private function shouldStripRequestPath(?string $newSuffix): bool protected function getActiveStoreIds(UrlRewriteGeneratorInterface $landingPage): array { // phpcs:disable SlevomatCodingStandard.Functions.StrictCall.NonStrictComparison - if (\in_array('0', $landingPage->getStoreIds(), false) !== false) { // @phpstan-ignore-line + if (in_array('0', $landingPage->getStoreIds(), false) !== false) { // @phpstan-ignore-line return array_map( static function (StoreInterface $store) { return $store->getId(); diff --git a/src/Ui/Component/Listing/Column/PageActions.php b/src/Ui/Component/Listing/Column/PageActions.php index bc2bff7..a076288 100644 --- a/src/Ui/Component/Listing/Column/PageActions.php +++ b/src/Ui/Component/Listing/Column/PageActions.php @@ -4,46 +4,37 @@ use Magento\Catalog\Model\CategoryRepository; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Framework\UrlInterface; +use Magento\Framework\View\Element\UiComponent\ContextInterface; +use Magento\Framework\View\Element\UiComponentFactory; use Magento\Store\Api\StoreRepositoryInterface; +use Magento\Ui\Component\Listing\Columns\Column; -class PageActions extends \Magento\Ui\Component\Listing\Columns\Column +class PageActions extends Column { - /** - * @var \Magento\Framework\UrlInterface - */ - protected $urlBuilder; - - /** - * @var \Magento\Catalog\Model\CategoryRepository - */ - public CategoryRepository $categoryRepository; // phpcs:ignore SlevomatCodingStandard.Classes.ForbiddenPublicProperty.ForbiddenPublicProperty - public const URL_PATH_DETAILS = 'emico_attributelanding/page/details'; protected const URL_PATH_EDIT = 'emico_attributelanding/page/edit'; protected const URL_PATH_DELETE = 'emico_attributelanding/page/delete'; protected const URL_PATH_DUPLICATE = 'emico_attributelanding/page/duplicate'; /** - * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context - * @param \Magento\Framework\View\Element\UiComponentFactory $uiComponentFactory + * @param ContextInterface $context + * @param UiComponentFactory $uiComponentFactory * @param CategoryRepository $categoryRepository * @param StoreRepositoryInterface $storeRepository - * @param \Magento\Framework\UrlInterface $urlBuilder + * @param UrlInterface $urlBuilder * @param array $components * @param array $data */ public function __construct( - \Magento\Framework\View\Element\UiComponent\ContextInterface $context, - \Magento\Framework\View\Element\UiComponentFactory $uiComponentFactory, - \Magento\Catalog\Model\CategoryRepository $categoryRepository, - public StoreRepositoryInterface $storeRepository, - \Magento\Framework\UrlInterface $urlBuilder, + ContextInterface $context, + UiComponentFactory $uiComponentFactory, + private readonly CategoryRepository $categoryRepository, + private readonly StoreRepositoryInterface $storeRepository, + protected readonly UrlInterface $urlBuilder, array $components = [], array $data = [] ) { - $this->categoryRepository = $categoryRepository; - $this->urlBuilder = $urlBuilder; - parent::__construct($context, $uiComponentFactory, $components, $data); } diff --git a/src/Ui/Component/Product/Form/Categories/Options.php b/src/Ui/Component/Product/Form/Categories/Options.php index 1e83278..10f56e4 100644 --- a/src/Ui/Component/Product/Form/Categories/Options.php +++ b/src/Ui/Component/Product/Form/Categories/Options.php @@ -2,6 +2,7 @@ namespace Emico\AttributeLanding\Ui\Component\Product\Form\Categories; +use Magento\Catalog\Ui\Component\Product\Form\Categories\Options as MagentoOptions; use Magento\Framework\Data\OptionSourceInterface; use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory; use Magento\Framework\App\RequestInterface; @@ -9,7 +10,7 @@ /** * Options tree for "Categories" field */ -class Options extends \Magento\Catalog\Ui\Component\Product\Form\Categories\Options implements OptionSourceInterface +class Options extends MagentoOptions implements OptionSourceInterface { /** * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory diff --git a/src/registration.php b/src/registration.php index 4138334..45b1fd4 100644 --- a/src/registration.php +++ b/src/registration.php @@ -2,8 +2,10 @@ declare(strict_types=1); -\Magento\Framework\Component\ComponentRegistrar::register( - \Magento\Framework\Component\ComponentRegistrar::MODULE, +use Magento\Framework\Component\ComponentRegistrar; + +ComponentRegistrar::register( + ComponentRegistrar::MODULE, 'Emico_AttributeLanding', __DIR__ );