diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | php-doctrine-dbal3-bin.patch | 33 | ||||
| -rw-r--r-- | php-doctrine-dbal3.spec | 9 |
3 files changed, 27 insertions, 21 deletions
diff --git a/composer.json b/composer.json index 954da94..325b56b 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ ], "require": { "php": "^7.3 || ^8.0", - "composer/package-versions-deprecated": "^1.11.99", + "composer-runtime-api": "^2", "doctrine/cache": "^1.11|^2.0", "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.0", @@ -42,13 +42,13 @@ "require-dev": { "doctrine/coding-standard": "9.0.0", "jetbrains/phpstorm-stubs": "2021.1", - "phpstan/phpstan": "1.3.0", + "phpstan/phpstan": "1.4.0", "phpstan/phpstan-strict-rules": "^1.1", "phpunit/phpunit": "9.5.11", "psalm/plugin-phpunit": "0.16.1", "squizlabs/php_codesniffer": "3.6.2", "symfony/cache": "^5.2|^6.0", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0", + "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0", "vimeo/psalm": "4.16.1" }, "suggest": { diff --git a/php-doctrine-dbal3-bin.patch b/php-doctrine-dbal3-bin.patch index 2d92fcd..7deb6a2 100644 --- a/php-doctrine-dbal3-bin.patch +++ b/php-doctrine-dbal3-bin.patch @@ -1,11 +1,14 @@ diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php ---- ./bin/doctrine-dbal.php.rpm 2021-10-04 09:39:41.000000000 +0200 -+++ ./bin/doctrine-dbal.php 2021-10-04 09:40:19.300550825 +0200 -@@ -1,25 +1,14 @@ +--- ./bin/doctrine-dbal.php.rpm 2022-01-18 12:01:41.339284813 +0100 ++++ ./bin/doctrine-dbal.php 2022-01-18 12:03:08.516032174 +0100 +@@ -1,3 +1,4 @@ +#!/usr/bin/env php <?php use Doctrine\DBAL\Tools\Console\ConsoleRunner; +@@ -11,24 +12,12 @@ fwrite( + + echo PHP_EOL . PHP_EOL; -$files = [__DIR__ . '/../vendor/autoload.php', __DIR__ . '/../../../autoload.php']; -$loader = null; @@ -31,22 +34,22 @@ diff -up ./bin/doctrine-dbal.php.rpm ./bin/doctrine-dbal.php $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php'; diff -up ./src/Tools/Console/ConsoleRunner.php.rpm ./src/Tools/Console/ConsoleRunner.php ---- ./src/Tools/Console/ConsoleRunner.php.rpm 2021-10-04 09:39:41.000000000 +0200 -+++ ./src/Tools/Console/ConsoleRunner.php 2021-10-04 09:41:02.034408249 +0200 -@@ -5,7 +5,6 @@ namespace Doctrine\DBAL\Tools\Console; +--- ./src/Tools/Console/ConsoleRunner.php.rpm 2022-01-18 12:01:41.339284813 +0100 ++++ ./src/Tools/Console/ConsoleRunner.php 2022-01-18 12:04:47.473745340 +0100 +@@ -2,7 +2,6 @@ + + namespace Doctrine\DBAL\Tools\Console; + +-use Composer\InstalledVersions; use Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand; use Doctrine\DBAL\Tools\Console\Command\RunSqlCommand; use Exception; --use PackageVersions\Versions; - use Symfony\Component\Console\Application; - use Symfony\Component\Console\Command\Command; - -@@ -25,7 +24,7 @@ class ConsoleRunner +@@ -27,7 +26,7 @@ class ConsoleRunner */ public static function run(ConnectionProvider $connectionProvider, $commands = []) { -- $cli = new Application('Doctrine Command Line Interface', Versions::getVersion('doctrine/dbal')); -+ $cli = new Application('Doctrine Command Line Interface', '@VERSION@'); +- $version = InstalledVersions::getVersion('doctrine/dbal'); ++ $version = '@VERSION@'; + assert($version !== null); - $cli->setCatchExceptions(true); - self::addCommands($cli, $connectionProvider); + $cli = new Application('Doctrine Command Line Interface', $version); diff --git a/php-doctrine-dbal3.spec b/php-doctrine-dbal3.spec index 626c3d0..b9eb05e 100644 --- a/php-doctrine-dbal3.spec +++ b/php-doctrine-dbal3.spec @@ -12,8 +12,8 @@ %global github_owner doctrine %global github_name dbal -%global github_version 3.2.1 -%global github_commit 4caf37acf14b513a91dd4f087f7eda424fa25542 +%global github_version 3.3.0 +%global github_commit a4b37db6f186b6843474189b424aed6a7cc5de4b %global major 3 %global composer_vendor doctrine @@ -30,7 +30,7 @@ # "doctrine/deprecations": "^0.5.3", %global doctrine_deprecations_min_ver 0.5.3 %global doctrine_deprecations_max_ver 2 -# "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0" +# "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0" # ignore v2 %global symfony_console_min_ver 3.0 %global symfony_console_max_ver 7 @@ -290,6 +290,9 @@ exit $RETURN_CODE %changelog +* Tue Jan 18 2022 Remi Collet <remi@remirepo.net> - 3.3.0-1 +- update to 3.3.0 + * Thu Jan 6 2022 Remi Collet <remi@remirepo.net> - 3.2.1-1 - update to 3.2.1 |