Skip to content

Commit 5ef871f

Browse files
authored
Merge pull request #615 from greg0ire/drop-stuff
Drop support for old packages
2 parents 18f7ed8 + 0e8fca7 commit 5ef871f

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: "PHPUnit"
1515
uses: "doctrine/.github/.github/workflows/[email protected]"
1616
with:
17-
php-versions: '["8.1", "8.2", "8.3", "8.4"]'
17+
php-versions: '["8.4"]'
1818
secrets:
1919
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
2020

UPGRADE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## 4.0.0
44

5+
## Dependencies
6+
7+
- Support for PHP < 8.4 has been dropped.
8+
- Support for `doctrine/orm` < 3 has been dropped.
9+
- Support for `doctrine/doctrine-bundle` < 3 has been dropped.
10+
511
## BC break: final, internal classes
612

713
Some classes have been marked as `final` and `@internal` because they are not

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,16 @@
2424
],
2525
"homepage": "https://www.doctrine-project.org",
2626
"require": {
27-
"php": "^8.1",
28-
"doctrine/doctrine-bundle": "^2.8",
27+
"php": "^8.4",
28+
"doctrine/doctrine-bundle": "^3",
2929
"doctrine/migrations": "^3.2",
3030
"symfony/deprecation-contracts": "^2.1 || ^3",
3131
"symfony/framework-bundle": "^6.4 || ^7.0"
3232
},
3333
"require-dev": {
3434
"composer/semver": "^3.0",
3535
"doctrine/coding-standard": "^12",
36-
"doctrine/orm": "^2.15 || ^3",
37-
"doctrine/persistence": "^3.1",
36+
"doctrine/orm": "^3",
3837
"phpstan/phpstan": "^2",
3938
"phpstan/phpstan-deprecation-rules": "^2",
4039
"phpstan/phpstan-phpunit": "^2",

src/EventListener/SchemaFilterListener.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Doctrine\Bundle\MigrationsBundle\EventListener;
66

77
use Doctrine\DBAL\Schema\AbstractAsset;
8+
use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
89
use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand;
910
use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
1011
use Symfony\Component\Console\Event\ConsoleCommandEvent;
@@ -24,6 +25,7 @@ public function __construct(private string $configurationTableName)
2425

2526
private bool $enabled = false;
2627

28+
/** @param AbstractAsset<OptionallyQualifiedName>|string $asset */
2729
public function __invoke(AbstractAsset|string $asset): bool
2830
{
2931
if (! $this->enabled) {

tests/DependencyInjection/DoctrineMigrationsExtensionTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Doctrine\Bundle\MigrationsBundle\Tests\DependencyInjection;
66

7-
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\CacheCompatibilityPass;
87
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
98
use Doctrine\Bundle\DoctrineBundle\Registry;
109
use Doctrine\Bundle\MigrationsBundle\DependencyInjection\DoctrineMigrationsExtension;
@@ -251,7 +250,7 @@ public function testPrefersEntityManagerOverConnection(): void
251250
],
252251
null,
253252
[
254-
'enable_lazy_ghost_objects' => true,
253+
'enable_native_lazy_objects' => true,
255254
'controller_resolver' => ['auto_mapping' => false],
256255
],
257256
);
@@ -320,7 +319,6 @@ public function testCustomEntityManager(): void
320319
'acb' => null,
321320
],
322321
'controller_resolver' => ['auto_mapping' => false],
323-
'enable_lazy_ghost_objects' => true,
324322
],
325323
);
326324

@@ -439,7 +437,6 @@ private function getContainer(array $config, array|null $dbalConfig = null, arra
439437

440438
$container->getDefinition('doctrine.migrations.dependency_factory')->setPublic(true);
441439
$container->getDefinition('doctrine.migrations.configuration')->setPublic(true);
442-
$container->addCompilerPass(new CacheCompatibilityPass());
443440

444441
return $container;
445442
}
@@ -461,6 +458,7 @@ private function getContainerBuilder(): ContainerBuilder
461458
'kernel.environment' => 'test',
462459
'kernel.project_dir' => __DIR__ . '/../',
463460
'kernel.root_dir' => __DIR__ ,
461+
'kernel.build_dir' => __DIR__ ,
464462
]));
465463
}
466464
}

0 commit comments

Comments
 (0)