Skip to content

Commit f3b9a9c

Browse files
authored
Merge pull request #18 from xabbuh/symfony-7.0
update to Symfony 7.0
2 parents 48c0e38 + 8908a1e commit f3b9a9c

File tree

9 files changed

+80
-94
lines changed

9 files changed

+80
-94
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 8.1
19+
php-version: 8.2
2020
coverage: none
2121

2222
- name: Download dependencies

composer.json

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,50 @@
77
"ext-iconv": "*",
88
"composer/package-versions-deprecated": "1.11.99.1",
99
"doctrine/annotations": "^1.0",
10-
"doctrine/doctrine-bundle": "^2.3",
10+
"doctrine/doctrine-bundle": "^2.11",
1111
"doctrine/orm": "^2.8",
1212
"phpdocumentor/reflection-docblock": "^5.2",
13-
"sensio/framework-extra-bundle": "^6.1",
14-
"symfony/asset": "6.4.*",
15-
"symfony/console": "6.4.*",
16-
"symfony/dotenv": "6.4.*",
17-
"symfony/expression-language": "6.4.*",
13+
"symfony/asset": "*",
14+
"symfony/console": "*",
15+
"symfony/dotenv": "*",
16+
"symfony/expression-language": "*",
1817
"symfony/flex": "^1.3.1",
19-
"symfony/form": "6.4.*",
20-
"symfony/framework-bundle": "6.4.*",
21-
"symfony/html-sanitizer": "6.4.*",
22-
"symfony/http-client": "6.4.*",
23-
"symfony/intl": "6.4.*",
24-
"symfony/mailer": "6.4.*",
18+
"symfony/form": "*",
19+
"symfony/framework-bundle": "*",
20+
"symfony/html-sanitizer": "*",
21+
"symfony/http-client": "*",
22+
"symfony/intl": "*",
23+
"symfony/mailer": "*",
2524
"symfony/mercure-bundle": "^0.3.2",
26-
"symfony/messenger": "6.4.*",
25+
"symfony/messenger": "*",
2726
"symfony/monolog-bundle": "^3.1",
28-
"symfony/notifier": "6.4.*",
29-
"symfony/process": "6.4.*",
30-
"symfony/property-access": "6.4.*",
31-
"symfony/property-info": "6.4.*",
32-
"symfony/proxy-manager-bridge": "6.4.*",
33-
"symfony/rate-limiter": "6.4.*",
34-
"symfony/routing": "6.4.*",
35-
"symfony/security-bundle": "6.4.*",
36-
"symfony/serializer": "6.4.*",
37-
"symfony/translation": "6.4.*",
38-
"symfony/twig-bundle": "6.4.*",
39-
"symfony/uid": "6.4.*",
40-
"symfony/validator": "6.4.*",
41-
"symfony/web-link": "6.4.*",
42-
"symfony/webpack-encore-bundle": "^1.11",
43-
"symfony/yaml": "6.4.*",
27+
"symfony/notifier": "*",
28+
"symfony/process": "*",
29+
"symfony/property-access": "*",
30+
"symfony/property-info": "*",
31+
"symfony/rate-limiter": "*",
32+
"symfony/routing": "*",
33+
"symfony/security-bundle": "*",
34+
"symfony/serializer": "*",
35+
"symfony/translation": "*",
36+
"symfony/twig-bundle": "*",
37+
"symfony/uid": "*",
38+
"symfony/validator": "*",
39+
"symfony/web-link": "*",
40+
"symfony/webpack-encore-bundle": "^2.1",
41+
"symfony/yaml": "*",
4442
"twig/extra-bundle": "^3.0",
4543
"twig/twig": "^3.0"
4644
},
4745
"require-dev": {
48-
"symfony/browser-kit": "6.4.*",
49-
"symfony/css-selector": "6.4.*",
50-
"symfony/debug-bundle": "6.4.*",
46+
"symfony/browser-kit": "*",
47+
"symfony/css-selector": "*",
48+
"symfony/debug-bundle": "*",
5149
"symfony/maker-bundle": "^1.0",
5250
"symfony/phpunit-bridge": "^5.2",
53-
"symfony/stopwatch": "6.4.*",
54-
"symfony/var-dumper": "6.4.*",
55-
"symfony/web-profiler-bundle": "6.4.*"
51+
"symfony/stopwatch": "*",
52+
"symfony/var-dumper": "*",
53+
"symfony/web-profiler-bundle": "*"
5654
},
5755
"config": {
5856
"allow-plugins": {
@@ -102,7 +100,7 @@
102100
"extra": {
103101
"symfony": {
104102
"allow-contrib": false,
105-
"require": "6.*"
103+
"require": "7.0.*"
106104
}
107105
},
108106
"minimum-stability": "dev",

config/bundles.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
return [
44
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
5-
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
65
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
76
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
87
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],

config/packages/doctrine.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ doctrine:
1313
mappings:
1414
App:
1515
is_bundle: false
16-
type: annotation
16+
type: attribute
1717
dir: '%kernel.project_dir%/src/Entity'
1818
prefix: 'App\Entity'
1919
alias: App

config/packages/security.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
security:
2+
# https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
3+
password_hashers:
4+
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
5+
# https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
6+
providers:
7+
users_in_memory: { memory: null }
8+
firewalls:
9+
dev:
10+
pattern: ^/(_(profiler|wdt)|css|images|js)/
11+
security: false
12+
main:
13+
lazy: true
14+
provider: users_in_memory
15+
16+
# activate different ways to authenticate
17+
# https://symfony.com/doc/current/security.html#the-firewall
18+
19+
# https://symfony.com/doc/current/security/impersonating_user.html
20+
# switch_user: true
21+
22+
# Easy way to control access for large sections of your site
23+
# Note: Only the *first* access control that matches will be used
24+
access_control:
25+
# - { path: ^/admin, roles: ROLE_ADMIN }
26+
# - { path: ^/profile, roles: ROLE_USER }
27+
28+
when@test:
29+
security:
30+
password_hashers:
31+
# By default, password hashers are resource intensive and take time. This is
32+
# important to generate secure password hashes. In tests however, secure hashes
33+
# are not important, waste resources and increase test times. The following
34+
# reduces the work factor to the lowest possible values.
35+
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
36+
algorithm: auto
37+
cost: 4 # Lowest possible value for bcrypt
38+
time_cost: 3 # Lowest possible value for argon
39+
memory_cost: 10 # Lowest possible value for argon

config/packages/sensio_framework_extra.yaml

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

config/routes.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
#index:
2-
# path: /
3-
# controller: App\Controller\DefaultController::index
1+
controllers:
2+
resource:
3+
path: ../src/Controller/
4+
namespace: App\Controller
5+
type: attribute

config/routes/annotations.yaml

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

symfony.lock

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@
8383
"fig/link-util": {
8484
"version": "1.2.0"
8585
},
86-
"friendsofphp/proxy-manager-lts": {
87-
"version": "v1.0.5"
88-
},
89-
"laminas/laminas-code": {
90-
"version": "4.5.0"
91-
},
9286
"lcobucci/clock": {
9387
"version": "2.1.0"
9488
},
@@ -119,27 +113,12 @@
119113
"psr/event-dispatcher": {
120114
"version": "1.0.0"
121115
},
122-
"psr/event-dispatcher": {
123-
"version": "1.0.0"
124-
},
125116
"psr/link": {
126117
"version": "1.1.1"
127118
},
128119
"psr/log": {
129120
"version": "2.0.0"
130121
},
131-
"sensio/framework-extra-bundle": {
132-
"version": "5.6",
133-
"recipe": {
134-
"repo": "github.com/symfony/recipes",
135-
"branch": "master",
136-
"version": "5.2",
137-
"ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
138-
},
139-
"files": [
140-
"config/packages/sensio_framework_extra.yaml"
141-
]
142-
},
143122
"symfony/amqp-messenger": {
144123
"version": "v6.0.0"
145124
},
@@ -282,18 +261,6 @@
282261
"config/packages/lock.yaml"
283262
]
284263
},
285-
"symfony/lock": {
286-
"version": "6.0",
287-
"recipe": {
288-
"repo": "github.com/symfony/recipes",
289-
"branch": "master",
290-
"version": "5.2",
291-
"ref": "a1c8800e40ae735206bb14586fdd6c4630a51b8d"
292-
},
293-
"files": [
294-
"config/packages/lock.yaml"
295-
]
296-
},
297264
"symfony/mailer": {
298265
"version": "5.4",
299266
"recipe": {
@@ -432,12 +399,6 @@
432399
"symfony/property-info": {
433400
"version": "v5.4.0"
434401
},
435-
"symfony/proxy-manager-bridge": {
436-
"version": "v5.4.0"
437-
},
438-
"symfony/rate-limiter": {
439-
"version": "v5.4.0"
440-
},
441402
"symfony/rate-limiter": {
442403
"version": "v6.0.0"
443404
},
@@ -525,9 +486,6 @@
525486
"templates/base.html.twig"
526487
]
527488
},
528-
"symfony/uid": {
529-
"version": "v5.4.0"
530-
},
531489
"symfony/uid": {
532490
"version": "v6.0.0"
533491
},

0 commit comments

Comments
 (0)