diff options
| -rw-r--r-- | composer.json | 14 | ||||
| -rw-r--r-- | php-doctrine-datafixtures.spec | 27 |
2 files changed, 24 insertions, 17 deletions
diff --git a/composer.json b/composer.json index aacbb75..1ca32fb 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ ], "require": { "php": "^7.2 || ^8.0", - "doctrine/persistence": "^1.3.3|^2.0|^3.0" + "doctrine/deprecations": "^0.5.3 || ^1.0", + "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0" }, "conflict": { "doctrine/dbal": "<2.13", @@ -24,15 +25,14 @@ }, "require-dev": { "ext-sqlite3": "*", - "doctrine/coding-standard": "^10.0", + "doctrine/coding-standard": "^11.0", "doctrine/dbal": "^2.13 || ^3.0", - "doctrine/deprecations": "^1.0", "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", "doctrine/orm": "^2.12", "phpstan/phpstan": "^1.5", - "phpunit/phpunit": "^8.5 || ^9.5", + "phpunit/phpunit": "^8.5 || ^9.5 || ^10.0", "symfony/cache": "^5.0 || ^6.0", - "vimeo/psalm": "^4.10" + "vimeo/psalm": "^4.10 || ^5.9" }, "suggest": { "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", @@ -49,12 +49,12 @@ }, "autoload": { "psr-4": { - "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" + "Doctrine\\Common\\DataFixtures\\": "src" } }, "autoload-dev": { "psr-4": { - "Doctrine\\Tests\\": "tests/Doctrine/Tests" + "Doctrine\\Tests\\": "tests" } } } diff --git a/php-doctrine-datafixtures.spec b/php-doctrine-datafixtures.spec index 453a2ca..6117169 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.6.3 -%global github_commit c27821d038e64f1bfc852a94064d65d2a75ad01f +%global github_version 1.6.5 +%global github_commit e6b97f557942ea17564bbc30ae3ebc9bd2209363 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor doctrine @@ -69,7 +69,7 @@ BuildRequires: php-composer(doctrine/orm) < %{doctrine_orm_max_ver} BuildRequires: php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} BuildRequires: php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver} BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} -BuildRequires: php-composer(doctrine/deprecations) < %{doctrine_dep_max_ver} +BuildRequires: php-composer(doctrine/deprecations) < %{doctrine_dep_max_ver} BuildRequires: php-composer(doctrine/deprecations) >= %{doctrine_dep_min_ver} BuildRequires: php-composer(doctrine/persistence) < %{doctrine_pers_max_ver} BuildRequires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} @@ -88,12 +88,15 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(doctrine/deprecations) >= %{doctrine_dep_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_dep_max_ver}) Requires: (php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver}) # composer.json: optional and deprecated Suggests: php-composer(alcaeus/mongo-php-adapter) # missing option doctrine/mongodb-odm -# remirepo:4 +# remirepo:6 %else +Requires: php-composer(doctrine/deprecations) < %{doctrine_dep_max_ver} +Requires: php-composer(doctrine/deprecations) >= %{doctrine_dep_min_ver} Requires: php-composer(doctrine/persistence) < %{doctrine_pers_max_ver} Requires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} %endif @@ -122,7 +125,7 @@ Autoloader: %{phpdir}/Doctrine/Common/DataFixtures/autoload.php %build : Create autoloader -cat <<'AUTOLOAD' | tee lib/Doctrine/Common/DataFixtures/autoload.php +cat <<'AUTOLOAD' | tee src/autoload.php <?php /** * Autoloader for %{name} and its' dependencies @@ -133,6 +136,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Common\\DataFixtures\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/Doctrine/Deprecations/autoload.php', [ '%{phpdir}/Doctrine/Persistence3/autoload.php', '%{phpdir}/Doctrine/Persistence2/autoload.php', @@ -148,8 +152,8 @@ AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir} -cp -rp lib/* %{buildroot}%{phpdir}/ +mkdir -p %{buildroot}%{phpdir}/Doctrine/Common +cp -rp src %{buildroot}%{phpdir}/Doctrine/Common/DataFixtures %check @@ -158,9 +162,8 @@ cp -rp lib/* %{buildroot}%{phpdir}/ cat << 'BOOTSTRAP' | tee bootstrap.php <?php require_once '%{buildroot}%{phpdir}/Doctrine/Common/DataFixtures/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr0('Doctrine\\Tests\\', __DIR__.'/tests'); +\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Tests\\', __DIR__.'/tests'); \Fedora\Autoloader\Dependencies::required([ - '%{phpdir}/Doctrine/Deprecations/autoload.php', [ '%{phpdir}/Doctrine/DBAL3/autoload.php', '%{phpdir}/Doctrine/DBAL/autoload.php', @@ -170,7 +173,7 @@ require_once '%{buildroot}%{phpdir}/Doctrine/Common/DataFixtures/autoload.php'; BOOTSTRAP : ignore as doctrine/phpcr-odm not available -rm tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php +rm tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php : Upstream tests RETURN_CODE=0 @@ -196,6 +199,10 @@ exit $RETURN_CODE %changelog +* Fri Apr 7 2023 Remi Collet <remi@remirepo.net> - 1.6.5-1 +- update to 1.6.5 +- add dependency on doctrine/deprecations + * Mon Jan 9 2023 Remi Collet <remi@remirepo.net> - 1.6.3-1 - update to 1.6.3 |