Skip to content

Allow Symfony 8 #2069

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

Open
wants to merge 11 commits into
base: 2.17.x
Choose a base branch
from
Open

Allow Symfony 8 #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5fa7acc
Allow Symfony 8
ajgarlag Sep 25, 2025
a02caff
Restrict allowed Symfony 8 components
ajgarlag Sep 25, 2025
5d9d4b6
Fix framework-bundle annotations configuration
ajgarlag Oct 1, 2025
5a4a7ea
Fix test errors
ajgarlag Oct 1, 2025
0e2ab37
Fix deprecations about XML config format
ajgarlag Oct 1, 2025
e7fa999
Remove IngoreDeperecations messagePattern
ajgarlag Oct 1, 2025
334d2bb
Move IngoreDeprecations attribute to Xml test case
ajgarlag Oct 1, 2025
fdb61e0
Set IgnoreDeprecations annotation to class level
ajgarlag Oct 1, 2025
acca876
Make easier to clean legacy code
ajgarlag Oct 1, 2025
dab971c
Restore IgnoreDeprecations attributes removed by mistake
ajgarlag Oct 1, 2025
17720ff
Use `RequiresMethod` attribute to skip test
ajgarlag Oct 1, 2025
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
32 changes: 16 additions & 16 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"doctrine/deprecations": "^1.0",
"doctrine/persistence": "^3.1 || ^4",
"doctrine/sql-formatter": "^1.0.1",
"symfony/cache": "^6.4 || ^7.0",
"symfony/config": "^6.4 || ^7.0",
"symfony/cache": "^6.4 || ^7.0 || ^8.0",
"symfony/config": "^6.4 || ^7.0 || ^8.0",
"symfony/console": "^6.4 || ^7.0",
"symfony/dependency-injection": "^6.4 || ^7.0",
"symfony/doctrine-bridge": "^6.4.3 || ^7.0.3",
"symfony/framework-bundle": "^6.4 || ^7.0",
"symfony/doctrine-bridge": "^6.4.3 || ^7.0.3 || ^8.0",
"symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0",
"symfony/service-contracts": "^2.5 || ^3"
},
"require-dev": {
Expand All @@ -53,18 +53,18 @@
"phpstan/phpstan-strict-rules": "^2",
"phpunit/phpunit": "^10.5.53 || ^12.3.10",
"psr/log": "^1.1.4 || ^2.0 || ^3.0",
"symfony/doctrine-messenger": "^6.4 || ^7.0",
"symfony/expression-language": "^6.4 || ^7.0",
"symfony/messenger": "^6.4 || ^7.0",
"symfony/property-info": "^6.4 || ^7.0",
"symfony/security-bundle": "^6.4 || ^7.0",
"symfony/stopwatch": "^6.4 || ^7.0",
"symfony/string": "^6.4 || ^7.0",
"symfony/twig-bridge": "^6.4 || ^7.0",
"symfony/validator": "^6.4 || ^7.0",
"symfony/var-exporter": "^6.4.1 || ^7.0.1",
"symfony/web-profiler-bundle": "^6.4 || ^7.0",
"symfony/yaml": "^6.4 || ^7.0",
"symfony/doctrine-messenger": "^6.4 || ^7.0 || ^8.0",
"symfony/expression-language": "^6.4 || ^7.0 || ^8.0",
"symfony/messenger": "^6.4 || ^7.0 || ^8.0",
"symfony/property-info": "^6.4 || ^7.0 || ^8.0",
"symfony/security-bundle": "^6.4 || ^7.0 || ^8.0",
"symfony/stopwatch": "^6.4 || ^7.0 || ^8.0",
"symfony/string": "^6.4 || ^7.0 || ^8.0",
"symfony/twig-bridge": "^6.4 || ^7.0 || ^8.0",
"symfony/validator": "^6.4 || ^7.0 || ^8.0",
"symfony/var-exporter": "^6.4.1 || ^7.0.1 || ^8.0",
"symfony/web-profiler-bundle": "^6.4 || ^7.0 || ^8.0",
"symfony/yaml": "^6.4 || ^7.0 || ^8.0",
"twig/twig": "^2.14.7 || ^3.0.4"
},
"conflict": {
Expand Down
4 changes: 4 additions & 0 deletions tests/DependencyInjection/AbstractDoctrineExtensionTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use PDO;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\IgnoreDeprecations;
use PHPUnit\Framework\Attributes\RequiresMethod;
use PHPUnit\Framework\TestCase;
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
use Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestHydrator;
Expand All @@ -47,6 +48,7 @@
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\VarExporter\ProxyHelper;

use function array_filter;
use function array_intersect_key;
Expand Down Expand Up @@ -1494,6 +1496,7 @@ public function testDisableSchemaValidation(): void
}

#[IgnoreDeprecations]
#[RequiresMethod(ProxyHelper::class, 'generateLazyGhost')]
public function testNativeLazyObjectsWithoutConfig(): void
{
if (! interface_exists(EntityManagerInterface::class)) {
Expand Down Expand Up @@ -1538,6 +1541,7 @@ public function testNativeLazyObjectsWithConfigTrue(): void
}

#[IgnoreDeprecations]
#[RequiresMethod(ProxyHelper::class, 'generateLazyGhost')]
public function testNativeLazyObjectsWithConfigFalse(): void
{
if (! interface_exists(EntityManagerInterface::class)) {
Expand Down
1 change: 0 additions & 1 deletion tests/DependencyInjection/Compiler/IdGeneratorPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public function testRepositoryServiceWiring(): void
$extension->load([
'framework' => [
'http_method_override' => false,
'annotations' => ['enabled' => false],
'php_errors' => ['log' => true],
'handle_all_throwables' => true,
],
Expand Down
9 changes: 6 additions & 3 deletions tests/DependencyInjection/Fixtures/DbalTestKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,14 @@
$container->loadFromExtension('framework', [
'secret' => 'F00',
'http_method_override' => false,
'annotations' => [
'enabled' => version_compare(Kernel::VERSION, '7.0.0', '<'),
],
]);

if (version_compare(Kernel::VERSION, '7.0.0', '<')) {

Check failure on line 49 in tests/DependencyInjection/Fixtures/DbalTestKernel.php

View workflow job for this annotation

GitHub Actions / Static Analysis / PHPStan (PHP: 8.4) 

If condition is always false.
$container->loadFromExtension('framework', [
'annotations' => ['enabled' => true],
]);
}

$container->loadFromExtension('doctrine', [
'dbal' => $this->dbalConfig,
]);
Expand Down
1 change: 0 additions & 1 deletion tests/DependencyInjection/Fixtures/TestKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
$container->loadFromExtension('framework', [
'secret' => 'F00',
'http_method_override' => false,
'annotations' => false,
'php_errors' => ['log' => true],
'handle_all_throwables' => true,
]);
Expand Down
2 changes: 2 additions & 0 deletions tests/DependencyInjection/XmlDoctrineExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@

namespace Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection;

use PHPUnit\Framework\Attributes\IgnoreDeprecations;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;

#[IgnoreDeprecations]
class XmlDoctrineExtensionTest extends AbstractDoctrineExtensionTestCase
{
protected function loadFromFile(
Expand Down
1 change: 0 additions & 1 deletion tests/ServiceRepositoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public function testRepositoryServiceWiring(): void
'framework' => [
'http_method_override' => false,
'php_errors' => ['log' => true],
'annotations' => ['enabled' => false],
'handle_all_throwables' => true,
],
], $container);
Expand Down
Loading