From a42120070ec9c4ab1b88c9619c152cfd9d65057f Mon Sep 17 00:00:00 2001 From: yurichechulin Date: Mon, 14 Jul 2025 16:29:09 +0500 Subject: [PATCH 1/2] Update Laravel to 12 --- CHANGELOG.md | 11 +++++++++++ Dockerfile | 4 ++-- Makefile | 14 +++++++------- README.md | 2 +- composer.json | 2 +- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba69572..c4b68a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver]. +## Unreleased + +### Added + +- Laravel `12.x` support +- Using `docker` with `compose` plugin instead of `docker-compose` for test environment + +### Changed + +- Version of `composer` in docker container updated up to `2.8.9` + ## v1.10.0 ### Changed diff --git a/Dockerfile b/Dockerfile index 46ec3d8..f76f10d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM php:8.1-alpine +FROM php:8.3-alpine ENV \ COMPOSER_ALLOW_SUPERUSER="1" \ COMPOSER_HOME="/tmp/composer" -COPY --from=composer:2.6.6 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2.8.9 /usr/bin/composer /usr/bin/composer RUN set -x \ && apk add --no-cache binutils git \ diff --git a/Makefile b/Makefile index fde70a1..2d01abd 100644 --- a/Makefile +++ b/Makefile @@ -14,25 +14,25 @@ help: ## Show this help @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf " \033[32m%-14s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) build: ## Build docker images, required for current package environment - docker-compose build + docker compose build latest: clean ## Install latest php dependencies - docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-stable + docker compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-stable install: clean ## Install regular php dependencies - docker-compose run $(RUN_APP_ARGS) app composer update -n --prefer-dist --no-interaction + docker compose run $(RUN_APP_ARGS) app composer update -n --prefer-dist --no-interaction lowest: clean ## Install lowest php dependencies - docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-lowest + docker compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-lowest test: ## Execute php tests and linters - docker-compose run $(RUN_APP_ARGS) app composer test + docker compose run $(RUN_APP_ARGS) app composer test test-cover: ## Execute php tests with coverage - docker-compose run --rm --user "0:0" -e 'XDEBUG_MODE=coverage' app sh -c 'docker-php-ext-enable xdebug && su $(shell whoami) -s /bin/sh -c "composer phpunit-cover"' + docker compose run --rm --user "0:0" -e 'XDEBUG_MODE=coverage' app sh -c 'docker-php-ext-enable xdebug && su $(shell whoami) -s /bin/sh -c "composer phpunit-cover"' shell: ## Start shell into container with php - docker-compose run $(RUN_APP_ARGS) app sh + docker compose run $(RUN_APP_ARGS) app sh clean: ## Remove all dependencies and unimportant files -rm -Rf ./composer.lock ./vendor ./coverage diff --git a/README.md b/README.md index 2616249..a60ccc7 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ For more examples - look into sources. ### Testing -For package testing we use `phpunit` framework and `docker-ce` + `docker-compose` as develop environment. So, just write into your terminal after repository cloning: +For package testing we use `phpunit` framework and `docker` with `compose` plugin as develop environment. So, just write into your terminal after repository cloning: ```bash $ make build diff --git a/composer.json b/composer.json index 4ef6dc6..b8199c8 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "ext-json": "*", "ext-mbstring": "*", "avtocod/specs": "~4.0", - "illuminate/support": "~9.0 || ~10.0 || ~11.0" + "illuminate/support": "~9.0 || ~10.0 || ~11.0 || ~12.0" }, "require-dev": { "phpunit/phpunit": "^9.6 || ^10.0", From 9987e661b75c4c982c67d22bc351ce81b64f4ed7 Mon Sep 17 00:00:00 2001 From: yurichechulin Date: Tue, 15 Jul 2025 17:31:41 +0500 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4b68a5..4cefbd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ The format is based on [Keep a Changelog][keepachangelog] and this project adher ### Added -- Laravel `12.x` support - Using `docker` with `compose` plugin instead of `docker-compose` for test environment +- Laravel `12.x` support ### Changed