Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,5 +1,4 @@
-/php-doctrine-collections-1.1-819871759a4d41dab244d358507bd27d0e8b1e33.tar.gz
-/php-doctrine-collections-1.2-b99c5c46c87126201899afe88ec490a25eedd6a2.tar.gz
-/php-doctrine-collections-1.3.0-6c1e4eef75f310ea1b3e30945e9f06e652128b8a.tar.gz
-/php-doctrine-collections-1.4.0-1a4fb7e902202c33cce8c55989b945612943c2ba.tar.gz
-/php-doctrine-collections-1.5.0-a01ee38fcd999f34d9bfbcee59dbda5105449cbf.tar.gz
+clog
+/php-doctrine-collections-1.7.2-3fe77330f5591108bbf1315da7377a7e704ed8a0.tar.gz
+/php-doctrine-collections-1.7.3-09dde3eb237756190f2de738d3c97cff10a8407b.tar.gz
+/php-doctrine-collections-1.8.0-2b44dd4cbca8b5744327de78bafef5945c7e7b5e.tar.gz

composer.json

@@ -0,0 +1,61 @@
+{
+    "name": "doctrine/collections",
+    "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
+    "license": "MIT",
+    "type": "library",
+    "keywords": [
+        "php",
+        "collections",
+        "array",
+        "iterators"
+    ],
+    "authors": [
+        {
+            "name": "Guilherme Blanco",
+            "email": "guilhermeblanco@gmail.com"
+        },
+        {
+            "name": "Roman Borschel",
+            "email": "roman@code-factory.org"
+        },
+        {
+            "name": "Benjamin Eberlei",
+            "email": "kontakt@beberlei.de"
+        },
+        {
+            "name": "Jonathan Wage",
+            "email": "jonwage@gmail.com"
+        },
+        {
+            "name": "Johannes Schmitt",
+            "email": "schmittjoh@gmail.com"
+        }
+    ],
+    "homepage": "https://www.doctrine-project.org/projects/collections.html",
+    "require": {
+        "php": "^7.1.3 || ^8.0",
+        "doctrine/deprecations": "^0.5.3 || ^1"
+    },
+    "require-dev": {
+        "doctrine/coding-standard": "^9.0 || ^10.0",
+        "phpstan/phpstan": "^1.4.8",
+        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5",
+        "vimeo/psalm": "^4.22"
+    },
+    "autoload": {
+        "psr-4": {
+            "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
+}

php-doctrine-collections.spec

@@ -1,7 +1,7 @@
 #
 # Fedora spec file for php-doctrine-collections
 #
-# Copyright (c) 2013-2017 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2013-2022 Shawn Iwinski, Remi Collet
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -11,26 +11,28 @@
 
 %global github_owner     doctrine
 %global github_name      collections
-%global github_version   1.5.0
-%global github_commit    a01ee38fcd999f34d9bfbcee59dbda5105449cbf
+%global github_version   1.8.0
+%global github_commit    2b44dd4cbca8b5744327de78bafef5945c7e7b5e
 
 %global composer_vendor  doctrine
 %global composer_project collections
 
-# "php": "^7.1"
-%global php_min_ver 7.1
+# "php": "^7.1.3 || ^8.0"
+%global php_min_ver 7.1.3
+# "doctrine/deprecations": "^0.5.3 || ^1"
+%global doctrine_depr_min_ver 1
+%global doctrine_depr_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}
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       8%{?github_release}%{?dist}
 Summary:       Collections abstraction library
 
-Group:         Development/Libraries
 License:       MIT
 URL:           https://github.com/%{github_owner}/%{github_name}
 
@@ -41,20 +43,23 @@ Source1:       %{name}-get-source.sh
 
 BuildArch:     noarch
 # Tests
-%if %{with_tests}
+%if %{with tests}
 ## composer.json
-BuildRequires: %{_bindir}/phpunit
+%global phpunit %{_bindir}/phpunit9
+BuildRequires: %{phpunit}
 BuildRequires: php(language) >= %{php_min_ver}
-## phpcompatinfo (computed from version 1.5.0)
+BuildRequires: (php-composer(doctrine/deprecations) >= %{doctrine_depr_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_depr_max_ver})
+## phpcompatinfo (computed from version 1.6.0)
 BuildRequires: php-pcre
 BuildRequires: php-spl
-# Autoloader
-BuildRequires: php-composer(fedora/autoloader)
 %endif
+# Autoloader
+BuildRequires: php-fedora-autoloader-devel
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 1.5.0)
+Requires:     (php-composer(doctrine/deprecations) >= %{doctrine_depr_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_depr_max_ver})
+# phpcompatinfo (computed from version 1.6.0)
 Requires:      php-pcre
 Requires:      php-spl
 # Autoloader
@@ -78,25 +83,24 @@ Autoloader: %{phpdir}/Doctrine/Common/Collections/autoload.php
 
 %build
 : Create autoloader
-cat <<'AUTOLOAD' | tee lib/Doctrine/Common/Collections/autoload.php
-<?php
-/**
- * Autoloader for %{name} and its' dependencies
- * (created by %{name}-%{version}-%{release}).
- */
-require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
+phpab --template fedora \
+      --output lib/Doctrine/Common/Collections/autoload.php \
+      lib/Doctrine/Common/Collections
 
-\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Common\\Collections\\', __DIR__);
+cat <<'AUTOLOAD' | tee -a lib/Doctrine/Common/Collections/autoload.php
+\Fedora\Autoloader\Dependencies::required([
+    '%{phpdir}/Doctrine/Deprecations/autoload.php',
+]);
 AUTOLOAD
 
 
 %install
-mkdir -p %{buildroot}%{phpdir}/Doctrine/Common
-cp -rp lib/Doctrine/Common/Collections %{buildroot}%{phpdir}/Doctrine/Common/
+mkdir -p %{buildroot}%{phpdir}
+cp -rp lib/* %{buildroot}%{phpdir}/
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Create tests bootstrap
 cat <<'BOOTSTRAP' | tee bootstrap.php
 <?php
@@ -105,22 +109,21 @@ require_once '%{buildroot}%{phpdir}/Doctrine/Common/Collections/autoload.php';
 BOOTSTRAP
 
 : Upstream tests
-RETURN_CODE=0
-PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" php72; do
-    if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
-        $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
-            || RETURN_CODE=1
+SCL_RETURN_CODE=0
+for CMD in "php %{phpunit}" php74 php80 php81 php82; do
+    if which $CMD; then
+        set $CMD
+        $1 ${2:-%{_bindir}/phpunit9} --verbose --bootstrap bootstrap.php \
+            || SCL_RETURN_CODE=1
     fi
 done
-exit $RETURN_CODE
+exit $SCL_RETURN_CODE
 %else
 : Tests skipped
 %endif
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
 %doc composer.json
@@ -130,6 +133,93 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 30 2022 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+
+* Mon Sep 26 2022 Remi Collet <remi@remirepo.net> - 1.7.3-1
+- update to 1.7.3
+
+* Fri Sep  9 2022 Remi Collet <remi@remirepo.net> - 1.7.2-1
+- update to 1.7.2
+- switch to classmap autoloader
+- add dependency on doctrine/deprecations
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Aug 11 2021 Remi Collet <remi@remirepo.net> - 1.6.8-1
+- update to 1.6.8
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 1.6.7-1
+- update to 1.6.7
+- add upstream patch for recent PHPUnit
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Remi Collet <remi@remirepo.net> - 1.6.6-1
+- update to 1.6.6
+
+* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 1.6.5-1
+- update to 1.6.5
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Nov 13 2019 Remi Collet <remi@remirepo.net> - 1.6.4-1
+- update to 1.6.4
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 11 2019 Remi Collet <remi@remirepo.net> - 1.6.2-1
+- update to 1.6.2
+
+* Tue Mar 26 2019 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- update to 1.6.1
+
+* Mon Mar 25 2019 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- update to 1.6.0
+- raise dependency on PHP 7.1.3
+- use PHPUnit 7 for test suite
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (php-doctrine-collections-1.5.0-a01ee38fcd999f34d9bfbcee59dbda5105449cbf.tar.gz) = 64ca9ed63ea7f819ba76e85e4ef48a31dd8094befd8e3c9347460dcd88a990c37f90032d2d31b68de40885857ff90fe48f480feb28f62e645c67872d8810b575
+SHA512 (php-doctrine-collections-1.8.0-2b44dd4cbca8b5744327de78bafef5945c7e7b5e.tar.gz) = c3595152e9e52ba66b280cb775f8ec5171cbd6f83de8abf1a8fe7efefa5d4fb31ea1aba18de5a99e9f14c0af7642ada89434a147db169205a124271de44ec582