summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rwxr-xr-xcomposer-dev.json39
-rwxr-xr-x[-rw-r--r--]composer.json16
-rw-r--r--php-phpunit-phpcov-dev.spec177
-rw-r--r--php-phpunit-phpcov.spec91
5 files changed, 77 insertions, 255 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6f69818
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.bz2
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer-dev.json b/composer-dev.json
deleted file mode 100755
index 29f874e..0000000
--- a/composer-dev.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "name": "phpunit/phpcov",
- "description": "CLI frontend for PHP_CodeCoverage",
- "homepage": "https://github.com/sebastianbergmann/phpcov",
- "license": "BSD-3-Clause",
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/phpcov/issues"
- },
- "require": {
- "php": "^5.6 || ^7.0",
- "phpunit/phpunit": "^5.0",
- "phpunit/php-code-coverage": "^4.0",
- "sebastian/diff": "^1.1",
- "sebastian/finder-facade": "^1.1",
- "sebastian/version": "^1.0|^2.0",
- "symfony/console": "^2|^3"
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "bin": [
- "phpcov"
- ],
- "extra": {
- "branch-alias": {
- "dev-master": "3.1.x-dev"
- }
- }
-}
-
diff --git a/composer.json b/composer.json
index 1a58f16..29f874e 100644..100755
--- a/composer.json
+++ b/composer.json
@@ -14,13 +14,13 @@
"issues": "https://github.com/sebastianbergmann/phpcov/issues"
},
"require": {
- "php": ">=5.3.3",
- "phpunit/phpunit": ">=4.1",
- "phpunit/php-code-coverage": "~2.0",
- "sebastian/diff": "~1.1",
- "sebastian/finder-facade": "~1.1",
- "sebastian/version": "~1.0",
- "symfony/console": "~2.2"
+ "php": "^5.6 || ^7.0",
+ "phpunit/phpunit": "^5.0",
+ "phpunit/php-code-coverage": "^4.0",
+ "sebastian/diff": "^1.1",
+ "sebastian/finder-facade": "^1.1",
+ "sebastian/version": "^1.0|^2.0",
+ "symfony/console": "^2|^3"
},
"autoload": {
"classmap": [
@@ -32,7 +32,7 @@
],
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "3.1.x-dev"
}
}
}
diff --git a/php-phpunit-phpcov-dev.spec b/php-phpunit-phpcov-dev.spec
deleted file mode 100644
index 8c9589e..0000000
--- a/php-phpunit-phpcov-dev.spec
+++ /dev/null
@@ -1,177 +0,0 @@
-# spec file for php-phpunit-phpcov
-#
-# Copyright (c) 2013-2017 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# Please, preserve the changelog entries
-#
-%global gh_commit 2005bd90c2c8aae6d93ec82d9cda9d55dca96c3d
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner sebastianbergmann
-%global gh_project phpcov
-%global php_home %{_datadir}/php/SebastianBergmann
-%global pear_name phpcov
-%global pear_channel pear.phpunit.de
-# not Ready
-%global with_tests 0%{!?_without_tests:1}
-
-
-Name: php-phpunit-phpcov
-Version: 3.1.0
-Release: 1%{?dist}
-Summary: TextUI front-end for PHP_CodeCoverage
-
-Group: Development/Libraries
-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
-
-# Fix autoload for RPM
-Patch0: %{gh_project}-rpm.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-BuildRequires: php(language) >= 5.6
-BuildRequires: %{_bindir}/phpab
-%if %{with_tests}
-BuildRequires: php-composer(phpunit/phpunit) >= 5.0
-BuildRequires: php-composer(phpunit/php-code-coverage) >= 4.0
-BuildRequires: php-composer(sebastian/diff) >= 1.1
-BuildRequires: php-composer(sebastian/diff) < 2
-BuildRequires: php-composer(sebastian/finder-facade) >= 1.1
-BuildRequires: php-composer(sebastian/finder-facade) < 2
-BuildRequires: php-composer(sebastian/version) >= 1.0
-BuildRequires: php-composer(sebastian/version) < 3
-BuildRequires: php-composer(symfony/console) >= 2.2
-BuildRequires: php-pecl(Xdebug)
-%endif
-
-# from composer.json
-# "php": "^5.6 || ^7.0",
-# "phpunit/phpunit": "^5.0",
-# "phpunit/php-code-coverage": "^4.0",
-# "sebastian/diff": "^1.1",
-# "sebastian/finder-facade": "^1.1",
-# "sebastian/version": "^1.0|^2.0",
-# "symfony/console": "^2|^3"
-Requires: php(language) >= 5.6
-Requires: php-composer(phpunit/phpunit) >= 5.0
-Requires: php-composer(phpunit/phpunit) < 6
-Requires: php-composer(phpunit/php-code-coverage) >= 4.0
-Requires: php-composer(phpunit/php-code-coverage) < 5
-Requires: php-composer(sebastian/diff) >= 1.1
-Requires: php-composer(sebastian/diff) < 2
-Requires: php-composer(sebastian/finder-facade) >= 1.1
-Requires: php-composer(sebastian/finder-facade) < 2
-Requires: php-composer(sebastian/version) >= 1.0
-Requires: php-composer(sebastian/version) < 3
-Requires: php-composer(symfony/console) >= 2
-Requires: php-composer(symfony/console) < 4
-# from phpcompatinfo report for version 3.0.0
-Requires: php-reflection
-Requires: php-spl
-
-Provides: php-composer(phpunit/phpcov) = %{version}
-
-Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
-# Project name
-Provides: phpcov = %{version}
-
-
-%description
-TextUI front-end for PHP_CodeCoverage.
-
-
-%prep
-%setup -q -n %{gh_project}-%{gh_commit}
-
-%patch0 -p0 -b .rpm
-
-
-%build
-phpab \
- --output src/autoload.php \
- src
-
-cat << 'EOF' | tee -a src/autoload.php
-// Dependencies
-require_once 'PHPUnit/Autoload.php';
-require_once 'SebastianBergmann/CodeCoverage/autoload.php';
-require_once 'SebastianBergmann/Diff/autoload.php';
-require_once 'SebastianBergmann/FinderFacade/autoload.php';
-require_once 'SebastianBergmann/Version/autoload.php';
-require_once 'Symfony/Component/Console/autoloader.php';
-EOF
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{php_home}
-cp -pr src %{buildroot}%{php_home}/PHPCOV
-
-install -D -p -m 755 phpcov %{buildroot}%{_bindir}/phpcov
-
-
-%if %{with_tests}
-%check
-%{_bindir}/phpunit \
- --bootstrap src/autoload.php \
- tests
-
-if which php70; then
- php70 %{_bindir}/phpunit \
- --bootstrap src/autoload.php \
- tests
-fi
-%endif
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%post
-if [ -x %{_bindir}/pear ]; then
- %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
- %{pear_channel}/%{pear_name} >/dev/null || :
-fi
-
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE README.md composer.json
-%{php_home}/PHPCOV
-%{_bindir}/phpcov
-
-
-%changelog
-* Fri Jun 3 2016 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
-- Update to 3.1.0
-- raise dependency on phpunit/php-code-coverage >= 4.0
-- drop the autoloader template, simply generate it
-
-* Mon Apr 18 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-3
-- allow sebastian/version 2.0
-
-* Sat Jan 9 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
-- update to 3.0.0
-- raise minimal PHP version to 5.6
-- raise dependencies on phpunit ~5.0, php-code-coverage ~3.0
-- allow symfony 3
-- run test suite with both PHP 6 and 7 when available
-
-* Mon Oct 5 2015 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
-- update to 2.0.2
-- allow PHPUnit 5
-
-* Wed Jun 25 2014 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
-- update to 2.0.1
-- composer dependencies
-
-* Wed Apr 30 2014 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
-- update to 2.0.0
-- sources from github
-
-* Thu Sep 12 2013 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
-- initial package
diff --git a/php-phpunit-phpcov.spec b/php-phpunit-phpcov.spec
index 530255e..8c9589e 100644
--- a/php-phpunit-phpcov.spec
+++ b/php-phpunit-phpcov.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 9ef291483ff65eefd8639584d61bbfb044d747f3
+%global gh_commit 2005bd90c2c8aae6d93ec82d9cda9d55dca96c3d
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpcov
@@ -14,11 +14,11 @@
%global pear_name phpcov
%global pear_channel pear.phpunit.de
# not Ready
-%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
+%global with_tests 0%{!?_without_tests:1}
Name: php-phpunit-phpcov
-Version: 2.0.2
+Version: 3.1.0
Release: 1%{?dist}
Summary: TextUI front-end for PHP_CodeCoverage
@@ -27,48 +27,48 @@ 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
-# Autoload template
-Source1: autoload.php.in
-
# Fix autoload for RPM
Patch0: %{gh_project}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: php(language) >= 5.3.3
+BuildRequires: php(language) >= 5.6
BuildRequires: %{_bindir}/phpab
%if %{with_tests}
-BuildRequires: php-composer(phpunit/phpunit) >= 4.1
-BuildRequires: php-composer(phpunit/php-code-coverage) >= 2.0
+BuildRequires: php-composer(phpunit/phpunit) >= 5.0
+BuildRequires: php-composer(phpunit/php-code-coverage) >= 4.0
BuildRequires: php-composer(sebastian/diff) >= 1.1
BuildRequires: php-composer(sebastian/diff) < 2
BuildRequires: php-composer(sebastian/finder-facade) >= 1.1
BuildRequires: php-composer(sebastian/finder-facade) < 2
-BuildRequires: php-composer(sebastian/version) >= 1.0.3
-BuildRequires: php-composer(sebastian/version) < 1.1
-BuildRequires: php-symfony-console >= 2.2
+BuildRequires: php-composer(sebastian/version) >= 1.0
+BuildRequires: php-composer(sebastian/version) < 3
+BuildRequires: php-composer(symfony/console) >= 2.2
+BuildRequires: php-pecl(Xdebug)
%endif
# from composer.json
-# "php": ">=5.3.3",
-# "phpunit/phpunit": ">=4.1",
-# "phpunit/php-code-coverage": "~2.0",
-# "sebastian/diff": "~1.1",
-# "sebastian/finder-facade": "~1.1",
-# "sebastian/version": "~1.0",
-# "symfony/console": "~2.2"
-Requires: php(language) >= 5.3.3
-Requires: php-composer(phpunit/phpunit) >= 4.1
-Requires: php-composer(phpunit/php-code-coverage) >= 2.0
-Requires: php-composer(phpunit/php-code-coverage) < 3
+# "php": "^5.6 || ^7.0",
+# "phpunit/phpunit": "^5.0",
+# "phpunit/php-code-coverage": "^4.0",
+# "sebastian/diff": "^1.1",
+# "sebastian/finder-facade": "^1.1",
+# "sebastian/version": "^1.0|^2.0",
+# "symfony/console": "^2|^3"
+Requires: php(language) >= 5.6
+Requires: php-composer(phpunit/phpunit) >= 5.0
+Requires: php-composer(phpunit/phpunit) < 6
+Requires: php-composer(phpunit/php-code-coverage) >= 4.0
+Requires: php-composer(phpunit/php-code-coverage) < 5
Requires: php-composer(sebastian/diff) >= 1.1
Requires: php-composer(sebastian/diff) < 2
Requires: php-composer(sebastian/finder-facade) >= 1.1
Requires: php-composer(sebastian/finder-facade) < 2
Requires: php-composer(sebastian/version) >= 1.0
-Requires: php-composer(sebastian/version) < 2
-Requires: php-symfony-console >= 2.2
-# from phpcompatinfo report for version 1.1.0
+Requires: php-composer(sebastian/version) < 3
+Requires: php-composer(symfony/console) >= 2
+Requires: php-composer(symfony/console) < 4
+# from phpcompatinfo report for version 3.0.0
Requires: php-reflection
Requires: php-spl
@@ -92,9 +92,18 @@ TextUI front-end for PHP_CodeCoverage.
%build
phpab \
--output src/autoload.php \
- --template %{SOURCE1} \
src
+cat << 'EOF' | tee -a src/autoload.php
+// Dependencies
+require_once 'PHPUnit/Autoload.php';
+require_once 'SebastianBergmann/CodeCoverage/autoload.php';
+require_once 'SebastianBergmann/Diff/autoload.php';
+require_once 'SebastianBergmann/FinderFacade/autoload.php';
+require_once 'SebastianBergmann/Version/autoload.php';
+require_once 'Symfony/Component/Console/autoloader.php';
+EOF
+
%install
rm -rf %{buildroot}
@@ -106,10 +115,15 @@ install -D -p -m 755 phpcov %{buildroot}%{_bindir}/phpcov
%if %{with_tests}
%check
-phpunit \
- --bootstrap src/autoload.php \
- -d date.timezone=UTC \
- tests
+%{_bindir}/phpunit \
+ --bootstrap src/autoload.php \
+ tests
+
+if which php70; then
+ php70 %{_bindir}/phpunit \
+ --bootstrap src/autoload.php \
+ tests
+fi
%endif
@@ -132,6 +146,21 @@ fi
%changelog
+* Fri Jun 3 2016 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
+- Update to 3.1.0
+- raise dependency on phpunit/php-code-coverage >= 4.0
+- drop the autoloader template, simply generate it
+
+* Mon Apr 18 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-3
+- allow sebastian/version 2.0
+
+* Sat Jan 9 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
+- update to 3.0.0
+- raise minimal PHP version to 5.6
+- raise dependencies on phpunit ~5.0, php-code-coverage ~3.0
+- allow symfony 3
+- run test suite with both PHP 6 and 7 when available
+
* Mon Oct 5 2015 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
- update to 2.0.2
- allow PHPUnit 5