diff --git a/.gitignore b/.gitignore index a38f8d3..769b661 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +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 -/php-doctrine-collections-1.6.0-acc35813077be497dc7f658af76729fa456444e3.tar.gz -/php-doctrine-collections-1.6.1-d2ae4ef05e25197343b6a39bae1d3c427a2f6956.tar.gz -/php-doctrine-collections-1.6.2-c5e0bc17b1620e97c968ac409acbff28b8b850be.tar.gz -/php-doctrine-collections-1.6.4-6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7.tar.gz -/php-doctrine-collections-1.6.5-fc0206348e17e530d09463fef07ba8968406cd6d.tar.gz -/php-doctrine-collections-1.6.6-5f0470363ff042d0057006ae7acabc5d7b5252d5.tar.gz -/php-doctrine-collections-1.6.7-55f8b799269a1a472457bd1a41b4f379d4cfba4a.tar.gz -/php-doctrine-collections-1.6.8-1958a744696c6bb3bb0d28db2611dc11610e78af.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 diff --git a/composer.json b/composer.json index 9a6494e..d9422dd 100644 --- a/composer.json +++ b/composer.json @@ -1,37 +1,61 @@ { "name": "doctrine/collections", - "type": "library", "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.", + "license": "MIT", + "type": "library", "keywords": [ "php", "collections", "array", "iterators" ], - "homepage": "https://www.doctrine-project.org/projects/collections.html", - "license": "MIT", "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"} + { + "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" + "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", - "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "^0.12", - "vimeo/psalm": "^4.2.1" + "vimeo/psalm": "^4.22" }, "autoload": { - "psr-4": { "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" } + "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 + } } } diff --git a/php-doctrine-collections.spec b/php-doctrine-collections.spec index 4cf21d0..748b4e0 100644 --- a/php-doctrine-collections.spec +++ b/php-doctrine-collections.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-doctrine-collections # -# Copyright (c) 2013-2020 Shawn Iwinski +# Copyright (c) 2013-2022 Shawn Iwinski, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -11,14 +11,17 @@ %global github_owner doctrine %global github_name collections -%global github_version 1.6.8 -%global github_commit 1958a744696c6bb3bb0d28db2611dc11610e78af +%global github_version 1.8.0 +%global github_commit 2b44dd4cbca8b5744327de78bafef5945c7e7b5e %global composer_vendor doctrine %global composer_project collections # "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 %bcond_without tests @@ -27,7 +30,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 8%{?github_release}%{?dist} Summary: Collections abstraction library License: MIT @@ -45,15 +48,17 @@ BuildArch: noarch %global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} BuildRequires: php(language) >= %{php_min_ver} +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} +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 @@ -78,15 +83,14 @@ Autoloader: %{phpdir}/Doctrine/Common/Collections/autoload.php %build : Create autoloader -cat <<'AUTOLOAD' | tee lib/Doctrine/Common/Collections/autoload.php - - 1.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 1.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 1.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Sep 30 2022 Remi Collet - 1.8.0-1 +- update to 1.8.0 + +* Mon Sep 26 2022 Remi Collet - 1.7.3-1 +- update to 1.7.3 + +* Fri Sep 9 2022 Remi Collet - 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 - 1.6.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Aug 11 2021 Remi Collet - 1.6.8-1 - update to 1.6.8 diff --git a/sources b/sources index c8081c4..dd219f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-collections-1.6.8-1958a744696c6bb3bb0d28db2611dc11610e78af.tar.gz) = a4b3e4bc7103c1e5ea91e03b7b2164d6d2bc91e24145e3d23c71115b0ee15833b0ecb7ede43558901af5c99c42d1cc76da14440b94faff877141c1ebe3e895b8 +SHA512 (php-doctrine-collections-1.8.0-2b44dd4cbca8b5744327de78bafef5945c7e7b5e.tar.gz) = c3595152e9e52ba66b280cb775f8ec5171cbd6f83de8abf1a8fe7efefa5d4fb31ea1aba18de5a99e9f14c0af7642ada89434a147db169205a124271de44ec582