From fee4d71fdf4f8e210706d96e1e6d47ab59cc1f98 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 09:41:36 +0200 Subject: [PATCH 1/6] v0.12.32 (cherry picked from commit 36813b3d1dd80cbbc0cf38a0eef7624eca370711) --- .gitignore | 1 + php-swaggest-json-schema.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 38e860f..354984f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /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 diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index 36a4596..35de389 100644 --- a/php-swaggest-json-schema.spec +++ b/php-swaggest-json-schema.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-swaggest-json-schema # -# Copyright (c) 2019-2020 Remi Collet +# Copyright (c) 2019-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit a4adcdbb38f38a19d3f1801150822172cf1c4853 +%global gh_commit f92567a1f4fcb0296758b471654171acfdb6031b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project php-json-schema @@ -23,7 +23,7 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 0.12.31 +Version: 0.12.32 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: High definition PHP structures with JSON-schema based validation @@ -45,10 +45,10 @@ BuildRequires: php-phplang-scope-exit >= 1.0 BuildRequires: php-swaggest-json-diff >= 3.5.1 %endif # 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 +BuildRequires: php-composer(phpunit/phpunit) >= 5 %global phpunit %{_bindir}/phpunit BuildRequires: php-date BuildRequires: php-filter @@ -129,7 +129,7 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload EOF ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd %{phpunit} --no-coverage --verbose || ret=1 fi @@ -149,6 +149,9 @@ exit $ret %changelog +* Mon May 17 2021 Remi Collet - 0.12.32-1 +- update to 0.12.32 + * Mon Sep 21 2020 Remi Collet - 0.12.31-1 - update to 0.12.31 diff --git a/sources b/sources index 2909ecb..86f464c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.31-a4adcdb.tgz) = 298b8b9fa111b6bad535f03bdd7206b300d94b7c4550141c9713acfd077da28cc74e2afeef2b342caa0b55d0e02d6ce82b91f91eae5a4001d61cfab722b41594 +SHA512 (php-swaggest-json-schema-0.12.32-f92567a.tgz) = 8ba5cb196973c0406a8493cfdd1ef7406e7a4e4b919e53dd12872edd27e5f39d946b2d85df35469bae63f139059da14a44fd699fdb0dc0a0b6e28fab624ef8c9 From cbf722f03d9713d96f51b1f8e16a41ef99066caf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 May 2021 08:12:29 +0200 Subject: [PATCH 2/6] v0.12.33 (cherry picked from commit 27065a222785a00921b6a111a4567edbc2872434) --- .gitignore | 1 + php-swaggest-json-schema.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 354984f..536559f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /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 diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index 35de389..33d9823 100644 --- a/php-swaggest-json-schema.spec +++ b/php-swaggest-json-schema.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit f92567a1f4fcb0296758b471654171acfdb6031b +%global gh_commit 87919a4564b9682c4c4328d00ba28f9f631b0bbc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project php-json-schema @@ -23,7 +23,7 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 0.12.32 +Version: 0.12.33 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: High definition PHP structures with JSON-schema based validation @@ -149,6 +149,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 86f464c..bdca616 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.32-f92567a.tgz) = 8ba5cb196973c0406a8493cfdd1ef7406e7a4e4b919e53dd12872edd27e5f39d946b2d85df35469bae63f139059da14a44fd699fdb0dc0a0b6e28fab624ef8c9 +SHA512 (php-swaggest-json-schema-0.12.33-87919a4.tgz) = 929eb32a4e513c0f78be143047f3ec2a8f8c33c4ce1592e23864c105b72dc6581abca57bd25c512d83e65fed0c168d282d7567e4a78aa6338cfb21d8961c747f From 432f8a5aca67489057cf1f07e1b26afab72dfbfd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Jun 2021 14:54:46 +0200 Subject: [PATCH 3/6] v0.12.34 (cherry picked from commit 5facf9cf9c839202cad31941c9c899bb952655b2) --- .gitignore | 1 + php-swaggest-json-schema.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 536559f..98a5898 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /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 diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index 33d9823..e9cf51d 100644 --- a/php-swaggest-json-schema.spec +++ b/php-swaggest-json-schema.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 87919a4564b9682c4c4328d00ba28f9f631b0bbc +%global gh_commit ec9085579a2ba10be7e083116556332d45355206 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project php-json-schema @@ -23,7 +23,7 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 0.12.33 +Version: 0.12.34 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: High definition PHP structures with JSON-schema based validation @@ -128,10 +128,14 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\', dirname(__DIR__).'/tests/src'); EOF +# Skip online tests: testInvalid, testValidate ret=0 for cmd in php php73 php74 php80; do if which $cmd; then - $cmd %{phpunit} --no-coverage --verbose || ret=1 + $cmd %{phpunit} \ + --no-coverage \ + --filter '^((?!(SwaggerTest::testInvalid|SwaggerTest::testValidate)).)*$' \ + --verbose || ret=1 fi done exit $ret @@ -149,6 +153,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index bdca616..3e7fec0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.33-87919a4.tgz) = 929eb32a4e513c0f78be143047f3ec2a8f8c33c4ce1592e23864c105b72dc6581abca57bd25c512d83e65fed0c168d282d7567e4a78aa6338cfb21d8961c747f +SHA512 (php-swaggest-json-schema-0.12.34-ec90855.tgz) = f5a0ae317fcfcda6fd8b2b098df7f81286e683c61cae3cab264b8ccce40f5f229cdc75ee7999d644e3fb32cb10389212b180352a9f296e0656e0889339591361 From a33fb21d832306b225bf636f65882c5039ac7225 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 18 Jun 2021 08:20:07 +0200 Subject: [PATCH 4/6] v0.12.35 (cherry picked from commit 470e850c13a7e3ebec6ffd8545505fb7688dc6bf) --- .gitignore | 1 + php-swaggest-json-schema.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 98a5898..8d94bbb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /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 diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index e9cf51d..b279bee 100644 --- a/php-swaggest-json-schema.spec +++ b/php-swaggest-json-schema.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit ec9085579a2ba10be7e083116556332d45355206 +%global gh_commit d0126bd830c92a498691d278f01d3ce13a2c9c0a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project php-json-schema @@ -23,7 +23,7 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 0.12.34 +Version: 0.12.35 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: High definition PHP structures with JSON-schema based validation @@ -153,6 +153,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 3e7fec0..a801b87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.34-ec90855.tgz) = f5a0ae317fcfcda6fd8b2b098df7f81286e683c61cae3cab264b8ccce40f5f229cdc75ee7999d644e3fb32cb10389212b180352a9f296e0656e0889339591361 +SHA512 (php-swaggest-json-schema-0.12.35-d0126bd.tgz) = 4a4ee9b338addd0ea63582e68d08233d0b41c079d99cc684ceef1cdfde152d593e37a74bbf8693800ca6de6f2e9e163a0390e8f38eb0f38f5785f1a47b06c021 From 81dcd52d66e681aaa1e459c9d7b71969daf015db Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Jul 2021 10:48:16 +0200 Subject: [PATCH 5/6] v0.12.36 (cherry picked from commit 362211f80b99edec1593be677fb045ca96784d1b) --- .gitignore | 1 + php-swaggest-json-schema.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8d94bbb..a78acb1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /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 diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index b279bee..6fd1c14 100644 --- a/php-swaggest-json-schema.spec +++ b/php-swaggest-json-schema.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit d0126bd830c92a498691d278f01d3ce13a2c9c0a +%global gh_commit cbdf1d92d45ace7e1152714ba878bc57ba896461 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project php-json-schema @@ -23,7 +23,7 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 0.12.35 +Version: 0.12.36 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: High definition PHP structures with JSON-schema based validation @@ -153,6 +153,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index a801b87..4c0cc5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.35-d0126bd.tgz) = 4a4ee9b338addd0ea63582e68d08233d0b41c079d99cc684ceef1cdfde152d593e37a74bbf8693800ca6de6f2e9e163a0390e8f38eb0f38f5785f1a47b06c021 +SHA512 (php-swaggest-json-schema-0.12.36-cbdf1d9.tgz) = 650bcf3360afab96d33e7f29ef66aebe7d8742289e5d8f5874190cb41a3c5dde3fc76fa9227ccbe6b3ac1d2102744fb4847b8b594b4ea4241aef6a973c93a7a7 From c5343a915758288ef954fa6be7ecaff5b1fd8544 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Sep 2021 15:25:22 +0200 Subject: [PATCH 6/6] v0.12.37 (cherry picked from commit 06c2ccac10acebb0bf24cafb02d68e3fa2e11403) (cherry picked from commit 0daa568974439b878911416a6388fdf70c0c683b) --- .gitignore | 1 + php-swaggest-json-schema.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a78acb1..40218a7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /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 diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index 6fd1c14..24fd69c 100644 --- a/php-swaggest-json-schema.spec +++ b/php-swaggest-json-schema.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit cbdf1d92d45ace7e1152714ba878bc57ba896461 +%global gh_commit 1d7cce2dac6844a8a612672ad5936e8c4145e96a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project php-json-schema @@ -23,7 +23,7 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 0.12.36 +Version: 0.12.37 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: High definition PHP structures with JSON-schema based validation @@ -153,6 +153,9 @@ exit $ret %changelog +* Thu Sep 2 2021 Remi Collet - 0.12.37-1 +- update to 0.12.37 + * Mon Jul 19 2021 Remi Collet - 0.12.36-1 - update to 0.12.36 diff --git a/sources b/sources index 4c0cc5b..f7b8991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.36-cbdf1d9.tgz) = 650bcf3360afab96d33e7f29ef66aebe7d8742289e5d8f5874190cb41a3c5dde3fc76fa9227ccbe6b3ac1d2102744fb4847b8b594b4ea4241aef6a973c93a7a7 +SHA512 (php-swaggest-json-schema-0.12.37-1d7cce2.tgz) = 860c9bfa1dd1c842b10eb3f77c40617c7f96196086cf5530c68c0c20b6f95ef82fd2b438f5c4cf9bc31d9ec8038f136f3eb93e64445d39262965efd7e82aef98