Skip to content

Commit

Permalink
Remove unused Carbon dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
mwikberg-virta committed Apr 3, 2024
1 parent 69b8a33 commit 925dcf5
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 14 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit 925dcf5

Please sign in to comment.