Update to 4.0.1

allow Symfony 4

2 files changed, 22 insertions, 10 deletions

diff --git a/composer.json b/composer.json
index c4e2153..980622f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "php": "^5.6 || ^7.0",
         "sebastian/finder-facade": "^1.1",
         "sebastian/version": "^2.0",
-        "symfony/console": "^2.7|^3.0"
+        "symfony/console": "^2.7|^3.0|^4.0"
     },
     "autoload": {
         "classmap": [
diff --git a/php-phpunit-phploc.spec b/php-phpunit-phploc.spec
index e90ad8f..6773b30 100644
--- a/php-phpunit-phploc.spec
+++ b/php-phpunit-phploc.spec
@@ -7,7 +7,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    7335bb2173c687759631fe4901db6897245f6e2b
+%global gh_commit    6a8a9416517b82d6326ac9c2d040ad53c13654eb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phploc
@@ -17,7 +17,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:           php-phpunit-phploc
-Version:        4.0.0
+Version:        4.0.1
 Release:        1%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
@@ -37,13 +37,14 @@ BuildRequires:  php-composer(sebastian/finder-facade) <  2
 BuildRequires:  php-composer(sebastian/finder-facade) >= 1.1
 BuildRequires:  php-composer(sebastian/version) <  3
 BuildRequires:  php-composer(sebastian/version) >= 2.0
-BuildRequires:  php-composer(symfony/console) <  4
-BuildRequires:  php-composer(symfony/console) >= 2.5
 %if 0%{?fedora} >= 26
+BuildRequires:  php-composer(symfony/console) <  5
 %global phpunit %{_bindir}/phpunit6
 %else
+BuildRequires:  php-composer(symfony/console) <  4
 %global phpunit %{_bindir}/phpunit
 %endif
+BuildRequires:  php-composer(symfony/console) >= 2.7
 BuildRequires: %{phpunit}
 %endif
 
@@ -51,15 +52,19 @@ BuildRequires: %{phpunit}
 #      "php": "^5.6 || ^7.0",
 #      "sebastian/finder-facade": "^1.1",
 #      "sebastian/version": "^2.0",
-#      "symfony/console": "^2.7|^3.0"
+#      "symfony/console": "^2.7|^3.0|^4.0"
 Requires:       php(language) >= 5.6
 Requires:       php-cli
-Requires:       php-composer(sebastian/finder-facade) >= 1.1
 Requires:       php-composer(sebastian/finder-facade) <  2
-Requires:       php-composer(sebastian/version) >= 2.0
+Requires:       php-composer(sebastian/finder-facade) >= 1.1
 Requires:       php-composer(sebastian/version) <  3
-Requires:       php-composer(symfony/console) >= 2.5
+Requires:       php-composer(sebastian/version) >= 2.0
+%if 0%{?fedora} >= 26
+Requires:       php-composer(symfony/console) <  5
+%else
 Requires:       php-composer(symfony/console) <  4
+%endif
+Requires:       php-composer(symfony/console) >= 2.7
 # From phpcompatinfo report for version 4.0.0
 Requires:       php-dom
 Requires:       php-spl
@@ -100,6 +105,7 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{_datadir}/php/SebastianBergmann/Version/autoload.php',
     '%{_datadir}/php/TheSeer/fDOMDocument/autoload.php',
     [
+        '%{_datadir}/php/Symfony4/Component/Console/autoload.php',
         '%{_datadir}/php/Symfony3/Component/Console/autoload.php',
         '%{_datadir}/php/Symfony/Component/Console/autoload.php',
     ],
@@ -116,14 +122,16 @@ install -D -p -m 755 phploc %{buildroot}%{_bindir}/phploc
 
 %if %{with_tests}
 %check
+ret=0
 for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
   if which $cmd; then
     set $cmd
     $1 ${2:-%{_bindir}/phpunit6} \
       --bootstrap %{buildroot}%{php_home}/PHPLOC/autoload.php \
-      --verbose tests
+      --verbose tests || ret=1
   fi
 done
+exit $ret
 %endif
 
 
@@ -144,6 +152,10 @@ fi
 
 
 %changelog
+* Sun Nov 19 2017 Remi Collet <remi@remirepo.net> - 4.0.1-1
+- Update to 4.0.1
+- allow Symfony 4
+
 * Wed Jun  7 2017 Remi Collet <remi@remirepo.net> - 4.0.0-1
 - Update to 4.0.0
 - use phpunit6 when available