2.x

.github/workflows/lint.yml

@@ -54,6 +54,14 @@ jobs:
         if: always() && steps.install.outcome == 'success'
         run: vendor/bin/php-cs-fixer fix --diff --dry-run
 
+      - name: PHPStan
+        if: always() && steps.install.outcome == 'success'
+        run: vendor/bin/phpstan analyse
+
+      - name: Rector
+        if: always() && steps.install.outcome == 'success'
+        run: vendor/bin/rector process src --clear-cache --dry-run
+
       - name: Lint YAML files
         if: always() && steps.install.outcome == 'success'
         run: ./bin/console lint:yaml config --parse-tags

.github/workflows/mariadb.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

assets/app.js

@@ -6,3 +6,9 @@ import 'bootstrap';
 import 'lazysizes';
 import bootbox from 'bootbox';
 window.bootbox = bootbox;
+
+$.ajaxSetup({
+    headers: {
+        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+    }
+});

assets/js/admin/menu-sorting.js

@@ -14,7 +14,6 @@ const changeButtons = () => {
 
 const sendRequest = () => {
     const item = $('.js-move');
-    const token = $('#menu').data('token');
 
     if (item.length > 1) {
         let items = [];
@@ -26,7 +25,7 @@ const sendRequest = () => {
         $.ajax({
             method: 'POST',
             url: '/en/admin/menu/sort',
-            data: { csrf_token: token, items: items }
+            data: { items: items }
         });
     }
 };

assets/js/auth/_resend.js

@@ -8,7 +8,6 @@
         $.ajax({
             url: '/en/auth/should_link_be_visible',
             type: 'GET',
-            data: { csrf_token: link.data('token') },
             success: function (response) {
                 if (response.display === true) {
                     link.show();
@@ -21,7 +20,6 @@
         $.ajax({
             url: link.data('path'),
             type: 'POST',
-            data: { csrf_token: link.data('token') },
             success: function (response) {
                 link.hide();
                 bootbox.alert(response.message);

assets/js/city.js

@@ -24,9 +24,8 @@
     $('body').on('change', '#property_city', function () {
         clearOptions();
         let cityId = $(this).val();
-        const token = $('#property_form').data('token');
-        const url =
-            '/en/city/' + cityId + '.json?csrf_token=' + token;
+
+        const url = '/en/city/' + cityId + '.json';
 
         if ('' === cityId) {
             return;

assets/js/user/password/_update_password.js

@@ -7,15 +7,13 @@
 
     // Send request
     $button.click(function () {
-        let token = $('[name="password_token"]').val();
         $(this)
             .attr('disabled', true)
             .text($button.data('progress-text'));
         $.ajax({
             method: 'POST',
             url: $('#passwordForm').attr('action'),
             data: {
-                csrf_token: token,
                 password1: $('#password1').val(),
                 password2: $('#password2').val()
             }

assets/js/user/two_factor/google_authenticator.js

@@ -2,7 +2,6 @@
     'use strict';
 
     const $form = $('#generate_google_auth_secret');
-    const token = $('[name="auth_token"]').val();
     const $secret = $('[name="generatedSecret"]');
     const $authentication_code = $('[name="authentication_code"]');
 
@@ -11,8 +10,7 @@
         if ($form.data('generate-new-secret') === true) {
             $.ajax({
                 method: 'GET',
-                url: '/en/user/google_authenticator_code',
-                data: { csrf_token: token }
+                url: '/en/user/google_authenticator_code'
             }).done(function (response) {
                 const { secret, qr_code } = response;
                 const image = new Image();
@@ -39,7 +37,6 @@
             method: 'PUT',
             url: $form.attr('action'),
             data: {
-                csrf_token: token,
                 secret: $secret.val(),
                 authentication_code: authentication_code
             }
@@ -56,8 +53,7 @@
     $('#disable2fa').click(function () {
         $.ajax({
             method: 'DELETE',
-            url: $form.attr('action'),
-            data: { csrf_token: token }
+            url: $form.attr('action')
         })
             .done(function () {
                 location.reload();

composer.json

@@ -10,69 +10,69 @@
         "ext-ctype": "*",
         "ext-gd": "*",
         "doctrine/annotations": "^2.0",
-        "doctrine/doctrine-bundle": "^2.8",
-        "doctrine/doctrine-migrations-bundle": "^3.2",
-        "doctrine/orm": "^2.13",
+        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/doctrine-migrations-bundle": "^3.3",
+        "doctrine/orm": "^2.17",
         "endroid/qr-code": "^4.8",
         "gregwar/image": "master",
-        "knplabs/knp-paginator-bundle": "^6.2",
-        "phpdocumentor/reflection-docblock": "^5.2",
-        "scheb/2fa-bundle": "^6.8",
-        "scheb/2fa-google-authenticator": "^6.8",
-        "symfony/asset": "^6.3",
-        "symfony/cache": "^6.3",
-        "symfony/console": "^6.3",
-        "symfony/dotenv": "^6.3",
-        "symfony/expression-language": "^6.3",
-        "symfony/flex": "^2.2",
-        "symfony/form": "^6.3",
-        "symfony/framework-bundle": "^6.3",
-        "symfony/google-mailer": "^6.3",
-        "symfony/http-client": "^6.3",
-        "symfony/intl": "^6.3",
-        "symfony/lock": "^6.3",
-        "symfony/mailer": "^6.3",
-        "symfony/messenger": "^6.3",
-        "symfony/monolog-bridge": "^6.3",
-        "symfony/monolog-bundle": "^3.8",
-        "symfony/notifier": "^6.3",
-        "symfony/process": "^6.3",
-        "symfony/property-access": "^6.3",
-        "symfony/property-info": "^6.3",
-        "symfony/proxy-manager-bridge": "^6.3",
-        "symfony/rate-limiter": "^6.3",
-        "symfony/runtime": "^6.3",
-        "symfony/security-bundle": "^6.1",
-        "symfony/serializer": "^6.3",
-        "symfony/string": "^6.3",
-        "symfony/translation": "^6.3",
-        "symfony/twig-bundle": "^6.3",
-        "symfony/validator": "^6.3",
-        "symfony/web-link": "^6.3",
-        "symfony/webpack-encore-bundle": "^2.0",
-        "symfony/yaml": "^6.3",
-        "symfonycasts/verify-email-bundle": "^1.10",
-        "twig/extra-bundle": "^3.4",
-        "twig/intl-extra": "^3.4",
-        "twig/string-extra": "^3.4",
-        "twig/twig": "^v3.4.3",
+        "knplabs/knp-paginator-bundle": "^6.3",
+        "phpdocumentor/reflection-docblock": "^5.3",
+        "scheb/2fa-bundle": "^6.12",
+        "scheb/2fa-google-authenticator": "^6.12",
+        "symfony/asset": "^6.4",
+        "symfony/cache": "^6.4",
+        "symfony/console": "^6.4",
+        "symfony/dotenv": "^6.4",
+        "symfony/expression-language": "^6.4",
+        "symfony/flex": "^2.4",
+        "symfony/form": "^6.4",
+        "symfony/framework-bundle": "^6.4",
+        "symfony/google-mailer": "^6.4",
+        "symfony/http-client": "^6.4",
+        "symfony/intl": "^6.4",
+        "symfony/lock": "^6.4",
+        "symfony/mailer": "^6.4",
+        "symfony/messenger": "^6.4",
+        "symfony/monolog-bridge": "^6.4",
+        "symfony/monolog-bundle": "^3.10",
+        "symfony/notifier": "^6.4",
+        "symfony/process": "^6.4",
+        "symfony/property-access": "^6.4",
+        "symfony/property-info": "^6.4",
+        "symfony/proxy-manager-bridge": "^6.4",
+        "symfony/rate-limiter": "^6.4",
+        "symfony/runtime": "^6.4",
+        "symfony/security-bundle": "^6.4",
+        "symfony/serializer": "^6.4",
+        "symfony/string": "^6.4",
+        "symfony/translation": "^6.4",
+        "symfony/twig-bundle": "^6.4",
+        "symfony/validator": "^6.4",
+        "symfony/web-link": "^6.4",
+        "symfony/webpack-encore-bundle": "^2.1",
+        "symfony/yaml": "^6.4",
+        "symfonycasts/verify-email-bundle": "^1.15",
+        "twig/extra-bundle": "^3.8",
+        "twig/intl-extra": "^3.8",
+        "twig/string-extra": "^3.8",
+        "twig/twig": "^v3.8.0",
         "voku/portable-ascii": "^1.6"
     },
     "require-dev": {
         "coderberg/google-authenticator": "^1.2",
-        "dbrekelmans/bdi": "^1.0",
-        "doctrine/doctrine-fixtures-bundle": "^3.4",
-        "friendsofphp/php-cs-fixer": "^3.17",
+        "dbrekelmans/bdi": "^1.1",
+        "doctrine/doctrine-fixtures-bundle": "^3.5",
+        "friendsofphp/php-cs-fixer": "^3.40",
         "phpunit/phpunit": "^9.6",
         "rector/rector": "^0.14.5",
-        "symfony/browser-kit": "^6.3",
-        "symfony/css-selector": "^6.3",
-        "symfony/debug-bundle": "^6.3",
-        "symfony/maker-bundle": "^1.48",
-        "symfony/panther": "^2.0",
-        "symfony/phpunit-bridge": "^6.3",
-        "symfony/stopwatch": "^6.3",
-        "symfony/web-profiler-bundle": "^6.3"
+        "symfony/browser-kit": "^6.4",
+        "symfony/css-selector": "^6.4",
+        "symfony/debug-bundle": "^6.4",
+        "symfony/maker-bundle": "^1.52",
+        "symfony/panther": "^2.1",
+        "symfony/phpunit-bridge": "^6.4",
+        "symfony/stopwatch": "^6.4",
+        "symfony/web-profiler-bundle": "^6.4"
     },
     "config": {
         "platform": {
@@ -125,7 +125,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "6.3.*"
+            "require": "6.4.*"
         }
     }
 }