Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Remi Collet
4e5abb7bbf v5.2.9
(cherry picked from commit 4741f4bd77)
2019-09-26 09:30:22 +02:00
4 changed files with 17 additions and 14 deletions

1
.gitignore vendored
View file

@ -9,3 +9,4 @@ clog
/php-justinrainbow-json-schema5-5.2.6-d283e11.tgz
/php-justinrainbow-json-schema5-5.2.7-8560d43.tgz
/php-justinrainbow-json-schema5-5.2.8-dcb6e10.tgz
/php-justinrainbow-json-schema5-5.2.9-44c6787.tgz

View file

@ -1,6 +1,6 @@
diff -up ./bin/validate-json.rpm ./bin/validate-json
--- ./bin/validate-json.rpm 2019-01-15 07:24:47.000000000 +0100
+++ ./bin/validate-json 2019-01-15 07:25:27.730125985 +0100
--- ./bin/validate-json.rpm 2019-09-26 09:03:49.371018279 +0200
+++ ./bin/validate-json 2019-09-26 09:06:21.033483985 +0200
@@ -6,32 +6,7 @@
* @author Christian Weiske <christian.weiske@netresearch.de>
*/
@ -12,7 +12,7 @@ diff -up ./bin/validate-json.rpm ./bin/validate-json
- *
- * @return void
- */
-function __autoload($className)
-spl_autoload_register(function ($className)
-{
- $className = ltrim($className, '\\');
- $fileName = '';
@ -25,7 +25,7 @@ diff -up ./bin/validate-json.rpm ./bin/validate-json
- if (stream_resolve_include_path($fileName)) {
- require_once $fileName;
- }
-}
-});
-
-// support running this tool from git checkout
-if (is_dir(__DIR__ . '/../src/JsonSchema')) {
@ -36,8 +36,8 @@ diff -up ./bin/validate-json.rpm ./bin/validate-json
$arOptions = array();
$arArgs = array();
diff -up ./src/JsonSchema/Uri/UriRetriever.php.rpm ./src/JsonSchema/Uri/UriRetriever.php
--- ./src/JsonSchema/Uri/UriRetriever.php.rpm 2019-01-15 07:24:47.000000000 +0100
+++ ./src/JsonSchema/Uri/UriRetriever.php 2019-01-15 07:25:27.731125991 +0100
--- ./src/JsonSchema/Uri/UriRetriever.php.rpm 2019-09-26 09:03:13.000000000 +0200
+++ ./src/JsonSchema/Uri/UriRetriever.php 2019-09-26 09:03:49.371018279 +0200
@@ -342,7 +342,8 @@ class UriRetriever implements BaseUriRet
}
@ -49,8 +49,8 @@ diff -up ./src/JsonSchema/Uri/UriRetriever.php.rpm ./src/JsonSchema/Uri/UriRetri
return $uri;
}
diff -up ./tests/Uri/UriRetrieverTest.php.rpm ./tests/Uri/UriRetrieverTest.php
--- ./tests/Uri/UriRetrieverTest.php.rpm 2019-01-15 07:24:47.000000000 +0100
+++ ./tests/Uri/UriRetrieverTest.php 2019-01-15 07:26:27.403439007 +0100
--- ./tests/Uri/UriRetrieverTest.php.rpm 2019-09-26 09:03:13.000000000 +0200
+++ ./tests/Uri/UriRetrieverTest.php 2019-09-26 09:03:49.372018275 +0200
@@ -296,7 +296,8 @@ EOF;
public function testPackageURITranslation()
{

View file

@ -6,14 +6,14 @@
#
# Please, preserve the changelog entries
#
%global gh_commit dcb6e1006bb5fd1e392b4daa68932880f37550d4
%global gh_commit 44c6787311242a979fa15c704327c20e7221a0e4
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner justinrainbow
%global gh_project json-schema
%global php_home %{_datadir}/php
%global with_tests 0%{!?_without_tests:1}
%global major 5
%global minor 2.8
%global minor 2.9
# Some sample files, only used for tests
@ -29,7 +29,7 @@
Name: php-%{gh_owner}-%{gh_project}%{major}
Version: %{major}.%{minor}
Release: 2%{?dist}
Release: 1%{?dist}
Summary: A library to validate a json schema
License: MIT
URL: https://github.com/%{gh_owner}/%{gh_project}
@ -157,7 +157,7 @@ php bin/validate-json-test \
: Upstream test suite
ret=0
for cmd in php php70 php71 php72 php73; do
for cmd in php php71 php72 php73 php74; do
if which $cmd; then
$cmd -d memory_limit=1G %{_bindir}/phpunit -d memory_limit=1G --verbose || ret=1
fi
@ -169,7 +169,6 @@ exit $ret
%files
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json
%doc *.md
@ -179,6 +178,9 @@ exit $ret
%changelog
* Thu Sep 26 2019 Remi Collet <remi@remirepo.net> - 5.2.9-1
- update to 5.2.9
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View file

@ -1,2 +1,2 @@
SHA512 (JSON-Schema-Test-Suite-1.2.0-f3d5aeb.tar.gz) = 6b917a0a0b02d5b2be6457403fba0ae4d3789634da911ebbdc56986b99ae285ed8a7bc696abc668f2a95b55e33d7bfbf8709162fc0995d76ab2f0d05494a2d02
SHA512 (php-justinrainbow-json-schema5-5.2.8-dcb6e10.tgz) = c875486dfe9c1e244e84a1edeb86280e0a1e626fa77eee26cca2524928b0d1e8883dba5dcee69b1a4013d6b07eefb91c8314631f46e76ddd6297c4d7eaa941d8
SHA512 (php-justinrainbow-json-schema5-5.2.9-44c6787.tgz) = 652a90380517ab1ee1b79b3930947e8a6b3485cf87838574e4d0fda71a4a1485a0bfbe24f815a833aa227665baa37334094ab408f6b89c5f015c6c6f9853d018