From 9ab156ac4bb56541818d5cf7b19418981321ec02 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 6 Nov 2017 08:41:15 +0100
Subject: adapt autoloader for php-sebastian-php-token-stream2

---
 php-phpunit-PHP-CodeCoverage.spec | 70 +++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 28 deletions(-)

(limited to 'php-phpunit-PHP-CodeCoverage.spec')

diff --git a/php-phpunit-PHP-CodeCoverage.spec b/php-phpunit-PHP-CodeCoverage.spec
index f58f953..1d0d5cf 100644
--- a/php-phpunit-PHP-CodeCoverage.spec
+++ b/php-phpunit-PHP-CodeCoverage.spec
@@ -18,7 +18,7 @@
 %global pear_channel pear.phpunit.de
 %global major        4.0
 %global minor        8
-%global specrel      1
+%global specrel      3
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
 %else
@@ -35,6 +35,8 @@ License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 
+Patch1:         https://patch-diff.githubusercontent.com/raw/sebastianbergmann/php-code-coverage/pull/554.patch
+
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-fedora-autoloader-devel
@@ -46,6 +48,12 @@ BuildRequires:  php-composer(phpunit/phpunit) >= 5.7
 BuildRequires:  php-composer(sebastian/code-unit-reverse-lookup) >= 1
 BuildRequires:  php-composer(sebastian/environment) >= 1.3.2
 BuildRequires:  php-pecl-xdebug  >= 2.4.0
+%if 0%{?fedora} >= 25
+BuildRequires:  php-composer(phpunit/php-token-stream) <  3
+%else
+BuildRequires:  php-composer(phpunit/php-token-stream) <  2
+%endif
+BuildRequires:  php-composer(phpunit/php-token-stream) >= 1.4.2
 %endif
 
 # From composer.json, require
@@ -64,7 +72,11 @@ Requires:       php-xmlwriter
 Requires:       php-composer(phpunit/php-file-iterator) >= 1.3
 Requires:       php-composer(phpunit/php-file-iterator) <  2
 Requires:       php-composer(phpunit/php-token-stream) >= 1.4.2
+%if 0%{?fedora} >= 25
 Requires:       php-composer(phpunit/php-token-stream) <  3
+%else
+Requires:       php-composer(phpunit/php-token-stream) <  2
+%endif
 Requires:       php-composer(phpunit/php-text-template) >= 1.2
 Requires:       php-composer(phpunit/php-text-template) <  2
 Requires:       php-composer(sebastian/code-unit-reverse-lookup) >= 1
@@ -97,6 +109,7 @@ for PHP code coverage information.
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch1 -p1
 
 
 %build
@@ -107,12 +120,17 @@ for PHP code coverage information.
 
 cat << 'EOF' | tee -a src/autoload.php
 // Dependencies
-require_once 'File/Iterator/Autoload.php';
-require_once 'PHP/Token/Stream/Autoload.php';
-require_once 'Text/Template/Autoload.php';
-require_once 'SebastianBergmann/CodeUnitReverseLookup/autoload.php';
-require_once 'SebastianBergmann/Environment/autoload.php';
-require_once 'SebastianBergmann/Version/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+    'File/Iterator/Autoload.php',
+    [
+        'SebastianBergmann/PhpTokenStream2/autoload.php',
+        'PHP/Token/Stream/Autoload.php',
+    ],
+    'Text/Template/Autoload.php',
+    'SebastianBergmann/CodeUnitReverseLookup/autoload.php',
+    'SebastianBergmann/Environment/autoload.php',
+    'SebastianBergmann/Version/autoload.php',
+]);
 EOF
 
 
@@ -135,28 +153,16 @@ require __DIR__ . '/TestCase.php';
 define('TEST_FILES_PATH', __DIR__ . '/_files/');
 EOF
 
-# remirepo:15
-run=0
 ret=0
-if which php56; then
-  php56 $EXT \
-    -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-    %{_bindir}/phpunit || ret=1
-  run=1
-fi
-if which php71; then
-  php71 $EXT \
-    -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-    %{_bindir}/phpunit || ret=1
-  run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/php $EXT \
-    -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-    %{_bindir}/phpunit \
-        --verbose
-# remirepo:2
-fi
+for cmd in php php70 php71 php72; do
+  if which $cmd; then
+    $cmd $EXT \
+      -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
+      %{_bindir}/phpunit \
+        --filter '^((?!(testForClassWithAnonymousFunction|testTextForClassWithAnonymousFunction|testGetLinesToBeIgnored3|testCloverForClassWithAnonymousFunction)).)*$' \
+        --verbose || ret=1
+  fi
+done
 exit $ret
 %endif
 
@@ -178,6 +184,14 @@ fi
 
 
 %changelog
+* Mon Nov  6 2017 Remi Collet <remi@remirepo.net> - 4.0.8-3
+- adapt autoloader for php-sebastian-php-token-stream2
+
+* Fri Nov  3 2017 Remi Collet <remi@remirepo.net> - 4.0.8-2
+- fix FTBFS from Koschei, add patch for PHP 7.2 from
+  https://github.com/sebastianbergmann/php-code-coverage/pull/554
+- ignore test failing, know by upstream (travis)
+
 * Sun Apr  2 2017 Remi Collet <remi@remirepo.net> - 4.0.8-1
 - Update to 4.0.8
 
-- 
cgit