Skip to content

Commit

Permalink
feature #1362 Update to Symfony 6.2 (javiereguiluz)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the main branch.

Discussion
----------

Update to Symfony 6.2

Comments:

* I've removed the SensioFrameworkExtraBundle because Symfony 6.2 now includes everything we need
* The `dev` dependency of DoctrineBundle is needed because we need the unreleased `2.7.1` to have the equivalent of the old ParamConverter
* The following indirect deprecations remain:

```
Remaining indirect deprecation notices (3)

1x: The "Symfony\Bridge\Doctrine\Logger\DbalLogger" class implements
"Doctrine\DBAL\Logging\SQLLogger" that is deprecated
Use {`@see` \Doctrine\DBAL\Logging\Middleware}
or implement {`@see` \Doctrine\DBAL\Driver\Middleware} instead.
  1x in AddUserCommandTest::testCreateUserNonInteractive from App\Tests\Command

1x: The "Monolog\Logger" class is considered final. It may change without
further notice as of its next major version. You should not extend it
from "Symfony\Bridge\Monolog\Logger".
  1x in AddUserCommandTest::testCreateUserNonInteractive from App\Tests\Command

1x: Since symfony/translation 6.2: "Symfony\Component\Translation\Extractor\PhpExtractor"
is deprecated, use "Symfony\Component\Translation\Extractor\PhpAstExtractor" instead.
  1x in AddUserCommandTest::testCreateUserNonInteractive from App\Tests\Command
```

Commits
-------

1c9ca01 Update to Symfony 6.2
  • Loading branch information
javiereguiluz committed Dec 1, 2022
2 parents 28ca5c5 + 1c9ca01 commit 441b20b
Show file tree
Hide file tree
Showing 29 changed files with 705 additions and 765 deletions.
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# Real environment variables win over .env files.
#
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
# https://symfony.com/doc/current/configuration/secrets.html
#
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
Expand All @@ -30,5 +31,5 @@ DATABASE_URL=sqlite:///%kernel.project_dir%/data/database.sqlite
###< doctrine/doctrine-bundle ###

###> symfony/mailer ###
# MAILER_DSN=smtp://localhost
# MAILER_DSN=null://null
###< symfony/mailer ###
1 change: 0 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ env:
fail-fast: true
PHPUNIT_FLAGS: "-v"
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
SYMFONY_REQUIRE: ">=6.0"
SYMFONY_DEPRECATIONS_HELPER: 7

permissions:
Expand Down
2 changes: 1 addition & 1 deletion assets/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { startStimulusApp } from '@symfony/stimulus-bridge';
export const app = startStimulusApp(require.context(
'@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
true,
/\.(j|t)sx?$/
/\.[jt]sx?$/
));

// register any custom, 3rd party controllers here
Expand Down
51 changes: 25 additions & 26 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,32 @@
"php": ">=8.1",
"ext-pdo_sqlite": "*",
"doctrine/dbal": "^3.1",
"doctrine/doctrine-bundle": "^2.5",
"doctrine/doctrine-bundle": "2.7.x-dev",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.10",
"league/commonmark": "^2.1",
"sensio/framework-extra-bundle": "^6.2",
"symfony/apache-pack": "^1.0",
"symfony/asset": "^6.1",
"symfony/console": "^6.1",
"symfony/dotenv": "^6.1",
"symfony/expression-language": "^6.1",
"symfony/asset": "^6.2",
"symfony/console": "^6.2",
"symfony/dotenv": "^6.2",
"symfony/expression-language": "^6.2",
"symfony/flex": "^2.0",
"symfony/form": "^6.1",
"symfony/framework-bundle": "^6.1",
"symfony/html-sanitizer": "^6.1",
"symfony/http-client": "^6.1",
"symfony/intl": "^6.1",
"symfony/mailer": "^6.1",
"symfony/form": "^6.2",
"symfony/framework-bundle": "^6.2",
"symfony/html-sanitizer": "^6.2",
"symfony/http-client": "^6.2",
"symfony/intl": "^6.2",
"symfony/mailer": "^6.2",
"symfony/monolog-bundle": "^3.7",
"symfony/polyfill-intl-messageformatter": "^1.12",
"symfony/runtime": "^6.1",
"symfony/security-bundle": "^6.1",
"symfony/string": "^6.1",
"symfony/translation": "^6.1",
"symfony/twig-bundle": "^6.1",
"symfony/validator": "^6.1",
"symfony/runtime": "^6.2",
"symfony/security-bundle": "^6.2",
"symfony/string": "^6.2",
"symfony/translation": "^6.2",
"symfony/twig-bundle": "^6.2",
"symfony/validator": "^6.2",
"symfony/webpack-encore-bundle": "^1.13",
"symfony/yaml": "^6.1",
"symfony/yaml": "^6.2",
"twig/extra-bundle": "^3.3",
"twig/intl-extra": "^3.3",
"twig/markdown-extra": "^3.3"
Expand All @@ -51,13 +50,13 @@
"dama/doctrine-test-bundle": "^7.0",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"phpstan/phpstan": "^1.2",
"symfony/browser-kit": "^6.1",
"symfony/css-selector": "^6.1",
"symfony/debug-bundle": "^6.1",
"symfony/browser-kit": "^6.2",
"symfony/css-selector": "^6.2",
"symfony/debug-bundle": "^6.2",
"symfony/maker-bundle": "^1.36",
"symfony/phpunit-bridge": "^6.1",
"symfony/stopwatch": "^6.1",
"symfony/web-profiler-bundle": "^6.1"
"symfony/phpunit-bridge": "^6.2",
"symfony/stopwatch": "^6.2",
"symfony/web-profiler-bundle": "^6.2"
},
"config": {
"platform": {
Expand Down Expand Up @@ -98,7 +97,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "6.1.*"
"require": "6.2.*"
}
}
}
Loading

0 comments on commit 441b20b

Please sign in to comment.