Skip to content

Commit dcce4dd

Browse files
authored
Minimal PHP version is 8.0 (#24)
1 parent 219535e commit dcce4dd

15 files changed

+168
-170
lines changed

.github/workflows/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
3636
strategy:
3737
matrix:
38-
php-version: [ 7.2, 7.3, 7.4 ]
38+
php-version: [ 8.0, 8.1 ]
3939
composer_flags: [ "--prefer-lowest", "" ]
4040
steps:
4141
- name: Checkout code
@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: Uploading coverage to coveralls
6060
env:
61-
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6262
run: make report-coveralls --no-print-directory || true
6363

6464
- name: Upload Artifacts
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575
strategy:
7676
matrix:
77-
php-version: [ 7.2, 7.3, 7.4 ]
77+
php-version: [ 8.0, 8.1 ]
7878
steps:
7979
- name: Checkout code
8080
uses: actions/checkout@v2
@@ -107,7 +107,7 @@ jobs:
107107
runs-on: ubuntu-latest
108108
strategy:
109109
matrix:
110-
php-version: [ 7.2, 7.3, 7.4 ]
110+
php-version: [ 8.0, 8.1 ]
111111
steps:
112112
- name: Checkout code
113113
uses: actions/checkout@v2

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ update: ##@Project Install/Update all 3rd party dependencies
2020
$(call title,"Install/Update all 3rd party dependencies")
2121
@echo "Composer flags: $(JBZOO_COMPOSER_UPDATE_FLAGS)"
2222
@composer update $(JBZOO_COMPOSER_UPDATE_FLAGS)
23+
@mkdir -pv ./build/images
2324

2425

2526
test-all: ##@Project Run all project tests at once

build/images/.gitkeep

Whitespace-only changes.

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
],
2525

2626
"require" : {
27-
"php" : "^7.2",
27+
"php" : "^8.0",
2828
"ext-gd" : "*",
2929
"ext-exif" : "*",
3030
"ext-ctype" : "*",
@@ -34,7 +34,7 @@
3434
},
3535

3636
"require-dev" : {
37-
"jbzoo/toolbox-dev" : "^3.2|^4.0.1"
37+
"jbzoo/toolbox-dev" : "^4.0.1"
3838
},
3939

4040
"autoload" : {

phpunit.xml.dist

+14-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
@copyright Copyright (C) JBZoo.com, All rights reserved.
1212
@link https://github.com/JBZoo/Image
1313
-->
14-
<phpunit bootstrap="tests/autoload.php"
14+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15+
bootstrap="tests/autoload.php"
1516
colors="true"
1617
convertErrorsToExceptions="true"
1718
convertNoticesToExceptions="true"
@@ -23,25 +24,26 @@
2324
stopOnSkipped="false"
2425
stopOnRisky="false"
2526
verbose="false"
27+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
2628
>
29+
<coverage processUncoveredFiles="true">
30+
<include>
31+
<directory suffix=".php">src</directory>
32+
</include>
33+
<report>
34+
<clover outputFile="build/coverage_xml/main.xml"/>
35+
<php outputFile="build/coverage_cov/main.cov"/>
36+
<text outputFile="php://stdout" showUncoveredFiles="false" showOnlySummary="true"/>
37+
</report>
38+
</coverage>
2739

2840
<testsuites>
2941
<testsuite name="PHPUnit">
3042
<directory suffix="Test.php">tests</directory>
3143
</testsuite>
3244
</testsuites>
3345

34-
<filter>
35-
<whitelist processUncoveredFilesFromWhitelist="true">
36-
<directory suffix=".php">src</directory>
37-
</whitelist>
38-
</filter>
39-
4046
<logging>
41-
<log type="coverage-clover" target="build/coverage_xml/main.xml"/>
42-
<log type="coverage-php" target="build/coverage_cov/main.cov"/>
43-
<log type="junit" target="build/coverage_junit/main.xml"/>
44-
<log type="coverage-text" target="php://stdout" showUncoveredFiles="false" showOnlySummary="true"/>
47+
<junit outputFile="build/coverage_junit/main.xml"/>
4548
</logging>
46-
4749
</phpunit>

0 commit comments

Comments
 (0)