Skip to content

Commit ec391be

Browse files
authored
Merge pull request #9356 from derrabus/remove/package-versions
Remove the `composer/package-versions-deprecated` package
2 parents e487b6f + 697e234 commit ec391be

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

UPGRADE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,7 @@ These methods have been deprecated:
228228
## Deprecated `Doctrine\ORM\Version`
229229

230230
The `Doctrine\ORM\Version` class is now deprecated and will be removed in Doctrine ORM 3.0:
231-
please refrain from checking the ORM version at runtime or use
232-
[ocramius/package-versions](https://github.com/Ocramius/PackageVersions/).
231+
please refrain from checking the ORM version at runtime or use Composer's [runtime API](https://getcomposer.org/doc/07-runtime.md#knowing-whether-package-x-is-installed-in-version-y).
233232

234233
## Deprecated `EntityManager#merge()` method
235234

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"sort-packages": true
2121
},
2222
"require": {
23-
"php": "^7.1 ||^8.0",
23+
"php": "^7.1 || ^8.0",
24+
"composer-runtime-api": "^2",
2425
"ext-ctype": "*",
2526
"ext-pdo": "*",
26-
"composer/package-versions-deprecated": "^1.8",
2727
"doctrine/cache": "^1.12.1 || ^2.1.1",
2828
"doctrine/collections": "^1.5",
2929
"doctrine/common": "^3.0.3",

lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php

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

55
namespace Doctrine\ORM\Tools\Console;
66

7+
use Composer\InstalledVersions;
78
use Doctrine\DBAL\Tools\Console as DBALConsole;
89
use Doctrine\ORM\EntityManagerInterface;
910
use Doctrine\ORM\Tools\Console\EntityManagerProvider\ConnectionFromManagerProvider;
1011
use Doctrine\ORM\Tools\Console\EntityManagerProvider\HelperSetManagerProvider;
1112
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
1213
use OutOfBoundsException;
13-
use PackageVersions\Versions;
1414
use Symfony\Component\Console\Application;
1515
use Symfony\Component\Console\Command\Command as SymfonyCommand;
1616
use Symfony\Component\Console\Helper\HelperSet;
1717

18+
use function assert;
1819
use function class_exists;
1920

2021
/**
@@ -59,7 +60,10 @@ public static function run($helperSetOrProvider, array $commands = []): void
5960
*/
6061
public static function createApplication($helperSetOrProvider, array $commands = []): Application
6162
{
62-
$cli = new Application('Doctrine Command Line Interface', Versions::getVersion('doctrine/orm'));
63+
$version = InstalledVersions::getVersion('doctrine/orm');
64+
assert($version !== null);
65+
66+
$cli = new Application('Doctrine Command Line Interface', $version);
6367
$cli->setCatchExceptions(true);
6468

6569
if ($helperSetOrProvider instanceof HelperSet) {

tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php

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

55
namespace Doctrine\Tests\ORM\Tools\Console;
66

7+
use Composer\InstalledVersions;
78
use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
89
use Doctrine\ORM\Tools\Console\ConsoleRunner;
910
use Doctrine\ORM\Tools\Console\EntityManagerProvider;
1011
use Doctrine\Tests\DoctrineTestCase;
11-
use PackageVersions\Versions;
1212
use Symfony\Component\Console\Command\Command;
1313
use Symfony\Component\Console\Helper\HelperSet;
1414

@@ -28,7 +28,7 @@ public function testCreateApplicationShouldReturnAnApplicationWithTheCorrectComm
2828
$app = ConsoleRunner::createApplication($helperSet);
2929

3030
self::assertSame($helperSet, $app->getHelperSet());
31-
self::assertSame(Versions::getVersion('doctrine/orm'), $app->getVersion());
31+
self::assertSame(InstalledVersions::getVersion('doctrine/orm'), $app->getVersion());
3232

3333
self::assertTrue($app->has('dbal:reserved-words'));
3434
self::assertTrue($app->has('dbal:run-sql'));

0 commit comments

Comments
 (0)