added support for monolog 3

Author: DKravtsov

Dockerfile

@@ -1,11 +1,14 @@
 FROM php:8.1-fpm
 
 # set main params
-ARG BUILD_ARGUMENT_DEBUG_ENABLED=false
-ENV DEBUG_ENABLED=$BUILD_ARGUMENT_DEBUG_ENABLED
 ARG BUILD_ARGUMENT_ENV=dev
 ENV ENV=$BUILD_ARGUMENT_ENV
 ENV APP_HOME /var/www/html
+ARG HOST_UID=1000
+ARG HOST_GID=1000
+ENV USERNAME=www-data
+ARG INSIDE_DOCKER_CONTAINER=1
+ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
 
 # check environment
 RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev" && exit 2; \
@@ -38,11 +41,12 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     && rm -rf /var/lib/apt/lists/* \
     && apt-get clean
 
-# create document root
-RUN mkdir -p $APP_HOME/public
-
-# change owner
-RUN chown -R www-data:www-data $APP_HOME
+# create document root, fix permissions for www-data user and change owner to www-data
+RUN mkdir -p $APP_HOME/public && \
+    mkdir -p /home/$USERNAME && chown $USERNAME:$USERNAME /home/$USERNAME \
+    && usermod -o -u $HOST_UID $USERNAME -d /home/$USERNAME \
+    && groupmod -o -g $HOST_GID $USERNAME \
+    && chown -R ${USERNAME}:${USERNAME} $APP_HOME
 
 # put php config for Symfony
 COPY ./docker/$BUILD_ARGUMENT_ENV/www.conf /usr/local/etc/php-fpm.d/www.conf
@@ -65,4 +69,4 @@ ENV COMPOSER_ALLOW_SUPERUSER 1
 WORKDIR $APP_HOME
 
 # create composer folder for user www-data
-RUN mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www/.composer
+RUN mkdir -p /var/www/.composer && chown -R ${USERNAME}:${USERNAME} /var/www/.composer

Makefile

@@ -1,34 +1,81 @@
-dir=${CURDIR}
+ifndef INSIDE_DOCKER_CONTAINER
+	INSIDE_DOCKER_CONTAINER = 0
+endif
 export COMPOSE_PROJECT_NAME=easy_log_bundle
-project=-p ${COMPOSE_PROJECT_NAME}
-service=${COMPOSE_PROJECT_NAME}:latest
-interactive:=$(shell [ -t 0 ] && echo 1)
-ifneq ($(interactive),1)
-	optionT=-T
+HOST_UID := $(shell id -u)
+HOST_GID := $(shell id -g)
+PHP_USER := -u www-data
+PROJECT_NAME := -p ${COMPOSE_PROJECT_NAME}
+INTERACTIVE := $(shell [ -t 0 ] && echo 1)
+ERROR_ONLY_FOR_HOST = @printf "\033[33mThis command for host machine\033[39m\n"
+ifneq ($(INTERACTIVE), 1)
+	OPTION_T := -T
 endif
 
 build:
-	@docker-compose -f docker-compose.yml build
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml build
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
 
 start:
-	@docker-compose -f docker-compose.yml $(project) up -d
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
 
 stop:
-	@docker-compose -f docker-compose.yml $(project) down
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
 
 restart: stop start
 
 ssh:
-	@docker-compose $(project) exec $(optionT) symfony bash
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
+
+ssh-root:
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
 
 ssh-nginx:
-	@docker-compose $(project) exec nginx /bin/sh
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec nginx /bin/sh
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
 
 exec:
-	@docker-compose $(project) exec $(optionT) symfony $$cmd
+ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
+	@$$cmd
+else
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
+endif
 
 exec-bash:
-	@docker-compose $(project) exec $(optionT) symfony bash -c "$(cmd)"
+ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
+	@bash -c "$(cmd)"
+else
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
+endif
+
+exec-by-root:
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
 
 test-using-symfony-4:
 	@make clean
@@ -52,25 +99,34 @@ test-using-symfony-6:
 	@make cache-clear-warmup
 
 clean:
-	@make exec-bash cmd="find . -delete"
+	@make exec-by-root cmd="find . -delete"
+	@make exec-by-root cmd="chown -R www-data:www-data /var/www/html"
 
 transfer-monolog-config:
 	@make exec-bash cmd="mkdir -p /var/www/html/config/packages/dev && cp --force /tmp/monolog.yaml /var/www/html/config/packages/dev/"
 
 install-bundle:
 	@make exec-bash cmd="composer config extra.symfony.allow-contrib true"
-	@make exec-bash cmd="composer require --dev systemsdk/easy-log-bundle"
+	@make exec-bash cmd="composer require --dev systemsdk/easy-log-bundle:*"
 
 cache-clear-warmup:
 	@make exec-bash cmd="bin/console cache:clear"
 	@make exec-bash cmd="bin/console cache:warmup"
 
 info:
-	@make exec cmd="bin/console --version"
 	@make exec cmd="php --version"
+	@make exec cmd="bin/console about"
 
 logs:
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
 	@docker logs -f ${COMPOSE_PROJECT_NAME}_symfony
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
 
 logs-nginx:
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
 	@docker logs -f ${COMPOSE_PROJECT_NAME}_nginx
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif

composer.json

@@ -27,10 +27,10 @@
 		"easycorp/easy-log-handler": "*"
 	},
 	"require": {
-		"php": ">=7.4",
-		"monolog/monolog": "~1.6|~2.0",
-		"symfony/yaml": "^4.4|^5.0|^6.0",
-		"symfony/framework-bundle": "^4.4|^5.0|^6.0"
+		"php": ">=8.1",
+		"monolog/monolog": "~3.0",
+		"symfony/yaml": "^6.1",
+		"symfony/framework-bundle": "^6.1"
 	},
 	"autoload": {
 		"psr-4": {

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '3.5'
 
 services:
 
@@ -7,15 +7,15 @@ services:
       build:
         context: ./docker/
         args:
-          - "BUILD_ARGUMENT_ENV=dev"
+          BUILD_ARGUMENT_ENV: dev
         dockerfile: ./nginx/Dockerfile
       container_name: ${COMPOSE_PROJECT_NAME}_nginx
       restart: always
       ports:
-        - 80:80
-        - 443:443
+        - "80:80"
+        - "443:443"
       volumes:
-        - ./docker/src:/var/www/html:ro
+        - ./docker/src:/var/www/html:ro,cached
       depends_on:
         - symfony
       links:
@@ -26,11 +26,12 @@ services:
       build:
         context: .
         args:
-          - "BUILD_ARGUMENT_ENV=dev"
-          - "BUILD_ARGUMENT_DEBUG_ENABLED=false"
+          BUILD_ARGUMENT_ENV: dev
+          HOST_UID: ${HOST_UID}
+          HOST_GID: ${HOST_GID}
         dockerfile: ./Dockerfile
       container_name: ${COMPOSE_PROJECT_NAME}_symfony
       expose:
         - 9000
       volumes:
-        - ./docker/src:/var/www/html
+        - ./docker/src:/var/www/html:cached

readme.md

@@ -11,10 +11,15 @@ Symfony log files are formatted in the same way for all environments. This means
 
 This bundle is a new Monolog handler that creates human-friendly log files. It's optimized to display the log information in a clear and concise way. Use it in the development environment to become a much more productive developer.
 
-## Requirements
+## Requirements for EasyLogBundle version 2 or later
+* PHP 8.1 or later
+* Symfony 6.1 or later
+* Monolog bundle 3.0 or later
+
+## Requirements for EasyLogBundle version 1
 * PHP 7.4 or later
 * Symfony 4.4 or later
-* Monolog bundle 1.6 or later
+* Monolog bundle 1.6 or later up to 2.X
 
 ## Contents
 1. [Features](#features)
@@ -159,7 +164,7 @@ Use the `buffered` handler to configure the channels logged/excluded and the lev
 3. Allow Flex to use contrib recipes and install next symfony bundle:
 ```bash
 $ composer config extra.symfony.allow-contrib true
-$ composer require --dev systemsdk/easy-log-bundle
+$ composer require --dev systemsdk/easy-log-bundle:*
 ```
 
 Configuration and Usage

src/DependencyInjection/Compiler/ValidateConfigurationPass.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 
 namespace Systemsdk\Bundle\EasyLogBundle\DependencyInjection\Compiler;
 

src/DependencyInjection/Configuration.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 
 namespace Systemsdk\Bundle\EasyLogBundle\DependencyInjection;
 

src/DependencyInjection/EasyLogExtension.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 
 namespace Systemsdk\Bundle\EasyLogBundle\DependencyInjection;
 

src/EasyLogBundle.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 
 namespace Systemsdk\Bundle\EasyLogBundle;