Skip to content

Commit

Permalink
Add support for laravel 10 and php 8.2 (#39)
Browse files Browse the repository at this point in the history
* Add support for laravel 10 and php 8.2



---------

Co-authored-by: André Lázari <andre.lazari@arquivei.com.br>
  • Loading branch information
AndreLazari and André Lázari authored Jul 5, 2023
1 parent 5ed64a4 commit 3fb0f27
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PHP_VERSION="8.1"
ARG PHP_VERSION="8.2"

FROM php:${PHP_VERSION}-cli

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
strategy:
matrix:
php: [ "8.0", "8.1" ]
php: [ "8.2" ]
runs-on: ubuntu-latest

steps:
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
PHP_VERSION ?= 8.1
PHP_VERSION ?= 8.2
PHP ?= bin/php -d "xdebug.mode=off"
COMPOSER ?= bin/composer

.PHONY: setup
setup:
DOCKER_BUILDKIT=1 docker build -f .docker/Dockerfile -t laravel-prometheus-exporter:8.0 --build-arg PHP_VERSION=8.0 .
DOCKER_BUILDKIT=1 docker build -f .docker/Dockerfile -t laravel-prometheus-exporter:8.1 --build-arg PHP_VERSION=8.1 .
DOCKER_BUILDKIT=1 docker build -f .docker/Dockerfile -t laravel-prometheus-exporter:8.2 --build-arg PHP_VERSION=8.2 .

.PHONY: vendor
vendor:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
}
],
"require": {
"php": "^8.0 || ^8.1",
"php": "^8.0 || ^8.1 || ^8.2",
"guzzlehttp/guzzle": "^7.4.2",
"illuminate/routing": "^9.0",
"illuminate/support": "^9.0",
"illuminate/routing": "^10.0",
"illuminate/support": "^10.0",
"promphp/prometheus_client_php": "^2.6.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5.20",
"mockery/mockery": "^1.5.0",
"orchestra/testbench": "^7.5.0"
"orchestra/testbench": "^8.5"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 3fb0f27

Please sign in to comment.