From 4641ca192d23c4f67057c3ec89f3b9ca4f384ffc Mon Sep 17 00:00:00 2001 From: Michael Wikberg Date: Wed, 3 Apr 2024 16:04:18 +0300 Subject: [PATCH 1/5] Support compose plugin in addition to docker-compose --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c3440b2..4702ab7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,14 @@ -dcphp=$$(echo "docker-compose exec php") +ifneq (, $(shell which docker-compose)) +DOCKER_COMPOSE := docker-compose +endif +ifneq (, $(shell docker compose version 2>/dev/null)) +DOCKER_COMPOSE := docker compose +endif +ifndef DOCKER_COMPOSE +$(error "No docker-compose nor valid 'docker compose' in $(PATH), what now?") +endif + +dcphp=$$(echo "$(DOCKER_COMPOSE) exec php") .PHONY: it it: fix stan test ## Run the commonly used targets @@ -12,11 +22,11 @@ setup: build vendor ## Setup the local environment .PHONY: build build: ## Build the local Docker containers - docker-compose build --pull --build-arg USER_ID=$(shell id --user) --build-arg GROUP_ID=$(shell id --group) + ${DOCKER_COMPOSE} build --pull --build-arg USER_ID=$(shell id --user) --build-arg GROUP_ID=$(shell id --group) .PHONY: up -up: ## Bring up the docker-compose stack - docker-compose up --detach +up: ## Bring up the docker compose stack + ${DOCKER_COMPOSE} up --detach .PHONY: fix fix: rector php-cs-fixer From d5c5265fc4c7ec5bbb617ce1e37095305c595222 Mon Sep 17 00:00:00 2001 From: Michael Wikberg Date: Wed, 3 Apr 2024 16:04:38 +0300 Subject: [PATCH 2/5] Support Carbon 3.2+ --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 92c9dce..3595fd9 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "php": "^8.1", "illuminate/support": "^9.51 || ^10 || ^11", "mll-lab/str_putcsv": "^1", - "nesbot/carbon": "^2.64", + "nesbot/carbon": "^2.64 || ^3.2", "ramsey/uuid": "^4.7", "thecodingmachine/safe": "^1 || ^2" }, From 09c8535a2b7374ccc5b4bee6669ce27cfa1d61ba Mon Sep 17 00:00:00 2001 From: Michael Wikberg Date: Wed, 3 Apr 2024 16:07:52 +0300 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e2981..2b1a106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ See [GitHub releases](https://github.com/mll-lab/laravel-utils/releases). ## Unreleased +### Changed + +- Updated Carbon dependency to allow 3.2+ also + ## v4.12.0 ### Changed From 4d5a4ce4e38d88599324927a89fb673ef9f640df Mon Sep 17 00:00:00 2001 From: Michael Wikberg Date: Wed, 3 Apr 2024 16:18:25 +0300 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b1a106..d148187 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ See [GitHub releases](https://github.com/mll-lab/laravel-utils/releases). ### Changed - Updated Carbon dependency to allow 3.2+ also +- Support docker compose plugin in addition to docker-compose ## v4.12.0 From 384f75224ea83f3301562beb70dc3e2ef6b967ad Mon Sep 17 00:00:00 2001 From: Michael Wikberg Date: Wed, 3 Apr 2024 16:48:53 +0300 Subject: [PATCH 5/5] Just remove the unused dependency instead --- CHANGELOG.md | 2 +- composer.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d148187..57d3eb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ See [GitHub releases](https://github.com/mll-lab/laravel-utils/releases). ### Changed -- Updated Carbon dependency to allow 3.2+ also +- Remove unused dependency nesbot/carbon - Support docker compose plugin in addition to docker-compose ## v4.12.0 diff --git a/composer.json b/composer.json index 3595fd9..8dbd7dc 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "php": "^8.1", "illuminate/support": "^9.51 || ^10 || ^11", "mll-lab/str_putcsv": "^1", - "nesbot/carbon": "^2.64 || ^3.2", "ramsey/uuid": "^4.7", "thecodingmachine/safe": "^1 || ^2" },