2.4 coding standart

.github/workflows/grumphp.yml

@@ -0,0 +1,47 @@
+name: Static Test
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - v2.4
+  push:
+    branches:
+      - v2.4
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['7.4', '8.1']
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, xml, ctype, iconv, intl, mysql
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - run: composer self-update --2
+      - run: echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGE_LOGIN}\",\"password\":\"${MAGE_PWD}\"}}}" > auth.json
+        env:
+          MAGE_LOGIN: ${{ secrets.MAGE_LOGIN }}
+          MAGE_PWD: ${{ secrets.MAGE_PWD }}
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+      - run: php vendor/bin/phpcs --config-set ignore_warnings_on_exit 1
+      - run: php vendor/bin/phpcs --config-set show_warnings 0
+      - name: Run Tests
+        run: php vendor/bin/grumphp run

.gitignore

@@ -5,5 +5,6 @@
 /composer.lock
 .DS_Store
 .php_cs.cache
+.php-cs-fixer.cache
 auth.json
 /generate

Api/Data/KeysInterface.php

@@ -10,10 +10,10 @@
 
 interface KeysInterface
 {
-    const ID = 'id';
-    const CODE = 'code';
-    const ORDER_ID = 'order_id';
-    const HKEY = 'hkey';
+    public const ID = 'id';
+    public const CODE = 'code';
+    public const ORDER_ID = 'order_id';
+    public const HKEY = 'hkey';
 
     /**
      * Get id

Api/Data/RegistrationInterface.php

@@ -10,14 +10,14 @@
 
 interface RegistrationInterface
 {
-    const ID = 'id';
-    const CODE = 'code';
-    const ORDER_ID = 'order_id';
-    const PAYMENT_ID = 'payment_id';
-    const PAYMENT_URL = 'payment_url';
-    const TRY = 'try';
-    const PAYMENT_TYPE = 'payment_type';
-    const CREATED_AT = 'created_at';
+    public const ID = 'id';
+    public const CODE = 'code';
+    public const ORDER_ID = 'order_id';
+    public const PAYMENT_ID = 'payment_id';
+    public const PAYMENT_URL = 'payment_url';
+    public const TRY = 'try';
+    public const PAYMENT_TYPE = 'payment_type';
+    public const CREATED_AT = 'created_at';
 
     /**
      * Get id

Block/Info.php

@@ -74,7 +74,8 @@ public function isPaid()
     public function isComplete()
     {
         $state = $this->getOrder()->getState();
-        if ($this->getOrder()->isCanceled() ||
+        if (
+            $this->getOrder()->isCanceled() ||
             $state === Order::STATE_COMPLETE ||
             $state === Order::STATE_CLOSED
         ) {

Helper/Transaction.php

@@ -156,11 +156,13 @@ public function proceedReceipt($order, $transactionId, $parentTransactionId, $tr
     {
         $this->helper->debug('proceed receipt: ' . $transactionId, $transData);
 
-        if ($this->checkIfTransactionExists(
-            $transactionId,
-            $order->getPayment()->getId(),
-            $order->getId()
-        )) {
+        if (
+            $this->checkIfTransactionExists(
+                $transactionId,
+                $order->getPayment()->getId(),
+                $order->getId()
+            )
+        ) {
             $this->helper->notice('transaction %1 already exists', $transactionId);
 
             return;
@@ -199,11 +201,13 @@ public function proceedRefundReceipt($order, $transactionId, $parentTransactionI
     {
         $this->helper->debug('Proceed receipt refund: ' . $transactionId, $transData);
 
-        if ($this->checkIfTransactionExists(
-            $transactionId,
-            $order->getPayment()->getId(),
-            $order->getId()
-        )) {
+        if (
+            $this->checkIfTransactionExists(
+                $transactionId,
+                $order->getPayment()->getId(),
+                $order->getId()
+            )
+        ) {
             $this->helper->notice('Transaction %1 already exists', $transactionId);
 
             return;

Model/Method/Adapter.php

@@ -76,9 +76,10 @@ public function executeCustomCommand($commandCode, $arguments = [])
             return;
         }
 
-        if (isset($arguments['payment'])
+        if (
+            isset($arguments['payment'])
             && $arguments['payment'] instanceof \Magento\Payment\Model\InfoInterface
-          ) {
+        ) {
             $arguments['payment'] = $this->paymentDataObjectFactory->create($arguments['payment']);
         }
         $command = $this->commandPool->get($commandCode);

Model/Source/Steps.php

@@ -10,8 +10,8 @@
 
 class Steps implements \Magento\Framework\Option\ArrayInterface
 {
-    const ONE_STEP = 1;
-    const TWO_STEP = 2;
+    public const ONE_STEP = 1;
+    public const TWO_STEP = 2;
 
     /**
      * One/Two factor payment

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "mygento/module-payment",
   "type": "magento2-module",
-  "version": "2.4.0-RC1",
+  "version": "2.4.0",
   "license": "OSL-3.0",
   "homepage": "https://github.com/mygento/module-payment",
   "description": "Mygento Payment Base",
@@ -23,13 +23,11 @@
   ],
   "require": {
     "magento/module-payment": "100.*",
-    "mygento/module-base": "~2.4.0-RC1"
+    "mygento/module-base": "~2.4.0"
   },
   "require-dev": {
-    "mygento/coding-standard": "~2.14.0-beta3"
+    "mygento/coding-standard": "~2.14.0"
   },
-  "minimum-stability": "RC",
-  "prefer-stable": true,
   "autoload": {
     "files": [
       "registration.php"
@@ -41,5 +39,11 @@
   "repositories": [{
     "type": "composer",
     "url": "https://repo.magento.com"
-  }]
+  }],
+  "config": {
+    "allow-plugins": {
+      "magento/composer-dependency-version-audit-plugin": false,
+      "phpro/grumphp": true
+    }
+  }
 }

grumphp.yml

@@ -9,11 +9,11 @@ grumphp:
                 - "exit;"
         phplint:
         phpcsfixer:
-            config: '.php_cs'
+            config: '.php-cs-fixer.php'
         phpmd:
             ruleset: ['vendor/mygento/coding-standard/Mygento-Mage2/phpmd.xml']
         phpcs:
-            warning_severity: null
+            warning_severity: 0
         xmllint:
         phpstan:
           autoload_file: 'vendor/mygento/coding-standard/stan/autoload.php'

phpstan.neon

@@ -2,4 +2,5 @@ includes:
   - vendor/mygento/coding-standard/stan/extension.neon
 
 parameters:
-    bootstrap: 'vendor/mygento/coding-standard/stan/autoload.php'
+    bootstrapFiles:
+        - 'vendor/mygento/coding-standard/stan/autoload.php'