fix: Make installable on PHP 8.x (#85) (#89)

* fix: Make installable on PHP 8.x (#85) * chore: style fixes (#90)
EmicoEcommerce · May 1, 2024 · 40c4eee · 40c4eee
1 parent c1cb03a
commit 40c4eee
Show file tree

Hide file tree

Showing 25 changed files with 24 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "emico/m2-attributelanding",
     "description": "Attribute landing pages for Magento 2",
     "require": {
-        "php": ">=8.0 <8.3",
+        "php": "^8.0",
         "magento/module-sitemap": "^100.2||^100.4",
         "magento/module-catalog": "^102.0||^103.0||^104.0"
     },

diff --git a/src/Block/Adminhtml/OverviewPage/Edit/BackButton.php b/src/Block/Adminhtml/OverviewPage/Edit/BackButton.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\OverviewPage\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

diff --git a/src/Block/Adminhtml/OverviewPage/Edit/DeleteButton.php b/src/Block/Adminhtml/OverviewPage/Edit/DeleteButton.php
@@ -1,11 +1,11 @@
 <?php
+
 namespace Emico\AttributeLanding\Block\Adminhtml\OverviewPage\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */
@@ -22,6 +22,7 @@ public function getButtonData(): array
                 'sort_order' => 20,
             ];
         }
+
         return $data;
     }
 

diff --git a/src/Block/Adminhtml/OverviewPage/Edit/GenericButton.php b/src/Block/Adminhtml/OverviewPage/Edit/GenericButton.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\OverviewPage\Edit;
 
 use Emico\AttributeLanding\Api\Data\LandingPageInterface;

diff --git a/src/Block/Adminhtml/OverviewPage/Edit/SaveAndContinueButton.php b/src/Block/Adminhtml/OverviewPage/Edit/SaveAndContinueButton.php
@@ -1,13 +1,11 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\OverviewPage\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 class SaveAndContinueButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */

diff --git a/src/Block/Adminhtml/OverviewPage/Edit/SaveButton.php b/src/Block/Adminhtml/OverviewPage/Edit/SaveButton.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\OverviewPage\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

diff --git a/src/Block/Adminhtml/Page/Edit/BackButton.php b/src/Block/Adminhtml/Page/Edit/BackButton.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\Page\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

diff --git a/src/Block/Adminhtml/Page/Edit/DeleteButton.php b/src/Block/Adminhtml/Page/Edit/DeleteButton.php
@@ -1,11 +1,11 @@
 <?php
+
 namespace Emico\AttributeLanding\Block\Adminhtml\Page\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */
@@ -22,6 +22,7 @@ public function getButtonData(): array
                 'sort_order' => 20,
             ];
         }
+
         return $data;
     }
 

diff --git a/src/Block/Adminhtml/Page/Edit/GenericButton.php b/src/Block/Adminhtml/Page/Edit/GenericButton.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\Page\Edit;
 
 use Emico\AttributeLanding\Api\Data\LandingPageInterface;

diff --git a/src/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php b/src/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php
@@ -1,13 +1,11 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\Page\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 class SaveAndContinueButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */

diff --git a/src/Block/Adminhtml/Page/Edit/SaveButton.php b/src/Block/Adminhtml/Page/Edit/SaveButton.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Block\Adminhtml\Page\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

diff --git a/src/Controller/Adminhtml/OverviewPage.php b/src/Controller/Adminhtml/OverviewPage.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
@@ -9,10 +8,12 @@
 
 abstract class OverviewPage extends Action
 {
-    const ADMIN_MENU_RESOURCE = 'Emico_AttributeLanding::overviewpage_management';
+    public const ADMIN_MENU_RESOURCE = 'Emico_AttributeLanding::overviewpage_management';
 
     /**
      * @param Context $context
+     *
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod.Found
      */
     public function __construct(
         Context $context

diff --git a/src/Controller/Adminhtml/OverviewPage/Delete.php b/src/Controller/Adminhtml/OverviewPage/Delete.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\OverviewPage;
 
 use Emico\AttributeLanding\Api\OverviewPageRepositoryInterface;

diff --git a/src/Controller/Adminhtml/OverviewPage/Edit.php b/src/Controller/Adminhtml/OverviewPage/Edit.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\OverviewPage;
 
 use Emico\AttributeLanding\Api\Data\OverviewPageInterfaceFactory;
@@ -80,7 +79,9 @@ public function execute()
             $id ? __('Edit overview page') : __('New overview page')
         );
 
-        $resultPage->getConfig()->getTitle()->prepend($id ? __('Edit overview page %1', $landingPage->getPageId()) : __('New overview page'));
+        $resultPage->getConfig()->getTitle()->prepend(
+            $id ? __('Edit overview page %1', $landingPage->getPageId()) : __('New overview page')
+        );
 
         return $resultPage;
     }

diff --git a/src/Controller/Adminhtml/OverviewPage/Index.php b/src/Controller/Adminhtml/OverviewPage/Index.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\OverviewPage;
 
 use Emico\AttributeLanding\Controller\Adminhtml\OverviewPage;

diff --git a/src/Controller/Adminhtml/OverviewPage/NewAction.php b/src/Controller/Adminhtml/OverviewPage/NewAction.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\OverviewPage;
 
 use Emico\AttributeLanding\Controller\Adminhtml\OverviewPage;

diff --git a/src/Controller/Adminhtml/OverviewPage/Save.php b/src/Controller/Adminhtml/OverviewPage/Save.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\OverviewPage;
 
 use Emico\AttributeLanding\Api\Data\OverviewPageInterface;

diff --git a/src/Controller/Adminhtml/Page.php b/src/Controller/Adminhtml/Page.php
@@ -1,13 +1,12 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
 
 abstract class Page extends Action
 {
-    const ADMIN_MENU_RESOURCE = 'Emico_AttributeLanding::page_management';
+    public const ADMIN_MENU_RESOURCE = 'Emico_AttributeLanding::page_management';
 
     /**
      * Init page

diff --git a/src/Controller/Adminhtml/Page/Delete.php b/src/Controller/Adminhtml/Page/Delete.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\Page;
 
 use Emico\AttributeLanding\Api\LandingPageRepositoryInterface;

diff --git a/src/Controller/Adminhtml/Page/Duplicate.php b/src/Controller/Adminhtml/Page/Duplicate.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\Page;
 
 use Emico\AttributeLanding\Api\Data\LandingPageInterface;
@@ -78,11 +77,10 @@ public function execute()
             $this->messageManager->addNoticeMessage('Your page has been duplicated');
             $this->messageManager->addWarningMessage('Do not forget to change the URL path');
             return $resultRedirect->setPath('*/*/edit', ['page_id' => $newLandingPage->getId()]);
-
         } catch (NoSuchEntityException $exception) {
             $this->messageManager->addErrorMessage(__('This Page no longer exists.'));
 
             return $resultRedirect->setPath('*/*/');
         }
     }
-}
+}
diff --git a/src/Controller/Adminhtml/Page/Edit.php b/src/Controller/Adminhtml/Page/Edit.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\Page;
 
 use Emico\AttributeLanding\Api\Data\LandingPageInterfaceFactory;
@@ -81,7 +80,9 @@ public function execute()
             $id ? __('Edit page') : __('New page')
         );
 
-        $resultPage->getConfig()->getTitle()->prepend($id ? __('Edit page %1', $landingPage->getPageId()) : __('New page'));
+        $resultPage->getConfig()->getTitle()->prepend(
+            $id ? __('Edit page %1', $landingPage->getPageId()) : __('New page')
+        );
 
         return $resultPage;
     }

diff --git a/src/Controller/Adminhtml/Page/Index.php b/src/Controller/Adminhtml/Page/Index.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\Page;
 
 use Emico\AttributeLanding\Controller\Adminhtml\Page;

diff --git a/src/Controller/Adminhtml/Page/NewAction.php b/src/Controller/Adminhtml/Page/NewAction.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\Page;
 
 use Emico\AttributeLanding\Controller\Adminhtml\Page;

diff --git a/src/Controller/Adminhtml/Page/Save.php b/src/Controller/Adminhtml/Page/Save.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Emico\AttributeLanding\Controller\Adminhtml\Page;
 
 use Emico\AttributeLanding\Api\Data\LandingPageInterface;
@@ -111,17 +110,20 @@ public function execute()
     /**
      * @param LandingPageInterface $landingPage
      * @param array $data
+     *
      * phpcs:disable Magento2.Security.InsecureFunction.FoundWithAlternative
      */
     protected function hydrateLandingPage(LandingPageInterface $landingPage, array $data)
     {
         if (!isset($data[LandingPageInterface::OVERVIEW_PAGE_IMAGE])) {
             $data[LandingPageInterface::OVERVIEW_PAGE_IMAGE] = null;
         } elseif (isset($data[LandingPageInterface::OVERVIEW_PAGE_IMAGE][0]['file'])) {
-            $data[LandingPageInterface::OVERVIEW_PAGE_IMAGE] = $data[LandingPageInterface::OVERVIEW_PAGE_IMAGE][0]['file'];
+            $data[LandingPageInterface::OVERVIEW_PAGE_IMAGE] =
+                $data[LandingPageInterface::OVERVIEW_PAGE_IMAGE][0]['file'];
         } else {
             unset($data[LandingPageInterface::OVERVIEW_PAGE_IMAGE]);
         }
+
         $filterAttributes = $data[LandingPageInterface::FILTER_ATTRIBUTES] ?? [];
         $filterAttributes = $this->sanitizeFilterAttributes($filterAttributes);
         $landingPage->setFilterAttributes(serialize($filterAttributes));
@@ -148,8 +150,10 @@ protected function sanitizeFilterAttributes(array $filterAttributes): array
                     unset($filterAttribute[$field]);
                 }
             }
+
             $sanitizedAttributes[] = $filterAttribute;
         }
+
         return $sanitizedAttributes;
     }
 }
diff --git a/src/Controller/Adminhtml/Page/UploadImage.php b/src/Controller/Adminhtml/Page/UploadImage.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Bram Gerritsen <bgerritsen@emico.nl>
  * @copyright (c) Emico B.V. 2017
@@ -22,7 +23,6 @@ class UploadImage extends \Magento\Backend\App\Action
     /**
      * UploadImage constructor.
      * @param Context $context
-     * @param LoggerInterface $logger
      * @param ImageUploader $imageUploader
      */
     public function __construct(
@@ -45,4 +45,4 @@ public function execute()
         $resultJson->setData($result);
         return $resultJson;
     }
-}
+}