Carbon3

CHANGELOG.md

@@ -9,6 +9,11 @@ See [GitHub releases](https://github.com/mll-lab/laravel-utils/releases).
 
 ## Unreleased
 
+### Changed
+
+- Remove unused dependency nesbot/carbon
+- Support docker compose plugin in addition to docker-compose
+
 ## v4.12.0
 
 ### Changed

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

composer.json

@@ -22,7 +22,6 @@
     "php": "^8.1",
     "illuminate/support": "^9.51 || ^10 || ^11",
     "mll-lab/str_putcsv": "^1",
-    "nesbot/carbon": "^2.64",
     "ramsey/uuid": "^4.7",
     "thecodingmachine/safe": "^1 || ^2"
   },