Updated composer dependencies, xdebug 3.4.1, MySQL 8.4.4.

Author: DKravtsov

.env

@@ -27,12 +27,12 @@ WEB_PORT_SSL=443
 # XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
 XDEBUG_CONFIG=main
 # Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
-XDEBUG_VERSION=3.4.0
+XDEBUG_VERSION=3.4.1
 ###< XDebug docker configuration ###
 
 ###> MySQL docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
-# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
-MYSQL_VERSION=8.4.3
+# MySQL version, recommend values: 9.1.0|9.0.1|8.4.4|8.3.0|8.2.0|8.1.0|8.0.39
+MYSQL_VERSION=8.4.4
 # MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
 INNODB_USE_NATIVE_AIO=1
 # Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode

.env.dev

@@ -24,6 +24,11 @@ reports/*
 /config/jwt/*.pem
 ###< lexik/jwt-authentication-bundle ###
 
+###> symfony/asset-mapper ###
+/public/assets/
+/assets/vendor/
+###< symfony/asset-mapper ###
+
 ###> friendsofphp/php-cs-fixer ###
 .php-cs-fixer.cache
 .php_cs

.gitignore

@@ -12,7 +12,7 @@ ARG INSIDE_DOCKER_CONTAINER=1
 ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
 ARG XDEBUG_CONFIG=main
 ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
-ARG XDEBUG_VERSION=3.4.0
+ARG XDEBUG_VERSION=3.4.1
 ENV XDEBUG_VERSION=$XDEBUG_VERSION
 ENV PHP_CS_FIXER_IGNORE_ENV=1
 

.idea/htdocs.iml

@@ -0,0 +1,10 @@
+import './bootstrap.js';
+/*
+ * Welcome to your app's main JavaScript file!
+ *
+ * This file will be included onto the page via the importmap() Twig function,
+ * which should already be in your base.html.twig.
+ */
+import './styles/app.css';
+
+console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');

.idea/php.xml

@@ -0,0 +1,5 @@
+import { startStimulusApp } from '@symfony/stimulus-bundle';
+
+const app = startStimulusApp();
+// register any custom, 3rd party controllers here
+// app.register('some_controller_name', SomeImportedController);

Dockerfile

@@ -0,0 +1,15 @@
+{
+    "controllers": {
+        "@symfony/ux-turbo": {
+            "turbo-core": {
+                "enabled": true,
+                "fetch": "eager"
+            },
+            "mercure-turbo-stream": {
+                "enabled": false,
+                "fetch": "eager"
+            }
+        }
+    },
+    "entrypoints": []
+}

assets/app.js

@@ -0,0 +1,79 @@
+const nameCheck = /^[-_a-zA-Z0-9]{4,22}$/;
+const tokenCheck = /^[-_\/+a-zA-Z0-9]{24,}$/;
+
+// Generate and double-submit a CSRF token in a form field and a cookie, as defined by Symfony's SameOriginCsrfTokenManager
+document.addEventListener('submit', function (event) {
+    generateCsrfToken(event.target);
+}, true);
+
+// When @hotwired/turbo handles form submissions, send the CSRF token in a header in addition to a cookie
+// The `framework.csrf_protection.check_header` config option needs to be enabled for the header to be checked
+document.addEventListener('turbo:submit-start', function (event) {
+    const h = generateCsrfHeaders(event.detail.formSubmission.formElement);
+    Object.keys(h).map(function (k) {
+        event.detail.formSubmission.fetchRequest.headers[k] = h[k];
+    });
+});
+
+// When @hotwired/turbo handles form submissions, remove the CSRF cookie once a form has been submitted
+document.addEventListener('turbo:submit-end', function (event) {
+    removeCsrfToken(event.detail.formSubmission.formElement);
+});
+
+export function generateCsrfToken (formElement) {
+    const csrfField = formElement.querySelector('input[data-controller="csrf-protection"], input[name="_csrf_token"]');
+
+    if (!csrfField) {
+        return;
+    }
+
+    let csrfCookie = csrfField.getAttribute('data-csrf-protection-cookie-value');
+    let csrfToken = csrfField.value;
+
+    if (!csrfCookie && nameCheck.test(csrfToken)) {
+        csrfField.setAttribute('data-csrf-protection-cookie-value', csrfCookie = csrfToken);
+        csrfField.defaultValue = csrfToken = btoa(String.fromCharCode.apply(null, (window.crypto || window.msCrypto).getRandomValues(new Uint8Array(18))));
+        csrfField.dispatchEvent(new Event('change', { bubbles: true }));
+    }
+
+    if (csrfCookie && tokenCheck.test(csrfToken)) {
+        const cookie = csrfCookie + '_' + csrfToken + '=' + csrfCookie + '; path=/; samesite=strict';
+        document.cookie = window.location.protocol === 'https:' ? '__Host-' + cookie + '; secure' : cookie;
+    }
+}
+
+export function generateCsrfHeaders (formElement) {
+    const headers = {};
+    const csrfField = formElement.querySelector('input[data-controller="csrf-protection"], input[name="_csrf_token"]');
+
+    if (!csrfField) {
+        return headers;
+    }
+
+    const csrfCookie = csrfField.getAttribute('data-csrf-protection-cookie-value');
+
+    if (tokenCheck.test(csrfField.value) && nameCheck.test(csrfCookie)) {
+        headers[csrfCookie] = csrfField.value;
+    }
+
+    return headers;
+}
+
+export function removeCsrfToken (formElement) {
+    const csrfField = formElement.querySelector('input[data-controller="csrf-protection"], input[name="_csrf_token"]');
+
+    if (!csrfField) {
+        return;
+    }
+
+    const csrfCookie = csrfField.getAttribute('data-csrf-protection-cookie-value');
+
+    if (tokenCheck.test(csrfField.value) && nameCheck.test(csrfCookie)) {
+        const cookie = csrfCookie + '_' + csrfField.value + '=0; path=/; samesite=strict; max-age=0';
+
+        document.cookie = window.location.protocol === 'https:' ? '__Host-' + cookie + '; secure' : cookie;
+    }
+}
+
+/* stimulusFetch: 'lazy' */
+export default 'csrf-protection-controller';

assets/bootstrap.js

@@ -0,0 +1,16 @@
+import { Controller } from '@hotwired/stimulus';
+
+/*
+ * This is an example Stimulus controller!
+ *
+ * Any element with a data-controller="hello" attribute will cause
+ * this controller to be executed. The name "hello" comes from the filename:
+ * hello_controller.js -> "hello"
+ *
+ * Delete this file or adapt it for your use!
+ */
+export default class extends Controller {
+    connect() {
+        this.element.textContent = 'Hello Stimulus! Edit me in assets/controllers/hello_controller.js';
+    }
+}

assets/controllers.json

@@ -0,0 +1,3 @@
+body {
+    background-color: skyblue;
+}

assets/controllers/csrf_protection_controller.js

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v3.4.0",
+	"version": "v3.4.1",
 	"license": "MIT",
 	"authors": [
 		{
@@ -42,29 +42,30 @@
 		"ext-pdo": "*",
 		"ext-pdo_mysql": "*",
 		"beberlei/doctrineextensions": "^1.5",
-		"doctrine/doctrine-bundle": "^2.13",
-		"doctrine/doctrine-migrations-bundle": "^3.3",
-		"doctrine/orm": "^2.20",
-		"dukecity/command-scheduler-bundle": "^6.0",
-		"elasticsearch/elasticsearch": "^7.17",
-		"gedmo/doctrine-extensions": "^3.17",
-		"lexik/jwt-authentication-bundle": "^3.1",
+		"doctrine/doctrine-bundle": "^2.13.2",
+		"doctrine/doctrine-migrations-bundle": "^3.4.1",
+		"doctrine/orm": "^2.20.1",
+		"dukecity/command-scheduler-bundle": "^6.0.3",
+		"elasticsearch/elasticsearch": "^7.17.2",
+		"gedmo/doctrine-extensions": "^3.17.1",
+		"lexik/jwt-authentication-bundle": "^3.1.1",
 		"mark-gerarts/automapper-plus-bundle": "^1.5",
-		"matomo/device-detector": "^6.4",
+		"matomo/device-detector": "^6.4.3",
 		"matthiasnoback/symfony-console-form": "^6.0",
-		"nelmio/api-doc-bundle": "^4.33",
+		"nelmio/api-doc-bundle": "^4.36.1",
 		"nelmio/cors-bundle": "^2.5",
-		"phpdocumentor/reflection-docblock": "^5.6",
+		"phpdocumentor/reflection-docblock": "^5.6.1",
 		"ramsey/uuid-doctrine": "^2.1",
 		"symfony/amqp-messenger": "7.2.*",
 		"symfony/asset": "7.2.*",
+		"symfony/asset-mapper": "7.2.*",
 		"symfony/config": "7.2.*",
 		"symfony/console": "7.2.*",
 		"symfony/doctrine-bridge": "7.2.*",
 		"symfony/doctrine-messenger": "7.2.*",
 		"symfony/dotenv": "7.2.*",
 		"symfony/expression-language": "7.2.*",
-		"symfony/flex": "^2.4",
+		"symfony/flex": "^2.4.7",
 		"symfony/form": "7.2.*",
 		"symfony/framework-bundle": "7.2.*",
 		"symfony/http-client": "7.2.*",
@@ -82,38 +83,45 @@
 		"symfony/routing": "7.2.*",
 		"symfony/security-bundle": "7.2.*",
 		"symfony/serializer": "7.2.*",
+		"symfony/stimulus-bundle": "^2.22.1",
 		"symfony/string": "7.2.*",
 		"symfony/translation": "7.2.*",
 		"symfony/twig-bundle": "7.2.*",
+		"symfony/ux-turbo": "^2.22.1",
 		"symfony/validator": "7.2.*",
 		"symfony/web-link": "7.2.*",
 		"symfony/yaml": "7.2.*",
-		"twig/extra-bundle": "^2.12|^3.0"
+		"twig/extra-bundle": "^2.12|^3.19",
+		"twig/twig": "^2.12|^3.19"
 	},
 	"conflict": {
 		"symfony/debug": "<3.3",
 		"symfony/symfony": "*",
 		"symfony/twig-bundle": "<3.3"
 	},
 	"require-dev": {
-		"bamarni/composer-bin-plugin": "^1.8",
+		"bamarni/composer-bin-plugin": "^1.8.2",
 		"doctrine/doctrine-fixtures-bundle": "^4.0",
 		"systemsdk/easy-log-bundle": "2.0.*",
 		"roave/security-advisories": "dev-latest",
 		"symfony/browser-kit": "7.2.*",
 		"symfony/debug-bundle": "7.2.*",
-		"symfony/maker-bundle": "^1.60",
-		"symfony/requirements-checker": "^2.0",
+		"symfony/maker-bundle": "^1.62.1",
+		"symfony/requirements-checker": "^2.0.3",
 		"symfony/stopwatch": "7.2.*",
 		"symfony/var-dumper": "7.2.*",
 		"symfony/web-profiler-bundle": "7.2.*"
 	},
 	"replace": {
 		"symfony/polyfill-ctype": "*",
 		"symfony/polyfill-mbstring": "*",
+		"symfony/polyfill-iconv": "*",
 		"symfony/polyfill-php72": "*",
+		"symfony/polyfill-php73": "*",
+		"symfony/polyfill-php74": "*",
 		"symfony/polyfill-php80": "*",
-		"symfony/polyfill-php81": "*"
+		"symfony/polyfill-php81": "*",
+		"symfony/polyfill-php82": "*"
 	},
 	"config": {
 		"allow-plugins": true,
@@ -123,6 +131,7 @@
 		"preferred-install": {
 			"*": "dist"
 		},
+		"bump-after-update": true,
 		"sort-packages": true
 	},
 	"extra": {
@@ -184,7 +193,8 @@
 			"cache:warmup": "symfony-cmd",
 			"cache:pool:clear cache.app || true": "symfony-cmd",
 			"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
-			"assets:install %PUBLIC_DIR%": "symfony-cmd"
+			"assets:install %PUBLIC_DIR%": "symfony-cmd",
+			"importmap:install": "symfony-cmd"
 		}
 	},
 	"support": {

assets/controllers/hello_controller.js

@@ -21,4 +21,6 @@
     AutoMapperPlus\AutoMapperPlusBundle\AutoMapperPlusBundle::class => ['all' => true],
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
     Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true],
+    Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
+    Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
 ];

assets/styles/app.css

@@ -0,0 +1,11 @@
+framework:
+    asset_mapper:
+        # The paths to make available to the asset mapper.
+        paths:
+            - assets/
+        missing_import_mode: strict
+
+when@prod:
+    framework:
+        asset_mapper:
+            missing_import_mode: warn

composer.json

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Returns the importmap for this application.
+ *
+ * - "path" is a path inside the asset mapper system. Use the
+ *     "debug:asset-map" command to see the full list of paths.
+ *
+ * - "entrypoint" (JavaScript only) set to true for any module that will
+ *     be used as an "entrypoint" (and passed to the importmap() Twig function).
+ *
+ * The "importmap:require" command can be used to add new entries to this file.
+ */
+return [
+    'app' => [
+        'path' => './assets/app.js',
+        'entrypoint' => true,
+    ],
+    '@hotwired/stimulus' => [
+        'version' => '3.2.2',
+    ],
+    '@symfony/stimulus-bundle' => [
+        'path' => './vendor/symfony/stimulus-bundle/assets/dist/loader.js',
+    ],
+    '@hotwired/turbo' => [
+        'version' => '7.3.0',
+    ],
+];

composer.lock

@@ -69,7 +69,7 @@ public function encrypt(string $textForEncrypt): array
             'data' => $encryptedText,
             'params' => [
                 'iv' => bin2hex($iv),
-                'tag' => is_string($tag) ? bin2hex($tag) : $tag,
+                'tag' => is_string($tag) ? bin2hex($tag) : (string)$tag,
             ],
         ];
     }

config/bundles.php

@@ -30,12 +30,12 @@
         "version": "v0.5.3"
     },
     "doctrine/doctrine-bundle": {
-        "version": "2.12",
+        "version": "2.13",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "2.12",
-            "ref": "7266981c201efbbe02ae53c87f8bb378e3f825ae"
+            "version": "2.13",
+            "ref": "8d96c0b51591ffc26794d865ba3ee7d193438a83"
         },
         "files": [
             "config/packages/doctrine.yaml",
@@ -271,6 +271,21 @@
     "symfony/asset": {
         "version": "v4.4.25"
     },
+    "symfony/asset-mapper": {
+        "version": "7.2",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "6.4",
+            "ref": "5ad1308aa756d58f999ffbe1540d1189f5d7d14a"
+        },
+        "files": [
+            "assets/app.js",
+            "assets/styles/app.css",
+            "config/packages/asset_mapper.yaml",
+            "importmap.php"
+        ]
+    },
     "symfony/browser-kit": {
         "version": "v4.4.25"
     },
@@ -344,27 +359,28 @@
         "version": "v4.4.25"
     },
     "symfony/flex": {
-        "version": "2.2",
+        "version": "2.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "1.0",
-            "ref": "146251ae39e06a95be0fe3d13c807bcf3938b172"
+            "version": "2.4",
+            "ref": "52e9754527a15e2b79d9a610f98185a1fe46622a"
         },
         "files": [
-            ".env"
+            ".env",
+            ".env.dev"
         ]
     },
     "symfony/form": {
         "version": "v4.4.25"
     },
     "symfony/framework-bundle": {
-        "version": "7.1",
+        "version": "7.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "7.0",
-            "ref": "6356c19b9ae08e7763e4ba2d9ae63043efc75db5"
+            "version": "7.2",
+            "ref": "87bcf6f7c55201f345d8895deda46d2adbdbaa89"
         },
         "files": [
             "config/packages/cache.yaml",
@@ -405,12 +421,12 @@
         ]
     },
     "symfony/mailer": {
-        "version": "6.4",
+        "version": "7.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
             "version": "4.3",
-            "ref": "df66ee1f226c46f01e85c29c2f7acce0596ba35a"
+            "ref": "09051cfde49476e3c12cd3a0e44289ace1c75a4f"
         },
         "files": [
             "config/packages/mailer.yaml"
@@ -553,6 +569,21 @@
     "symfony/service-contracts": {
         "version": "v2.4.0"
     },
+    "symfony/stimulus-bundle": {
+        "version": "2.22",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "2.20",
+            "ref": "3acc494b566816514a6873a89023a35440b6386d"
+        },
+        "files": [
+            "assets/bootstrap.js",
+            "assets/controllers.json",
+            "assets/controllers/csrf_protection_controller.js",
+            "assets/controllers/hello_controller.js"
+        ]
+    },
     "symfony/stopwatch": {
         "version": "v4.4.25"
     },
@@ -591,6 +622,15 @@
             "templates/base.html.twig"
         ]
     },
+    "symfony/ux-turbo": {
+        "version": "2.22",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "2.20",
+            "ref": "c85ff94da66841d7ff087c19cbcd97a2df744ef9"
+        }
+    },
     "symfony/validator": {
         "version": "7.1",
         "recipe": {

config/packages/asset_mapper.yaml

@@ -8,6 +8,7 @@
         {% endblock %}
 
         {% block javascripts %}
+            {% block importmap %}{{ importmap('app') }}{% endblock %}
         {% endblock %}
     </head>
     <body>

importmap.php

@@ -5,7 +5,7 @@
 		"php": "^8.4.0"
 	},
 	"require-dev": {
-		"friendsofphp/php-cs-fixer": "3.66.*",
+		"friendsofphp/php-cs-fixer": "3.68.*",
 		"squizlabs/php_codesniffer": "3.11.*",
 		"symplify/easy-coding-standard": "12.5.*",
 		"roave/security-advisories": "dev-latest"

src/Tool/Domain/Service/Crypt/OpenSslCryptService.php

@@ -7,7 +7,7 @@
 	"require-dev": {
 		"ergebnis/composer-normalize": "^2.45",
 		"icanhazstring/composer-unused": "^0.8",
-		"maglnet/composer-require-checker": "^4.14",
+		"maglnet/composer-require-checker": "^4.15",
 		"roave/security-advisories": "dev-latest"
 	},
 	"config": {