Skip to content

Commit

Permalink
Merge pull request #57 from PierreRambaud/update/dependencies
Browse files Browse the repository at this point in the history
Update dependencies to be compliant with PHP 7.2.5+
  • Loading branch information
PierreRambaud authored Apr 16, 2021
2 parents 62f38cf + 5a25ec0 commit 002586a
Show file tree
Hide file tree
Showing 8 changed files with 1,018 additions and 274 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@ on: [push, pull_request]
jobs:
# Check there is no syntax errors in the project
php-linter:
name: PHP Syntax check
name: PHP Syntax check 7.2|7.3|7.4|8.0`
runs-on: ubuntu-latest
strategy:
matrix:
php: ['7.2', '7.3', '7.4']
php: ['7.2', '7.3', '7.4', '8.0']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}

- name: Checkout
uses: actions/checkout@v2.0.0

Expand All @@ -21,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: ['7.3', '7.4']
php: ['7.2', '7.3', '7.4', '8.0']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 2 additions & 0 deletions bin/prestashop-coding-standards
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env php
<?php

declare(strict_types=1);

// OK, it's not, let give Composer autoloader a try!
$autoloadFile = __DIR__.'/../../../autoload.php';
if (file_exists($autoloadFile)) {
Expand Down
13 changes: 8 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,28 @@
"description": "PrestaShop coding standards",
"license": "MIT",
"require": {
"php": ">=5.6.0",
"php": ">=7.2.5",
"symfony/console": "~3.2 || ~4.0 || ~5.0",
"friendsofphp/php-cs-fixer": "^2.14",
"squizlabs/php_codesniffer": "^3.4",
"symfony/filesystem": "~3.2 || ~4.0 || ~5.0",
"prestashop/header-stamp": "^1.0"
"prestashop/header-stamp": "^2.0"
},
"conflict": {
"friendsofphp/php-cs-fixer": "2.18.3"
},
"bin": ["bin/prestashop-coding-standards"],
"bin": [
"bin/prestashop-coding-standards"
],
"autoload": {
"psr-4": {
"PrestaShop\\CodingStandards\\": "src/"
}
},
"config": {
"platform": {
"php": "5.6.0"
"php": "7.2.5"
}
}
},
"author": "PrestaShop"
}
Loading

0 comments on commit 002586a

Please sign in to comment.