Fix coding standard on Refactored branch

.github/workflows/coding-standard.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: extdn/github-actions-m2/magento-coding-standard/8.1@master
         with:
           phpcs_severity: 10
@@ -18,15 +18,55 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: extdn/github-actions-m2/magento-mess-detector@master
 
   phpstan:
     name: M2 PHPStan
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v2
-      - uses: extdn/github-actions-m2/magento-phpstan/8.1@master
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          composer_name: buckaroo/magento2
+          php-version: 8.1
+          tools: composer:v2
+
+      - uses: actions/checkout@v3
+
+      - name: Validate composer json
+        run: composer validate
+
+      - name: Clear Composer cache
+        run: composer clear-cache
+
+      - name: Setup Magento
+        run: |
+          pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
+          url="https://api.github.com/repos/buckaroo-it/Magento2/pulls/$pull_number/files"
+          echo $url
+          curl $url > files_changed
+          cat files_changed | grep '"filename"' | sed 's/\"filename\"\: \"//' | sed 's/\",//' | xargs ls
+          echo '{"http-basic": {"repo.magento.com": {"username": "${{ secrets.REPO_USERNAME }}","password": "${{ secrets.REPO_PASS }}"}}}' > auth.json
+          composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition=2.4.6-p2 ~/m246
+          mkdir -p ~/m246/app/code/Buckaroo/Magento2/
+          rsync -r --exclude='m246' ./ ~/m246/app/code/Buckaroo/Magento2/
+          cd ~/m246
+          bin/magento module:enable --all
+          bin/magento setup:di:compile
+
+      - name: Install PHPStan
+        run: |
+          cd ~/m246
+          composer require --dev phpstan/phpstan:^1.10
+          ls -la vendor/bin/
+
+      - name: Install Buckaroo SDK
+        run: |
+          cd ~/m246
+          composer require buckaroo/sdk
+
+      - name: Run PHPStan
+        run: |
+          cd ~/m246
+          vendor/bin/phpstan analyse --level 1 app/code/Buckaroo/Magento2/ -c dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon

.github/workflows/integration.yml

@@ -18,7 +18,7 @@ jobs:
           - 3306:3306
         options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
       es:
-        image: docker.io/wardenenv/elasticsearch:7.16
+        image: docker.io/wardenenv/elasticsearch:7.8
         ports:
           - 9200:9200
         env:
@@ -27,10 +27,10 @@ jobs:
           ES_JAVA_OPTS: "-Xms64m -Xmx512m"
         options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: M2 Integration Tests with Magento 2 (Php 8.1)
         uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
         with:
           module_name: Buckaroo_Magento2
           composer_name: buckaroo/magento2
-          ce_version: '2.4.4'
+          ce_version: '2.4.6'

Api/Data/BuckarooGiftcardDataInterface.php

@@ -16,4 +16,4 @@ public function getGiftcardModel(): Giftcard;
      * @return BuckarooGiftcardDataInterface
      */
     public function setGiftcardModel(Giftcard $giftcard): BuckarooGiftcardDataInterface;
-}
+}

Api/Data/BuckarooResponseDataInterface.php

@@ -9,4 +9,4 @@ interface BuckarooResponseDataInterface
     public function getResponse(): TransactionResponse;
 
     public function setResponse(TransactionResponse $transactionResponse): BuckarooResponseDataInterface;
-}
+}

Api/PushProcessorInterface.php

@@ -9,4 +9,4 @@ interface PushProcessorInterface
      * @return bool
      */
     public function processPush(PushRequestInterface $pushRequest): bool;
-}
+}

Block/Adminhtml/Config/Support/SupportTab.php

@@ -57,8 +57,8 @@ class SupportTab extends Template implements RendererInterface
      * Override the parent constructor to require our own dependencies.
      *
      * @param Context $context
-     * @param ModuleResource $moduleContext
      * @param SoftwareData $softwareData
+     * @param Curl $curl
      * @param array $data
      */
     public function __construct(
@@ -118,8 +118,7 @@ public function phpVersionCheck()
         $phpMajorMinor = $phpVersion[0] . '.' . $phpVersion[1];
         $phpPatch = (int)$phpVersion[2];
 
-        if (
-            !isset($this->phpVersionSupport[$magentoMajorMinor]) ||
+        if (!isset($this->phpVersionSupport[$magentoMajorMinor]) ||
             !isset($this->phpVersionSupport[$magentoMajorMinor][$phpMajorMinor])
         ) {
             return 0;

Block/Adminhtml/System/Config/Fieldset/Payment.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * NOTICE OF LICENSE
  *
@@ -21,36 +20,43 @@
 
 namespace Buckaroo\Magento2\Block\Adminhtml\System\Config\Fieldset;
 
+use Magento\Backend\Block\Context;
+use Magento\Backend\Model\Auth\Session;
+use Magento\Config\Block\System\Config\Form\Fieldset;
+use Magento\Config\Model\Config;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\View\Helper\Js;
+
 /**
  * Fieldset renderer for Buckaroo solution
  */
-class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
+class Payment extends Fieldset
 {
     /**
-     * @var \Magento\Config\Model\Config
+     * @var Config
      */
-    protected $_backendConfig;
+    protected Config $backendConfig;
 
     /**
-     * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Backend\Model\Auth\Session $authSession
-     * @param \Magento\Framework\View\Helper\Js $jsHelper
-     * @param \Magento\Config\Model\Config $backendConfig
+     * @param Context $context
+     * @param Session $authSession
+     * @param Js $jsHelper
+     * @param Config $backendConfig
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Context $context,
-        \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\View\Helper\Js $jsHelper,
-        \Magento\Config\Model\Config $backendConfig,
+        Context $context,
+        Session $authSession,
+        Js $jsHelper,
+        Config $backendConfig,
         array $data = []
     ) {
-        $this->_backendConfig = $backendConfig;
+        $this->backendConfig = $backendConfig;
         parent::__construct($context, $authSession, $jsHelper, $data);
     }
 
     /**
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -60,8 +66,8 @@ protected function _getHeaderTitleHtml($element)
 
         $groupConfig = $element->getGroup();
 
-        $disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"';
-        $disabledClassString = $this->_isPaymentEnabled($element) ? '' : ' disabled';
+        $disabledAttributeString = $this->isPaymentEnabled($element) ? '' : ' disabled="disabled"';
+        $disabledClassString = $this->isPaymentEnabled($element) ? '' : ' disabled';
         $htmlId = $element->getHtmlId();
         $html .= '<div class="button-container"><button type="button"' .
             $disabledAttributeString .
@@ -81,14 +87,12 @@ protected function _getHeaderTitleHtml($element)
             ) . '</span></button>';
 
         if (!empty($groupConfig['more_url'])) {
-            $html .= '<a class="link-more" href="' . $groupConfig['more_url'] . '" target="_blank">' . __(
-                'Learn More'
-            ) . '</a>';
+            $html .= '<a class="link-more" href="' . $groupConfig['more_url'] . '" target="_blank">'
+                . __('Learn More') . '</a>';
         }
         if (!empty($groupConfig['demo_url'])) {
-            $html .= '<a class="link-demo" href="' . $groupConfig['demo_url'] . '" target="_blank">' . __(
-                'View Demo'
-            ) . '</a>';
+            $html .= '<a class="link-demo" href="' . $groupConfig['demo_url'] . '" target="_blank">'
+                . __('View Demo') . '</a>';
         }
 
         $html .= '</div>';
@@ -104,7 +108,20 @@ protected function _getHeaderTitleHtml($element)
     }
 
     /**
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * Check whether current payment method is enabled
+     *
+     * @param AbstractElement $element
+     * @return bool
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function isPaymentEnabled($element)
+    {
+        return (bool)(string)$this->backendConfig->getConfigDataValue('buckaroo_magento2/account/active') > 0;
+    }
+
+    /**
+     * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -114,7 +131,7 @@ protected function _getHeaderCommentHtml($element)
     }
 
     /**
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return false
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -124,7 +141,7 @@ protected function _isCollapseState($element)
     }
 
     /**
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -153,25 +170,12 @@ protected function _getExtraJs($element)
     }
 
     /**
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     protected function _getFrontendClass($element)
     {
-        $enabledString = $this->_isPaymentEnabled($element) ? ' enabled' : '';
+        $enabledString = $this->isPaymentEnabled($element) ? ' enabled' : '';
         return parent::_getFrontendClass($element) . ' with-button' . $enabledString;
     }
-
-    /**
-     * Check whether current payment method is enabled
-     *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
-     * @return bool
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    protected function _isPaymentEnabled($element)
-    {
-        return (bool)(string) $this->_backendConfig->getConfigDataValue('buckaroo_magento2/account/active') > 0;
-    }
 }

Block/Config/Form/Field/ColorPicker.php

@@ -37,4 +37,4 @@ protected function _getElementHtml(AbstractElement $element): string
         $element->setData('type', 'color');
         return $element->getElementHtml();
     }
-}
+}

Block/Config/Form/Field/Fieldset.php

@@ -153,8 +153,7 @@ private function getScopeValue(): array
      */
     protected function _getHeaderTitleHtml($element): string
     {
-        if (
-            !isset($element->getGroup()['id']) ||
+        if (!isset($element->getGroup()['id']) ||
             !is_string($element->getGroup()['id'])
         ) {
             return parent::_getHeaderTitleHtml($element);

Block/Config/Form/Field/LogoSelector.php

@@ -29,7 +29,7 @@ class LogoSelector extends Field
 {
     protected $_template = 'Buckaroo_Magento2::in3_logo.phtml';
 
-    protected  Repository $assetRepo;
+    protected Repository $assetRepo;
 
     /**
      * @param Context $context
@@ -56,8 +56,8 @@ protected function _getElementHtml(AbstractElement $element)
     {
         $element->setData('type', 'hidden');
         $this->assign("input", $element->getElementHtml());
-        $this->assign("inputId",   $element->getHtmlId());
-        $this->assign("inputValue",   $element->getEscapedValue());
+        $this->assign("inputId", $element->getHtmlId());
+        $this->assign("inputValue", $element->getEscapedValue());
         return $this->_toHtml();
     }
 
@@ -66,6 +66,6 @@ public function getLogos(): array
         return [
             "in3.svg" => $this->assetRepo->getUrl("Buckaroo_Magento2::images/svg/in3.svg"),
             "in3-ideal.svg" => $this->assetRepo->getUrl("Buckaroo_Magento2::images/svg/in3-ideal.svg")
-        ]; 
+        ];
     }
-}
+}

Block/Config/Form/Field/VerificationMethod.php

@@ -76,8 +76,7 @@ protected function _getFrontendClass($element): string
      */
     protected function _getHeaderTitleHtml($element): string
     {
-        if (
-            !isset($element->getGroup()['id']) ||
+        if (!isset($element->getGroup()['id']) ||
             !is_string($element->getGroup()['id'])
         ) {
             return parent::_getHeaderTitleHtml($element);

Controller/Adminhtml/Giftcard/Save.php

@@ -53,7 +53,6 @@ public function execute()
 
                 if ($this->getRequest()->getParam('back')) {
                     return $this->_redirect('*/*/edit', ['entity_id' => $giftcardModel->getId(), '_current' => true]);
-
                 }
 
                 return $this->_redirect('*/*/');

Controller/Adminhtml/Notification/MarkUserNotified.php

@@ -22,12 +22,13 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\FlagManager;
 use Psr\Log\LoggerInterface;
 
-class MarkUserNotified extends Action
+class MarkUserNotified extends Action implements HttpPostActionInterface
 {
     /**
      * @var FlagManager $flagManager

Controller/Applepay/Add.php

@@ -63,7 +63,8 @@ public function execute()
     {
         $this->logger->addDebug(sprintf(
             '[ApplePay] | [Controller] | [%s:%s] - Add Product to Cart | request: %s',
-            __METHOD__, __LINE__,
+            __METHOD__,
+            __LINE__,
             var_export($this->getParams(), true)
         ));
 
@@ -72,7 +73,8 @@ public function execute()
 
         $this->logger->addDebug(sprintf(
             '[ApplePay] | [Controller] | [%s:%s] - Add Product to Cart | response: %s',
-            __METHOD__, __LINE__,
+            __METHOD__,
+            __LINE__,
             var_export($data, true)
         ));