summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--composer.json43
-rw-r--r--php-doctrine-datafixtures.spec137
3 files changed, 119 insertions, 63 deletions
diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
package-*.xml
*.tgz
+*.tar.bz2
*.tar.gz
*.tar.xz
*.tar.xz.asc
diff --git a/composer.json b/composer.json
index 028ff8f..1ca32fb 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": [
{
@@ -14,46 +14,47 @@
}
],
"require": {
- "php": "^7.2",
- "doctrine/common": "^2.11",
- "doctrine/persistence": "^1.3.3"
+ "php": "^7.2 || ^8.0",
+ "doctrine/deprecations": "^0.5.3 || ^1.0",
+ "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0"
},
"conflict": {
+ "doctrine/dbal": "<2.13",
+ "doctrine/orm": "<2.12",
"doctrine/phpcr-odm": "<1.3.0"
},
"require-dev": {
- "alcaeus/mongo-php-adapter": "^1.1",
- "doctrine/coding-standard": "^6.0",
- "doctrine/dbal": "^2.5.4",
- "doctrine/mongodb-odm": "^1.3.0",
- "doctrine/orm": "^2.7.0",
- "phpunit/phpunit": "^7.0"
+ "ext-sqlite3": "*",
+ "doctrine/coding-standard": "^11.0",
+ "doctrine/dbal": "^2.13 || ^3.0",
+ "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
+ "doctrine/orm": "^2.12",
+ "phpstan/phpstan": "^1.5",
+ "phpunit/phpunit": "^8.5 || ^9.5 || ^10.0",
+ "symfony/cache": "^5.0 || ^6.0",
+ "vimeo/psalm": "^4.10 || ^5.9"
},
"suggest": {
- "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7",
+ "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)",
"doctrine/mongodb-odm": "For loading MongoDB ODM fixtures",
"doctrine/orm": "For loading ORM fixtures",
"doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
},
"config": {
- "platform": {
- "ext-mongo": "1.6.16"
- },
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "1.4.x-dev"
+ "sort-packages": true,
+ "allow-plugins": {
+ "composer/package-versions-deprecated": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
}
},
"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 fa090ae..6117169 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-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2013-2023 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,33 +12,30 @@
%global github_owner doctrine
%global github_name data-fixtures
-%global github_version 1.4.2
-%global github_commit 39e9777c9089351a468f780b01cffa3cb0a42907
+%global github_version 1.6.5
+%global github_commit e6b97f557942ea17564bbc30ae3ebc9bd2209363
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global composer_vendor doctrine
%global composer_project data-fixtures
-# "php": "^7.2"
+# "php": "^7.2 || ^8.0"
%global php_min_ver 7.2
-# "doctrine/common": "~2.11"
-%global doctrine_common_min_ver 2.11
-%global doctrine_common_max_ver 3.0
-# "doctrine/orm": "^2.7.0"
-%global doctrine_orm_min_ver 2.7.0
+# "doctrine/orm": "^2.12"
+%global doctrine_orm_min_ver 2.12
%global doctrine_orm_max_ver 3.0
-# "doctrine/dbal": "^2.5.4"
-%global doctrine_dbal_min_ver 2.5.4
-%global doctrine_dbal_max_ver 3.0
-# "doctrine/persistence": "^1.3.3"
+# "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|^3.0"
%global doctrine_pers_min_ver 1.3.3
-%global doctrine_pers_max_ver 2
-# "alcaeus/mongo-php-adapter": "^1.1"
-%global alcaeus_mongo_min_ver 1.1
-%global alcaeus_mongo_max_ver 2
+%global doctrine_pers_max_ver 4
+# "doctrine/deprecations": "^1.0",
+%global doctrine_dep_min_ver 1.0
+%global doctrine_dep_max_ver 2
# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
%{!?phpdir: %global phpdir %{_datadir}/php}
@@ -55,29 +52,30 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
-%if %{with_tests}
+%if %{with tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
+BuildRequires: php-sqlite3
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:(php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
BuildRequires:(php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} with php-composer(doctrine/orm) < %{doctrine_orm_max_ver})
BuildRequires:(php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} with php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver})
+BuildRequires:(php-composer(doctrine/deprecations) >= %{doctrine_dep_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_dep_max_ver})
BuildRequires:(php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
-BuildRequires:(php-composer(alcaeus/mongo-php-adapter) >= %{alcaeus_mongo_min_ver} with php-composer(alcaeus/mongo-php-adapter) < %{alcaeus_mongo_max_ver})
-# missing doctrine/mongodb-odm
+# missing doctrine/mongodb-odm ^1.3.0 || ^2.0.0
+# remirepo:10
%else
-BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver}
-BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver}
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_min_ver}
BuildRequires: php-composer(doctrine/persistence) < %{doctrine_pers_max_ver}
BuildRequires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver}
-BuildRequires: php-composer(alcaeus/mongo-php-adapter) < %{alcaeus_mongo_max_ver}
-BuildRequires: php-composer(alcaeus/mongo-php-adapter) >= %{alcaeus_mongo_min_ver}
%endif
-BuildRequires: phpunit7
+BuildRequires: php-symfony4-cache
+BuildRequires: phpunit9
## phpcompatinfo (computed from version 1.0.2)
BuildRequires: php-json
BuildRequires: php-reflection
@@ -88,15 +86,17 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
+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
+# composer.json: optional and deprecated
Suggests: php-composer(alcaeus/mongo-php-adapter)
# missing option doctrine/mongodb-odm
+# remirepo:6
%else
-Requires: php-composer(doctrine/common) < %{doctrine_common_max_ver}
-Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver}
+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
@@ -125,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
@@ -136,8 +136,12 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Common\\DataFixtures\\', __DIR__);
\Fedora\Autoloader\Dependencies::required([
- '%{phpdir}/Doctrine/Common/autoload.php',
- '%{phpdir}/Doctrine/Persistence/autoload.php',
+ '%{phpdir}/Doctrine/Deprecations/autoload.php',
+ [
+ '%{phpdir}/Doctrine/Persistence3/autoload.php',
+ '%{phpdir}/Doctrine/Persistence2/autoload.php',
+ '%{phpdir}/Doctrine/Persistence/autoload.php',
+ ]
]);
\Fedora\Autoloader\Dependencies::optional([
@@ -148,27 +152,34 @@ 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
-%if %{with_tests}
+%if %{with tests}
: Create tests bootstrap
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/DBAL3/autoload.php',
+ '%{phpdir}/Doctrine/DBAL/autoload.php',
+ ],
+ '%{phpdir}/Symfony4/Component/Cache/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
-for PHP_EXEC in "" php71 php72 php73 php74; do
+for PHP_EXEC in "" php80 php81 php82; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
- $PHP_EXEC %{_bindir}/phpunit7 --verbose --bootstrap bootstrap.php \
+ $PHP_EXEC %{_bindir}/phpunit9 --verbose --bootstrap bootstrap.php \
|| RETURN_CODE=1
fi
done
@@ -179,15 +190,57 @@ exit $RETURN_CODE
%files
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
-%doc UPGRADE
%doc composer.json
%{phpdir}/Doctrine/Common/DataFixtures
%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
+
+* Fri Jan 6 2023 Remi Collet <remi@remirepo.net> - 1.6.2-1
+- update to 1.6.2
+
+* Tue Jan 3 2023 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- update to 1.6.1
+- drop dependency on doctrine/common
+
+* Tue Jan 3 2023 Remi Collet <remi@remirepo.net> - 1.5.4-1
+- update to 1.5.4
+
+* 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
+
+* 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
+ https://github.com/doctrine/data-fixtures/pull/370
+
+* Mon Jan 25 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+
+* Tue Sep 1 2020 Remi Collet <remi@remirepo.net> - 1.4.4-1
+- update to 1.4.4
+- raise dependency on doctrine/common 2.13 and allow v3
+- allow doctrine/persistence v2
+
+* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 1.4.3-1
+- update to 1.4.3 (no change)
+
* Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 1.4.2-1
- update to 1.4.2
generated by cgit (git 2.34.1) at 2024-04-26 21:37:35 +0000