test build for upcoming 4.4.0

raise dependency on PHP 7.1.3
raise dependency on sebastian/version 2.0
raise dependency on nikic/php-parser 4.5
raise dependency on phpdocumentor/reflection-docblock 4.3
raise dependency on justinrainbow/json-schema 5.2
raise dependency on seld/jsonlint 1.4
add dependency on phpdocumentor/type-resolver 0.4
raise dependency on Symfony 4.4 and allow 5
switch to phpunit8

4 files changed, 100 insertions, 101 deletions

diff --git a/composer.json b/composer.json
index d9832f5..03f189b 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "issues": "https://github.com/llaville/php-reflect/issues"
     },
     "require": {
-        "php": "^5.5|^7.0",
+        "php": "^7.1.3",
         "ext-tokenizer": "*",
         "ext-pcre": "*",
         "ext-phar": "*",
@@ -18,17 +18,18 @@
         "ext-json": "*",
         "ext-date": "*",
         "ext-reflection": "*",
-        "sebastian/version": "^1.0|^2.0",
-        "nikic/php-parser": "^3.1",
+        "sebastian/version": "^2.0",
+        "nikic/php-parser": "^4.5",
         "doctrine/collections": "^1.4",
-        "symfony/event-dispatcher": "^2.5|^3.0|^4.0",
-        "symfony/finder": "^2.5|^3.0|^4.0",
-        "symfony/console": "^2.5|^3.0|^4.0",
-        "symfony/stopwatch": "^2.5|^3.0|^4.0",
-        "symfony/dependency-injection": "^2.5|^3.0|^4.0",
-        "phpdocumentor/reflection-docblock": "^3.0",
-        "justinrainbow/json-schema": "^1.3",
-        "seld/jsonlint": "^1.1",
+        "symfony/event-dispatcher": "^4.4|^5.0",
+        "symfony/finder": "^4.4|^5.0",
+        "symfony/console": "^4.4|^5.0",
+        "symfony/stopwatch": "^4.4|^5.0",
+        "symfony/dependency-injection": "^4.4|^5.0",
+        "phpdocumentor/reflection-docblock": "^4.3",
+        "phpdocumentor/type-resolver": "^0.5",
+        "justinrainbow/json-schema": "^5.2",
+        "seld/jsonlint": "^1.4",
         "psr/log": "^1.0"
     },
     "require-dev": {
diff --git a/php-bartlett-PHP-Reflect-4.3.0-rpm.patch b/php-bartlett-PHP-Reflect-4.4.0-rpm.patch
index 40f8a59..313cfad 100644
--- a/php-bartlett-PHP-Reflect-4.3.0-rpm.patch
+++ b/php-bartlett-PHP-Reflect-4.4.0-rpm.patch
@@ -60,7 +60,7 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
  
  Environment::setScanDir();
  
--$application = new Application($appName, '4.3');
+-$application = new Application($appName, '4.4');
 +$application = new Application($appName, '@package_version@');
  $application->run();
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
diff --git a/php-bartlett-PHP-Reflect-autoload.php b/php-bartlett-PHP-Reflect-autoload.php
index 5e1a183..d937c49 100644
--- a/php-bartlett-PHP-Reflect-autoload.php
+++ b/php-bartlett-PHP-Reflect-autoload.php
@@ -6,25 +6,25 @@
 require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('Bartlett\\', dirname(__DIR__));
-\Fedora\Autoloader\Dependencies::required(array(
-    '/usr/share/php/PhpParser3/autoload.php',
-    array(
+\Fedora\Autoloader\Dependencies::required([
+    '/usr/share/php/PhpParser4/autoload.php',
+    [
+        '/usr/share/php/Symfony5/Component/autoload.php',
         '/usr/share/php/Symfony4/Component/autoload.php',
-        '/usr/share/php/Symfony3/Component/autoload.php',
-        '/usr/share/php/Symfony/Component/autoload.php',
-    ),
+    ],
     '/usr/share/php/Seld/JsonLint/autoload.php',
-    '/usr/share/php/JsonSchema/autoload.php',
+    '/usr/share/php/JsonSchema5/autoload.php',
     '/usr/share/php/SebastianBergmann/Version/autoload.php',
     '/usr/share/php/Doctrine/Common/Collections/autoload.php',
     '/usr/share/php/Doctrine/Common/Cache/autoload.php',
-    '/usr/share/php/phpDocumentor/Reflection/DocBlock/autoload.php',
-));
-\Fedora\Autoloader\Dependencies::optional(array(
+    '/usr/share/php/phpDocumentor/Reflection2/autoload-type-resolver.php',
+    '/usr/share/php/phpDocumentor/Reflection/DocBlock4/autoload.php',
+]);
+\Fedora\Autoloader\Dependencies::optional([
     '/usr/share/php/Bartlett/CompatInfo/autoload.php', // Needed when installed for 'Bartlett\CompatInfo\Analyser\CompatibilityAnalyser'
     '/usr/share/php/Bartlett/UmlWriter/autoload.php',
     '/usr/share/php/Psr/Log/autoload.php',
     '/usr/share/php/Monolog/autoload.php',
-));
+]);
 
 $vendorDir = '/usr/share/php';
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index a3aa2ae..45a5401 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    5010b4de0540a711f329a26c72bd48280a3d755a
+%global gh_commit    8e66c7304d4004554e3c85aeb12a14a49d995196
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150331
 %global gh_owner     llaville
@@ -19,16 +19,11 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %endif
 
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 %global sym_prefix php-symfony4
-%global phpunit %{_bindir}/phpunit7
-%else
-%global sym_prefix php-symfony3
-%global phpunit %{_bindir}/phpunit
-%endif
+%global phpunit %{_bindir}/phpunit8
 
 Name:           php-bartlett-PHP-Reflect
-Version:        4.3.1
+Version:        4.4.0
 %global specrel 1
 Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Adds the ability to reverse-engineer PHP
@@ -41,72 +36,67 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 Source1:        %{name}-autoload.php
 
 # Enable cache plugin
-Patch0:         %{name}-4.3.0-rpm.patch
+Patch0:         %{name}-4.4.0-rpm.patch
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 7.1.3
 %if %{with_tests}
 # to run test suite
 BuildRequires:  %{phpunit}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(sebastian/version)                 >= 1.0   with php-composer(sebastian/version)                 < 3)
-BuildRequires: (php-composer(nikic/php-parser)                  >= 3.1   with php-composer(nikic/php-parser)                  < 4)
+BuildRequires: (php-composer(sebastian/version)                 >= 2.0   with php-composer(sebastian/version)                 < 3)
+BuildRequires: (php-composer(nikic/php-parser)                  >= 4.5   with php-composer(nikic/php-parser)                  < 5)
 BuildRequires: (php-composer(doctrine/collections)              >= 1.4   with php-composer(doctrine/collections)              < 2)
-BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 3.0   with php-composer(phpdocumentor/reflection-docblock) < 4)
-BuildRequires: (php-composer(seld/jsonlint)                     >= 1.1   with php-composer(seld/jsonlint)                     < 2)
-BuildRequires: (php-composer(justinrainbow/json-schema)         >= 1.3   with php-composer(justinrainbow/json-schema)         < 2)
+BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 4.3   with php-composer(phpdocumentor/reflection-docblock) < 5)
+BuildRequires: (php-composer(phpdocumentor/type-resolver)       >= 1.0   with php-composer(phpdocumentor/type-resolver)       < 2)
+BuildRequires: (php-composer(seld/jsonlint)                     >= 1.4   with php-composer(seld/jsonlint)                     < 2)
+BuildRequires: (php-composer(justinrainbow/json-schema)         >= 5.2   with php-composer(justinrainbow/json-schema)         < 6)
 BuildRequires: (php-composer(monolog/monolog)                   >= 1.10  with php-composer(monolog/monolog)                   < 2)
 BuildRequires: (php-composer(psr/log)                           >= 1.0   with php-composer(psr/log)                           < 2)
-BuildRequires: (php-composer(doctrine/cache)                    >= 1.3   with php-composer(doctrine/cache)                    <  2)
-# remirepo:19
+BuildRequires: (php-composer(doctrine/cache)                    >= 1.3   with php-composer(doctrine/cache)                    < 2)
+# remirepo:12
 %else
-BuildRequires:  php-composer(sebastian/version)                 >= 1.0
-BuildRequires:  php-composer(sebastian/version)                 <  3
-BuildRequires:  php-nikic-php-parser3                           >= 3.1
-BuildRequires:  php-composer(doctrine/collections)              >= 1.4
-BuildRequires:  php-composer(doctrine/collections)              <  2
-BuildRequires:  php-composer(phpdocumentor/reflection-docblock) >= 3.0
-BuildRequires:  php-composer(phpdocumentor/reflection-docblock) <  4
-BuildRequires:  php-composer(seld/jsonlint)                     >= 1.1
-BuildRequires:  php-composer(seld/jsonlint)                     <  2
-BuildRequires:  php-composer(justinrainbow/json-schema)         >= 1.3
-BuildRequires:  php-composer(justinrainbow/json-schema)         <  2
-BuildRequires:  php-composer(monolog/monolog)                   >= 1.10
-BuildRequires:  php-composer(monolog/monolog)                   <  2
-BuildRequires:  php-composer(psr/log)                           >= 1.0
-BuildRequires:  php-composer(psr/log)                           <  2
-BuildRequires:  php-composer(doctrine/cache)           >= 1.3
-BuildRequires:  php-composer(doctrine/cache)           <  2
+BuildRequires:  php-phpunit-Version                             >= 2.0
+BuildRequires:  php-nikic-php-parser4                           >= 3.1
+BuildRequires:  php-doctrine-collections                        >= 1.4
+BuildRequires:  php-phpdocumentor-reflection-docblock4          >= 4.3
+BuildRequires:  php-phpdocumentor-type-resolver1
+BuildRequires:  php-jsonlint                                    >= 1.4
+BuildRequires:  php-justinrainbow-json-schema5                  >= 5.2
+BuildRequires:  php-Monolog                                     >= 1.10
+BuildRequires:  php-PsrLog
+BuildRequires:  php-doctrine-cache                              >= 1.3
 %endif
-BuildRequires:  %{sym_prefix}-event-dispatcher
-BuildRequires:  %{sym_prefix}-finder
-BuildRequires:  %{sym_prefix}-console
-BuildRequires:  %{sym_prefix}-stopwatch
-BuildRequires:  %{sym_prefix}-dependency-injection
+BuildRequires:  %{sym_prefix}-event-dispatcher                  >= 4.4
+BuildRequires:  %{sym_prefix}-finder                            >= 4.4
+BuildRequires:  %{sym_prefix}-console                           >= 4.4
+BuildRequires:  %{sym_prefix}-stopwatch                         >= 4.4
+BuildRequires:  %{sym_prefix}-dependency-injection              >= 4.4
 # For our autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
 
 # From composer.json, "require": {
-#        "php": "^5.5|^7.0",
+#        "php": "^7.1.3",
 #        "ext-tokenizer": "*",
 #        "ext-pcre": "*",
 #        "ext-spl": "*",
 #        "ext-json": "*",
 #        "ext-date": "*",
 #        "ext-reflection": "*",
-#        "sebastian/version": "^1.0|^2.0",
-#        "nikic/php-parser": "^3.1",
+#        "sebastian/version": "^2.0",
+#        "nikic/php-parser": "^4.5",
 #        "doctrine/collections": "^1.4",
-#        "symfony/event-dispatcher": "^2.5|^3.0|^4.0",
-#        "symfony/finder": "^2.5|^3.0|^4.0",
-#        "symfony/console": "^2.5|^3.0|^4.0",
-#        "symfony/stopwatch": "^2.5|^3.0|^4.0",
-#        "symfony/dependency-injection": "^2.5|^3.0|^4.0",
-#        "phpdocumentor/reflection-docblock": "^3.0",
-#        "justinrainbow/json-schema": "^1.3",
-#        "seld/jsonlint": "^1.1"
+#        "symfony/event-dispatcher": "^4.4|^5.0",
+#        "symfony/finder": "^4.4|^5.0",
+#        "symfony/console": "^4.4|^5.0",
+#        "symfony/stopwatch": "^4.4|^5.0",
+#        "symfony/dependency-injection": "^4.4|^5.0",
+#        "phpdocumentor/reflection-docblock": "^4.3",
+#        "phpdocumentor/type-resolver": "^0.5",
+#        "justinrainbow/json-schema": "^5.2",
+#        "seld/jsonlint": "^1.4",
 #        "psr/log": "^1.0"
 Requires:       php(language) >= 5.5
 Requires:       php-cli
@@ -119,39 +109,35 @@ Requires:       php-spl
 Requires:       php-tokenizer
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(sebastian/version)                 >= 1.0   with php-composer(sebastian/version)                 < 3)
-Requires:      (php-composer(nikic/php-parser)                  >= 3.1   with php-composer(nikic/php-parser)                  < 4)
+Requires:      (php-composer(sebastian/version)                 >= 2.0   with php-composer(sebastian/version)                 < 3)
+Requires:      (php-composer(nikic/php-parser)                  >= 4.5   with php-composer(nikic/php-parser)                  < 5)
 Requires:      (php-composer(doctrine/collections)              >= 1.4   with php-composer(doctrine/collections)              < 2)
-Requires:      (php-composer(phpdocumentor/reflection-docblock) >= 3.0   with php-composer(phpdocumentor/reflection-docblock) < 4)
-Requires:      (php-composer(seld/jsonlint)                     >= 1.1   with php-composer(seld/jsonlint)                     < 2)
-Requires:      (php-composer(justinrainbow/json-schema)         >= 1.3   with php-composer(justinrainbow/json-schema)         < 2)
+Requires:      (php-composer(phpdocumentor/reflection-docblock) >= 4.3   with php-composer(phpdocumentor/reflection-docblock) < 5)
+Requires:      (php-composer(phpdocumentor/type-resolver)       >= 1.0   with php-composer(phpdocumentor/type-resolver)       < 2)
+Requires:      (php-composer(seld/jsonlint)                     >= 1.4   with php-composer(seld/jsonlint)                     < 2)
+Requires:      (php-composer(justinrainbow/json-schema)         >= 5.2   with php-composer(justinrainbow/json-schema)         < 6)
 Requires:      (php-composer(psr/log)                           >= 1.0   with php-composer(psr/log)                           < 2)
+Requires:      (php-composer(doctrine/cache)                    >= 1.3   with php-composer(doctrine/cache)                    < 2)
 # Mandatory for our patch
 Requires:      (php-composer(doctrine/cache)                    >= 1.3   with php-composer(doctrine/cache)                    <  2)
-# remirepo:18
+# remirepo:12
 %else
-Requires:       php-composer(sebastian/version)                 >= 1.0
-Requires:       php-composer(sebastian/version)                 <  3
-Requires:       php-nikic-php-parser3                           >= 3.1
-Requires:       php-composer(doctrine/collections)              >= 1.4
-Requires:       php-composer(doctrine/collections)              <  2
-Requires:       php-composer(phpdocumentor/reflection-docblock) >= 3.0
-Requires:       php-composer(phpdocumentor/reflection-docblock) <  4
-Requires:       php-composer(seld/jsonlint)                     >= 1.1
-Requires:       php-composer(seld/jsonlint)                     <  2
-Requires:       php-composer(justinrainbow/json-schema)         >= 1.3
-Requires:       php-composer(justinrainbow/json-schema)         <  2
-Requires:       php-composer(psr/log)                           >= 1.0
-Requires:       php-composer(psr/log)                           <  2
+Requires:       php-phpunit-Version                             >= 2.0
+Requires:       php-nikic-php-parser4                           >= 3.1
+Requires:       php-doctrine-collections                        >= 1.4
+Requires:       php-phpdocumentor-reflection-docblock4          >= 4.3
+Requires:       php-phpdocumentor-type-resolver1
+Requires:       php-jsonlint                                    >= 1.4
+Requires:       php-justinrainbow-json-schema5                  >= 5.2
+Requires:       php-PsrLog
 # Mandatory for our patch
-Requires:       php-composer(doctrine/cache)           >= 1.3
-Requires:       php-composer(doctrine/cache)           <  2
+Requires:       php-doctrine-cache                              >= 1.3
 %endif
-Requires:       %{sym_prefix}-event-dispatcher
-Requires:       %{sym_prefix}-finder
-Requires:       %{sym_prefix}-console
-Requires:       %{sym_prefix}-stopwatch
-Requires:       %{sym_prefix}-dependency-injection
+Requires:       %{sym_prefix}-event-dispatcher                  >= 4.4
+Requires:       %{sym_prefix}-finder                            >= 4.4
+Requires:       %{sym_prefix}-console                           >= 4.4
+Requires:       %{sym_prefix}-stopwatch                         >= 4.4
+Requires:       %{sym_prefix}-dependency-injection              >= 4.4
 #    "require-dev": {
 #        "monolog/monolog": "~1.10",
 #    "suggest": {
@@ -208,10 +194,10 @@ install -D -p -m 644 bin/phpreflect.1         %{buildroot}%{_mandir}/man1/phpref
 %check
 %if %{with_tests}
 ret=0
-for cmdarg in "php %{phpunit}" php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php72 php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit7} \
+    $1 ${2:-%{_bindir}/phpunit8} \
       --include-path=%{buildroot}%{_datadir}/php \
       --verbose || ret=1
   fi
@@ -240,6 +226,18 @@ fi
 
 
 %changelog
+* Mon Jul  6 2020 Remi Collet <remi@remirepo.net> - 4.4.0-0
+- test build for upcoming 4.4.0
+- raise dependency on PHP 7.1.3
+- raise dependency on sebastian/version 2.0
+- raise dependency on nikic/php-parser 4.5
+- raise dependency on phpdocumentor/reflection-docblock 4.3
+- raise dependency on justinrainbow/json-schema 5.2
+- raise dependency on seld/jsonlint 1.4
+- add dependency on phpdocumentor/type-resolver 0.4
+- raise dependency on Symfony 4.4 and allow 5
+- switch to phpunit8
+
 * Wed Feb 26 2020 Remi Collet <remi@remirepo.net> - 4.3.1-1
 - update to 4.3.1
 - drop patch merged upstream