Merge pull request #35 from PierreRambaud/update/dependencies

Update dependencies and phpstan configuration
PrestaShopCorp · Apr 16, 2021 · db3d7d4 · db3d7d4
2 parents d77ce6d + 16a5774
commit db3d7d4
Show file tree

Hide file tree

Showing 35 changed files with 1,343 additions and 741 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -2,17 +2,19 @@ name: PHP tests
 on: [push, pull_request]
 jobs:
   php-linter:
-    name: PHP Syntax check 5.6|7.2|7.3
+    name: PHP Syntax check 7.2|7.3|7.4|8.0
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2.0.0
-      - name: PHP syntax checker 5.6
-        uses: prestashop/github-action-php-lint/5.6@master
       - name: PHP syntax checker 7.2
         uses: prestashop/github-action-php-lint/7.2@master
       - name: PHP syntax checker 7.3
         uses: prestashop/github-action-php-lint/7.3@master
+      - name: PHP syntax checker 7.4
+        uses: prestashop/github-action-php-lint/7.4@master
+      - name: PHP syntax checker 8.0
+        uses: prestashop/github-action-php-lint/8.0@master
 
   php-cs-fixer:
     name: PHP-CS-Fixer
@@ -28,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['5.6', '7.0', '7.2']
+        php-version: ['7.2', '7.3', '7.4', '8.0']
     steps:
       - name: Setup PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v1
@@ -48,13 +50,11 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v1
         with:
-          php-version: '7.3'
+          php-version: '7.4'
           extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv
       - uses: actions/checkout@v1
         with:
           fetch-depth: 0
       - run: composer install --prefer-dist
       - name: Install & run PHPStan
-        run: |
-          composer global require phpstan/phpstan-shim:0.11.19;
-          ~/.composer/vendor/bin/phpstan analyse --configuration=$PWD/tests/phpstan/phpstan.neon;
+        run: ./vendor/bin/phpstan analyse --configuration=tests/phpstan/phpstan.neon
diff --git a/bin/header-stamp b/bin/header-stamp
@@ -25,6 +25,8 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
+declare(strict_types=1);
+
 $autoloadFiles = [
   __DIR__ . '/../../../autoload.php',
   __DIR__ . '/../vendor/autoload.php',

diff --git a/composer.json b/composer.json
@@ -10,27 +10,30 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.2.5",
         "symfony/console": "^3.4 || ~4.0 || ~5.0",
         "symfony/finder": "^3.4 || ~4.0 || ~5.0",
-        "nikic/php-parser": "^3.1"
+        "nikic/php-parser": "^4.10"
     },
     "config": {
         "preferred-install": "dist",
         "prepend-autoloader": false,
         "optimize-autoloader": true,
         "platform": {
-            "php": "5.6"
+            "php": "7.2.5"
         }
     },
-    "bin": ["bin/header-stamp"],
+    "bin": [
+        "bin/header-stamp"
+    ],
     "autoload": {
         "psr-4": {
             "PrestaShop\\HeaderStamp\\": "src/"
         }
     },
     "author": "PrestaShop",
     "require-dev": {
-        "prestashop/php-dev-tools": "1.*"
+        "prestashop/php-dev-tools": "1.*",
+        "phpstan/phpstan": "^0.12.83"
     }
 }