diff options
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | php-doctrine-datafixtures-dbal3.patch | 41 | ||||
| -rw-r--r-- | php-doctrine-datafixtures.spec | 18 |
3 files changed, 16 insertions, 51 deletions
diff --git a/composer.json b/composer.json index e440164..ebac32c 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require": { "php": "^7.2 || ^8.0", "doctrine/common": "^2.13|^3.0", - "doctrine/persistence": "^1.3.3|^2.0" + "doctrine/persistence": "^1.3.3|^2.0|^3.0" }, "conflict": { "doctrine/phpcr-odm": "<1.3.0", @@ -28,9 +28,9 @@ "doctrine/dbal": "^2.13 || ^3.0", "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", "doctrine/orm": "^2.7.0", - "jangregor/phpstan-prophecy": "^0.8.1", - "phpstan/phpstan": "^0.12.99", - "phpunit/phpunit": "^8.0", + "jangregor/phpstan-prophecy": "^1", + "phpstan/phpstan": "^1.5", + "phpunit/phpunit": "^8.5 || ^9.5", "symfony/cache": "^5.0 || ^6.0", "vimeo/psalm": "^4.10" }, diff --git a/php-doctrine-datafixtures-dbal3.patch b/php-doctrine-datafixtures-dbal3.patch deleted file mode 100644 index c2bdcbd..0000000 --- a/php-doctrine-datafixtures-dbal3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5abdfad7119646725461472c392e90c9b4121d84 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 5 Oct 2021 08:10:52 +0200 -Subject: [PATCH] skip test using setFilterSchemaAssetsExpression removed in - DBAL3 - -Signed-off-by: Remi Collet <remi@php.net> ---- - .../DataFixtures/Purger/ORMPurgerExcludeTest.php | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/tests/Doctrine/Tests/Common/DataFixtures/Purger/ORMPurgerExcludeTest.php b/tests/Doctrine/Tests/Common/DataFixtures/Purger/ORMPurgerExcludeTest.php -index c4169af..fce0057 100644 ---- a/tests/Doctrine/Tests/Common/DataFixtures/Purger/ORMPurgerExcludeTest.php -+++ b/tests/Doctrine/Tests/Common/DataFixtures/Purger/ORMPurgerExcludeTest.php -@@ -44,7 +44,9 @@ protected function loadTestData() - - $connection = $em->getConnection(); - $configuration = $connection->getConfiguration(); -- $configuration->setFilterSchemaAssetsExpression(null); -+ if (method_exists($configuration, 'setFilterSchemaAssetsExpression')) { -+ $configuration->setFilterSchemaAssetsExpression(null); -+ } - - $schemaTool = new SchemaTool($em); - $schemaTool->dropDatabase(); -@@ -86,7 +88,13 @@ public function executeTestPurge($expression, array $list, ?callable $filter = n - - $connection = $em->getConnection(); - $configuration = $connection->getConfiguration(); -- $configuration->setFilterSchemaAssetsExpression($expression); -+ if ($expression !== null) { -+ if (! method_exists($configuration, 'setFilterSchemaAssetsExpression')) { -+ $this->markTestSkipped('DBAL 2 is required to test schema assets filters'); -+ } -+ -+ $configuration->setFilterSchemaAssetsExpression($expression); -+ } - - if ($filter !== null) { - if (! method_exists($configuration, 'setSchemaAssetsFilter')) { diff --git a/php-doctrine-datafixtures.spec b/php-doctrine-datafixtures.spec index cab4c93..9f62b66 100644 --- a/php-doctrine-datafixtures.spec +++ b/php-doctrine-datafixtures.spec @@ -12,8 +12,8 @@ %global github_owner doctrine %global github_name data-fixtures -%global github_version 1.5.2 -%global github_commit 51c1890e8c5467c421c7cab4579f059ebf720278 +%global github_version 1.5.3 +%global github_commit ba37bfb776de763c5bf04a36d074cd5f5a083c42 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor doctrine @@ -30,9 +30,9 @@ # "doctrine/dbal": "^2.13 || ^3.0" %global doctrine_dbal_min_ver 2.13 %global doctrine_dbal_max_ver 4 -# "doctrine/persistence": "^1.3.3|^2.0" +# "doctrine/persistence": "^1.3.3|^2.0|^3.0" %global doctrine_pers_min_ver 1.3.3 -%global doctrine_pers_max_ver 3 +%global doctrine_pers_max_ver 4 # Build using "--without tests" to disable tests %bcond_without tests @@ -74,7 +74,7 @@ BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} BuildRequires: php-composer(doctrine/persistence) < %{doctrine_pers_max_ver} BuildRequires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} %endif -BuildRequires: phpunit8 +BuildRequires: phpunit9 ## phpcompatinfo (computed from version 1.0.2) BuildRequires: php-json BuildRequires: php-reflection @@ -139,6 +139,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; '%{phpdir}/Doctrine/Common3/autoload.php', '%{phpdir}/Doctrine/Common/autoload.php', ], [ + '%{phpdir}/Doctrine/Persistence3/autoload.php', '%{phpdir}/Doctrine/Persistence2/autoload.php', '%{phpdir}/Doctrine/Persistence/autoload.php', ] @@ -178,7 +179,7 @@ rm tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php RETURN_CODE=0 for PHP_EXEC in "" php74 php80 php81; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then - $PHP_EXEC %{_bindir}/phpunit8 --verbose --bootstrap bootstrap.php \ + $PHP_EXEC %{_bindir}/phpunit9 --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 fi done @@ -199,6 +200,11 @@ exit $RETURN_CODE %changelog +* Wed Apr 20 2022 Remi Collet <remi@remirepo.net> - 1.5.3-1 +- update to 1.5.3 (no change) +- allow doctrine/persistence v3 +- switch to phpunit9 + * Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 1.5.2-1 - update to 1.5.2 - drop patch merged upstream |