Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ on:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
php: ['8.2', '8.3', '8.4', '8.5']

name: PHP ${{ matrix.php }}

Expand All @@ -21,7 +22,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -37,7 +38,7 @@ jobs:
run: |
mkdir -p build/logs
export COLUMNS=200
vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
vendor/bin/phpunit --stop-on-error --coverage-clover ./build/logs/clover.xml

- name: Run phpcs
run: composer cs
Expand All @@ -47,13 +48,12 @@ jobs:

- name: Coverage upload
uses: codecov/codecov-action@v3
if: matrix.php == '7.4'
if: matrix.php == '8.4'
with:
files: ./build/logs/clover.xml
fail_ci_if_error: true

- name: Build phar
if: matrix.php == '7.2' && github.ref == 'refs/heads/master'
if: matrix.php == '8.4' && github.ref == 'refs/heads/master'
run: |
echo "Building phar"
./bin/deploy.sh
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# http://phpschool.io
#

FROM php:7-cli
FROM php:8-cli
MAINTAINER Michael Woodward <mikeymike.mw@gmail.com>

RUN apt-get update \
Expand Down
3 changes: 2 additions & 1 deletion box.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"compression": "GZ",
"directories": [
"src",
"app"
"app",
"vendor/symfony/console/Resources"
],
"files": [
"vendor/composer/ca-bundle/res/cacert.pem",
Expand Down
24 changes: 14 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,20 @@
}
],
"require": {
"php": "^7.2|^8.0",
"php-di/php-di": "^6",
"composer/composer": "^2.2",
"mnapoli/silly-php-di": "^1.0",
"symfony/console": "^4.0 | ^5.0 | ^6.0",
"symfony/filesystem": "^4.0 | ^5.0 | ^6.0",
"php": "^8.2",
"php-di/php-di": "^7.0",
"composer/composer": "^2.10",
"symfony/console": "^6.4 | ^7.0",
"symfony/filesystem": "^6.4 | ^7.0",
"mnapoli/silly": "^1.7",
"tm/tooly-composer-script": "^1.0",
"padraic/phar-updater": "^1.0",
"laravel-zero/phar-updater": "^1.4",
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-zip": "*",
"php-http/discovery": "^1.12",
"php-http/guzzle7-adapter": "^0.1.1",
"php-http/guzzle7-adapter": "^1.1",
"php-http/client-common": "^2.3",
"guzzlehttp/psr7": "^1.7 | ^2.4",
"http-interop/http-factory-guzzle": "^1.0"
Expand Down Expand Up @@ -66,7 +65,7 @@
],
"phar": [
"@composer update --no-dev -o",
"box.phar build -vv"
"box.phar compile"
],
"test": [
"phpunit",
Expand All @@ -80,9 +79,14 @@
"extra": {
"tools": {
"box": {
"url": "https://github.com/box-project/box2/releases/download/2.7.2/box-2.7.2.phar",
"url": "https://github.com/box-project/box/releases/download/4.7.0/box.phar",
"only-dev": false
}
}
},
"config": {
"platform": {
"php": "8.2.0"
}
}
}
Loading
Loading