Skip to content

Commit

Permalink
Merge pull request #18 from xabbuh/symfony-7.0
Browse files Browse the repository at this point in the history
update to Symfony 7.0
  • Loading branch information
xabbuh authored Dec 8, 2023
2 parents 48c0e38 + 8908a1e commit f3b9a9c
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 94 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1
php-version: 8.2
coverage: none

- name: Download dependencies
Expand Down
70 changes: 34 additions & 36 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,50 @@
"ext-iconv": "*",
"composer/package-versions-deprecated": "1.11.99.1",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.3",
"doctrine/doctrine-bundle": "^2.11",
"doctrine/orm": "^2.8",
"phpdocumentor/reflection-docblock": "^5.2",
"sensio/framework-extra-bundle": "^6.1",
"symfony/asset": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/asset": "*",
"symfony/console": "*",
"symfony/dotenv": "*",
"symfony/expression-language": "*",
"symfony/flex": "^1.3.1",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/html-sanitizer": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/mailer": "6.4.*",
"symfony/form": "*",
"symfony/framework-bundle": "*",
"symfony/html-sanitizer": "*",
"symfony/http-client": "*",
"symfony/intl": "*",
"symfony/mailer": "*",
"symfony/mercure-bundle": "^0.3.2",
"symfony/messenger": "6.4.*",
"symfony/messenger": "*",
"symfony/monolog-bundle": "^3.1",
"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/routing": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/uid": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/web-link": "6.4.*",
"symfony/webpack-encore-bundle": "^1.11",
"symfony/yaml": "6.4.*",
"symfony/notifier": "*",
"symfony/process": "*",
"symfony/property-access": "*",
"symfony/property-info": "*",
"symfony/rate-limiter": "*",
"symfony/routing": "*",
"symfony/security-bundle": "*",
"symfony/serializer": "*",
"symfony/translation": "*",
"symfony/twig-bundle": "*",
"symfony/uid": "*",
"symfony/validator": "*",
"symfony/web-link": "*",
"symfony/webpack-encore-bundle": "^2.1",
"symfony/yaml": "*",
"twig/extra-bundle": "^3.0",
"twig/twig": "^3.0"
},
"require-dev": {
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"symfony/browser-kit": "*",
"symfony/css-selector": "*",
"symfony/debug-bundle": "*",
"symfony/maker-bundle": "^1.0",
"symfony/phpunit-bridge": "^5.2",
"symfony/stopwatch": "6.4.*",
"symfony/var-dumper": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*"
"symfony/stopwatch": "*",
"symfony/var-dumper": "*",
"symfony/web-profiler-bundle": "*"
},
"config": {
"allow-plugins": {
Expand Down Expand Up @@ -102,7 +100,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.*"
"require": "7.0.*"
}
},
"minimum-stability": "dev",
Expand Down
1 change: 0 additions & 1 deletion config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
Expand Down
2 changes: 1 addition & 1 deletion config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ doctrine:
mappings:
App:
is_bundle: false
type: annotation
type: attribute
dir: '%kernel.project_dir%/src/Entity'
prefix: 'App\Entity'
alias: App
39 changes: 39 additions & 0 deletions config/packages/security.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
security:
# https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
password_hashers:
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
# https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
providers:
users_in_memory: { memory: null }
firewalls:
dev:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false
main:
lazy: true
provider: users_in_memory

# activate different ways to authenticate
# https://symfony.com/doc/current/security.html#the-firewall

# https://symfony.com/doc/current/security/impersonating_user.html
# switch_user: true

# Easy way to control access for large sections of your site
# Note: Only the *first* access control that matches will be used
access_control:
# - { path: ^/admin, roles: ROLE_ADMIN }
# - { path: ^/profile, roles: ROLE_USER }

when@test:
security:
password_hashers:
# By default, password hashers are resource intensive and take time. This is
# important to generate secure password hashes. In tests however, secure hashes
# are not important, waste resources and increase test times. The following
# reduces the work factor to the lowest possible values.
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
algorithm: auto
cost: 4 # Lowest possible value for bcrypt
time_cost: 3 # Lowest possible value for argon
memory_cost: 10 # Lowest possible value for argon
3 changes: 0 additions & 3 deletions config/packages/sensio_framework_extra.yaml

This file was deleted.

8 changes: 5 additions & 3 deletions config/routes.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#index:
# path: /
# controller: App\Controller\DefaultController::index
controllers:
resource:
path: ../src/Controller/
namespace: App\Controller
type: attribute
7 changes: 0 additions & 7 deletions config/routes/annotations.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@
"fig/link-util": {
"version": "1.2.0"
},
"friendsofphp/proxy-manager-lts": {
"version": "v1.0.5"
},
"laminas/laminas-code": {
"version": "4.5.0"
},
"lcobucci/clock": {
"version": "2.1.0"
},
Expand Down Expand Up @@ -119,27 +113,12 @@
"psr/event-dispatcher": {
"version": "1.0.0"
},
"psr/event-dispatcher": {
"version": "1.0.0"
},
"psr/link": {
"version": "1.1.1"
},
"psr/log": {
"version": "2.0.0"
},
"sensio/framework-extra-bundle": {
"version": "5.6",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "5.2",
"ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
},
"files": [
"config/packages/sensio_framework_extra.yaml"
]
},
"symfony/amqp-messenger": {
"version": "v6.0.0"
},
Expand Down Expand Up @@ -282,18 +261,6 @@
"config/packages/lock.yaml"
]
},
"symfony/lock": {
"version": "6.0",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "5.2",
"ref": "a1c8800e40ae735206bb14586fdd6c4630a51b8d"
},
"files": [
"config/packages/lock.yaml"
]
},
"symfony/mailer": {
"version": "5.4",
"recipe": {
Expand Down Expand Up @@ -432,12 +399,6 @@
"symfony/property-info": {
"version": "v5.4.0"
},
"symfony/proxy-manager-bridge": {
"version": "v5.4.0"
},
"symfony/rate-limiter": {
"version": "v5.4.0"
},
"symfony/rate-limiter": {
"version": "v6.0.0"
},
Expand Down Expand Up @@ -525,9 +486,6 @@
"templates/base.html.twig"
]
},
"symfony/uid": {
"version": "v5.4.0"
},
"symfony/uid": {
"version": "v6.0.0"
},
Expand Down

0 comments on commit f3b9a9c

Please sign in to comment.