From 3fb0f27cfcf4da3fc7bdffbcf84fa09ad3c340b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=C3=A1zari?= Date: Wed, 5 Jul 2023 18:30:50 -0300 Subject: [PATCH] Add support for laravel 10 and php 8.2 (#39) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add support for laravel 10 and php 8.2 --------- Co-authored-by: André Lázari --- .docker/Dockerfile | 2 +- .github/workflows/main.yml | 2 +- Makefile | 5 ++--- composer.json | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 9c7627e..3ca1bd0 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,4 +1,4 @@ -ARG PHP_VERSION="8.1" +ARG PHP_VERSION="8.2" FROM php:${PHP_VERSION}-cli diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 62637af..51709e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - php: [ "8.0", "8.1" ] + php: [ "8.2" ] runs-on: ubuntu-latest steps: diff --git a/Makefile b/Makefile index 4c8ff95..9105cea 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/composer.json b/composer.json index 9534b78..61a2441 100644 --- a/composer.json +++ b/composer.json @@ -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": {