Skip to content

Commit

Permalink
Minimal PHP version is 7.4 (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
SmetDenis authored Jun 5, 2022
1 parent bce1cf0 commit dd8b398
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 32 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,9 @@ jobs:
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
strategy:
matrix:
php-version: [ 7.2, 7.3, 7.4]
php-version: [ 7.4, 8.0, 8.1]
coverage: [ xdebug, none ]
composer_flags: [ "--prefer-lowest", "" ]
include:
- php-version: "8.0"
- php-version: "8.1"
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -64,7 +61,7 @@ jobs:
if: ${{ matrix.coverage == 'xdebug' }}
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: make report-coveralls --no-print-directory
run: make report-coveralls --no-print-directory || true

- name: Upload Artifacts
uses: actions/upload-artifact@v2
Expand All @@ -78,7 +75,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
php-version: [ 7.4, 8.0, 8.1 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -90,6 +87,7 @@ jobs:
with:
php-version: ${{ matrix.php-version }}
tools: composer
extensions: ast

- name: Build the Project
run: make update --no-print-directory
Expand All @@ -109,7 +107,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
php-version: [ 7.4, 8.0, 8.1 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down
20 changes: 8 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,17 @@
],

"require" : {
"php" : ">=7.2",
"php" : ">=7.4",

"jbzoo/phpunit" : "^4.12.0",
"jbzoo/codestyle" : "^3.3.0",
"jbzoo/markdown" : "^1.1.1",
"jbzoo/phpunit" : ">=4.13.1",
"jbzoo/codestyle" : ">=4.0.0",
"jbzoo/markdown" : ">=1.1.1",

"jbzoo/jbdump" : "^1.5.6",
"jbzoo/jbdump" : ">=1.5.6",
"symfony/var-dumper" : ">=4.4",

"php-coveralls/php-coveralls" : "^2.4.3",
"fakerphp/faker" : "^1.17.0"
},

"conflict" : {
"phpunit/phpunit" : ">=8.5.24,<9.0"
"php-coveralls/php-coveralls" : ">=2.5.2",
"fakerphp/faker" : ">=1.19.0"
},

"autoload" : {
Expand All @@ -52,7 +48,7 @@

"extra" : {
"branch-alias" : {
"dev-master" : "2.x-dev"
"dev-master" : "4.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion tests/ToolboxDevComposerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
*/
class ToolboxDevComposerTest extends AbstractComposerTest
{

protected $phpVersion = '>=7.4';
}
12 changes: 0 additions & 12 deletions tests/ToolboxDevReadmeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,4 @@
class ToolboxDevReadmeTest extends AbstractReadmeTest
{
protected $packageName = 'Toolbox-Dev';

/**
* @inheritDoc
*/
protected function setUp(): void
{
parent::setUp();

$this->params['codefactor'] = true;
$this->params['strict_types'] = true;
$this->params['travis'] = true;
}
}

0 comments on commit dd8b398

Please sign in to comment.