Skip to content

Commit ad7b155

Browse files
Merge pull request #9 from Mad-Collective/compatibility-psr-log-2
Add compatibility with psr/log 2
2 parents 5c457f4 + 313d03d commit ad7b155

6 files changed

Lines changed: 212 additions & 99 deletions

File tree

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
COMPONENT := pluggitmonitoring
2-
CONTAINER := phpfarm
2+
CONTAINER := php80
33
IMAGES ?= false
44
APP_ROOT := /app/monitoring
55

66
all: dev nodev
77

88
dev:
9-
@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml up
9+
@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml up -d --build
10+
11+
enter:
12+
@docker exec -ti ${COMPONENT}_${CONTAINER}_1 /bin/sh
1013

1114
nodev:
1215
@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml rm -fa > /dev/null
@@ -32,4 +35,4 @@ logs:
3235
tag: # List last tag for this repo
3336
@git tag -l | sort -r |head -1
3437

35-
restart: nodev dev
38+
restart: nodev dev

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
"require": {
66
"php": "^8.0",
7-
"psr/log": "^3.0"
7+
"psr/log": "^2.0 || ^3.0"
88
},
99
"require-dev": {
1010
"phpspec/phpspec": "^7.1.0",

0 commit comments

Comments
 (0)