v5.2.9

3 files changed, 16 insertions, 12 deletions

diff --git a/composer.json b/composer.json
index 20e85fc..884a697 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.2.20",
+        "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
         "json-schema/JSON-Schema-Test-Suite": "1.2.0",
         "phpunit/phpunit": "^4.8.35"
     },
diff --git a/php-justinrainbow-json-schema5-rpm.patch b/php-justinrainbow-json-schema5-rpm.patch
index 8485708..eb8e536 100644
--- a/php-justinrainbow-json-schema5-rpm.patch
+++ b/php-justinrainbow-json-schema5-rpm.patch
@@ -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()
      {
diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec
index cae3033..d10f410 100644
--- a/php-justinrainbow-json-schema5.spec
+++ b/php-justinrainbow-json-schema5.spec
@@ -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
@@ -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,6 +169,7 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
@@ -179,6 +180,9 @@ exit $ret
 
 
 %changelog
+* Thu Sep 26 2019 Remi Collet <remi@remirepo.net> - 5.2.9-1
+- update to 5.2.9
+
 * Tue Jan 15 2019 Remi Collet <remi@remirepo.net> - 5.2.8-1
 - update to 5.2.8