Merge pull request #1401 from buckaroo-it/BP-5064-Add-support-for-PHP-8.4

add support for php 8.4

Author: vegimcarkaxhija

.github/workflows/coding-standard.yml

@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v2
-      - uses: extdn/github-actions-m2/magento-coding-standard/8.1@master
+      - uses: actions/checkout@v4
+      - uses: extdn/github-actions-m2/magento-coding-standard@master
         with:
           phpcs_severity: 10
           phpcs_report: full
@@ -18,15 +18,15 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - 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@master
+      - uses: actions/checkout@v4
+      - uses: extdn/github-actions-m2/magento-phpstan/8.4@master
         with:
           composer_name: buckaroo/magento2

.github/workflows/integration.yml

@@ -11,26 +11,28 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
           - 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.8
+        image: opensearchproject/opensearch:2.5.0
         ports:
           - 9200:9200
         env:
-          'discovery.type': single-node
-          'xpack.security.enabled': false
-          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
+          discovery.type: single-node
+          plugins.security.disabled: true
+          OPENSEARCH_JAVA_OPTS: "-Xms512m -Xmx512m"
+          DISABLE_INSTALL_DEMO_CONFIG: true
+          compatibility.override_main_response_version: true
+        options: --health-cmd="curl -f localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
-      - uses: actions/checkout@v2
-      - name: M2 Integration Tests with Magento 2 (Php 7.4)
-        uses: extdn/github-actions-m2/magento-integration-tests/7.4@master
+      - uses: actions/checkout@v4
+      - name: M2 Integration Tests with Magento 2.4.8-p3 (PHP 8.3)
+        uses: extdn/github-actions-m2/magento-integration-tests/8.3@master
         with:
           module_name: Buckaroo_Magento2
           composer_name: buckaroo/magento2
-          ce_version: '2.4.0'
+          ce_version: '2.4.8-p3'

.github/workflows/main.yml

@@ -1,43 +1,82 @@
 name: Module checks
+
 on:
   push:
     branches: [ develop ]
   pull_request:
     branches: [ develop ]
   workflow_dispatch:
+
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
-      - name: setup php
+      - name: Setup PHP 8.4
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.3
-          tools: composer:v2
-      - uses: actions/checkout@v2
-      - name: validate composer json
+          php-version: '8.4'
+          tools: composer:v2, phpunit, phpcs
+          coverage: none
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Validate composer.json
         run: composer validate
+
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/${{ env.namespace }}-source/vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-php84-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-php-
-      - name: PHPUnit and PHPCS
+            ${{ runner.os }}-php84-
+
+      - name: Prepare auth for Magento repo
+        run: |
+          printf '%s\n' \
+          '{' \
+          '  "http-basic": {' \
+          '    "repo.magento.com": {' \
+          '      "username": "${{ secrets.REPO_USERNAME }}",' \
+          '      "password": "${{ secrets.REPO_PASS }}"' \
+          '    }' \
+          '  }' \
+          '}' > auth.json
+
+      - name: Determine changed files (PR only)
+        if: ${{ github.event_name == 'pull_request' }}
         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.3.6 m23
-          mkdir -p m23/app/code/Buckaroo/Magento2/
-          rsync -r --exclude='m23' ./ m23/app/code/Buckaroo/Magento2/
-          cat files_changed | grep '"filename"' | sed 's/\"filename\"\: \"//' | sed 's/\",//' | xargs ./m23/vendor/bin/phpcs --standard=Magento2
-          cd m23
+          url="https://api.github.com/repos/${{ github.repository }}/pulls/$pull_number/files"
+          echo "$url"
+          curl -sS "$url" > files_changed
+          cat files_changed | grep '"filename"' | sed 's/\"filename\"\: \"//' | sed 's/\",//' | xargs -r ls -la
+
+      - name: Create Magento 2.4.8-p3 project
+        run: |
+          composer create-project --repository-url=https://repo.magento.com/ \
+            magento/project-community-edition=2.4.8-p3 m248
+
+      - name: Copy module into Magento
+        run: |
+          mkdir -p m248/app/code/Buckaroo/Magento2/
+          rsync -r --exclude='m248' ./ m248/app/code/Buckaroo/Magento2/
+
+      - name: Run PHPCS against changed files (PR) or whole module (push)
+        run: |
+          if [ -f files_changed ]; then
+            cat files_changed | grep '"filename"' | sed 's/\"filename\"\: \"//' | sed 's/\",//' \
+              | xargs -r ./m248/vendor/bin/phpcs --standard=Magento2
+          else
+            ./m248/vendor/bin/phpcs --standard=Magento2 m248/app/code/Buckaroo/Magento2
+          fi
+
+      - name: Compile and run unit tests
+        working-directory: m248
+        run: |
           bin/magento module:enable --all
           bin/magento setup:di:compile
           vendor/phpunit/phpunit/phpunit -c dev/tests/unit/phpunit.xml.dist app/code/Buckaroo/Magento2

.github/workflows/rename-icons.php

@@ -1,4 +1,5 @@
 <?php
+// phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
 $path = realpath('./');
 
 $di = new RecursiveIteratorIterator(
@@ -7,8 +8,10 @@
 );
 
 foreach ($di as $name => $fio) {
-    $newname = $fio->getPath() . DIRECTORY_SEPARATOR . strtolower(str_replace(" ","",str_replace("&","-",$fio->getFilename())));
+    // phpcs:ignore Generic.Files.LineLength.TooLong
+    $newname = $fio->getPath() . DIRECTORY_SEPARATOR . strtolower(str_replace(" ", "", str_replace("&", "-", $fio->getFilename())));
     // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
     echo $newname, "\r\n";
+    // phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
     rename($name, $newname);
 }

.gitignore

@@ -1,3 +1,7 @@
 Build
 .DS_Store
 .idea/
+vendor/
+# Local testing files (keep for development only)
+phpstan.neon
+composer.lock

.php-cs-fixer.dist.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude(['vendor', 'var', 'Test'])
+    ->notPath('registration.php');
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PHP84Migration' => true,
+        '@PSR12' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
+        'modernize_types_casting' => true,
+        'visibility_required' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'trailing_comma_in_multiline' => true,
+        'no_unused_imports' => true,
+    ])
+    ->setFinder($finder)
+    ->setRiskyAllowed(true);

Api/CertificateRepositoryInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * NOTICE OF LICENSE
  *
@@ -17,6 +18,7 @@
  * @copyright Copyright (c) Buckaroo B.V.
  * @license   https://tldrlegal.com/license/mit-license
  */
+
 namespace Buckaroo\Magento2\Api;
 
 use Magento\Framework\Api\SearchCriteria;
@@ -29,37 +31,37 @@
 interface CertificateRepositoryInterface
 {
     /**
-     * @param CertificateInterface $certificate
-     * @return CertificateInterface
+     * @param  CertificateInterface  $certificate
      * @throws CouldNotSaveException
+     * @return CertificateInterface
      */
     public function save(CertificateInterface $certificate);
 
     /**
-     * @param int|string $certificateId
-     * @return CertificateInterface
+     * @param  int|string            $certificateId
      * @throws NoSuchEntityException
+     * @return CertificateInterface
      */
     public function getById($certificateId);
 
     /**
-     * @param SearchCriteria $searchCriteria
+     * @param  SearchCriteria         $searchCriteria
      * @return SearchResultsInterface
      */
     public function getList(SearchCriteria $searchCriteria);
 
     /**
-     * @param CertificateInterface $certificate
-     * @return bool
+     * @param  CertificateInterface    $certificate
      * @throws CouldNotDeleteException
+     * @return bool
      */
     public function delete(CertificateInterface $certificate);
 
     /**
-     * @param $certificateId
-     * @return bool
+     * @param                          $certificateId
      * @throws CouldNotDeleteException
      * @throws NoSuchEntityException
+     * @return bool
      */
     public function deleteById($certificateId);
 }

Api/Data/BreakdownItemInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * NOTICE OF LICENSE
  *
@@ -17,6 +18,7 @@
  * @copyright Copyright (c) Buckaroo B.V.
  * @license   https://tldrlegal.com/license/mit-license
  */
+
 namespace Buckaroo\Magento2\Api\Data;
 
 interface BreakdownItemInterface
@@ -34,4 +36,4 @@ public function getCurrencyCode();
      * @return string
      */
     public function getValue();
-}
+}

Api/Data/BuckarooRestOrderDataInterface.php

@@ -27,4 +27,4 @@ interface BuckarooRestOrderDataInterface
      * @return \Buckaroo\Magento2\Api\Data\Giftcard\TransactionResponseInterface[]
      */
     public function getGroupTransactions();
-}
+}

Api/Data/CertificateInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * NOTICE OF LICENSE
  *
@@ -17,12 +18,13 @@
  * @copyright Copyright (c) Buckaroo B.V.
  * @license   https://tldrlegal.com/license/mit-license
  */
+
 namespace Buckaroo\Magento2\Api\Data;
 
 interface CertificateInterface
 {
     /**
-     * @param string $certificate
+     * @param  string $certificate
      * @return $this
      */
     public function setCertificate($certificate);
@@ -33,7 +35,7 @@ public function setCertificate($certificate);
     public function getCertificate();
 
     /**
-     * @param string $name
+     * @param  string $name
      * @return $this
      */
     public function setName($name);
@@ -44,7 +46,7 @@ public function setName($name);
     public function getName();
 
     /**
-     * @param string $createdAt
+     * @param  string $createdAt
      * @return $this
      */
     public function setCreatedAt($createdAt);