Merge remote-tracking branch 'origin/chore(c)/github-actions-update' into chore(c)/github-actions-update

Author: tarlepp

composer.json

@@ -33,7 +33,7 @@
 		"gedmo/doctrine-extensions": "3.13.0",
 		"lexik/jwt-authentication-bundle": "2.19.1",
 		"mark-gerarts/automapper-plus-bundle": "1.4.1",
-		"matomo/device-detector": "6.1.5",
+		"matomo/device-detector": "6.1.6",
 		"matthiasnoback/symfony-console-form": "5.3.2",
 		"nelmio/api-doc-bundle": "4.12.0",
 		"nelmio/cors-bundle": "2.3.1",

composer.lock

@@ -12,14 +12,15 @@ doctrine:
             EnumLanguage: App\Doctrine\DBAL\Types\EnumLanguageType
             EnumLocale: App\Doctrine\DBAL\Types\EnumLocaleType
             EnumLogLogin: App\Doctrine\DBAL\Types\EnumLogLoginType
-
+        profiling_collect_backtrace: '%kernel.debug%'
         # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
         #server_version: '15'
-
     orm:
         auto_generate_proxy_classes: true
         enable_lazy_ghost_objects: true
+        report_fields_where_declared: true
+        validate_xml_mapping: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         auto_mapping: true
         mappings:

config/packages/doctrine.yaml

@@ -11,3 +11,5 @@ framework:
 #                dsn: '%env(LOCO_DSN)%'
 #            lokalise:
 #                dsn: '%env(LOKALISE_DSN)%'
+#            phrase:
+#                dsn: '%env(PHRASE_DSN)%'

config/packages/translation.yaml

@@ -15,7 +15,6 @@ have all basic configuration ready.
     * [PhpStorm basic configuration](#phpstorm-basic-configuration-table-of-contents)
     * [First connection](#first-connection-table-of-contents)
     * [Configuring debugging server](#configuring-debugging-server-table-of-contents)
-  * [Mac users](#mac-users-table-of-contents)
   * [Debug CLI commands](#debug-cli-commands-table-of-contents)
   * [Debug Postman requests](#debug-postman-requests-table-of-contents)
   * [External links / resources](#external-links--resources-table-of-contents)
@@ -27,9 +26,6 @@ These instructions relies heavily to screenshots, so you might need to use
 your own brains for some parts of these instructions - but I bet you can get
 this working in couple of minutes.
 
-Note that if you're using Mac, read [Mac users](#mac-users-table-of-contents)
-section first.
-
 ### PhpStorm basic configuration [ᐞ](#table-of-contents)
 
 1) Make sure that Xdebug port is `9003`
@@ -71,25 +67,6 @@ local paths. See the image below:
 
 ![Path mappings](images/xdebug_05.png)
 
-## Mac users [ᐞ](#table-of-contents)
-
-Mac users need to create a `docker-compose.override.yml` file with following
-content:
-
-```yaml
-version: '3'
-services:
-  php:
-    environment:
-      - DOCKER_WITH_MAC=1
-```
-
-And if you're reading this you might want to read [Speed problems with docker-compose?](SPEED_UP_DOCKER_COMPOSE.md)
-document, which will tell you how to speed your Mac environment quite lot.
-
-You just need to combine those both configurations to your local
-`docker-compose.override.yml` file
-
 ## Debug CLI commands [ᐞ](#table-of-contents)
 
 By default this application assumes that you're using `app.localhost` as your

doc/XDEBUG.md

@@ -19,6 +19,8 @@ services:
             - /app/var/:uid=$HOST_UID,gid=$HOST_GID
         environment:
             PHP_IDE_CONFIG: "serverName=app.localhost"
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
 
     nginx:
         container_name: symfony-backend-nginx

docker-compose.yml

@@ -4,12 +4,8 @@ set -e
 #
 # If we're starting web-server we need to do following:
 #   0) Basic linting of current JSON configuration file
-#   1) Determine docker container IP address, so that we can use it within
-#      XDebug configuration. Copy php.ini file to correct location and modify
-#      it to contain correct remote host value. With this we don't need to
-#      build container each time we want to change something in php.ini file.
-#      Also we want to export host IP so that we can use that within
-#      `check.php` to check that current environment is compatible with Symfony
+#   1) Copy updated php configuration file, with this we can change php
+#      configuration without rebuilding image
 #   2) Install all dependencies
 #   3) Generate JWT encryption keys
 #   4) Create database if it not exists yet
@@ -21,16 +17,7 @@ set -e
 make lint-configuration
 
 # Step 1
-if [[ -z "${DOCKER_WITH_MAC}" ]]; then
-    # Not Mac, so determine actual docker container IP address
-    HOST=$(/sbin/ip route|awk '/default/ { print $3 }')
-else
-    # Otherwise use special value, which works with Mac
-    HOST="docker.for.mac.localhost"
-fi
-
 cp /app/docker/php/php-dev.ini /usr/local/etc/php/php.ini
-sed -i "s/xdebug\.client_host \=.*/xdebug\.client_host\ = $HOST/g" /usr/local/etc/php/php.ini
 
 DOCKER_IP=$(/sbin/ip route|awk '/default/ { print $3 }')
 

docker-entrypoint-dev.sh

@@ -30,4 +30,4 @@ apc.serializer=igbinary
 ; Xdebug settings
 xdebug.mode = coverage,debug
 xdebug.start_with_request = yes
-xdebug.client_host = 127.0.0.1
+xdebug.client_host = host.docker.internal

docker/php/php-dev.ini

@@ -37,12 +37,12 @@
         "version": "v0.5.3"
     },
     "doctrine/doctrine-bundle": {
-        "version": "2.8",
+        "version": "2.10",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "2.8",
-            "ref": "6b43b7b6ff6bf2551f2933ebeb66721fa3db8fbc"
+            "version": "2.10",
+            "ref": "e025a6cb69b195970543820b2f18ad21724473fa"
         },
         "files": [
             "config/packages/doctrine.yaml",
@@ -438,12 +438,12 @@
         "version": "v5.1.0"
     },
     "symfony/translation": {
-        "version": "5.3",
+        "version": "6.3",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "5.3",
-            "ref": "da64f5a2b6d96f5dc24914517c0350a5f91dee43"
+            "branch": "main",
+            "version": "6.3",
+            "ref": "64fe617084223633e1dedf9112935d8c95410d3e"
         },
         "files": [
             "config/packages/translation.yaml",
@@ -457,12 +457,12 @@
         "version": "v4.4.3"
     },
     "symfony/twig-bundle": {
-        "version": "6.1",
+        "version": "6.3",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "5.4",
-            "ref": "bb2178c57eee79e6be0b297aa96fc0c0def81387"
+            "version": "6.3",
+            "ref": "b7772eb20e92f3fb4d4fe756e7505b4ba2ca1a2c"
         },
         "files": [
             "config/packages/twig.yaml",

symfony.lock

@@ -6,7 +6,7 @@
 	},
 	"require-dev": {
 		"liuggio/fastest": "1.11.0",
-		"phpunit/php-code-coverage": "10.1.6",
+		"phpunit/php-code-coverage": "10.1.7",
 		"phpunit/phpcov": "9.0.2",
 		"phpunit/phpunit": "10.0.19",
 		"roave/security-advisories": "dev-latest",