diff --git a/.gitignore b/.gitignore index d660691..96c463e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,17 @@ /php-swaggest-json-schema-0.12.24-395a9f6.tgz /php-swaggest-json-schema-0.12.25-0f50979.tgz /php-swaggest-json-schema-0.12.28-6f57c0d.tgz +/php-swaggest-json-schema-0.12.29-7564d4a.tgz +/php-swaggest-json-schema-0.12.30-4aca4f5.tgz +/php-swaggest-json-schema-0.12.31-a4adcdb.tgz +/php-swaggest-json-schema-0.12.32-f92567a.tgz +/php-swaggest-json-schema-0.12.33-87919a4.tgz +/php-swaggest-json-schema-0.12.34-ec90855.tgz +/php-swaggest-json-schema-0.12.35-d0126bd.tgz +/php-swaggest-json-schema-0.12.36-cbdf1d9.tgz +/php-swaggest-json-schema-0.12.37-1d7cce2.tgz +/php-swaggest-json-schema-0.12.38-ab7cca1.tgz +/php-swaggest-json-schema-0.12.39-193ba39.tgz +/php-swaggest-json-schema-0.12.41-1bb9790.tgz +/php-swaggest-json-schema-0.12.42-d23adb5.tgz +/php-swaggest-json-schema-0.12.43-1f3a77a.tgz diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index 1d68843..ee926cc 100644 --- a/php-swaggest-json-schema.spec +++ b/php-swaggest-json-schema.spec @@ -1,15 +1,16 @@ # remirepo/fedora spec file for php-swaggest-json-schema # -# Copyright (c) 2019-2020 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2019-2024 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests + # Github -%global gh_commit 6f57c0d80e246c2868accaab5c550cd470a5537f +%global gh_commit 1f3a77a382c5d273a0f1fe34be3b8af4060a88cd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project php-json-schema @@ -22,8 +23,8 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 0.12.28 -Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Version: 0.12.43 +Release: 3%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: High definition PHP structures with JSON-schema based validation License: MIT @@ -32,25 +33,18 @@ Source0: %{name}-%{version}-%{?gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} -BuildRequires: php(language) >= 5.4 +%if %{with tests} +BuildRequires: php(language) >= 7.1 BuildRequires: php-json BuildRequires: php-mbstring -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(phplang/scope-exit) > 1.0 with php-composer(phplang/scope-exit) < 2) -BuildRequires: (php-composer(swaggest/json-diff) > 3.5.1 with php-composer(swaggest/json-diff) < 4) -%else -BuildRequires: php-composer(phplang/scope-exit) < 2 -BuildRequires: php-composer(phplang/scope-exit) >= 1.0 -BuildRequires: php-composer(swaggest/json-diff) < 4 -BuildRequires: php-composer(swaggest/json-diff) >= 3.5.1 -%endif +BuildRequires: (php-composer(phplang/scope-exit) >= 1.0 with php-composer(phplang/scope-exit) < 2) +BuildRequires: (php-composer(swaggest/json-diff) >= 3.8.2 with php-composer(swaggest/json-diff) < 4) # For tests, from composer.json "require-dev": { -# "phpunit/phpunit": "^4.8.23", -# "phpunit/php-code-coverage": "2.2.4", +# "phpunit/phpunit": "^5", +# "phpunit/php-code-coverage": "^4", # "codeclimate/php-test-reporter": "^0.4.0" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8.23 -%global phpunit %{_bindir}/phpunit +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 BuildRequires: php-date BuildRequires: php-filter BuildRequires: php-pcre @@ -60,23 +54,17 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": ">=5.4", +# "php": ">=7.1", # "ext-json": "*", # "ext-mbstring": "*", # "phplang/scope-exit": "^1.0", -# "swaggest/json-diff": "^3.5.1" -Requires: php(language) >= 5.4 +# "swaggest/json-diff": "^3.8.2", +# "symfony/polyfill-mbstring": "^1.19" +Requires: php(language) >= 7.1 Requires: php-json Requires: php-mbstring -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phplang/scope-exit) > 1.0 with php-composer(phplang/scope-exit) < 2) -Requires: (php-composer(swaggest/json-diff) > 3.5.1 with php-composer(swaggest/json-diff) < 4) -%else -Requires: php-composer(phplang/scope-exit) < 2 -Requires: php-composer(phplang/scope-exit) >= 1.0 -Requires: php-composer(swaggest/json-diff) < 4 -Requires: php-composer(swaggest/json-diff) >= 3.5.1 -%endif +Requires: (php-composer(phplang/scope-exit) >= 1.0 with php-composer(phplang/scope-exit) < 2) +Requires: (php-composer(swaggest/json-diff) >= 3.8.2 with php-composer(swaggest/json-diff) < 4) # From phpcompatinfo report for 0.12.17 Requires: php-date Requires: php-filter @@ -123,18 +111,34 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %check -%if %{with_tests} +%if %{with tests} mkdir vendor cat << 'EOF' | tee vendor/autoload.php expectException($e); + if ($m) $this->expectExceptionMessage($m); + } +} EOF +# For phpunit9 +sed -e '/setUp()/s/$/:void/' \ + -i tests/src/PHPUnit/Example/ExampleTest.php + +# Skip online tests: testInvalid, testValidate +# Skip because of phpunit9: testPatternPropertiesMismatch ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then - $cmd %{phpunit} --no-coverage --verbose || ret=1 + $cmd %{phpunit} \ + --no-coverage \ + --filter '^((?!(SwaggerTest::testInvalid|SwaggerTest::testValidate|testPatternPropertiesMismatch)).)*$' \ + || ret=1 fi done exit $ret @@ -152,6 +156,93 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.12.43-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 0.12.43-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Dec 23 2024 Remi Collet - 0.12.43-1 +- update to 0.12.43 +- re-license spec file to CECILL-2.1 +- raise dependency on PHP 7.1 + +* Fri Jul 19 2024 Fedora Release Engineering - 0.12.42-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.12.42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.12.42-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Oct 6 2023 Remi Collet - 0.12.42-2 +- switch to phpunit9 + +* Wed Sep 13 2023 Remi Collet - 0.12.42-1 +- update to 0.12.42 + +* Fri Jul 21 2023 Fedora Release Engineering - 0.12.41-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 0.12.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Aug 18 2022 Remi Collet - 0.12.41-1 +- update to 0.12.41 + +* Fri Jul 22 2022 Fedora Release Engineering - 0.12.39-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 0.12.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 18 2021 Remi Collet - 0.12.39-1 +- update to 0.12.39 (no change) + +* Wed Sep 22 2021 Remi Collet - 0.12.38-1 +- update to 0.12.38 +- raise dependency on swaggest/json-diff 3.8.2 + +* Thu Sep 2 2021 Remi Collet - 0.12.37-1 +- update to 0.12.37 + +* Fri Jul 23 2021 Fedora Release Engineering - 0.12.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 19 2021 Remi Collet - 0.12.36-1 +- update to 0.12.36 + +* Fri Jun 18 2021 Remi Collet - 0.12.35-1 +- update to 0.12.35 + +* Thu Jun 17 2021 Remi Collet - 0.12.34-1 +- update to 0.12.34 + +* Mon May 31 2021 Remi Collet - 0.12.33-1 +- update to 0.12.33 + +* Mon May 17 2021 Remi Collet - 0.12.32-1 +- update to 0.12.32 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.12.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Sep 21 2020 Remi Collet - 0.12.31-1 +- update to 0.12.31 + +* Thu Sep 10 2020 Remi Collet - 0.12.30-1 +- update to 0.12.30 + +* Tue Jul 28 2020 Fedora Release Engineering - 0.12.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Mar 19 2020 Remi Collet - 0.12.29-1 +- update to 0.12.29 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.12.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 27 2020 Remi Collet - 0.12.28-1 - update to 0.12.28 diff --git a/sources b/sources index 6a12d8d..b9268ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.28-6f57c0d.tgz) = 24ef1b9cf3aec751ac26bcf87e3e32d501bf99f0eb35d294ceb4a94c0ad90badd4b803dc131b8cbc73e022caab78e5fdac4ecf79aa4c871e6f67d04457ee1fbb +SHA512 (php-swaggest-json-schema-0.12.43-1f3a77a.tgz) = fc1961dfb66d289af17ad602fd01edebb0d9647c28a93203c931a9290eb56eb9e5cdc764878d2e267a4940fbe2d0f9295c375236c184ca15b49d843a7a327969