Merge pull request #5 from MaximGns/bugfix/grumphp

Update grumphp and update code

Author: stefliekens

.github/workflows/grumphp.yml

@@ -2,35 +2,27 @@ on: [push]
 
 jobs:
   build:
-    name: Checking coding standards
+    name: Running GrumPHP
     runs-on: ubuntu-latest
+    env:
+      extensions: intl, mbstring
     steps:
       - uses: actions/checkout@v2
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache Composer Downloads
-        uses: actions/cache@v1
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Cache PHP dependencies
-        uses: actions/cache@v1
-        with:
-          path: vendor
-          key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
-
-      - uses: MilesChou/composer-action@master
-        with:
-          args: config "http-basic.repo.magento.com" ${{ secrets.MAGE_USER }} ${{ secrets.MAGE_PASS }}
-
-      - uses: MilesChou/composer-action@master
+          php-version: '7.3'
+          extensions: ${{ env.extensions }}
+          tools: composer
+      - name: Get Composer Cache Directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache dependencies
+        uses: actions/cache@v2
         with:
-          args: install --prefer-dist
-
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Install dependencies
+        run: composer config "http-basic.repo.magento.com" ${{ secrets.MAGE_USER }} ${{ secrets.MAGE_PASS }} && composer install --prefer-dist
       - run: ./vendor/bin/grumphp run

Config/SystemConfiguration.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Phpro\APILogger\Config;
 
 use Phpro\LoggerHandler\Config\LogConfiguration;

Plugin/RestApiLog.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Phpro\APILogger\Plugin;
@@ -39,7 +40,8 @@ public function aroundDispatch(
         list($responseStatusCode, $responseBody) = $this->getResponseData($response);
 
         $this->logger->info(sprintf(
-            '[API LOGGER] [IP: "%s"] [Method: "%s"] [Endpoint: "%s"] [ResponseCode: "%s"] [Exec Time: %s] [Request Body: "%s"] [Response Body: "%s"]',
+            '[API LOGGER] [IP: "%s"] [Method: "%s"] [Endpoint: "%s"] [ResponseCode: "%s"]' .
+            '[Exec Time: %s] [Request Body: "%s"] [Response Body: "%s"]',
             $request->getClientIp(),
             $request->getMethod(),
             $request->getRequestUri(),

Setup/UpgradeData.php

@@ -11,13 +11,13 @@
     }
   ],
   "require": {
-    "php": "^7.0",
+    "php": "^7.1",
     "magento/framework": "^100.1|^101.0|^102.0|^103.0",
     "phpro/mage2-module-logger-handler": "^3.0.0"
   },
   "require-dev": {
-    "magento/marketplace-eqp": "^1.0",
-    "phpro/grumphp": "^0.14"
+    "phpro/grumphp-shim": "~1.5.0",
+    "magento/magento-coding-standard": "5"
   },
   "autoload": {
     "psr-4": {
@@ -48,5 +48,13 @@
       "ext-soap": "7.1",
       "ext-zip": "7.1"
     }
+  },
+  "scripts": {
+    "post-install-cmd": [
+      "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard,../../phpcompatibility/php-compatibility/PHPCompatibility)"
+    ],
+    "post-update-cmd": [
+      "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard,../../phpcompatibility/php-compatibility/PHPCompatibility)"
+    ]
   }
 }

composer.json

@@ -1,8 +1,7 @@
-parameters:
+grumphp:
     tasks:
         phpcs:
-            standard: "ruleset.xml"
-            warning_severity: 0
+            standard: [PSR2]
             ignore_patterns:
                 - "Test/Unit"
             triggered_by: [php]