summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-01-12 16:27:10 +0100
committerRemi Collet <remi@php.net>2022-01-12 16:27:10 +0100
commit95b2c2a367157d5bb862d32001bf0dae48eed9f9 (patch)
treef22e37f0ca4d4a69a5aa3685cb0236c6dac8d68f
parent0f4b742eb9dd77371cf5c3f1873d315b6bd54faa (diff)
update to 2.11.0
-rw-r--r--composer.json16
-rw-r--r--php-doctrine-orm-version.patch48
-rw-r--r--php-doctrine-orm.spec18
3 files changed, 45 insertions, 37 deletions
diff --git a/composer.json b/composer.json
index 9d77d78..afd84e3 100644
--- a/composer.json
+++ b/composer.json
@@ -13,17 +13,21 @@
{"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
],
"config": {
+ "allow-plugins": {
+ "composer/package-versions-deprecated": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ },
"sort-packages": true
},
"require": {
- "php": "^7.1 ||^8.0",
+ "php": "^7.1 || ^8.0",
+ "composer-runtime-api": "^2",
"ext-ctype": "*",
"ext-pdo": "*",
- "composer/package-versions-deprecated": "^1.8",
"doctrine/cache": "^1.12.1 || ^2.1.1",
"doctrine/collections": "^1.5",
"doctrine/common": "^3.0.3",
- "doctrine/dbal": "^2.13.1 || ^3.1.1",
+ "doctrine/dbal": "^2.13.1 || ^3.2",
"doctrine/deprecations": "^0.5.3",
"doctrine/event-manager": "^1.1",
"doctrine/inflector": "^1.4 || ^2.0",
@@ -39,12 +43,12 @@
"doctrine/annotations": "^1.13",
"doctrine/coding-standard": "^9.0",
"phpbench/phpbench": "^0.16.10 || ^1.0",
- "phpstan/phpstan": "1.2.0",
+ "phpstan/phpstan": "1.3.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
"squizlabs/php_codesniffer": "3.6.2",
- "symfony/cache": "^4.4 || ^5.2",
+ "symfony/cache": "^4.4 || ^5.4 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
- "vimeo/psalm": "4.15.0"
+ "vimeo/psalm": "4.18.1"
},
"conflict": {
"doctrine/annotations": "<1.13 || >= 2.0"
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'));
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec
index 6847f70..f0d895e 100644
--- a/php-doctrine-orm.spec
+++ b/php-doctrine-orm.spec
@@ -13,8 +13,8 @@
%global github_owner doctrine
%global github_name orm
-%global github_version 2.10.4
-%global github_commit cccb2e2fdfed2969afb3d65c5ea82bafdefbe1a7
+%global github_version 2.11.0
+%global github_commit bfed8cb6ed448f4ab1ea3fff06e4d6c44439e4ef
%global composer_vendor doctrine
%global composer_project orm
@@ -33,8 +33,8 @@
# "doctrine/common": "^3.0.3"
%global common_min_ver 3.0.3
%global common_max_ver 4
-# "doctrine/dbal": "^2.13 || ^3.1.1"
-%global dbal_min_ver 2.13
+# "doctrine/dbal": "^2.13.1 || ^3.2"
+%global dbal_min_ver 2.13.1
%global dbal_max_ver 4
# "doctrine/deprecations": "^0.5.3"
%global deprecations_min_ver 0.5.3
@@ -58,9 +58,9 @@
# "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0"
%global symfony_min_ver 3.4
%global symfony_max_ver 7
-# "symfony/cache": "^4.4 || ^5.2",
+# "symfony/cache": "^4.4 || ^5.4 || ^6.0",
%global sym_cache_min_ver 4.4
-%global sym_cache_max_ver 6
+%global sym_cache_max_ver 7
# "symfony/polyfill-php72": "^1.23",
# "symfony/polyfill-php80": "^1.15"
%global sym_poly_min_ver 1.23
@@ -328,7 +328,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
'%{phpdir}/Symfony6/Component/Yaml/autoload.php',
'%{phpdir}/Symfony5/Component/Yaml/autoload.php',
'%{phpdir}/Symfony4/Component/Yaml/autoload.php',
- '%{phpdir}/Symfony3Component/Yaml/autoload.php',
+ '%{phpdir}/Symfony3/Component/Yaml/autoload.php',
],
]);
AUTOLOAD
@@ -362,6 +362,7 @@ require_once '%{buildroot}%{phpdir}/Doctrine/ORM/autoload.php';
\Fedora\Autoloader\Dependencies::required([
'%{phpdir}/Doctrine/Common/Annotations/autoload.php',
[
+ '%{phpdir}/Symfony6/Component/Cache/autoload.php',
'%{phpdir}/Symfony5/Component/Cache/autoload.php',
'%{phpdir}/Symfony4/Component/Cache/autoload.php',
],
@@ -400,6 +401,9 @@ exit $RETURN_CODE
%changelog
+* Wed Jan 12 2022 Remi Collet <remi@remirepo.net> - 2.11.0-1
+- update to 2.11.0
+
* Tue Dec 21 2021 Remi Collet <remi@remirepo.net> - 2.10.4-1
- update to 2.10.4