diff options
author | Remi Collet <remi@remirepo.net> | 2022-01-12 16:27:10 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2022-01-12 16:27:10 +0100 |
commit | 95b2c2a367157d5bb862d32001bf0dae48eed9f9 (patch) | |
tree | f22e37f0ca4d4a69a5aa3685cb0236c6dac8d68f /php-doctrine-orm-version.patch | |
parent | 0f4b742eb9dd77371cf5c3f1873d315b6bd54faa (diff) |
update to 2.11.0
Diffstat (limited to 'php-doctrine-orm-version.patch')
-rw-r--r-- | php-doctrine-orm-version.patch | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/php-doctrine-orm-version.patch b/php-doctrine-orm-version.patch index a179212..4838292 100644 --- a/php-doctrine-orm-version.patch +++ b/php-doctrine-orm-version.patch @@ -1,39 +1,39 @@ diff -up ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm2 ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php ---- ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm2 2021-10-04 09:50:51.000000000 +0200 -+++ ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php 2021-10-04 10:02:19.311037009 +0200 -@@ -10,7 +10,6 @@ use Doctrine\ORM\Tools\Console\EntityMan - use Doctrine\ORM\Tools\Console\EntityManagerProvider\HelperSetManagerProvider; - use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; - use OutOfBoundsException; --use PackageVersions\Versions; - use Symfony\Component\Console\Application; - use Symfony\Component\Console\Command\Command as SymfonyCommand; - use Symfony\Component\Console\Helper\HelperSet; -@@ -59,7 +58,7 @@ final class ConsoleRunner +--- ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm2 2022-01-12 16:22:59.316791685 +0100 ++++ ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php 2022-01-12 16:24:06.823498397 +0100 +@@ -4,7 +4,6 @@ declare(strict_types=1); + + namespace Doctrine\ORM\Tools\Console; + +-use Composer\InstalledVersions; + use Doctrine\DBAL\Tools\Console as DBALConsole; + use Doctrine\ORM\EntityManagerInterface; + use Doctrine\ORM\Tools\Console\EntityManagerProvider\ConnectionFromManagerProvider; +@@ -60,7 +59,7 @@ final class ConsoleRunner */ public static function createApplication($helperSetOrProvider, array $commands = []): Application { -- $cli = new Application('Doctrine Command Line Interface', Versions::getVersion('doctrine/orm')); -+ $cli = new Application('Doctrine Command Line Interface', '@VERSION@'); - $cli->setCatchExceptions(true); +- $version = InstalledVersions::getVersion('doctrine/orm'); ++ $version = '@VERSION@'; + assert($version !== null); - if ($helperSetOrProvider instanceof HelperSet) { + $cli = new Application('Doctrine Command Line Interface', $version); diff -up ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm2 ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php ---- ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm2 2021-10-04 09:50:51.000000000 +0200 -+++ ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php 2021-10-04 10:03:22.242820863 +0200 -@@ -8,7 +8,6 @@ use Doctrine\Deprecations\PHPUnit\Verify +--- ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm2 2022-01-12 16:22:59.316791685 +0100 ++++ ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php 2022-01-12 16:24:37.684281754 +0100 +@@ -4,7 +4,6 @@ declare(strict_types=1); + + namespace Doctrine\Tests\ORM\Tools\Console; + +-use Composer\InstalledVersions; + use Doctrine\Deprecations\PHPUnit\VerifyDeprecations; use Doctrine\ORM\Tools\Console\ConsoleRunner; use Doctrine\ORM\Tools\Console\EntityManagerProvider; - use Doctrine\Tests\DoctrineTestCase; --use PackageVersions\Versions; - use Symfony\Component\Console\Command\Command; - use Symfony\Component\Console\Helper\HelperSet; - @@ -28,7 +27,7 @@ final class ConsoleRunnerTest extends Do $app = ConsoleRunner::createApplication($helperSet); self::assertSame($helperSet, $app->getHelperSet()); -- self::assertSame(Versions::getVersion('doctrine/orm'), $app->getVersion()); +- self::assertSame(InstalledVersions::getVersion('doctrine/orm'), $app->getVersion()); + self::assertSame('@VERSION@', $app->getVersion()); self::assertTrue($app->has('dbal:reserved-words')); |