diff options
Diffstat (limited to 'php-doctrine-orm-version.patch')
| -rw-r--r-- | php-doctrine-orm-version.patch | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/php-doctrine-orm-version.patch b/php-doctrine-orm-version.patch index 3329460..ea72431 100644 --- a/php-doctrine-orm-version.patch +++ b/php-doctrine-orm-version.patch @@ -1,41 +1,40 @@ -diff -up ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php ---- ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php.rpm 2020-02-17 10:57:11.784461836 +0100 -+++ ./lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php 2020-02-17 10:58:14.085234990 +0100 -@@ -23,7 +23,6 @@ use Doctrine\DBAL\Tools\Console as DBALC - use Doctrine\ORM\EntityManagerInterface; - use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; - use OutOfBoundsException; --use PackageVersions\Versions; - use Symfony\Component\Console\Application; - use Symfony\Component\Console\Helper\HelperSet; +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 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; -@@ -75,7 +74,7 @@ final class ConsoleRunner +-use Composer\InstalledVersions; + use Doctrine\DBAL\Tools\Console as DBALConsole; + use Doctrine\ORM\EntityManagerInterface; + use Doctrine\ORM\Tools\Console\EntityManagerProvider\ConnectionFromManagerProvider; +@@ -62,7 +61,7 @@ final class ConsoleRunner */ - public static function createApplication(HelperSet $helperSet, array $commands = []) : Application + 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); - $cli->setHelperSet($helperSet); - self::addCommands($cli); -diff -up ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php ---- ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php.rpm 2020-02-17 11:04:44.126876478 +0100 -+++ ./tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php 2020-02-17 11:04:47.738864467 +0100 -@@ -4,7 +4,6 @@ namespace Doctrine\Tests\ORM\Tools\Conso +- $version = InstalledVersions::getVersion('doctrine/orm'); ++ $version = '@VERSION@'; + assert($version !== null); - use Doctrine\ORM\Tools\Console\ConsoleRunner; - use Doctrine\Tests\DoctrineTestCase; --use PackageVersions\Versions; - use Symfony\Component\Console\Command\Command; - use Symfony\Component\Console\Helper\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 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; -@@ -21,7 +20,7 @@ final class ConsoleRunnerTest extends Do +-use Composer\InstalledVersions; + use Doctrine\Deprecations\PHPUnit\VerifyDeprecations; + use Doctrine\ORM\Tools\Console\ConsoleRunner; + use Doctrine\ORM\Tools\Console\EntityManagerProvider; +@@ -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:import')); self::assertTrue($app->has('dbal:reserved-words')); - + self::assertTrue($app->has('dbal:run-sql')); |