summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--composer.json36
-rw-r--r--php-myclabs-deep-copy.spec81
3 files changed, 74 insertions, 45 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 4108a23..66fb34a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,27 @@
{
"name": "myclabs/deep-copy",
- "type": "library",
"description": "Create deep copies (clones) of your objects",
- "keywords": ["clone", "copy", "duplicate", "object", "object graph"],
"license": "MIT",
-
+ "type": "library",
+ "keywords": [
+ "clone",
+ "copy",
+ "duplicate",
+ "object",
+ "object graph"
+ ],
+ "require": {
+ "php": "^7.1 || ^8.0"
+ },
+ "require-dev": {
+ "doctrine/collections": "^1.6.8",
+ "doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+ },
+ "conflict": {
+ "doctrine/collections": "<1.6.8",
+ "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ },
"autoload": {
"psr-4": {
"DeepCopy\\": "src/DeepCopy/"
@@ -19,19 +36,6 @@
"DeepCopyTest\\": "tests/DeepCopyTest/"
}
},
-
- "require": {
- "php": "^7.1"
- },
- "require-dev": {
- "doctrine/collections": "^1.0",
- "doctrine/common": "^2.6",
- "phpunit/phpunit": "^7.1"
- },
- "replace": {
- "myclabs/deep-copy": "self.version"
- },
-
"config": {
"sort-packages": true
}
diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec
index 8aa0c43..114e34e 100644
--- a/php-myclabs-deep-copy.spec
+++ b/php-myclabs-deep-copy.spec
@@ -1,27 +1,22 @@
# remirepo/fedora spec file for php-myclabs-deep-copy
#
-# Copyright (c) 2015-2019 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2015-2023 Remi Collet
+# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 579bb7356d91f9456ccd505f24ca8b667966a0a7
+%global gh_commit 7284c22080590fb39f2ffa3e9057f10a4ddd0e0c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner myclabs
%global gh_project DeepCopy
%global c_project deep-copy
%global major %nil
%global php_home %{_datadir}/php
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
-# remirepo:4
-%if 0%{?fedora} < 26 && 0%{?rhel} < 8
-%global major 19
-%global with_tests 0
-%endif
Name: php-myclabs-deep-copy%{major}
-Version: 1.9.4
+Version: 1.11.1
Release: 1%{?dist}
Summary: Create deep copies (clones) of your objects
@@ -34,33 +29,31 @@ Source1: makesrc.sh
Source2: php-myclabs-deep-copy-autoload.php
BuildArch: noarch
-%if %{with_tests}
+%if %{with tests}
# For tests
BuildRequires: php(language) >= 7.1
BuildRequires: php-reflection
BuildRequires: php-spl
# From composer.json, "require-dev": {
-# "doctrine/collections": "^1.0",
-# "doctrine/common": "^2.6",
-# "phpunit/phpunit": "^7.1"
+# "doctrine/collections": "^1.6.8",
+# "doctrine/common": "^2.13.3 || ^3.2.2",
+# "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/collections) >= 1.0 with php-composer(doctrine/collections) < 2)
-BuildRequires: (php-composer(doctrine/common) >= 2.6 with php-composer(doctrine/common) < 3)
-# remirepo:6
+BuildRequires: (php-composer(doctrine/collections) >= 1.6.8 with php-composer(doctrine/collections) < 2)
+BuildRequires: (php-composer(doctrine/common) >= 3.2.2 with php-composer(doctrine/common) < 4)
+# remirepo:4
%else
-BuildRequires: php-composer(doctrine/collections) < 2
-BuildRequires: php-composer(doctrine/collections) >= 1.0
-BuildRequires: php-composer(doctrine/common) < 3
-BuildRequires: php-composer(doctrine/common) >= 2.6
+BuildRequires: php-doctrine-collections >= 1.6.8
+BuildRequires: php-doctrine-common3 >= 3.2.2
%endif
-BuildRequires: phpunit7 >= 7.1
+BuildRequires: phpunit9 >= 9.5.13
# Required by autoloader
BuildRequires: php-composer(fedora/autoloader)
%endif
# From composer.json, "require": {
-# "php": "^7.1"
+# "php": "^7.1 || ^8.0"
Requires: php(language) >= 7.1
# From phpcompatinfo report for version 1.8.0
Requires: php-reflection
@@ -68,6 +61,9 @@ Requires: php-date
Requires: php-spl
# Required by autoloader
Requires: php-composer(fedora/autoloader)
+# remirepo:2
+Obsoletes: php-myclabs-deep-copy19 < 1.10
+Provides: php-myclabs-deep-copy19 = %{version}
Provides: php-composer(%{gh_owner}/%{c_project}) = %{version}
@@ -94,22 +90,24 @@ cp -pr src/%{gh_project} %{buildroot}%{php_home}/%{gh_project}%{major}
%check
-%if %{with_tests}
+%if %{with tests}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
require '%{buildroot}%{php_home}/%{gh_project}%{major}/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('DeepCopy\\', dirname(__DIR__).'/fixtures/');
\Fedora\Autoloader\Autoload::addPsr4('DeepCopyTest\\', dirname(__DIR__).'/tests/DeepCopyTest/');
-require_once '%{php_home}/Doctrine/Common/Collections/autoload.php';
-require_once '%{php_home}/Doctrine/Common/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+ '%{php_home}/Doctrine/Common/Collections/autoload.php',
+ '%{php_home}/Doctrine/Common3/autoload.php',
+]);
EOF
ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php80 php81 php82; do
if which $cmd; then
- $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{gh_project}%{major}/autoload.php \
- %{_bindir}/phpunit7 --verbose || ret=1
+ $cmd -d auto_prepend_file=vendor/autoload.php \
+ %{_bindir}/phpunit9 --verbose || ret=1
fi
done
exit $ret
@@ -128,6 +126,31 @@ exit $ret
%changelog
+* Wed Mar 8 2023 Remi Collet <remi@remirepo.net> - 1.11.1-1
+- update to 1.11.1
+
+* Thu Mar 3 2022 Remi Collet <remi@remirepo.net> - 1.11.0-1
+- update to 1.11.0
+
+* Thu Mar 3 2022 Remi Collet <remi@remirepo.net> - 1.10.3-1
+- update to 1.10.3
+- switch to phpunit9 and doctrine/common v3
+
+* Sat Nov 14 2020 Remi Collet <remi@remirepo.net> - 1.10.2-1
+- update to 1.10.2
+
+* Tue Jun 30 2020 Remi Collet <remi@remirepo.net> - 1.10.1-1
+- update to 1.10.1
+
+* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 1.10.0-2
+- update to 1.10.0 (no change)
+
+* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 1.10.0-1
+- update to 1.10.0 (no change)
+
+* Mon Jan 20 2020 Remi Collet <remi@remirepo.net> - 1.9.5-1
+- update to 1.9.5
+
* Mon Dec 16 2019 Remi Collet <remi@remirepo.net> - 1.9.4-1
- update to 1.9.4
generated by cgit (git 2.34.1) at 2024-04-18 12:17:10 +0000