From 9c310860f50fcf4552d3788846d0f253e2e77651 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Nov 2024 10:19:37 +0100 Subject: [PATCH 1/2] v1.12.1 (cherry picked from commit 44e2237a29594eba62bd8641e1e8af66962b6e21) --- .gitignore | 1 + php-myclabs-deep-copy.spec | 28 ++++++++++++++-------------- sources | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 77f505d..d749b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-myclabs-deep-copy-1.11.0-14daed4.tgz /php-myclabs-deep-copy-1.11.1-7284c22.tgz /php-myclabs-deep-copy-1.12.0-3a6b9a4.tgz +/php-myclabs-deep-copy-1.12.1-123267b.tgz diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec index 9eef182..e2787af 100644 --- a/php-myclabs-deep-copy.spec +++ b/php-myclabs-deep-copy.spec @@ -6,14 +6,9 @@ # # Please, preserve the changelog entries # -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 -# Disabled as missing doctrine packages -%bcond_with tests -%else %bcond_without tests -%endif -%global gh_commit 3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c +%global gh_commit 123267b2c49fbf30d78a7b2d333f6be754b94845 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project DeepCopy @@ -22,8 +17,8 @@ %global php_home %{_datadir}/php Name: php-myclabs-deep-copy%{major} -Version: 1.12.0 -Release: 2%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: Create deep copies (clones) of your objects @@ -44,8 +39,6 @@ BuildRequires: php-spl # "doctrine/common": "^2.13.3 || ^3.2.2", # "phpspec/prophecy": "^1.10", # "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" -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) BuildRequires: (php-composer(phpspec/prophecy) >= 1.10 with php-composer(phpspec/prophecy) < 2) BuildRequires: phpunit9 >= 9.5.13 %endif @@ -96,17 +89,21 @@ 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/'); \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/Doctrine/Common/Collections/autoload.php', - '%{php_home}/Doctrine/Common3/autoload.php', '%{php_home}/Prophecy/autoload.php', ]); EOF +# disable doctrine related tests +rm -r tests/DeepCopyTest/Matcher/Doctrine \ + tests/DeepCopyTest/Filter/Doctrine + ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then $cmd -d auto_prepend_file=vendor/autoload.php \ - %{_bindir}/phpunit9 --verbose || ret=1 + %{_bindir}/phpunit9 \ + --filter '^((?!(test_it_can_apply_two_filters_with_chainable_filter|test_it_can_copy_property_after_applying_doctrine_proxy_filter_with_chainable_filter)).)*$' \ + --verbose || ret=1 fi done exit $ret @@ -123,6 +120,9 @@ exit $ret %changelog +* Tue Nov 12 2024 Remi Collet - 1.12.1-1 +- update to 1.12.1 + * Thu Jun 13 2024 Remi Collet - 1.12.0-2 - update to 1.12.0 - disable test suite diff --git a/sources b/sources index 36b5cab..de3ea4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-deep-copy-1.12.0-3a6b9a4.tgz) = 1dfcf3191276d042af46cd9e95dc6d0293e7889be54cceb7757cdce6b4440e2f52d2277cc45ac8ad1ab3e4650c87e5c049cc138b942cb498b7b7359a3cd2f9a4 +SHA512 (php-myclabs-deep-copy-1.12.1-123267b.tgz) = bebe1e171e4924f76ef0bac091e79188ddf0e989c682212cc309c3c2700339cf1e12837bc3ba6673c2d5f47217250af7c719a2bca0f61ab64378715c9483383c From ca256aee82708e28f4c1478a6a6b9da36138b8b9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Feb 2025 14:52:04 +0100 Subject: [PATCH 2/2] update to 1.13.0 re-license spec file to CECILL-2.1 (cherry picked from commit 40bcd6b0e9271c7ca488907a8fa26d7413a96272) (cherry picked from commit ceb5619cdec9aba9135e9d232a7021d9c267c282) --- .gitignore | 1 + php-myclabs-deep-copy.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d749b7e..57876e6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /php-myclabs-deep-copy-1.11.1-7284c22.tgz /php-myclabs-deep-copy-1.12.0-3a6b9a4.tgz /php-myclabs-deep-copy-1.12.1-123267b.tgz +/php-myclabs-deep-copy-1.13.0-024473a.tgz diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec index e2787af..9c94e6b 100644 --- a/php-myclabs-deep-copy.spec +++ b/php-myclabs-deep-copy.spec @@ -1,14 +1,14 @@ # remirepo/fedora spec file for php-myclabs-deep-copy # -# Copyright (c) 2015-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2015-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests -%global gh_commit 123267b2c49fbf30d78a7b2d333f6be754b94845 +%global gh_commit 024473a478be9df5fdaca2c793f2232fe788e414 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project DeepCopy @@ -17,7 +17,7 @@ %global php_home %{_datadir}/php Name: php-myclabs-deep-copy%{major} -Version: 1.12.1 +Version: 1.13.0 Release: 1%{?dist} Summary: Create deep copies (clones) of your objects @@ -120,6 +120,10 @@ exit $ret %changelog +* Wed Feb 12 2025 Remi Collet - 1.13.0-1 +- update to 1.13.0 +- re-license spec file to CECILL-2.1 + * Tue Nov 12 2024 Remi Collet - 1.12.1-1 - update to 1.12.1 diff --git a/sources b/sources index de3ea4d..b4ae1d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-deep-copy-1.12.1-123267b.tgz) = bebe1e171e4924f76ef0bac091e79188ddf0e989c682212cc309c3c2700339cf1e12837bc3ba6673c2d5f47217250af7c719a2bca0f61ab64378715c9483383c +SHA512 (php-myclabs-deep-copy-1.13.0-024473a.tgz) = 7a4bda4f37ee0f90f047458e6b16e7ed7a99114791da1c8cc9e08585915f0aeb505caf96384b1fa4c011e812c4608f38ed9cd4d6edfe684dc50467d02179334b