Skip to content

Upgrade to Symfony 6.4 and employ new PHP 8.2 features #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MusikAnimal merged 1 commit into from
Dec 30, 2025
Merged

Upgrade to Symfony 6.4 and employ new PHP 8.2 features #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ APP_ENV=dev
APP_SECRET=ThisTokenIsNotSoSecretChangeIt
# Wikimedia Cloud Services
TRUSTED_PROXIES=172.16.0.0/21,172.16.8.0/21,172.16.16.0/21,2a02:ec80:a000:1::/64
#TRUSTED_HOSTS=
###< symfony/framework-bundle ###

APP_VERSION=3.22.4
Expand Down
39 changes: 7 additions & 32 deletions bin/console
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,15 @@

use App\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\ErrorHandler\Debug;

if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
}

set_time_limit(0);
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';

require dirname(__DIR__).'/vendor/autoload.php';
return function (array $context) {
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);

if (!class_exists(Application::class)) {
throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.');
}

$input = new ArgvInput();
if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
}

if ($input->hasParameterOption('--no-debug', true)) {
putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
}

require dirname(__DIR__).'/config/bootstrap.php';

if ($_SERVER['APP_DEBUG']) {
umask(0000);

if (class_exists(Debug::class)) {
Debug::enable();
}
}

$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
$application = new Application($kernel);
$application->run($input);
return new Application($kernel);
};
45 changes: 23 additions & 22 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"symfony/flex": true
"symfony/flex": true,
"symfony/runtime": true
},
"sort-packages": true
},
Expand All @@ -30,45 +31,45 @@
"ext-intl": "*",
"ext-json": "*",
"doctrine/common": "~3.1",
"doctrine/doctrine-bundle": "~2.2",
"doctrine/doctrine-migrations-bundle": "~2.0",
"doctrine/doctrine-migrations-bundle": "^3.0",
"eightpoints/guzzle-bundle": "^8.0",
"jms/serializer-bundle": "^3.4",
"jms/serializer-bundle": "^5.0",
"krinkle/intuition": "^2.3",
"mediawiki/oauthclient": "2.0.*",
"nelmio/api-doc-bundle": "~4.11",
"nelmio/cors-bundle": "^2.3",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.16",
"slevomat/coding-standard": "^8.0",
"symfony/asset": "~5.4",
"symfony/cache": "~5.4",
"symfony/config": "~5.4",
"symfony/css-selector": "~5.4",
"symfony/dom-crawler": "~5.4",
"symfony/dotenv": "~5.4",
"symfony/asset": "~6.4",
"symfony/cache": "~6.4",
"symfony/config": "~6.4",
"symfony/css-selector": "~6.4",
"symfony/dom-crawler": "~6.4",
"symfony/dotenv": "~6.4",
"symfony/flex": "^1.19",
"symfony/http-kernel": "~5.4",
"symfony/mailer": "~5.4",
"symfony/http-kernel": "~6.4",
"symfony/mailer": "~6.4",
"symfony/monolog-bundle": "^3.3",
"symfony/property-access": "~5.4",
"symfony/property-info": "~5.4",
"symfony/routing": "~5.4",
"symfony/security-csrf": "~5.4",
"symfony/serializer": "~5.4",
"symfony/twig-bridge": "~5.4",
"symfony/web-profiler-bundle": "~5.4",
"symfony/property-access": "~6.4",
"symfony/property-info": "~6.4",
"symfony/routing": "~6.4",
"symfony/runtime": "^7.3",
"symfony/security-csrf": "~6.4",
"symfony/serializer": "~6.4",
"symfony/twig-bridge": "~6.4",
"symfony/web-profiler-bundle": "~6.4",
"symfony/webpack-encore-bundle": "^1.16",
"symfony/yaml": "~5.4",
"symfony/yaml": "~6.4",
"twig/twig": "^3.0",
"wikimedia/ip-utils": "^5.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~5.4",
"symfony/phpunit-bridge": "~6.4",
"squizlabs/php_codesniffer": "^3.3.0",
"mediawiki/minus-x": "^1.0.0",
"dms/phpunit-arraysubset-asserts": "^0.4.0",
"symfony/browser-kit": "~5.4"
"symfony/browser-kit": "~6.4"
},
"scripts": {
"test": [
Expand Down
Loading
Loading