Skip to content

Commit a3b4eae

Browse files
committed
feature #673 Upgrade from 3.3 to 3.4 & 4.0 (yceruto)
This PR was squashed before being merged into the master branch (closes #673). Discussion ---------- Upgrade from 3.3 to 3.4 & 4.0 Remaining deprecation notices: SwiftmailerBundle --- - [x] <del>User Deprecated: The **"swiftmailer.mailer.default.plugin.messagelogger"** service is private, checking for its existence is deprecated since Symfony 3.2 and will fail in 4.0.</del> - [x] <del>User Deprecated: The **"swiftmailer.mailer.default.plugin.messagelogger"** service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead. </del> - [x] <del>User Deprecated: The **"mailer"** service is private, checking for its existence is deprecated since Symfony 3.2 and will fail in 4.0.</del> - [x] <del>The **"swiftmailer.mailer.default.transport.real"** service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.</del> WhiteOctoberPagerfantaBundle --- - [x] <del>User Deprecated: The **"white_october_pagerfanta.view_factory"** service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.</del> Symfony --- - [x] <del>The **Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler** class is deprecated since version 3.4 and will be removed in 4.0. Use the **\SessionHandler** class instead.</del> - [x] <del>User Deprecated: The **Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy** class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.</del> - [x] <del>User Deprecated: The **Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy** class is deprecated since version 3.4 and will be removed in 4.0. Use your session handler implementation directly.</del> - [x] <del>User Deprecated: The **"Doctrine\DBAL\Configuration"** class is considered internal When adding a new configuration option just write a getter/setter pair and add the option to the _attributes array with a proper default value. It may change without further notice. You should not use it from **"Doctrine\ORM\Configuration"**.</del> - [x] <del>Setting **logout_on_user_change** to false is deprecated as of 3.4 and will always be true in 4.0. Set **logout_on_user_change** to true in your firewall configuration. (isn't a blocker for 4.0)</del> - [x] <del>Relying on service auto-registration for type **"App\Entity\Post"** is deprecated since version 3.4 and won't be supported in 4.0. Create a service named **"App\Entity\Post"** instead. (isn't a blocker for 4.0)</del> - [x] <del>User Deprecated: The **"Symfony\Bridge\Doctrine\ManagerRegistry::setContainer()"** method is deprecated since version 3.4 and will be removed in 4.0. Inject a PSR-11 container using the constructor instead.</del> Commits ------- 549ed2c Upgrade from 3.3 to 3.4 & 4.0
2 parents f76e900 + 549ed2c commit a3b4eae

28 files changed

+1419
-1226
lines changed

.gitignore

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/build/
22
/node_modules/
3-
/phpunit.xml
4-
/.php_cs
53
/var/*
64
!/var/cache
75
/var/cache/*
@@ -16,15 +14,23 @@
1614
!var/SymfonyRequirements.php
1715
/public/build/fonts/glyphicons-*
1816
/public/build/images/glyphicons-*
17+
1918
###> symfony/framework-bundle ###
2019
.env
2120
/public/bundles/
2221
/var/
2322
/vendor/
2423
###< symfony/framework-bundle ###
24+
2525
###> symfony/phpunit-bridge ###
2626
/phpunit.xml
2727
###< symfony/phpunit-bridge ###
28+
2829
###> symfony/web-server-bundle ###
2930
.web-server-pid
3031
###< symfony/web-server-bundle ###
32+
33+
###> friendsofphp/php-cs-fixer ###
34+
.php_cs
35+
.php_cs.cache
36+
###< friendsofphp/php-cs-fixer ###

Makefile

-46
This file was deleted.

bin/console

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33

44
use App\Kernel;
55
use Symfony\Bundle\FrameworkBundle\Console\Application;
6-
use Symfony\Component\Dotenv\Dotenv;
76
use Symfony\Component\Console\Input\ArgvInput;
87
use Symfony\Component\Debug\Debug;
8+
use Symfony\Component\Dotenv\Dotenv;
99

10-
umask(0000);
1110
set_time_limit(0);
1211

1312
require __DIR__.'/../vendor/autoload.php';
@@ -24,8 +23,12 @@ $input = new ArgvInput();
2423
$env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'dev');
2524
$debug = ($_SERVER['APP_DEBUG'] ?? true) !== '0' && !$input->hasParameterOption(['--no-debug', '']);
2625

27-
if ($debug && class_exists(Debug::class)) {
28-
Debug::enable();
26+
if ($debug) {
27+
umask(0000);
28+
29+
if (class_exists(Debug::class)) {
30+
Debug::enable();
31+
}
2932
}
3033

3134
$kernel = new Kernel($env, $debug);

composer.json

+25-26
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@
66
"require": {
77
"php": "^7.1.3",
88
"ext-pdo_sqlite": "*",
9-
"doctrine/doctrine-fixtures-bundle": "^2.3",
9+
"doctrine/doctrine-fixtures-bundle": "^2.4",
1010
"erusev/parsedown": "^1.6",
1111
"ezyang/htmlpurifier": "^4.9",
12-
"sensio/framework-extra-bundle": "^3.0",
12+
"sensio/framework-extra-bundle": "^5.0",
1313
"sensiolabs/security-checker": "^4.1",
14-
"symfony/asset": "^3.3",
15-
"symfony/expression-language": "^3.3",
14+
"symfony/asset": "^4.0",
15+
"symfony/expression-language": "^4.0",
1616
"symfony/flex": "^1.0",
17-
"symfony/form": "^3.3",
18-
"symfony/framework-bundle": "^3.3",
17+
"symfony/form": "^4.0",
18+
"symfony/framework-bundle": "^4.0",
1919
"symfony/monolog-bundle": "^3.1",
2020
"symfony/orm-pack": "^1.0",
21-
"symfony/polyfill-apcu": "^1.4",
22-
"symfony/security-bundle": "^3.3",
23-
"symfony/swiftmailer-bundle": "^3.0",
24-
"symfony/translation": "^3.3",
25-
"symfony/validator": "^3.3",
26-
"symfony/yaml": "^3.3",
21+
"symfony/polyfill-apcu": "^1.5",
22+
"symfony/security-bundle": "^4.0",
23+
"symfony/swiftmailer-bundle": "^3.1",
24+
"symfony/translation": "^4.0",
25+
"symfony/validator": "^4.0",
26+
"symfony/yaml": "^4.0",
2727
"twig/extensions": "^1.5",
2828
"twig/twig": "^2.4",
29-
"white-october/pagerfanta-bundle": "^1.0"
29+
"white-october/pagerfanta-bundle": "^1.1"
3030
},
3131
"require-dev": {
3232
"dama/doctrine-test-bundle": "^4.0",
33-
"friendsofphp/php-cs-fixer": "^2.4",
34-
"symfony/browser-kit": "^3.3",
35-
"symfony/css-selector": "^3.3",
36-
"symfony/debug-bundle": "^3.3",
37-
"symfony/dotenv": "^3.3",
38-
"symfony/phpunit-bridge": "^3.3",
33+
"friendsofphp/php-cs-fixer": "^2.7",
34+
"symfony/browser-kit": "^4.0",
35+
"symfony/css-selector": "^4.0",
36+
"symfony/debug-bundle": "^4.0",
37+
"symfony/dotenv": "^4.0",
38+
"symfony/phpunit-bridge": "^4.0",
3939
"symfony/profiler-pack": "^1.0",
40-
"symfony/var-dumper": "^3.3",
41-
"symfony/web-server-bundle": "^3.3"
40+
"symfony/var-dumper": "^4.0",
41+
"symfony/web-server-bundle": "^4.0"
4242
},
4343
"config": {
4444
"platform": {
@@ -61,19 +61,18 @@
6161
},
6262
"scripts": {
6363
"auto-scripts": {
64-
"make cache-warmup": "script",
64+
"cache:clear": "symfony-cmd",
6565
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
6666
"security-checker security:check": "script"
6767
}
6868
},
6969
"conflict": {
70-
"symfony/symfony": "*",
71-
"symfony/twig-bundle": "<3.3",
72-
"symfony/debug": "<3.3"
70+
"symfony/symfony": "*"
7371
},
72+
"minimum-stability": "beta",
7473
"extra": {
7574
"symfony": {
76-
"id": "",
75+
"id": "01BY8QJHBGTYRP06WQFNY99EKP",
7776
"allow-contrib": true
7877
}
7978
}

0 commit comments

Comments
 (0)