Merge branch 'master' into chore(ci)/concurrency-rules

Author: tarlepp

Dockerfile_dev

@@ -83,17 +83,6 @@ RUN composer completion bash > /etc/bash_completion.d/composer
 COPY ./docker/php/php-dev.ini /usr/local/etc/php/php.ini
 COPY ./docker/php/www-dev.conf /usr/local/etc/php-fpm.d/www.conf
 
-# Define used work directory
-WORKDIR /app
-
-# Add everything inside docker image
-COPY . .
-
-# Ensure that all required files has execute rights
-RUN chmod +x /app/bin/console \
-    && chmod +x /app/docker-entrypoint-dev.sh \
-    && chmod +x /usr/bin/composer
-
 RUN chmod -R o+s+w /usr/local/etc/php
 
 RUN curl -s https://api.github.com/repos/fabpot/local-php-security-checker/releases/latest | \
@@ -106,14 +95,12 @@ RUN curl -s https://api.github.com/repos/fabpot/local-php-security-checker/relea
 
 RUN groupadd --gid ${HOST_GID} dev \
     && useradd \
-        -p $(perl \
-        -e 'print crypt($ARGV[0], "password")' 'dev') \
+        -p $(perl -e 'print crypt($ARGV[0], "password")' 'dev') \
         --uid ${HOST_UID} \
         --gid ${HOST_GID} \
         --shell /bin/bash \
         --create-home dev \
     && usermod -a -G www-data,sudo dev \
-    && chgrp -hR dev /app \
     && echo 'dev ALL=(ALL) ALL' >> /etc/sudoers
 
 RUN mkdir -p /home/dev/.config/fish/completions \
@@ -123,6 +110,17 @@ RUN mkdir -p /home/dev/.config/fish/completions \
     && mkdir -p /home/dev/.nvm \
     && chmod 777 -R /home/dev
 
+# Define used work directory
+WORKDIR /app
+
+# Add everything inside docker image
+COPY --chown=dev:dev . .
+
+# Ensure that all required files has execute rights
+RUN chmod +x /app/bin/console \
+    && chmod +x /app/docker-entrypoint-dev.sh \
+    && chmod +x /usr/bin/composer
+
 USER dev
 
 RUN pip3 install thefuck --user --break-system-packages

composer.json

@@ -44,7 +44,7 @@
 		"symfony/console": "6.3.4",
 		"symfony/dotenv": "6.3.0",
 		"symfony/expression-language": "6.3.0",
-		"symfony/flex": "2.3.3",
+		"symfony/flex": "2.4.0",
 		"symfony/form": "6.3.6",
 		"symfony/framework-bundle": "6.3.6",
 		"symfony/monolog-bundle": "3.8.0",

composer.lock

@@ -11,7 +11,7 @@
 		"phpunit/phpunit": "10.0.19",
 		"roave/security-advisories": "dev-latest",
 		"symfony/browser-kit": "6.3.2",
-		"symfony/phpunit-bridge": "6.3.2"
+		"symfony/phpunit-bridge": "6.3.6"
 	},
 	"config": {
 		"allow-plugins": true,

tools/01_phpunit/composer.json

@@ -5,7 +5,7 @@
 		"php": "^8.2.0"
 	},
 	"require-dev": {
-		"friendsofphp/php-cs-fixer": "3.35.1",
+		"friendsofphp/php-cs-fixer": "3.36.0",
 		"roave/security-advisories": "dev-latest",
 		"symplify/config-transformer": "12.1.1",
 		"symplify/easy-coding-standard": "12.0.8"