PHP 8.1 and Symfony 5.4 upgrade #2

Merged
skobkin merged 6 commits from composer_udpate into master 2022-07-04 22:19:09 +00:00
7 changed files with 931 additions and 862 deletions
Showing only changes of commit f4769ed931 - Show all commits

View file

@ -24,32 +24,34 @@
"doctrine/doctrine-migrations-bundle": "^2",
"doctrine/orm": "^2",
"excelwebzone/recaptcha-bundle": "^1.5",
"pagerfanta/doctrine-orm-adapter": "^3.6",
"pagerfanta/twig": "^3.6",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.6",
"sensio/framework-extra-bundle": "^5.1",
"sensio/framework-extra-bundle": "^6.0",
"sentry/sentry-symfony": "^4",
"suin/php-rss-writer": "^1.6",
"symfony/asset": "^4.1",
"symfony/console": "^4.1",
"symfony/dotenv": "^4.1",
"symfony/expression-language": "^4.1",
"symfony/asset": "5.0.*",
"symfony/console": "5.0.*",
"symfony/dotenv": "^5.0",
"symfony/expression-language": "5.0.*",
"symfony/flex": "^1.0",
"symfony/form": "^4.1",
"symfony/framework-bundle": "^4.1",
"symfony/http-client": "^4.1",
"symfony/mailer": "^4.1",
"symfony/form": "5.0.*",
"symfony/framework-bundle": "5.0.*",
"symfony/http-client": "5.0.*",
"symfony/mailer": "5.0.*",
"symfony/monolog-bundle": "^3.3",
"symfony/property-access": "^4.1",
"symfony/property-info": "^4.1",
"symfony/security-bundle": "^4.1",
"symfony/serializer": "^4.1",
"symfony/translation": "^4.1",
"symfony/twig-bundle": "^4.1",
"symfony/validator": "^4.1",
"symfony/yaml": "^4.1"
"symfony/property-access": "^5.0",
"symfony/property-info": "^5.0",
"symfony/security-bundle": "5.0.*",
"symfony/serializer": "5.0.*",
"symfony/translation": "5.0.*",
"symfony/twig-bundle": "5.0.*",
"symfony/validator": "5.0.*",
"symfony/yaml": "5.0.*"
},
"require-dev": {
"symfony/web-profiler-bundle": "^4.1",
"symfony/web-profiler-bundle": "^5.0",
"symfony/web-server-bundle": "^4.1"
},
"config": {

1706
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,21 +0,0 @@
services:
_defaults:
autowire: true
autoconfigure: true
Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface:
'@Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory'
Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface:
'@Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory'
Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory: null
Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory: null
# Uncomment the following line to allow controllers to receive a
# PSR-7 server request object instead of an HttpFoundation request
#Symfony\Bridge\PsrHttpMessage\ArgumentValueResolver\PsrServerRequestResolver: null
# Uncomment the following line to allow controllers to return a
# PSR-7 response object instead of an HttpFoundation response
#Symfony\Bridge\PsrHttpMessage\EventListener\PsrResponseListener: null

View file

@ -1,3 +1,3 @@
_errors:
resource: '@TwigBundle/Resources/config/routing/errors.xml'
resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
prefix: /_error

View file

@ -1,10 +1,14 @@
<?php
declare(strict_types=1);
use App\Kernel;
use Symfony\Component\Debug\Debug;
use Symfony\Component\Dotenv\Dotenv;
use Symfony\Component\ErrorHandler\Debug;
use Symfony\Component\HttpFoundation\Request;
require dirname(__DIR__).'/config/bootstrap.php';
require dirname(__DIR__).'/vendor/autoload.php';
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
if ($_SERVER['APP_DEBUG']) {
umask(0000);
@ -12,11 +16,11 @@ if ($_SERVER['APP_DEBUG']) {
Debug::enable();
}
if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) {
Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);
}
if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? false) {
Request::setTrustedHosts([$trustedHosts]);
}

View file

@ -1,15 +1,16 @@
<?php
declare(strict_types=1);
namespace App\Pager;
use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Doctrine\ORM\QueryAdapter;
/**
* This adapter don't make COUNT() queries.
*/
class PagelessDoctrineORMAdapter extends DoctrineORMAdapter
class PagelessDoctrineORMAdapter extends QueryAdapter
{
public function getNbResults()
public function getNbResults(): int
{
return 1;
}

View file

@ -228,9 +228,6 @@
"ref": "e3868d2f4a5104f19f844fe551099a00c6562527"
}
},
"symfony/debug": {
"version": "v4.1.0"
},
"symfony/dependency-injection": {
"version": "v4.1.0"
},