Skip to content

Commit ea82d64

Browse files
CoderbergCoderberg
authored
Merge pull request #112 from Coderberg/2.x
2.x
2 parents 77b5841 + 998e213 commit ea82d64

82 files changed

Lines changed: 1581 additions & 1492 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/lint.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ jobs:
5454
if: always() && steps.install.outcome == 'success'
5555
run: vendor/bin/php-cs-fixer fix --diff --dry-run
5656

57+
- name: PHPStan
58+
if: always() && steps.install.outcome == 'success'
59+
run: vendor/bin/phpstan analyse
60+
61+
- name: Rector
62+
if: always() && steps.install.outcome == 'success'
63+
run: vendor/bin/rector process src --clear-cache --dry-run
64+
5765
- name: Lint YAML files
5866
if: always() && steps.install.outcome == 'success'
5967
run: ./bin/console lint:yaml config --parse-tags

‎.github/workflows/mariadb.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
php-versions: ['8.1']
21+
php-versions: ['8.3']
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v2

‎assets/app.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ import 'bootstrap';
66
import 'lazysizes';
77
import bootbox from 'bootbox';
88
window.bootbox = bootbox;
9+
10+
$.ajaxSetup({
11+
headers: {
12+
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
13+
}
14+
});

‎assets/js/admin/menu-sorting.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const changeButtons = () => {
1414

1515
const sendRequest = () => {
1616
const item = $('.js-move');
17-
const token = $('#menu').data('token');
1817

1918
if (item.length > 1) {
2019
let items = [];
@@ -26,7 +25,7 @@ const sendRequest = () => {
2625
$.ajax({
2726
method: 'POST',
2827
url: '/en/admin/menu/sort',
29-
data: { csrf_token: token, items: items }
28+
data: { items: items }
3029
});
3130
}
3231
};

‎assets/js/auth/_resend.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
$.ajax({
99
url: '/en/auth/should_link_be_visible',
1010
type: 'GET',
11-
data: { csrf_token: link.data('token') },
1211
success: function (response) {
1312
if (response.display === true) {
1413
link.show();
@@ -21,7 +20,6 @@
2120
$.ajax({
2221
url: link.data('path'),
2322
type: 'POST',
24-
data: { csrf_token: link.data('token') },
2523
success: function (response) {
2624
link.hide();
2725
bootbox.alert(response.message);

‎assets/js/city.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
$('body').on('change', '#property_city', function () {
2525
clearOptions();
2626
let cityId = $(this).val();
27-
const token = $('#property_form').data('token');
28-
const url =
29-
'/en/city/' + cityId + '.json?csrf_token=' + token;
27+
28+
const url = '/en/city/' + cityId + '.json';
3029

3130
if ('' === cityId) {
3231
return;

‎assets/js/user/password/_update_password.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77

88
// Send request
99
$button.click(function () {
10-
let token = $('[name="password_token"]').val();
1110
$(this)
1211
.attr('disabled', true)
1312
.text($button.data('progress-text'));
1413
$.ajax({
1514
method: 'POST',
1615
url: $('#passwordForm').attr('action'),
1716
data: {
18-
csrf_token: token,
1917
password1: $('#password1').val(),
2018
password2: $('#password2').val()
2119
}

‎assets/js/user/two_factor/google_authenticator.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
'use strict';
33

44
const $form = $('#generate_google_auth_secret');
5-
const token = $('[name="auth_token"]').val();
65
const $secret = $('[name="generatedSecret"]');
76
const $authentication_code = $('[name="authentication_code"]');
87

@@ -11,8 +10,7 @@
1110
if ($form.data('generate-new-secret') === true) {
1211
$.ajax({
1312
method: 'GET',
14-
url: '/en/user/google_authenticator_code',
15-
data: { csrf_token: token }
13+
url: '/en/user/google_authenticator_code'
1614
}).done(function (response) {
1715
const { secret, qr_code } = response;
1816
const image = new Image();
@@ -39,7 +37,6 @@
3937
method: 'PUT',
4038
url: $form.attr('action'),
4139
data: {
42-
csrf_token: token,
4340
secret: $secret.val(),
4441
authentication_code: authentication_code
4542
}
@@ -56,8 +53,7 @@
5653
$('#disable2fa').click(function () {
5754
$.ajax({
5855
method: 'DELETE',
59-
url: $form.attr('action'),
60-
data: { csrf_token: token }
56+
url: $form.attr('action')
6157
})
6258
.done(function () {
6359
location.reload();

‎composer.json‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,69 +10,69 @@
1010
"ext-ctype": "*",
1111
"ext-gd": "*",
1212
"doctrine/annotations": "^2.0",
13-
"doctrine/doctrine-bundle": "^2.8",
14-
"doctrine/doctrine-migrations-bundle": "^3.2",
15-
"doctrine/orm": "^2.13",
13+
"doctrine/doctrine-bundle": "^2.11",
14+
"doctrine/doctrine-migrations-bundle": "^3.3",
15+
"doctrine/orm": "^2.17",
1616
"endroid/qr-code": "^4.8",
1717
"gregwar/image": "master",
18-
"knplabs/knp-paginator-bundle": "^6.2",
19-
"phpdocumentor/reflection-docblock": "^5.2",
20-
"scheb/2fa-bundle": "^6.8",
21-
"scheb/2fa-google-authenticator": "^6.8",
22-
"symfony/asset": "^6.3",
23-
"symfony/cache": "^6.3",
24-
"symfony/console": "^6.3",
25-
"symfony/dotenv": "^6.3",
26-
"symfony/expression-language": "^6.3",
27-
"symfony/flex": "^2.2",
28-
"symfony/form": "^6.3",
29-
"symfony/framework-bundle": "^6.3",
30-
"symfony/google-mailer": "^6.3",
31-
"symfony/http-client": "^6.3",
32-
"symfony/intl": "^6.3",
33-
"symfony/lock": "^6.3",
34-
"symfony/mailer": "^6.3",
35-
"symfony/messenger": "^6.3",
36-
"symfony/monolog-bridge": "^6.3",
37-
"symfony/monolog-bundle": "^3.8",
38-
"symfony/notifier": "^6.3",
39-
"symfony/process": "^6.3",
40-
"symfony/property-access": "^6.3",
41-
"symfony/property-info": "^6.3",
42-
"symfony/proxy-manager-bridge": "^6.3",
43-
"symfony/rate-limiter": "^6.3",
44-
"symfony/runtime": "^6.3",
45-
"symfony/security-bundle": "^6.1",
46-
"symfony/serializer": "^6.3",
47-
"symfony/string": "^6.3",
48-
"symfony/translation": "^6.3",
49-
"symfony/twig-bundle": "^6.3",
50-
"symfony/validator": "^6.3",
51-
"symfony/web-link": "^6.3",
52-
"symfony/webpack-encore-bundle": "^2.0",
53-
"symfony/yaml": "^6.3",
54-
"symfonycasts/verify-email-bundle": "^1.10",
55-
"twig/extra-bundle": "^3.4",
56-
"twig/intl-extra": "^3.4",
57-
"twig/string-extra": "^3.4",
58-
"twig/twig": "^v3.4.3",
18+
"knplabs/knp-paginator-bundle": "^6.3",
19+
"phpdocumentor/reflection-docblock": "^5.3",
20+
"scheb/2fa-bundle": "^6.12",
21+
"scheb/2fa-google-authenticator": "^6.12",
22+
"symfony/asset": "^6.4",
23+
"symfony/cache": "^6.4",
24+
"symfony/console": "^6.4",
25+
"symfony/dotenv": "^6.4",
26+
"symfony/expression-language": "^6.4",
27+
"symfony/flex": "^2.4",
28+
"symfony/form": "^6.4",
29+
"symfony/framework-bundle": "^6.4",
30+
"symfony/google-mailer": "^6.4",
31+
"symfony/http-client": "^6.4",
32+
"symfony/intl": "^6.4",
33+
"symfony/lock": "^6.4",
34+
"symfony/mailer": "^6.4",
35+
"symfony/messenger": "^6.4",
36+
"symfony/monolog-bridge": "^6.4",
37+
"symfony/monolog-bundle": "^3.10",
38+
"symfony/notifier": "^6.4",
39+
"symfony/process": "^6.4",
40+
"symfony/property-access": "^6.4",
41+
"symfony/property-info": "^6.4",
42+
"symfony/proxy-manager-bridge": "^6.4",
43+
"symfony/rate-limiter": "^6.4",
44+
"symfony/runtime": "^6.4",
45+
"symfony/security-bundle": "^6.4",
46+
"symfony/serializer": "^6.4",
47+
"symfony/string": "^6.4",
48+
"symfony/translation": "^6.4",
49+
"symfony/twig-bundle": "^6.4",
50+
"symfony/validator": "^6.4",
51+
"symfony/web-link": "^6.4",
52+
"symfony/webpack-encore-bundle": "^2.1",
53+
"symfony/yaml": "^6.4",
54+
"symfonycasts/verify-email-bundle": "^1.15",
55+
"twig/extra-bundle": "^3.8",
56+
"twig/intl-extra": "^3.8",
57+
"twig/string-extra": "^3.8",
58+
"twig/twig": "^v3.8.0",
5959
"voku/portable-ascii": "^1.6"
6060
},
6161
"require-dev": {
6262
"coderberg/google-authenticator": "^1.2",
63-
"dbrekelmans/bdi": "^1.0",
64-
"doctrine/doctrine-fixtures-bundle": "^3.4",
65-
"friendsofphp/php-cs-fixer": "^3.17",
63+
"dbrekelmans/bdi": "^1.1",
64+
"doctrine/doctrine-fixtures-bundle": "^3.5",
65+
"friendsofphp/php-cs-fixer": "^3.40",
6666
"phpunit/phpunit": "^9.6",
6767
"rector/rector": "^0.14.5",
68-
"symfony/browser-kit": "^6.3",
69-
"symfony/css-selector": "^6.3",
70-
"symfony/debug-bundle": "^6.3",
71-
"symfony/maker-bundle": "^1.48",
72-
"symfony/panther": "^2.0",
73-
"symfony/phpunit-bridge": "^6.3",
74-
"symfony/stopwatch": "^6.3",
75-
"symfony/web-profiler-bundle": "^6.3"
68+
"symfony/browser-kit": "^6.4",
69+
"symfony/css-selector": "^6.4",
70+
"symfony/debug-bundle": "^6.4",
71+
"symfony/maker-bundle": "^1.52",
72+
"symfony/panther": "^2.1",
73+
"symfony/phpunit-bridge": "^6.4",
74+
"symfony/stopwatch": "^6.4",
75+
"symfony/web-profiler-bundle": "^6.4"
7676
},
7777
"config": {
7878
"platform": {
@@ -125,7 +125,7 @@
125125
"extra": {
126126
"symfony": {
127127
"allow-contrib": true,
128-
"require": "6.3.*"
128+
"require": "6.4.*"
129129
}
130130
}
131131
}

0 commit comments

Comments
 (0)