diff --git a/.gitignore b/.gitignore index b34252a..58ca6a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -clog -/php-webmozart-assert-1.11.0-11cb2199493b2f8a3b53e7f19068fc6aac760991.tar.gz -/php-webmozart-assert-1.12.0-541057574806f942c94662b817a50f63f7345360.tar.gz -/php-webmozart-assert-1.12.1-9be6926d8b485f55b9229203f962b51ed377ba68.tar.gz +/php-webmozart-assert-1.1.0-bb2d123231c095735130cc8f6d31385a44c7b308.tar.gz +/php-webmozart-assert-1.2.0-2db61e59ff05fe5126d152bd0655c9ea113e550f.tar.gz +/php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz +/php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz +/php-webmozart-assert-1.7.0-aed98a490f9a8f78468232db345ab9cf606cf598.tar.gz +/php-webmozart-assert-1.9.1-bafc69caeb4d49c39fd0779086c03a3738cbb389.tar.gz diff --git a/composer.json b/composer.json index b340452..2e609b6 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,12 @@ { "name": "webmozart/assert", "description": "Assertions to validate method input/output with nice error messages.", - "license": "MIT", "keywords": [ "assert", "check", "validate" ], + "license": "MIT", "authors": [ { "name": "Bernhard Schussek", @@ -14,15 +14,15 @@ } ], "require": { - "php": "^7.2 || ^8.0", - "ext-ctype": "*" + "php": "^5.3.3 || ^7.0 || ^8.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "phpunit/phpunit": "^8.5.13" + "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" + "vimeo/psalm": "<3.9.1", + "phpstan/phpstan": "<0.12.20" }, "autoload": { "psr-4": { @@ -34,10 +34,5 @@ "Webmozart\\Assert\\Tests\\": "tests/", "Webmozart\\Assert\\Bin\\": "bin/src" } - }, - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } } } diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 0616422..1e5d0aa 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-webmozart-assert # -# Copyright (c) 2016-2025 Shawn Iwinski +# Copyright (c) 2016-2020 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -13,18 +13,23 @@ %global bootstrap 0 %global github_owner webmozart %global github_name assert -%global github_version 1.12.1 -%global github_commit 9be6926d8b485f55b9229203f962b51ed377ba68 +%global github_version 1.9.1 +%global github_commit bafc69caeb4d49c39fd0779086c03a3738cbb389 %global composer_vendor webmozart %global composer_project assert -# "php": "^7.2 || ^8.0" -%global php_min_ver 7.2 +# "php": "^5.3.3 || ^7.0 || ^8.0" +%global php_min_ver 5.3.3 # PHPUnit -%global phpunit_require phpunit8 -%global phpunit_exec phpunit8 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +%global phpunit_require phpunit7 +%global phpunit_exec phpunit7 +%else +%global phpunit_require php-composer(phpunit/phpunit) +%global phpunit_exec phpunit +%endif %if %{bootstrap} # Build using "--with tests" to enable tests @@ -54,20 +59,27 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-ctype BuildRequires: %{phpunit_require} ## phpcompatinfo (computed from version 1.7.0) +BuildRequires: php-ctype +BuildRequires: php-filter BuildRequires: php-mbstring +BuildRequires: php-pcre +BuildRequires: php-reflection BuildRequires: php-simplexml +BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-ctype # phpcompatinfo (computed from version 1.7.0) +Requires: php-ctype +Requires: php-filter Requires: php-mbstring +Requires: php-pcre +Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -119,7 +131,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which %{phpunit_exec}) -for PHP_EXEC in php81 php82 php83 php84 php85; do +for PHP_EXEC in php %{?rhel:php54 php55 php56 php70 php71 php72} php73 php74 php80; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC \ -d auto_prepend_file=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php \ @@ -135,6 +147,7 @@ exit $RETURN_CODE %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json @@ -143,56 +156,6 @@ exit $RETURN_CODE %changelog -* Thu Oct 30 2025 Remi Collet - 1.12.1-1 -- update to 1.12.1 (no change) - -* Tue Oct 21 2025 Remi Collet - 1.12.0-1 -- update to 1.12.0 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.11.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.11.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.11.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.11.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.11.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Aug 8 2022 Remi Collet - 1.11.0-1 -- update to 1.11.0 -- raise dependency on PHP 7.2 -- switch to phpunit8 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Sep 24 2021 Remi Collet - 1.10.0-1 -- update to 1.10.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Tue Jul 21 2020 Remi Collet - 1.9.1-1 - update to 1.9.1 (RHBZ #1825544) diff --git a/sources b/sources index dc7d3b2..13ddbd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.12.1-9be6926d8b485f55b9229203f962b51ed377ba68.tar.gz) = 1d8732643dd50272fbce65adee8fb6511f034021ad9d14e40d437dbb181368934cf4f5f552ae41e4e48a99cd23d570070d00d64a7702eefb578e1cbd38253edc +SHA512 (php-webmozart-assert-1.9.1-bafc69caeb4d49c39fd0779086c03a3738cbb389.tar.gz) = 600a0c861436900ba397a87ae4aeadc0f3ebb17e0e2fc659f0bd229b224bff259fb144b5fb85af965541b6e76956d9f52471f521540f7243a7605212da504437