Compare commits

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

1 commit

Author SHA1 Message Date
Remi Collet
b7d76a0c7f v5.2.8
(cherry picked from commit c6b358f378)
2019-01-15 08:37:45 +01:00
4 changed files with 21 additions and 17 deletions

1
.gitignore vendored
View file

@ -8,3 +8,4 @@ clog
/php-justinrainbow-json-schema5-5.2.5-0d4fda8.tgz
/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

View file

@ -1,6 +1,6 @@
diff -up ./bin/validate-json.rpm ./bin/validate-json
--- ./bin/validate-json.rpm 2017-03-23 08:58:50.000000000 +0100
+++ ./bin/validate-json 2017-03-23 09:23:35.797857285 +0100
--- ./bin/validate-json.rpm 2019-01-15 07:24:47.000000000 +0100
+++ ./bin/validate-json 2019-01-15 07:25:27.730125985 +0100
@@ -6,32 +6,7 @@
* @author Christian Weiske <christian.weiske@netresearch.de>
*/
@ -36,9 +36,9 @@ 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 2017-03-23 08:58:50.000000000 +0100
+++ ./src/JsonSchema/Uri/UriRetriever.php 2017-03-23 09:23:35.797857285 +0100
@@ -323,7 +323,8 @@ class UriRetriever implements BaseUriRet
--- ./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
@@ -342,7 +342,8 @@ class UriRetriever implements BaseUriRet
}
// translate references to local files within the json-schema package
@ -49,9 +49,9 @@ 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 2017-03-23 08:58:50.000000000 +0100
+++ ./tests/Uri/UriRetrieverTest.php 2017-03-23 09:28:28.992372836 +0100
@@ -295,7 +295,8 @@ EOF;
--- ./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
@@ -296,7 +296,8 @@ EOF;
public function testPackageURITranslation()
{
$retriever = new UriRetriever();
@ -61,7 +61,7 @@ diff -up ./tests/Uri/UriRetrieverTest.php.rpm ./tests/Uri/UriRetrieverTest.php
$uri = $retriever->translate('package://foo/bar.json');
$this->assertEquals("${root}foo/bar.json", $uri);
@@ -304,7 +305,8 @@ EOF;
@@ -305,7 +306,8 @@ EOF;
public function testDefaultDistTranslations()
{
$retriever = new UriRetriever();
@ -71,7 +71,7 @@ diff -up ./tests/Uri/UriRetrieverTest.php.rpm ./tests/Uri/UriRetrieverTest.php
$this->assertEquals(
$root . 'json-schema-draft-03.json',
@@ -322,11 +324,12 @@ EOF;
@@ -323,11 +325,12 @@ EOF;
$retriever = new UriRetriever();
// load schema from package
@ -85,8 +85,8 @@ diff -up ./tests/Uri/UriRetrieverTest.php.rpm ./tests/Uri/UriRetrieverTest.php
+ $this->assertEquals('c2ef5714b639cea176fdeeafe418aa09', md5(json_encode($schema)));
}
public function testJsonSchemaOrgMediaTypeHack()
@@ -365,7 +367,7 @@ EOF;
public function testInvalidContentTypeEndpointsDefault()
@@ -389,7 +392,7 @@ EOF;
'JsonSchema\Exception\JsonDecodingException',
'JSON syntax is malformed'
);

View file

@ -1,19 +1,19 @@
# remirepo/fedora spec file for php-justinrainbow-json-schema5
#
# Copyright (c) 2016-2018 Remi Collet
# Copyright (c) 2016-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global gh_commit 8560d4314577199ba51bf2032f02cd1315587c23
%global gh_commit dcb6e1006bb5fd1e392b4daa68932880f37550d4
%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.7
%global minor 2.8
# Some sample files, only used for tests
@ -157,7 +157,7 @@ php bin/validate-json-test \
: Upstream test suite
ret=0
for cmd in php php70 php71 php72; do
for cmd in php php70 php71 php72 php73; do
if which $cmd; then
$cmd -d memory_limit=1G %{_bindir}/phpunit -d memory_limit=1G --verbose || ret=1
fi
@ -179,6 +179,9 @@ exit $ret
%changelog
* Tue Jan 15 2019 Remi Collet <remi@remirepo.net> - 5.2.8-1
- update to 5.2.8
* Thu Feb 15 2018 Remi Collet <remi@remirepo.net> - 5.2.7-1
- Update to 5.2.7

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.7-8560d43.tgz) = e43d8cfc09aabaec3532e8ca788c6362072d27d626f9150a6d7f68750d58a748b4dff45edd5f89c1f9e6a5edb0d6365af76f253d07c8c3ea13e4e9323505b179
SHA512 (php-justinrainbow-json-schema5-5.2.8-dcb6e10.tgz) = c875486dfe9c1e244e84a1edeb86280e0a1e626fa77eee26cca2524928b0d1e8883dba5dcee69b1a4013d6b07eefb91c8314631f46e76ddd6297c4d7eaa941d8