update to 4.4.1v4.3

raise dependency on phpdocumentor/reflection-docblock 5.2

4 files changed, 16 insertions, 12 deletions

diff --git a/composer.json b/composer.json
index 7e35412..0b1e636 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "issues": "https://github.com/llaville/php-reflect/issues"
     },
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.1.3|^8.0",
         "ext-tokenizer": "*",
         "ext-pcre": "*",
         "ext-phar": "*",
@@ -26,7 +26,7 @@
         "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/reflection-docblock": "^4.3|^5.2",
         "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
         "justinrainbow/json-schema": "^5.2",
         "seld/jsonlint": "^1.4",
diff --git a/php-bartlett-PHP-Reflect-4.4.0-rpm.patch b/php-bartlett-PHP-Reflect-4.4.0-rpm.patch
index cb17986..791ef96 100644
--- a/php-bartlett-PHP-Reflect-4.4.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.4.0');
+-$application = new Application($appName, '4.4.1');
 +$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 d937c49..09f93e8 100644
--- a/php-bartlett-PHP-Reflect-autoload.php
+++ b/php-bartlett-PHP-Reflect-autoload.php
@@ -18,7 +18,7 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
     '/usr/share/php/Doctrine/Common/Collections/autoload.php',
     '/usr/share/php/Doctrine/Common/Cache/autoload.php',
     '/usr/share/php/phpDocumentor/Reflection2/autoload-type-resolver.php',
-    '/usr/share/php/phpDocumentor/Reflection/DocBlock4/autoload.php',
+    '/usr/share/php/phpDocumentor/Reflection/DocBlock5/autoload.php',
 ]);
 \Fedora\Autoloader\Dependencies::optional([
     '/usr/share/php/Bartlett/CompatInfo/autoload.php', // Needed when installed for 'Bartlett\CompatInfo\Analyser\CompatibilityAnalyser'
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 5833e55..e916b76 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    6e571b0f6fcc90325b30f155d7ef0959cf114897
+%global gh_commit    2e890a43cab0a2c92806d1eaf45fa1b4edd3b887
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150331
 %global gh_owner     llaville
@@ -23,7 +23,7 @@
 %global phpunit %{_bindir}/phpunit8
 
 Name:           php-bartlett-PHP-Reflect
-Version:        4.4.0
+Version:        4.4.1
 %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
@@ -48,7 +48,7 @@ BuildRequires:  %{phpunit}
 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) >= 4.3   with php-composer(phpdocumentor/reflection-docblock) < 5)
+BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2   with php-composer(phpdocumentor/reflection-docblock) < 6)
 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)
@@ -60,7 +60,7 @@ BuildRequires: (php-composer(doctrine/cache)                    >= 1.3   with ph
 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-reflection-docblock5          >= 5.2
 BuildRequires:  php-phpdocumentor-type-resolver1
 BuildRequires:  php-jsonlint                                    >= 1.4
 BuildRequires:  php-justinrainbow-json-schema5                  >= 5.2
@@ -78,7 +78,7 @@ BuildRequires:  php-composer(fedora/autoloader)
 %endif
 
 # From composer.json, "require": {
-#        "php": "^7.1.3",
+#        "php": "^7.1.3|^8.0",
 #        "ext-tokenizer": "*",
 #        "ext-pcre": "*",
 #        "ext-spl": "*",
@@ -93,7 +93,7 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "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/reflection-docblock": "^4.3|^5.2",
 #        "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
 #        "justinrainbow/json-schema": "^5.2",
 #        "seld/jsonlint": "^1.4",
@@ -112,7 +112,7 @@ Requires:       php-tokenizer
 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) >= 4.3   with php-composer(phpdocumentor/reflection-docblock) < 5)
+Requires:      (php-composer(phpdocumentor/reflection-docblock) >= 5.2   with php-composer(phpdocumentor/reflection-docblock) < 6)
 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)
@@ -125,7 +125,7 @@ Requires:      (php-composer(doctrine/cache)                    >= 1.3   with ph
 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-reflection-docblock5          >= 5.2
 Requires:       php-phpdocumentor-type-resolver1
 Requires:       php-jsonlint                                    >= 1.4
 Requires:       php-justinrainbow-json-schema5                  >= 5.2
@@ -226,6 +226,10 @@ fi
 
 
 %changelog
+* Wed Oct  7 2020 Remi Collet <remi@remirepo.net> - 4.4.1-1
+- update to 4.4.1
+- raise dependency on phpdocumentor/reflection-docblock 5.2
+
 * Tue Jul  7 2020 Remi Collet <remi@remirepo.net> - 4.4.0-1
 - update to 4.4.0