diff options
| -rw-r--r-- | composer.json | 62 | ||||
| -rw-r--r-- | php-doctrine-orm-bin.patch | 60 | ||||
| -rw-r--r-- | php-doctrine-orm-version.patch | 59 | ||||
| -rw-r--r-- | php-doctrine-orm.spec | 331 |
4 files changed, 363 insertions, 149 deletions
diff --git a/composer.json b/composer.json index 1e5ddef..34cecb1 100644 --- a/composer.json +++ b/composer.json @@ -13,32 +13,50 @@ {"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.2|^8.0", - "ext-pdo": "*", - "composer/package-versions-deprecated": "^1.8", - "doctrine/annotations": "^1.11.1", - "doctrine/cache": "^1.9.1", - "doctrine/collections": "^1.5", - "doctrine/common": "^3.0", - "doctrine/dbal": "^2.10.0", - "doctrine/event-manager": "^1.1", - "doctrine/inflector": "^1.4|^2.0", + "php": "^7.1 || ^8.0", + "composer-runtime-api": "^2", + "ext-ctype": "*", + "doctrine/cache": "^1.12.1 || ^2.1.1", + "doctrine/collections": "^1.5 || ^2.0", + "doctrine/common": "^3.0.3", + "doctrine/dbal": "^2.13.1 || ^3.2", + "doctrine/deprecations": "^0.5.3 || ^1", + "doctrine/event-manager": "^1.2 || ^2", + "doctrine/inflector": "^1.4 || ^2.0", "doctrine/instantiator": "^1.3", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^2.0", - "symfony/console": "^3.0|^4.0|^5.0" + "doctrine/lexer": "^1.2.3 || ^2", + "doctrine/persistence": "^2.4 || ^3", + "psr/cache": "^1 || ^2 || ^3", + "symfony/console": "^4.2 || ^5.0 || ^6.0", + "symfony/polyfill-php72": "^1.23", + "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "doctrine/coding-standard": "^8.0", - "phpstan/phpstan": "^0.12.18", - "phpunit/phpunit": "^8.5|^9.4", - "symfony/yaml": "^3.4|^4.0|^5.0", - "vimeo/psalm": "4.1.1" + "doctrine/annotations": "^1.13 || ^2", + "doctrine/coding-standard": "^9.0.2 || ^11.0", + "phpbench/phpbench": "^0.16.10 || ^1.0", + "phpstan/phpstan": "~1.4.10 || 1.9.8", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psr/log": "^1 || ^2 || ^3", + "squizlabs/php_codesniffer": "3.7.1", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", + "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", + "vimeo/psalm": "4.30.0 || 5.4.0" + }, + "conflict": { + "doctrine/annotations": "<1.13 || >= 3.0" }, "suggest": { + "ext-dom": "Provides support for XSD validation for XML mapping files", + "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, "autoload": { @@ -47,16 +65,12 @@ "autoload-dev": { "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests", + "Doctrine\\StaticAnalysis\\": "tests/Doctrine/StaticAnalysis", "Doctrine\\Performance\\": "tests/Doctrine/Performance" } }, "bin": ["bin/doctrine"], - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev" - } - }, "archive": { - "exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar", "vendor/satooshi", "lib/vendor", "*.swp"] + "exclude": ["!vendor", "tests", "*phpunit.xml", "build.xml", "build.properties", "composer.phar", "vendor/satooshi", "lib/vendor", "*.swp"] } } diff --git a/php-doctrine-orm-bin.patch b/php-doctrine-orm-bin.patch index 37e0e16..94fae70 100644 --- a/php-doctrine-orm-bin.patch +++ b/php-doctrine-orm-bin.patch @@ -1,15 +1,14 @@ -diff --git a/bin/doctrine.php b/bin/doctrine.php -index 842c5493f..e1ccb7506 100755 ---- a/bin/doctrine.php -+++ b/bin/doctrine.php +diff -up ./bin/doctrine.php.rpm1 ./bin/doctrine.php +--- ./bin/doctrine.php.rpm1 2022-09-23 11:23:08.000000000 +0200 ++++ ./bin/doctrine.php 2022-09-23 11:30:54.541647836 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/env php <?php - /* - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -@@ -20,17 +21,7 @@ + use Symfony\Component\Console\Helper\HelperSet; - use Doctrine\ORM\Tools\Console\ConsoleRunner; +@@ -13,17 +14,7 @@ fwrite( + + echo PHP_EOL . PHP_EOL; -$autoloadFiles = [ - __DIR__ . '/../vendor/autoload.php', @@ -26,32 +25,29 @@ index 842c5493f..e1ccb7506 100755 $directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config']; -diff -up a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php ---- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm 2019-09-30 08:35:50.547638239 +0200 -+++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php 2019-09-30 08:37:02.769360851 +0200 -@@ -43,7 +43,7 @@ class SetupTest extends OrmTestCase - - public function testDirectoryAutoload() - { -- Setup::registerAutoloadDirectory(__DIR__ . "/../../../../../vendor/doctrine/common/lib"); -+ Setup::registerAutoloadDirectory("/usr/share/php"); - - $this->assertEquals($this->originalAutoloaderCount + 2, count(spl_autoload_functions())); - } - -diff -up ./lib/Doctrine/ORM/Tools/Setup.php.rpm ./lib/Doctrine/ORM/Tools/Setup.php ---- ./lib/Doctrine/ORM/Tools/Setup.php.rpm 2020-05-27 11:28:24.144920624 +0200 -+++ ./lib/Doctrine/ORM/Tools/Setup.php 2020-05-27 11:29:14.330733814 +0200 -@@ -45,7 +45,11 @@ class Setup +diff -up ./lib/Doctrine/ORM/Tools/Setup.php.rpm1 ./lib/Doctrine/ORM/Tools/Setup.php +--- ./lib/Doctrine/ORM/Tools/Setup.php.rpm1 2022-09-23 11:30:54.542647834 +0200 ++++ ./lib/Doctrine/ORM/Tools/Setup.php 2022-09-23 11:32:10.791505590 +0200 +@@ -54,7 +54,9 @@ class Setup public static function registerAutoloadDirectory($directory) { - if (!class_exists('Doctrine\Common\ClassLoader', false)) { -- require_once $directory . "/Doctrine/Common/ClassLoader.php"; + if (! class_exists('Doctrine\Common\ClassLoader', false)) { +- if (file_exists($directory . '/Doctrine/Common/ClassLoader.php')) { + if (file_exists($directory . "/Doctrine/Common3/ClassLoader.php")) { + require_once $directory . "/Doctrine/Common3/ClassLoader.php"; -+ } else { -+ require_once $directory . "/Doctrine/Common/ClassLoader.php"; -+ } - } ++ } elseif (file_exists($directory . '/Doctrine/Common/ClassLoader.php')) { + require_once $directory . '/Doctrine/Common/ClassLoader.php'; + } elseif (file_exists(dirname($directory) . '/src/ClassLoader.php')) { + require_once dirname($directory) . '/src/ClassLoader.php'; +diff -up ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm1 ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php +--- ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm1 2022-09-23 11:23:08.000000000 +0200 ++++ ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php 2022-09-23 11:30:54.542647834 +0200 +@@ -54,7 +54,7 @@ class SetupTest extends TestCase - $loader = new ClassLoader("Doctrine", $directory); + public function testDirectoryAutoload(): void + { +- Setup::registerAutoloadDirectory(__DIR__ . '/../../../../../vendor/doctrine/common/lib'); ++ Setup::registerAutoloadDirectory("/usr/share/php"); + + self::assertCount($this->originalAutoloaderCount + 2, spl_autoload_functions()); + } 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')); diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index 22be8fb..c6fedb6 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-orm # -# Copyright (c) 2013-2020 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2023 Shawn Iwinski <shawn.iwinski@gmail.com> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -13,48 +13,65 @@ %global github_owner doctrine %global github_name orm -%global github_version 2.8.1 -%global github_commit 242cf1a33df1b8bc5e1b86c3ebd01db07851c833 +%global github_version 2.14.1 +%global github_commit de7eee5ed7b1b35c99b118f26f210a8281e6db8e %global composer_vendor doctrine %global composer_project orm -# "php": "^7.2|^8.0" -%global php_min_ver 7.2 -# "doctrine/annotations": "^1.11.1", -%global annotations_min_ver 1.11.1 +# "php": "^7.1 || ^8.0" +%global php_min_ver 7.1 +# "doctrine/annotations": "^1.13", +%global annotations_min_ver 1.13 %global annotations_max_ver 2 -# "doctrine/cache": "^1.9.1" -%global cache_min_ver 1.9.1 -%global cache_max_ver 2 -# "doctrine/collections": "^1.5" +# "doctrine/cache": "^1.12.1 || ^2.1.1" +%global cache_min_ver 1.12.1 +%global cache_max_ver 3 +# "doctrine/collections": "^1.5 || ^2.0" %global collections_min_ver 1.5 -%global collections_max_ver 2 -# "doctrine/common": "^3.0" -%global common_min_ver 3.0 +%global collections_max_ver 3 +# "doctrine/common": "^3.0.3" +%global common_min_ver 3.0.3 %global common_max_ver 4 -# "doctrine/dbal": "^2.10" -%global dbal_min_ver 2.10 -%global dbal_max_ver 3 -# "doctrine/inflector": "^1.4|^2.0" +# "doctrine/dbal": "^2.13.1 || ^3.2" +%global dbal_min_ver 2.13.1 +%global dbal_max_ver 4 +# "doctrine/deprecations": "^0.5.3 || ^1" +%global deprecations_min_ver 0.5.3 +%global deprecations_max_ver 2 +# "doctrine/inflector": "^1.4 || ^2.0" %global inflector_min_ver 1.4 %global inflector_max_ver 3 # "doctrine/instantiator": "^1.3" %global instantiator_min_ver 1.3 %global instantiator_max_ver 2 -# "doctrine/lexer": "^1.0" -%global lexer_min_ver 1.0 -%global lexer_max_ver 2 -# "doctrine/persistence": "^2.0" -%global persistence_min_ver 2.0 -%global persistence_max_ver 3 -# "doctrine/event-manager": "^1.1" -%global event_min_ver 1.1 -%global event_max_ver 2 -# "symfony/console": "^3.0|^4.0|^5.0" -# "symfony/yaml": "~^3.4|^4.0|^5.0" -%global symfony_min_ver 3.4 -%global symfony_max_ver 6 +# "doctrine/lexer": "^1.2.3 || ^2" +%global lexer_min_ver 1.2.3 +%global lexer_max_ver 3 +# "doctrine/persistence": "^2.4 || ^3" +%global persistence_min_ver 2.4 +%global persistence_max_ver 4 +# "doctrine/event-manager": "^1.2 || ^2.0" +%global event_min_ver 1.2 +%global event_max_ver 3 +# "symfony/console": "^4.2 || ^5.0 || ^6.0" +# "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0" +# "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", +%global symfony_min_ver 4.4 +%global symfony_max_ver 7 +# "symfony/cache": "^4.4 || ^5.4 || ^6.0", +%global sym_cache_min_ver 4.4 +%global sym_cache_max_ver 7 +# "symfony/polyfill-php72": "^1.23", +# "symfony/polyfill-php80": "^1.16" +%global sym_poly_min_ver 1.23 +%global sym_poly_max_ver 2 +# "psr/cache": "^1 || ^2 || ^3", +%global psr_cache_min_ver 1 +%global psr_cache_max_ver 4 +# "psr/log": "^1 || ^2 || ^3", +%global psr_log_min_ver 1 +%global psr_log_max_ver 4 %{!?phpdir: %global phpdir %{_datadir}/php} @@ -92,25 +109,31 @@ BuildRequires: (php-composer(doctrine/cache) >= %{cache_min_ver} BuildRequires: (php-composer(doctrine/collections) >= %{collections_min_ver} with php-composer(doctrine/collections) < %{collections_max_ver}) BuildRequires: (php-composer(doctrine/common) >= %{common_min_ver} with php-composer(doctrine/common) < %{common_max_ver}) BuildRequires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver}) +BuildRequires: (php-composer(doctrine/deprecations) >= %{deprecations_min_ver} with php-composer(doctrine/deprecations) < %{deprecations_max_ver}) BuildRequires: (php-composer(doctrine/inflector) >= %{inflector_min_ver} with php-composer(doctrine/inflector) < %{inflector_max_ver}) BuildRequires: (php-composer(doctrine/instantiator) >= %{instantiator_min_ver} with php-composer(doctrine/instantiator) < %{instantiator_max_ver}) BuildRequires: (php-composer(doctrine/event-manager) >= %{event_min_ver} with php-composer(doctrine/event-manager) < %{event_max_ver}) BuildRequires: (php-composer(doctrine/lexer) >= %{lexer_min_ver} with php-composer(doctrine/lexer) < %{lexer_max_ver}) BuildRequires: (php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) +BuildRequires: (php-composer(symfony/var-exporter) >= %{symfony_min_ver} with php-composer(symfony/var-exporter) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) -# remirepo:26 +BuildRequires: (php-composer(symfony/cache) >= %{sym_cache_min_ver} with php-composer(symfony/cache) < %{sym_cache_max_ver}) +BuildRequires: (php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} with php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver}) +BuildRequires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) +BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +# remirepo:36 %else -BuildRequires: php-composer(doctrine/annotations) < %{annotations_max_ver} -BuildRequires: php-composer(doctrine/annotations) >= %{annotations_min_ver} +BuildRequires: php-doctrine-annotations >= %{annotations_min_ver} BuildRequires: php-composer(doctrine/cache) < %{cache_max_ver} BuildRequires: php-composer(doctrine/cache) >= %{cache_min_ver} BuildRequires: php-composer(doctrine/collections) < %{collections_max_ver} BuildRequires: php-composer(doctrine/collections) >= %{collections_min_ver} BuildRequires: php-composer(doctrine/common) < %{common_max_ver} BuildRequires: php-composer(doctrine/common) >= %{common_min_ver} -BuildRequires: php-composer(doctrine/dbal) < %{dbal_max_ver} -BuildRequires: php-composer(doctrine/dbal) >= %{dbal_min_ver} +BuildRequires: php-doctrine-dbal >= %{dbal_min_ver} +BuildRequires: php-composer(doctrine/deprecations) < %{deprecations_max_ver} +BuildRequires: php-composer(doctrine/deprecations) >= %{deprecations_min_ver} BuildRequires: php-composer(doctrine/inflector) < %{inflector_max_ver} BuildRequires: php-composer(doctrine/inflector) >= %{inflector_min_ver} BuildRequires: php-composer(doctrine/instantiator) < %{instantiator_max_ver} @@ -123,16 +146,21 @@ BuildRequires: php-composer(doctrine/persistence) < %{persistence_max_ver} BuildRequires: php-composer(doctrine/persistence) >= %{persistence_min_ver} BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver} +BuildRequires: php-composer(symfony/var-exporter) < %{symfony_max_ver} +BuildRequires: php-composer(symfony/var-exporter) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/yaml) < %{symfony_max_ver} BuildRequires: php-composer(symfony/yaml) >= %{symfony_min_ver} +BuildRequires: php-composer(symfony/cache) < %{sym_cache_max_ver} +BuildRequires: php-composer(symfony/cache) >= %{sym_cache_min_ver} +BuildRequires: php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver} +BuildRequires: php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} +BuildRequires: php-composer(psr/cache) < %{psr_cache_max_ver} +BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver} +BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} +BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} %endif -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.4 -%else -%global phpunit %{_bindir}/phpunit8 -BuildRequires: phpunit8 >= 8.5 -%endif +BuildRequires: phpunit9 >= 9.5 BuildRequires: php-pdo # phpcompatinfo (computed from version 2.5.11) BuildRequires: php-ctype @@ -157,26 +185,29 @@ Requires: (php-composer(doctrine/cache) >= %{cache_min_ver} Requires: (php-composer(doctrine/collections) >= %{collections_min_ver} with php-composer(doctrine/collections) < %{collections_max_ver}) Requires: (php-composer(doctrine/common) >= %{common_min_ver} with php-composer(doctrine/common) < %{common_max_ver}) Requires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver}) +Requires: (php-composer(doctrine/deprecations) >= %{deprecations_min_ver} with php-composer(doctrine/deprecations) < %{deprecations_max_ver}) Requires: (php-composer(doctrine/inflector) >= %{inflector_min_ver} with php-composer(doctrine/inflector) < %{inflector_max_ver}) Requires: (php-composer(doctrine/instantiator) >= %{instantiator_min_ver} with php-composer(doctrine/instantiator) < %{instantiator_max_ver}) Requires: (php-composer(doctrine/event-manager) >= %{event_min_ver} with php-composer(doctrine/event-manager) < %{event_max_ver}) Requires: (php-composer(doctrine/lexer) >= %{lexer_min_ver} with php-composer(doctrine/lexer) < %{lexer_max_ver}) Requires: (php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) +Requires: (php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} with php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver}) +Requires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) # composer.json: suggest Recommends: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) -# remirepo:26 +# remirepo:30 %else -Requires: php-composer(doctrine/annotations) < %{annotations_max_ver} -Requires: php-composer(doctrine/annotations) >= %{annotations_min_ver} +Requires: php-doctrine-annotations >= %{annotations_min_ver} Requires: php-composer(doctrine/cache) < %{cache_max_ver} Requires: php-composer(doctrine/cache) >= %{cache_min_ver} Requires: php-composer(doctrine/collections) < %{collections_max_ver} Requires: php-composer(doctrine/collections) >= %{collections_min_ver} Requires: php-composer(doctrine/common) < %{common_max_ver} Requires: php-composer(doctrine/common) >= %{common_min_ver} -Requires: php-composer(doctrine/dbal) < %{dbal_max_ver} -Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver} +Requires: php-doctrine-dbal >= %{dbal_min_ver} +Requires: php-composer(doctrine/deprecations) < %{deprecations_max_ver} +Requires: php-composer(doctrine/deprecations) >= %{deprecations_min_ver} Requires: php-composer(doctrine/inflector) < %{inflector_max_ver} Requires: php-composer(doctrine/inflector) >= %{inflector_min_ver} Requires: php-composer(doctrine/instantiator) < %{instantiator_max_ver} @@ -191,6 +222,10 @@ Requires: php-composer(symfony/console) < %{symfony_max_ver} Requires: php-composer(symfony/console) >= %{symfony_min_ver} Requires: php-composer(symfony/yaml) < %{symfony_max_ver} Requires: php-composer(symfony/yaml) >= %{symfony_min_ver} +Requires: php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver} +Requires: php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} +Requires: php-composer(psr/cache) < %{psr_cache_max_ver} +Requires: php-composer(psr/cache) >= %{psr_cache_min_ver} %endif Requires: php-pdo # phpcompatinfo (computed from version 2.5.11) @@ -238,20 +273,24 @@ Autoloader: %{phpdir}/Doctrine/ORM/autoload.php %setup -qn %{github_name}-%{github_commit} : Patch bin script -%patch0 -p1 -b .rpm +%patch0 -p1 -b .rpm1 sed -e 's#__PHPDIR__#%{phpdir}#g' -i \ bin/doctrine.php -%patch1 -p1 -b .rpm +%patch1 -p1 -b .rpm2 sed -e 's/@VERSION@/%{version}/' -i \ lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php \ tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php -find lib -name \*.rpm -delete +find lib -name \*.rpm\? -delete + +: move schema in library +cp doctrine-mapping.xsd lib/Doctrine/ORM/Mapping/Driver/ +sed -e '/doctrine-mapping.xsd/s:/../../../../..::' \ + -i lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php : Remove empty file rm -f lib/Doctrine/ORM/README.markdown - %build : Create autoloader cat <<'AUTOLOAD' | tee lib/Doctrine/ORM/autoload.php @@ -265,31 +304,60 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\ORM\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ + [ + '%{phpdir}/Doctrine/Common/Lexer2/autoload.php', + '%{phpdir}/Doctrine/Common/Lexer/autoload.php', + ], [ + '%{phpdir}/Doctrine/Persistence3/autoload.php', + '%{phpdir}/Doctrine/Persistence2/autoload.php', + ], + '%{phpdir}/Doctrine/Common/Annotations/autoload.php', '%{phpdir}/Doctrine/Common3/autoload.php', - '%{phpdir}/Doctrine/Common/Cache/autoload.php', - '%{phpdir}/Doctrine/Common/Collections/autoload.php', + [ + '%{phpdir}/Doctrine/Common/Cache2/autoload.php', + '%{phpdir}/Doctrine/Common/Cache/autoload.php', + ], [ + '%{phpdir}/Doctrine/Common/Collections2/autoload.php', + '%{phpdir}/Doctrine/Common/Collections/autoload.php', + ], + '%{phpdir}/Doctrine/Deprecations/autoload.php', [ '%{phpdir}/Doctrine/Inflector2/autoload.php', '%{phpdir}/Doctrine/Common/Inflector/autoload.php', + ], [ + '%{phpdir}/Doctrine/EventManager2/autoload.php', + '%{phpdir}/Doctrine/Common/EventManager/autoload.php', + ], [ + '%{phpdir}/Doctrine/DBAL3/autoload.php', + '%{phpdir}/Doctrine/DBAL/autoload.php', ], - '%{phpdir}/Doctrine/Common/EventManager/autoload.php', - '%{phpdir}/Doctrine/Common/Lexer/autoload.php', - '%{phpdir}/Doctrine/Persistence2/autoload.php', - '%{phpdir}/Doctrine/DBAL/autoload.php', '%{phpdir}/Doctrine/Instantiator/autoload.php', [ - '%{phpdir}/Symfony5/Component/Console/autoload.php', - '%{phpdir}/Symfony4/Component/Console/autoload.php', - '%{phpdir}/Symfony3/Component/Console/autoload.php', + '%{phpdir}/Symfony6/Component/Console/autoload.php', + '%{phpdir}/Symfony5/Component/Console/autoload.php', + '%{phpdir}/Symfony4/Component/Console/autoload.php', + '%{phpdir}/Symfony3/Component/Console/autoload.php', + ], [ + '%{phpdir}/Psr/Cache3/autoload.php', + '%{phpdir}/Psr/Cache2/autoload.php', + '%{phpdir}/Psr/Cache/autoload.php', ], + '%{phpdir}/Symfony/Polyfill/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ [ + '%{phpdir}/Symfony6/Component/VarExporter/autoload.php', + '%{phpdir}/Symfony5/Component/VarExporter/autoload.php', + '%{phpdir}/Symfony4/Component/VarExporter/autoload.php', + '%{phpdir}/Symfony3/Component/VarExporter/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 @@ -312,24 +380,40 @@ grep -r --files-with-matches 'TestInit' tests \ | xargs sed '/TestInit/d' -i : Load annotation register file from buildroot -sed 's#__DIR__\s*\.\s*"/\(\.\./\)*lib#"%{buildroot}%{phpdir}#' \ +sed "/registerFile/s#__DIR__.*/lib#'%{buildroot}%{phpdir}#" \ -i tests/Doctrine/Tests/OrmTestCase.php : Create tests bootstrap cat > bootstrap.php <<'BOOTSTRAP' <?php require_once '%{buildroot}%{phpdir}/Doctrine/ORM/autoload.php'; +\Fedora\Autoloader\Dependencies::required([ + [ + '%{phpdir}/Psr/Log3/autoload.php', + '%{phpdir}/Psr/Log2/autoload.php', + '%{phpdir}/Psr/Log/autoload.php', + ], [ + '%{phpdir}/Symfony6/Component/Cache/autoload.php', + '%{phpdir}/Symfony5/Component/Cache/autoload.php', + '%{phpdir}/Symfony4/Component/Cache/autoload.php', + ], +]); \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Tests\\', __DIR__.'/tests/Doctrine/Tests'); +\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\StaticAnalysis\\', __DIR__.'/tests/Doctrine/StaticAnalysis'); \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Performance\\', __DIR__.'/tests/Doctrine/Performance'); BOOTSTRAP +# test failing only in mock +rm tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php + : Upstream tests RETURN_CODE=0 -for CMDARG in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for CMDARG in "php %{phpunit}" php80 php81 php82; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ --verbose -d memory_limit="512M" \ + --filter '^((?!(testConfigureCache|testDecimal|testCacheNamespaceShouldBeGeneratedForApcu)).)*$' \ --bootstrap bootstrap.php \ || RETURN_CODE=1 fi @@ -351,6 +435,127 @@ exit $RETURN_CODE %changelog +* Tue Jan 17 2023 Remi Collet <remi@remirepo.net> - 2.14.1-1 +- update to 2.14.1 + +* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.14.0-1 +- update to 2.14.0 +- allow doctrine/collections v2 +- allow doctrine/event-manager v2 +- allow doctrine/lexer v2 +- raise dependency on symfony/console 4.2 + +* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.13.5-1 +- update to 2.13.5 + +* Thu Nov 24 2022 Remi Collet <remi@remirepo.net> - 2.13.4-1 +- update to 2.13.4 + +* Fri Oct 7 2022 Remi Collet <remi@remirepo.net> - 2.13.3-1 +- update to 2.13.3 + +* Fri Sep 23 2022 Remi Collet <remi@remirepo.net> - 2.13.2-1 +- update to 2.13.2 + +* Mon Aug 8 2022 Remi Collet <remi@remirepo.net> - 2.13.1-1 +- update to 2.13.1 + +* Fri Jun 17 2022 Remi Collet <remi@remirepo.net> - 2.12.3-1 +- update to 2.12.3 + +* Tue May 3 2022 Remi Collet <remi@remirepo.net> - 2.12.2-1 +- update to 2.12.2 +- allow doctrine/deprecations 1 + +* Mon Apr 25 2022 Remi Collet <remi@remirepo.net> - 2.12.1-1 +- update to 2.12.1 + +* Wed Apr 20 2022 Remi Collet <remi@remirepo.net> - 2.12.0-1 +- update to 2.12.0 +- raise dependency on doctrine/persistence 2.4 and allow 3 +- raise dependency on doctrine/lexer 1.2.3 + +* Wed Apr 20 2022 Remi Collet <remi@remirepo.net> - 2.11.3-1 +- update to 2.11.3 + +* Thu Mar 10 2022 Remi Collet <remi@remirepo.net> - 2.11.2-1 +- update to 2.11.2 + +* Mon Jan 31 2022 Remi Collet <remi@remirepo.net> - 2.11.1-1 +- update to 2.11.1 + +* Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 2.11.0-2 +- add missing dependency on doctrine-annotations + see https://github.com/doctrine/orm/pull/9416 + +* 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 + +* Wed Dec 15 2021 Remi Collet <remi@remirepo.net> - 2.10.3-2 +- fix autoloader for dbal v2 + +* Tue Dec 7 2021 Remi Collet <remi@remirepo.net> - 2.10.3-1 +- update to 2.10.3 + +* Mon Oct 25 2021 Remi Collet <remi@remirepo.net> - 2.10.2-1 +- update to 2.10.2 + +* Wed Oct 6 2021 Remi Collet <remi@remirepo.net> - 2.10.1-1 +- update to 2.10.1 + +* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 2.10.0-2 +- update to 2.10.0 +- drop dependency on doctrine/annotations +- add dependency on symfony/polyfill-php80 +- allow doctrine/dbal v3 + +* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 2.9.6-1 +- update to 2.9.6 + +* Thu Sep 2 2021 Remi Collet <remi@remirepo.net> - 2.9.5-1 +- update to 2.9.5 + +* Thu Aug 12 2021 Remi Collet <remi@remirepo.net> - 2.9.4-1 +- update to 2.9.4 +- raise dependency on doctrine/cache 1.12.1 + +* Fri Jul 30 2021 Remi Collet <remi@remirepo.net> - 2.9.3-2 +- skip 1 test, fix FTBFS #1987811 + +* Tue Jun 15 2021 Remi Collet <remi@remirepo.net> - 2.9.3-1 +- update to 2.9.3 + +* Tue Jun 1 2021 Remi Collet <remi@remirepo.net> - 2.9.2-1 +- update to 2.9.2 +- raise dependency on doctrine/cache 1.11.3 + +* Tue May 25 2021 Remi Collet <remi@remirepo.net> - 2.9.1-1 +- update to 2.9.1 +- lower dependency on PHP 7.1 +- raise dependency on doctrine/annotations 1.13 +- raise dependency on doctrine/cache 1.11 and allow v2 +- raise dependency on doctrine/dbal 2.13 +- add dependency on doctrine/deprecations +- add dependency on psr/cache +- add build dependency on symfony/cache + +* Tue May 25 2021 Remi Collet <remi@remirepo.net> - 2.8.5-1 +- update to 2.8.5 +- raise dependency on doctrine/persistence 2.2 + +* Tue Apr 6 2021 Remi Collet <remi@remirepo.net> - 2.8.4-1 +- update to 2.8.4 + +* Tue Apr 6 2021 Remi Collet <remi@remirepo.net> - 2.8.3-1 +- update to 2.8.3 + +* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 2.8.2-1 +- update to 2.8.2 +- raise dependency on doctrine/common 3.0.3 + * Tue Dec 8 2020 Remi Collet <remi@remirepo.net> - 2.8.1-1 - update to 2.8.1 - raise dependency on PHP 7.2 |