Merge pull request #9 from Mad-Collective/compatibility-psr-log-2

Add compatibility with psr/log 2
Mad-Collective · Jun 12, 2024 · ad7b155 · ad7b155
2 parents 5c457f4 + 313d03d
commit ad7b155
Show file tree

Hide file tree

Showing 6 changed files with 212 additions and 99 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,15 @@
 COMPONENT := pluggitmonitoring
-CONTAINER := phpfarm
+CONTAINER := php80
 IMAGES ?= false
 APP_ROOT := /app/monitoring
 
 all: dev nodev
 
 dev:
-	@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml up
+	@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml up -d --build
+
+enter:
+	@docker exec -ti ${COMPONENT}_${CONTAINER}_1 /bin/sh
 
 nodev:
 	@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml rm -fa > /dev/null
@@ -32,4 +35,4 @@ logs:
 tag: # List last tag for this repo
 	@git tag -l | sort -r |head -1
 
-restart: nodev dev
+restart: nodev dev
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
 
   "require": {
     "php": "^8.0",
-    "psr/log": "^3.0"
+    "psr/log": "^2.0 || ^3.0"
   },
   "require-dev": {
     "phpspec/phpspec": "^7.1.0",