Skip to content

Commit c36cae9

Browse files
vkhramtsovvkhramtsov
committed
Upgrade symfony to 5.4
1 parent d276d8f commit c36cae9

File tree

18 files changed

+1702
-1626
lines changed

18 files changed

+1702
-1626
lines changed

‎bin/console‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,20 @@
11
#!/usr/bin/env php
22
<?php
33

4-
use App\Kernel;
5-
use Symfony\Bundle\FrameworkBundle\Console\Application;
6-
use Symfony\Component\Console\Input\ArgvInput;
7-
use Symfony\Component\Debug\Debug;
8-
use Symfony\Component\Dotenv\Dotenv;
9-
104
set_time_limit(0);
5+
umask(0002);
116

12-
require __DIR__.'/../vendor/autoload.php';
13-
14-
if (!class_exists(Application::class)) {
15-
throw new \RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
16-
}
7+
use App\Kernel;
8+
use Symfony\Bundle\FrameworkBundle\Console\Application;
179

18-
if (!isset($_SERVER['APP_ENV'])) {
19-
if (!class_exists(Dotenv::class)) {
20-
throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
21-
}
22-
(new Dotenv())->load(__DIR__.'/../.env');
10+
if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
11+
throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
2312
}
2413

25-
$input = new ArgvInput();
26-
$env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'dev', true);
27-
$debug = (bool) ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption('--no-debug', true);
28-
29-
umask(0002);
30-
31-
if ($debug) {
14+
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
3215

33-
if (class_exists(Debug::class)) {
34-
Debug::enable();
35-
}
36-
}
16+
return function (array $context) {
17+
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
3718

38-
$kernel = new Kernel($env, $debug);
39-
$application = new Application($kernel);
40-
$application->run($input);
19+
return new Application($kernel);
20+
};

‎composer.json‎

Lines changed: 62 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"name": "chilic/php.of.by",
3+
"type": "project",
34
"license": "MIT",
45
"description": "PHP UG site source code",
5-
"type": "project",
6+
"minimum-stability": "stable",
7+
"prefer-stable": true,
68
"repositories": [
79
{
810
"type": "package",
@@ -24,75 +26,62 @@
2426
"ext-pdo": "*",
2527
"ext-pdo_mysql": "*",
2628
"ext-zip": "*",
27-
"composer/package-versions-deprecated": "^1.11.99.4",
2829
"deployer/deployer": "^6.4.0",
2930
"doctrine/annotations": "^1.0",
30-
"doctrine/doctrine-bundle": "^2.4",
31-
"doctrine/doctrine-migrations-bundle": "^3.1",
32-
"doctrine/orm": "^2.9",
31+
"doctrine/doctrine-bundle": "^2.7",
32+
"doctrine/doctrine-migrations-bundle": "^3.2",
33+
"doctrine/orm": "^2.12",
3334
"easycorp/easyadmin-bundle": "^3.1.3",
3435
"friendsofsymfony/user-bundle": "^3.0",
3536
"owenversteeg/min": "dev-gh-pages#fe73afc9e1a0ae3492ad3af2efeb0f4d47f967cc",
3637
"pear/archive_tar": "1.4.*",
3738
"pear/pear-core-minimal": "1.*",
38-
"phpdocumentor/reflection-docblock": "^5.2",
39-
"sensio/framework-extra-bundle": "^5.1",
40-
"stof/doctrine-extensions-bundle": "^1.4.0",
41-
"symfony/asset": "4.4.*",
42-
"symfony/console": "4.4.*",
43-
"symfony/dotenv": "4.4.*",
44-
"symfony/expression-language": "4.4.*",
45-
"symfony/flex": "^1.3.1",
46-
"symfony/form": "4.4.*",
47-
"symfony/framework-bundle": "4.4.*",
48-
"symfony/http-client": "4.4.*",
49-
"symfony/intl": "4.4.*",
50-
"symfony/mailer": "4.4.*",
39+
"phpdocumentor/reflection-docblock": "^5.3",
40+
"phpstan/phpdoc-parser": "^1.6",
41+
"sensio/framework-extra-bundle": "^6.1",
42+
"stof/doctrine-extensions-bundle": "^1.7.0",
43+
"symfony/asset": "5.4.*",
44+
"symfony/console": "5.4.*",
45+
"symfony/dotenv": "5.4.*",
46+
"symfony/expression-language": "5.4.*",
47+
"symfony/flex": "^1.17|^2",
48+
"symfony/form": "5.4.*",
49+
"symfony/framework-bundle": "5.4.*",
50+
"symfony/http-client": "5.4.*",
51+
"symfony/intl": "5.4.*",
52+
"symfony/mailer": "5.4.*",
53+
"symfony/mime": "5.4.*",
5154
"symfony/monolog-bundle": "^3.1",
52-
"symfony/process": "4.4.*",
53-
"symfony/property-access": "4.4.*",
54-
"symfony/property-info": "4.4.*",
55-
"symfony/proxy-manager-bridge": "4.4.*",
55+
"symfony/notifier": "5.4.*",
56+
"symfony/process": "5.4.*",
57+
"symfony/property-access": "5.4.*",
58+
"symfony/property-info": "5.4.*",
59+
"symfony/proxy-manager-bridge": "5.4.*",
5660
"symfony/requirements-checker": "^2.0",
57-
"symfony/security-bundle": "4.4.*",
58-
"symfony/serializer": "4.4.*",
59-
"symfony/templating": "4.4.*",
60-
"symfony/translation": "4.4.*",
61-
"symfony/twig-bundle": "4.4.*",
62-
"symfony/validator": "4.4.*",
63-
"symfony/web-link": "4.4.*",
64-
"symfony/webpack-encore-bundle": "^1.0",
65-
"symfony/yaml": "4.4.*",
61+
"symfony/runtime": "5.4.*",
62+
"symfony/security-bundle": "5.4.*",
63+
"symfony/serializer": "5.4.*",
64+
"symfony/string": "5.4.*",
65+
"symfony/translation": "5.4.*",
66+
"symfony/twig-bundle": "5.4.*",
67+
"symfony/validator": "5.4.*",
68+
"symfony/web-link": "5.4.*",
69+
"symfony/webpack-encore-bundle": "^1.15.1",
70+
"symfony/yaml": "5.4.*",
6671
"twig/extra-bundle": "^2.12|^3.0",
6772
"twig/twig": "^2.12|^3.0"
6873
},
69-
"require-dev": {
70-
"elao/web-profiler-extra-bundle": "2.*",
71-
"friendsofphp/php-cs-fixer": "3.*",
72-
"pdepend/pdepend": "2.*",
73-
"phpmd/phpmd": "2.*",
74-
"phpunit/phpunit": "^9.3.8",
75-
"roave/security-advisories": "dev-master",
76-
"sebastian/phpcpd": "^6.0.2",
77-
"squizlabs/php_codesniffer": "^3.5.8",
78-
"symfony/browser-kit": "^4.4",
79-
"symfony/css-selector": "^4.4",
80-
"symfony/debug-bundle": "^4.4",
81-
"symfony/maker-bundle": "^1.0",
82-
"symfony/phpunit-bridge": "^5.3",
83-
"symfony/stopwatch": "^4.4",
84-
"symfony/web-profiler-bundle": "^4.4",
85-
"vimeo/psalm": "^4.0"
86-
},
8774
"config": {
75+
"allow-plugins": {
76+
"composer/package-versions-deprecated": true,
77+
"symfony/flex": true,
78+
"symfony/runtime": true
79+
},
80+
"optimize-autoloader": true,
8881
"preferred-install": {
8982
"*": "dist"
9083
},
91-
"sort-packages": true,
92-
"allow-plugins": {
93-
"composer/package-versions-deprecated": true,
94-
"symfony/flex": true
95-
}
84+
"sort-packages": true
9685
},
9786
"autoload": {
9887
"psr-4": {
@@ -109,12 +98,9 @@
10998
}
11099
},
111100
"replace": {
112-
"paragonie/random_compat": "2.*",
113101
"symfony/polyfill-ctype": "*",
114102
"symfony/polyfill-iconv": "*",
115-
"symfony/polyfill-php71": "*",
116-
"symfony/polyfill-php70": "*",
117-
"symfony/polyfill-php56": "*"
103+
"symfony/polyfill-php72": "*"
118104
},
119105
"scripts": {
120106
"auto-scripts": {
@@ -135,8 +121,25 @@
135121
"extra": {
136122
"symfony": {
137123
"allow-contrib": false,
138-
"require": "4.4.*"
124+
"require": "5.4.*"
139125
},
140126
"public-dir": "web"
127+
},
128+
"require-dev": {
129+
"friendsofphp/php-cs-fixer": "3.*",
130+
"pdepend/pdepend": "2.*",
131+
"phpmd/phpmd": "2.*",
132+
"phpunit/phpunit": "^9.5",
133+
"roave/security-advisories": "dev-master",
134+
"sebastian/phpcpd": "^6.0.2",
135+
"squizlabs/php_codesniffer": "^3.5.8",
136+
"symfony/browser-kit": "5.4.*",
137+
"symfony/css-selector": "5.4.*",
138+
"symfony/debug-bundle": "5.4.*",
139+
"symfony/maker-bundle": "^1.0",
140+
"symfony/phpunit-bridge": "^6.1",
141+
"symfony/stopwatch": "5.4.*",
142+
"symfony/web-profiler-bundle": "5.4.*",
143+
"vimeo/psalm": "^4.0"
141144
}
142145
}

0 commit comments

Comments
 (0)