Skip to content

Commit

Permalink
feature #1457 Update to Symfony 7 (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 7

Commits
-------

917ff37 Update to Symfony 7
  • Loading branch information
@javiereguiluz
javiereguiluz committed Dec 20, 2023
2 parents 637c294 + 917ff37 commit 3edba75
Show file tree
Hide file tree
Showing 9 changed files with 917 additions and 947 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: ['8.1']
php-version: ['8.2']

steps:
- name: "Checkout code"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
fail-fast: true
PHPUNIT_FLAGS: "-v"
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
SYMFONY_DEPRECATIONS_HELPER: 17
SYMFONY_DEPRECATIONS_HELPER: 0

permissions:
contents: read
Expand All @@ -24,12 +24,12 @@ jobs:
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-version: ['8.1', '8.2', '8.3']
php-version: ['8.2', '8.3']
include:
- operating-system: 'macos-latest'
php-version: '8.1'
php-version: '8.2'
- operating-system: 'windows-latest'
php-version: '8.1'
php-version: '8.2'

steps:
- name: "Checkout code"
Expand All @@ -39,7 +39,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
coverage: "none"
extensions: "intl, mbstring, pdo_sqlite"
extensions: "intl, mbstring, pdo_sqlite, zip"
php-version: ${{ matrix.php-version }}
tools: composer:v2

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ You can also learn about these practices in [the official Symfony Book][5].
Requirements
------------

* PHP 8.1.0 or higher;
* PHP 8.2.0 or higher;
* PDO-SQLite PHP extension enabled;
* and the [usual Symfony application requirements][2].

Expand Down
10 changes: 7 additions & 3 deletions bin/phpunit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ if (!ini_get('date.timezone')) {
}

if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
require PHPUNIT_COMPOSER_INSTALL;
PHPUnit\TextUI\Command::main();
if (PHP_VERSION_ID >= 80000) {
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
} else {
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
require PHPUNIT_COMPOSER_INSTALL;
PHPUnit\TextUI\Command::main();
}
} else {
if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
Expand Down
60 changes: 30 additions & 30 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,56 +13,56 @@
"symfony/polyfill-php81": "*"
},
"require": {
"php": ">=8.1",
"php": ">=8.2",
"ext-pdo_sqlite": "*",
"doctrine/dbal": "^3.1",
"doctrine/doctrine-bundle": "^2.11",
"doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "^2.16",
"league/commonmark": "^2.1",
"symfony/apache-pack": "^1.0",
"symfony/asset": "6.4.*",
"symfony/asset-mapper": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/asset": "^7.0",
"symfony/asset-mapper": "^7.0",
"symfony/console": "^7.0",
"symfony/dotenv": "^7.0",
"symfony/expression-language": "^7.0",
"symfony/flex": "^2",
"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": "^7.0",
"symfony/framework-bundle": "^7.0",
"symfony/html-sanitizer": "^7.0",
"symfony/http-client": "^7.0",
"symfony/intl": "^7.0",
"symfony/mailer": "^7.0",
"symfony/monolog-bundle": "^3.7",
"symfony/polyfill-intl-messageformatter": "^1.12",
"symfony/runtime": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/runtime": "^7.0",
"symfony/security-bundle": "^7.0",
"symfony/stimulus-bundle": "^2.12",
"symfony/string": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/string": "^7.0",
"symfony/translation": "^7.0",
"symfony/twig-bundle": "^7.0",
"symfony/ux-live-component": "^2.6",
"symfony/validator": "6.4.*",
"symfony/yaml": "6.4.*",
"symfonycasts/sass-bundle": "^0.2.3",
"symfony/validator": "^7.0",
"symfony/yaml": "^7.0",
"symfonycasts/sass-bundle": "^0.3",
"twig/extra-bundle": "^3.3",
"twig/intl-extra": "^3.3",
"twig/markdown-extra": "^3.3"
},
"require-dev": {
"dama/doctrine-test-bundle": "^8.0.0-beta5",
"doctrine/doctrine-fixtures-bundle": "4.0.x-dev",
"dama/doctrine-test-bundle": "^8.0.0",
"doctrine/doctrine-fixtures-bundle": "^3.5",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.2",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-symfony": "^1.2",
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"symfony/browser-kit": "^7.0",
"symfony/css-selector": "^7.0",
"symfony/debug-bundle": "^7.0",
"symfony/maker-bundle": "^1.36",
"symfony/phpunit-bridge": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*",
"symfony/phpunit-bridge": "^7.0.1",
"symfony/stopwatch": "^7.0",
"symfony/web-profiler-bundle": "^7.0",
"twbs/bootstrap": "^4.5.3"
},
"config": {
Expand All @@ -72,7 +72,7 @@
"phpstan/extension-installer": true
},
"platform": {
"php": "8.1.0"
"php": "8.2.0"
},
"preferred-install": {
"*": "dist"
Expand Down Expand Up @@ -106,7 +106,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "6.4.*"
"require": "7.0.*"
}
}
}
Loading

0 comments on commit 3edba75

Please sign in to comment.