update to 2.8.3 from Fedora

* Fri Mar 30 2018 Shawn Iwinski <shawn@iwin.ski> - 2.8.3-1
- Update to 2.8.3 (RHBZ #1492447)
- Add range version dependencies for Fedora >= 27 || RHEL >= 8

1 files changed, 47 insertions, 29 deletions

diff --git a/php-consolidation-annotated-command.spec b/php-consolidation-annotated-command.spec
index 6ac1346..55e1d8c 100644
--- a/php-consolidation-annotated-command.spec
+++ b/php-consolidation-annotated-command.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-consolidation-annotated-command
 #
-# Copyright (c) 2016-2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2018 Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,31 +12,30 @@
 
 %global github_owner     consolidation-org
 %global github_name      annotated-command
-%global github_version   2.4.13
-%global github_commit    abb685e42c83d0b698b4e22059e5d505588f7d3c
+%global github_version   2.8.3
+%global github_commit    8f8f5da2ca06fbd3a85f7d551c49f844b7c59437
 
 %global composer_vendor  consolidation
 %global composer_project annotated-command
 
 # "php": ">=5.4.0"
 %global php_min_ver 5.4.0
-# "consolidation/output-formatters": "^3.1.10"
-%global consolidation_output_formatters_min_ver 3.1.10
+# "consolidation/output-formatters": "^3.1.12"
+%global consolidation_output_formatters_min_ver 3.1.12
 %global consolidation_output_formatters_max_ver 4
 # "psr/log": "^1"
 #     NOTE: Min version not 1.0 because autoloader required
 %global psr_log_min_ver 1.0.1
 %global psr_log_max_ver 2.0
-# "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0"
-#     NOTE: Min version not 5.0 until it is determined how 4.0 of this
-#           dependency is implemented
-%global phpdocumentor_reflection_docblock_min_ver 2.0
-%global phpdocumentor_reflection_docblock_max_ver 4.0
-# "symfony/console": "^2.8|~3"
-# "symfony/event-dispatcher": "^2.5|^3"
-# "symfony/finder": "^2.5|^3"
+# "symfony/console": "^2.8|^3|^4"
+# "symfony/event-dispatcher": "^2.5|^3|^4"
+# "symfony/finder": "^2.5|^3|^4"
 %global symfony_min_ver 2.8
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%global symfony_max_ver 5.0
+%else
 %global symfony_max_ver 4.0
+%endif
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -58,20 +57,24 @@ BuildArch:     noarch
 %if %{with_tests}
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
+BuildRequires: php-composer(phpunit/phpunit)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver} with php-composer(consolidation/output-formatters) < %{consolidation_output_formatters_max_ver})
+BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+BuildRequires: (php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} with php-composer(symfony/event-dispatcher) < %{symfony_max_ver})
+BuildRequires: (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver})
+%else
 BuildRequires: php-composer(consolidation/output-formatters) <  %{consolidation_output_formatters_max_ver}
 BuildRequires: php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver}
-BuildRequires: php-composer(phpdocumentor/reflection-docblock) <  %{phpdocumentor_reflection_docblock_max_ver}
-BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
 BuildRequires: php-composer(psr/log) <  %{psr_log_max_ver}
 BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
 BuildRequires: php-composer(symfony/console) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver}
 BuildRequires: php-composer(symfony/event-dispatcher) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver}
 BuildRequires: php-composer(symfony/finder) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/finder) >= %{symfony_min_ver}
-## phpcompatinfo (computed from version 2.4.13)
+%endif
+## phpcompatinfo (computed from version 2.8.3)
 BuildRequires: php-dom
 BuildRequires: php-pcre
 BuildRequires: php-reflection
@@ -82,19 +85,22 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver} with php-composer(consolidation/output-formatters) < %{consolidation_output_formatters_max_ver})
+Requires:      (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+Requires:      (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+Requires:      (php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} with php-composer(symfony/event-dispatcher) < %{symfony_max_ver})
+Requires:      (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver})
+%else
 Requires:      php-composer(consolidation/output-formatters) <  %{consolidation_output_formatters_max_ver}
 Requires:      php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver}
-Requires:      php-composer(phpdocumentor/reflection-docblock) <  %{phpdocumentor_reflection_docblock_max_ver}
-Requires:      php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver}
 Requires:      php-composer(psr/log) <  %{psr_log_max_ver}
 Requires:      php-composer(psr/log) >= %{psr_log_min_ver}
 Requires:      php-composer(symfony/console) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/console) >= %{symfony_min_ver}
 Requires:      php-composer(symfony/event-dispatcher) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/event-dispatcher) >= %{symfony_min_ver}
 Requires:      php-composer(symfony/finder) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/finder) >= %{symfony_min_ver}
-# phpcompatinfo (computed from version 2.4.13)
+%endif
+# phpcompatinfo (computed from version 2.8.3)
 Requires:      php-dom
 Requires:      php-pcre
 Requires:      php-reflection
@@ -129,20 +135,19 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/Consolidation/OutputFormatters/autoload.php',
-    [
-        '%{phpdir}/phpDocumentor/Reflection/DocBlock/autoload.php',
-        '%{phpdir}/phpDocumentor/Reflection/DocBlock2/autoload.php',
-    ],
     '%{phpdir}/Psr/Log/autoload.php',
     [
+        '%{phpdir}/Symfony4/Component/Console/autoload.php',
         '%{phpdir}/Symfony3/Component/Console/autoload.php',
         '%{phpdir}/Symfony/Component/Console/autoload.php',
     ],
     [
+        '%{phpdir}/Symfony4/Component/EventDispatcher/autoload.php',
         '%{phpdir}/Symfony3/Component/EventDispatcher/autoload.php',
         '%{phpdir}/Symfony/Component/EventDispatcher/autoload.php',
     ],
     [
+        '%{phpdir}/Symfony4/Component/Finder/autoload.php',
         '%{phpdir}/Symfony3/Component/Finder/autoload.php',
         '%{phpdir}/Symfony/Component/Finder/autoload.php',
     ]
@@ -168,6 +173,15 @@ BOOTSTRAP
 sed 's/function testInteractAndValidate/function SKIP_testInteractAndValidate/' \
     -i tests/testAnnotatedCommandFactory.php
 
+: Update tests if symfony/var-dumper is installed
+if \
+    [ -e '%{phpdir}/Symfony4/Component/VarDumper/autoload.php' ] \
+    || [ -e '%{phpdir}/Symfony3/Component/VarDumper/autoload.php' ] \
+    || [ -e '%{phpdir}/Symfony/Component/VarDumper/autoload.php' ]
+then
+    grep -r --files-with-matches ',var_export' tests | xargs sed -i 's/,var_export/,var_dump,var_export/g'
+fi
+
 : Upstream tests
 RETURN_CODE=0
 for PHP_EXEC in php %{?rhel:php55} php56 php70 php71 php72; do
@@ -192,6 +206,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Mar 30 2018 Shawn Iwinski <shawn@iwin.ski> - 2.8.3-1
+- Update to 2.8.3 (RHBZ #1492447)
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+
 * Wed Aug 30 2017 Shawn Iwinski <shawn@iwin.ski> - 2.4.13-1
 - Update to 2.4.13 (RHBZ #1485331)