diff options
| -rw-r--r-- | composer.json | 19 | ||||
| -rw-r--r-- | php-doctrine-datafixtures.spec | 20 |
2 files changed, 25 insertions, 14 deletions
diff --git a/composer.json b/composer.json index b3d2b37..e440164 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "keywords": [ "database" ], - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "license": "MIT", "authors": [ { @@ -19,15 +19,20 @@ "doctrine/persistence": "^1.3.3|^2.0" }, "conflict": { - "doctrine/phpcr-odm": "<1.3.0" + "doctrine/phpcr-odm": "<1.3.0", + "doctrine/dbal": "<2.13" }, "require-dev": { "ext-sqlite3": "*", "doctrine/coding-standard": "^9.0", - "doctrine/dbal": "^2.5.4 || ^3.0", + "doctrine/dbal": "^2.13 || ^3.0", "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", "doctrine/orm": "^2.7.0", - "phpunit/phpunit": "^8.0" + "jangregor/phpstan-prophecy": "^0.8.1", + "phpstan/phpstan": "^0.12.99", + "phpunit/phpunit": "^8.0", + "symfony/cache": "^5.0 || ^6.0", + "vimeo/psalm": "^4.10" }, "suggest": { "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", @@ -36,7 +41,11 @@ "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" }, "config": { - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "composer/package-versions-deprecated": true, + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "autoload": { "psr-4": { diff --git a/php-doctrine-datafixtures.spec b/php-doctrine-datafixtures.spec index 45e3230..cab4c93 100644 --- a/php-doctrine-datafixtures.spec +++ b/php-doctrine-datafixtures.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-datafixtures # -# Copyright (c) 2013-2021 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2022 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner doctrine %global github_name data-fixtures -%global github_version 1.5.1 -%global github_commit f18adf13f6c81c67a88360dca359ad474523f8e3 +%global github_version 1.5.2 +%global github_commit 51c1890e8c5467c421c7cab4579f059ebf720278 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor doctrine @@ -27,8 +27,8 @@ # "doctrine/orm": "^2.7.0" %global doctrine_orm_min_ver 2.7.0 %global doctrine_orm_max_ver 3.0 -# "doctrine/dbal": "^2.5.4 || ^3.0" -%global doctrine_dbal_min_ver 2.5.4 +# "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" %global doctrine_pers_min_ver 1.3.3 @@ -50,8 +50,6 @@ URL: https://github.com/%{github_owner}/%{github_name} Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh -Patch0: %{name}-dbal3.patch - BuildArch: noarch # Tests %if %{with tests} @@ -122,7 +120,7 @@ Autoloader: %{phpdir}/Doctrine/Common/DataFixtures/autoload.php %prep %setup -qn %{github_name}-%{github_commit} -%patch0 -p1 + %build : Create autoloader @@ -178,7 +176,7 @@ rm tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php : Upstream tests RETURN_CODE=0 -for PHP_EXEC in "" php73 php74 php80 php81; do +for PHP_EXEC in "" php74 php80 php81; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC %{_bindir}/phpunit8 --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -201,6 +199,10 @@ exit $RETURN_CODE %changelog +* Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 1.5.2-1 +- update to 1.5.2 +- drop patch merged upstream + * Tue Oct 5 2021 Remi Collet <remi@remirepo.net> - 1.5.1-1 - update to 1.5.1 - add patch for test suite with doctrine/dbal v3 from |