Skip to content
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.

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

Dropped support for doctrine/dbal 2.x #763

Merged
merged 2 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,17 @@ jobs:
- "8.2"
- "8.3"
dbal-version:
- "2.13.0"
- "3.3.0"
dependencies:
- "highest"
optional-dependencies:
- true
- false
include:
- php-version: "8.1"
dbal-version: "2.13.0"
dependencies: "lowest"
optional-dependencies: false
- php-version: "8.1"
dbal-version: "3.3.0"
dependencies: "lowest"
optional-dependencies: false
- php-version: "8.1"
dbal-version: "2.13.0"
dependencies: "lowest"
optional-dependencies: true
- php-version: "8.1"
dbal-version: "3.3.0"
dependencies: "lowest"
Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-json": "*",
"doctrine/dbal": "^2.13.7 || ^3.3.2",
"doctrine/dbal": "^3.3.2",
"doctrine/doctrine-laminas-hydrator": "^3.0.0",
"doctrine/doctrine-module": "^5.3.0 || ^6.0.2",
"doctrine/event-manager": "^1.1.1 || ^2.0.0",
"doctrine/orm": "^2.11.1",
"doctrine/doctrine-module": "^5.3.0 || ^6.0.5",
"doctrine/event-manager": "^2.0.0",
"doctrine/orm": "^2.13.0",
"doctrine/persistence": "^2.3.0 || ^3.0.0",
"laminas/laminas-eventmanager": "^3.4.0",
"laminas/laminas-modulemanager": "^2.11.0",
Expand All @@ -32,21 +32,20 @@
"doctrine/annotations": "^1.13.2",
"doctrine/coding-standard": "^9.0.0",
"doctrine/data-fixtures": "^1.5.2",
"doctrine/migrations": "^3.4.1",
"doctrine/migrations": "^3.8.0",
"laminas/laminas-cache-storage-adapter-filesystem": "^2.0",
"laminas/laminas-cache-storage-adapter-memory": "^2.0",
"laminas/laminas-developer-tools": "^2.3.0",
"laminas/laminas-i18n": "^2.13.0",
"laminas/laminas-log": "^2.15.0",
"laminas/laminas-serializer": "^2.12.0",
"ocramius/proxy-manager": "^2.2.0",
"phpstan/phpstan": "^2.0.4",
"phpstan/phpstan-phpunit": "^2.0.3",
"phpunit/phpunit": "^10.5.40",
"squizlabs/php_codesniffer": "^3.6.2"
},
"conflict": {
"doctrine/migrations": "<3.3"
"doctrine/migrations": "<3.8"
},
"suggest": {
"doctrine/migrations": "doctrine migrations if you want to keep your schema definitions versioned",
Expand Down
3 changes: 0 additions & 3 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ parameters:
identifier: method.alreadyNarrowedType
-
identifier: function.alreadyNarrowedType
-
message: '#Method .*CliConfigurator::getHelpers\(\) .*ConnectionHelper#'
path: src/CliConfigurator.php
-
message: '#Method .*DBALConnection::getDriverClass\(\) never returns null#'
path: src/Options/DBALConnection.php
Expand Down
17 changes: 1 addition & 16 deletions src/CliConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

namespace DoctrineORMModule;

use Doctrine\DBAL\Tools\Console\Command\ImportCommand;
use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
use Doctrine\Migrations\Tools\Console\Command\VersionCommand;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
Expand Down Expand Up @@ -66,12 +64,6 @@ class CliConfigurator
public function __construct(ContainerInterface $container)
{
$this->container = $container;

if (! class_exists(ImportCommand::class)) {
return;
}

$this->commands[] = 'doctrine.dbal_cmd.import';
}

public function configure(Application $cli): void
Expand All @@ -97,17 +89,10 @@ public function configure(Application $cli): void
*/
private function getHelpers(EntityManagerInterface $objectManager): array
{
$helpers = [
return [
'dialog' => new QuestionHelper(),
'em' => new EntityManagerHelper($objectManager),
];

// this is only available with DBAL 2.x
if (class_exists(ConnectionHelper::class)) {
$helpers['db'] = new ConnectionHelper($objectManager->getConnection());
}

return $helpers;
}

private function createObjectManagerInputOption(): InputOption
Expand Down