Skip to content

Commit 5827a28

Browse files
committed
update to last umbrella version / sf 6.4
1 parent 2608663 commit 5827a28

File tree

69 files changed

+8424
-5123
lines changed

Some content is hidden

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

69 files changed

+8424
-5123
lines changed

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,13 @@ composer.lock
3232
/public/build/
3333
/public/ckeditor4/
3434
npm-debug.log
35-
yarn-error.log
3635
###< symfony/webpack-encore-bundle ###
36+
37+
###> yarn ###
38+
yarn-error.log
39+
/.pnp.cjs
40+
/.pnp.loader.mjs
41+
/.yarn/*
42+
!/.yarn/releases
43+
!/.yarn/plugins
44+
###< yarn ###

.php-cs-fixer.dist.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
$config = new PhpCsFixer\Config();
77

88
return $config
9+
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
910
->setRules([
1011
'@Symfony' => true,
11-
'@DoctrineAnnotation' => true,
1212
'phpdoc_summary' => false,
1313
'no_unneeded_final_method' => false,
1414
'no_superfluous_phpdoc_tags' => true,
@@ -21,7 +21,7 @@
2121
'header_comment' => [
2222
'header' => ''
2323
],
24-
'blank_line_before_statement' => []
24+
'blank_line_before_statement' => false
2525
])
2626
->setRiskyAllowed(true)
2727
->setFinder($finder);

.yarn/releases/yarn-4.7.0.cjs

Lines changed: 935 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
yarnPath: .yarn/releases/yarn-4.7.0.cjs
2+
nodeLinker: node-modules

assets/admin/plugins/highlightCode.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "~highlight.js/scss/atom-one-dark-reasonable";
1+
@use "~highlight.js/scss/atom-one-dark-reasonable";
22

33
hl-code {
44
display: block;

composer.json

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,64 @@
44
"type": "project",
55
"license": "MIT",
66
"require": {
7-
"php": ">=8.1",
7+
"php": ">=8.2",
88
"ext-ctype": "*",
99
"ext-iconv": "*",
10-
"doctrine/doctrine-bundle": "^2.5",
11-
"doctrine/doctrine-fixtures-bundle": "^3.4",
12-
"doctrine/doctrine-migrations-bundle": "^3.2",
13-
"knplabs/knp-time-bundle": "^1.18",
10+
"doctrine/dbal": "^3.9.4",
11+
"doctrine/doctrine-bundle": "^2.13.2",
12+
"doctrine/doctrine-fixtures-bundle": "^4.0",
13+
"doctrine/doctrine-migrations-bundle": "^3.4.1",
14+
"doctrine/orm": "^3.3.2",
15+
"knplabs/knp-time-bundle": "^2.4",
1416
"stof/doctrine-extensions-bundle": "^1.7",
15-
"symfony/asset": "^6.0",
16-
"symfony/config": "^6.0",
17-
"symfony/console": "^6.0",
18-
"symfony/doctrine-messenger": "^6.0",
19-
"symfony/dotenv": "^6.0",
20-
"symfony/error-handler": "^6.0",
21-
"symfony/expression-language": "^6.0",
17+
"symfony/asset": "6.4.*",
18+
"symfony/config": "6.4.*",
19+
"symfony/console": "6.4.*",
20+
"symfony/doctrine-messenger": "6.4.*",
21+
"symfony/dotenv": "6.4.*",
22+
"symfony/error-handler": "6.4.*",
23+
"symfony/expression-language": "6.4.*",
2224
"symfony/flex": "^2.0",
23-
"symfony/form": "^6.0",
24-
"symfony/framework-bundle": "^6.0",
25-
"symfony/http-client": "^6.0",
26-
"symfony/intl": "^6.0",
27-
"symfony/lock": "^6.0",
28-
"symfony/mailer": "^6.0",
29-
"symfony/messenger": "^6.0",
25+
"symfony/form": "6.4.*",
26+
"symfony/framework-bundle": "6.4.*",
27+
"symfony/http-client": "6.4.*",
28+
"symfony/intl": "6.4.*",
29+
"symfony/lock": "6.4.*",
30+
"symfony/mailer": "6.4.*",
31+
"symfony/messenger": "6.4.*",
3032
"symfony/monolog-bundle": "^3.7",
31-
"symfony/process": "^6.0",
32-
"symfony/property-access": "^6.0",
33-
"symfony/property-info": "^6.0",
34-
"symfony/proxy-manager-bridge": "^6.0",
35-
"symfony/rate-limiter": "^6.0",
36-
"symfony/runtime": "^6.0",
37-
"symfony/security-bundle": "^6.0",
38-
"symfony/serializer": "^6.0",
39-
"symfony/string": "^6.0",
40-
"symfony/translation": "^6.0",
41-
"symfony/twig-bundle": "^6.0",
42-
"symfony/validator": "^6.0",
43-
"symfony/web-link": "^6.0",
44-
"symfony/webpack-encore-bundle": "^1.16",
45-
"symfony/yaml": "^6.0",
33+
"symfony/process": "6.4.*",
34+
"symfony/property-access": "6.4.*",
35+
"symfony/property-info": "6.4.*",
36+
"symfony/rate-limiter": "6.4.*",
37+
"symfony/runtime": "6.4.*",
38+
"symfony/security-bundle": "6.4.*",
39+
"symfony/serializer": "6.4.*",
40+
"symfony/string": "6.4.*",
41+
"symfony/translation": "6.4.*",
42+
"symfony/twig-bundle": "6.4.*",
43+
"symfony/validator": "6.4.*",
44+
"symfony/web-link": "6.4.*",
45+
"symfony/webpack-encore-bundle": "^v2.2",
46+
"symfony/yaml": "6.4.*",
4647
"twig/extra-bundle": "^3.0",
4748
"twig/twig": "^3.0",
4849
"umbrella2/adminbundle": "dev-master",
4950
"umbrella2/corebundle": "dev-master",
50-
"vich/uploader-bundle": "^1.18"
51+
"vich/uploader-bundle": "^2.5"
5152
},
5253
"require-dev": {
53-
"friendsofphp/php-cs-fixer": "^3.6",
54-
"phpstan/phpstan": "^1.2",
55-
"phpstan/phpstan-doctrine": "^1.1",
56-
"phpstan/phpstan-symfony": "^1.1",
54+
"friendsofphp/php-cs-fixer": "^3.70",
55+
"phpstan/phpstan": "^2.1",
56+
"phpstan/phpstan-doctrine": "^2.0",
57+
"phpstan/phpstan-symfony": "^2.0",
5758
"phpunit/phpunit": "^9.5",
58-
"symfony/browser-kit": "^6.0",
59-
"symfony/css-selector": "^6.0",
60-
"symfony/debug-bundle": "^6.0",
59+
"symfony/browser-kit": "6.4.*",
60+
"symfony/css-selector": "6.4.*",
61+
"symfony/debug-bundle": "6.4.*",
6162
"symfony/maker-bundle": "^1.36",
62-
"symfony/phpunit-bridge": "^6.0",
63-
"symfony/web-profiler-bundle": "^6.0"
63+
"symfony/phpunit-bridge": "6.4.*",
64+
"symfony/web-profiler-bundle": "6.4.*"
6465
},
6566
"config": {
6667
"allow-plugins": {
@@ -110,7 +111,7 @@
110111
"extra": {
111112
"symfony": {
112113
"allow-contrib": false,
113-
"require": "^6.0"
114+
"require": "6.4.*"
114115
}
115116
}
116117
}

config/packages/doctrine.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ doctrine:
77
#server_version: '13'
88
orm:
99
auto_generate_proxy_classes: true
10+
enable_lazy_ghost_objects: true
11+
report_fields_where_declared: true
1012
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
1113
auto_mapping: true
1214
mappings:
@@ -15,6 +17,8 @@ doctrine:
1517
dir: '%kernel.project_dir%/src/Entity'
1618
prefix: 'App\Entity'
1719
alias: App
20+
controller_resolver:
21+
auto_mapping: false
1822

1923
when@test:
2024
doctrine:

config/routes.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
kernel:
2-
resource: ../src/Kernel.php
3-
type: annotation
4-
51
admin_:
62
resource: "../src/Controller/"
7-
type: annotation
3+
type: attribute
84
prefix: /
95

106
# User Profile

docker-compose.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

docker/nginx/symfony.conf

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)