rpms/phpunit8
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:f42
rpms:f43
rpms:main
rpms:f41
rpms:f39
rpms:f40
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f30
rpms:f29
...
pull from: rpms:f33
Branches Tags
rpms:f42
rpms:f43
rpms:main
rpms:rawhide
rpms:f41
rpms:f39
rpms:f40
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f30
rpms:f29
Sign in to create a new pull request.

8 commits
rawhide ... f33

Author SHA1 Message Date
Remi Collet
ee75966681 v8.5.21 
(cherry picked from commit c425089c0e)
 2021-09-27 07:04:06 +02:00
Remi Collet
042ac5d157 v8.5.20 
(cherry picked from commit 87c5760237)
 2021-09-01 15:02:26 +02:00
Remi Collet
41b785bb6a update to 8.5.19 
raise dependency on phar-io/manifest 2.0.3
raise dependency on phpunit/php-file-iterator 2.0.4

(cherry picked from commit 3fb51192c0)
(cherry picked from commit b626eb3b6f)
 2021-08-02 09:37:02 +02:00
Remi Collet
a84202d66f v8.5.18 
(cherry picked from commit 6db24b1845)
 2021-07-19 14:10:57 +02:00
Remi Collet
212f7511fd v8.5.17 
(cherry picked from commit 4205266d37)
 2021-06-23 09:22:52 +02:00
Remi Collet
e80b8b7825 v8.5.16 
(cherry picked from commit f3d6cd2ea3)
 2021-06-07 07:47:38 +02:00
Remi Collet
e4dc5b4c29 v8.5.15 
(cherry picked from commit b54a71ac0a)
 2021-03-17 10:21:59 +01:00
Remi Collet
90e626942c v8.5.14 
(cherry picked from commit 7f3d2baddd)
 2021-02-04 06:50:42 +01:00
5 changed files with 111 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored
View file

@ -7,3 +7,11 @@ clog
/phpunit8-8.5.11-3123601.tgz /phpunit8-8.5.11-3123601.tgz
/phpunit8-8.5.12-f40cf5b.tgz /phpunit8-8.5.12-f40cf5b.tgz
/phpunit8-8.5.13-8e86be3.tgz /phpunit8-8.5.13-8e86be3.tgz
/phpunit8-8.5.14-c25f798.tgz
/phpunit8-8.5.15-038d419.tgz
/phpunit8-8.5.16-cc66f2f.tgz
/phpunit8-8.5.17-7906785.tgz
/phpunit8-8.5.18-bd5fc77.tgz
/phpunit8-8.5.19-496281b.tgz
/phpunit8-8.5.20-9deefba.tgz
/phpunit8-8.5.21-50a58a6.tgz

36
makesrc.sh
View file

@ -1,28 +1,32 @@
#!/bin/bash #!/bin/bash
NAME=$(basename $PWD) NAME=$(basename $PWD)
OWNER=$(sed -n '/^%global gh_vendor/{s/.* //;p}' $NAME.spec) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
SHORT=${COMMIT:0:7} SHORT=${COMMIT:0:7}
echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
echo "$NAME-$VERSION-$SHORT.tgz already there"
else
echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
echo "Cloning..." echo "Cloning..."
rm -rf $PROJECT-$COMMIT rm -rf $PROJECT-$COMMIT
git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
echo "Getting commit..." echo "Getting commit..."
pushd $PROJECT-$COMMIT pushd $PROJECT-$COMMIT
git checkout $COMMIT git checkout $COMMIT || exit1
cp composer.json ../composer.json cp composer.json ../composer.json
popd popd
echo "Archiving..." echo "Archiving..."
tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
echo "Cleaning..." echo "Cleaning..."
rm -rf $PROJECT-$COMMIT rm -rf $PROJECT-$COMMIT
echo "Done." echo "Done."
fi

60
phpunit8-rpm.patch
View file

@ -1,7 +1,7 @@
diff -up ./phpunit.rpm ./phpunit diff -up ./phpunit.rpm ./phpunit
--- ./phpunit.rpm 2020-11-10 16:52:55.000000000 +0100 --- ./phpunit.rpm 2021-08-02 08:27:58.000000000 +0200
+++ ./phpunit 2020-11-10 16:58:06.470107562 +0100 +++ ./phpunit 2021-08-02 08:34:41.313976887 +0200
@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { @@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC'); ini_set('date.timezone', 'UTC');
} }
@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit
} }
$options = getopt('', array('prepend:')); $options = getopt('', array('prepend:'));
@@ -58,4 +45,8 @@ unset($options); @@ -89,4 +76,8 @@ unset($options);
require PHPUNIT_COMPOSER_INSTALL; require PHPUNIT_COMPOSER_INSTALL;
@ -44,28 +44,46 @@ diff -up ./phpunit.rpm ./phpunit
+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
+} +}
diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php
--- ./src/Util/Configuration.php.rpm 2020-11-10 16:58:06.470107562 +0100 --- ./src/Util/Configuration.php.rpm 2021-08-02 08:27:58.000000000 +0200
+++ ./src/Util/Configuration.php 2020-11-10 16:59:17.462913118 +0100 +++ ./src/Util/Configuration.php 2021-08-02 08:34:40.070979790 +0200
@@ -903,7 +903,7 @@ final class Configuration @@ -929,7 +929,7 @@ final class Configuration
private function validateConfigurationAgainstSchema(): void private function validateConfigurationAgainstSchema(): void
{ {
$original = \libxml_use_internal_errors(true); $original = libxml_use_internal_errors(true);
- $xsdFilename = __DIR__ . '/../../phpunit.xsd'; - $xsdFilename = __DIR__ . '/../../phpunit.xsd';
+ $xsdFilename = __DIR__ . '/../phpunit.xsd'; + $xsdFilename = __DIR__ . '/../phpunit.xsd';
if (\defined('__PHPUNIT_PHAR_ROOT__')) { if (defined('__PHPUNIT_PHAR_ROOT__')) {
$xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm 2020-11-10 16:52:55.000000000 +0100 --- ./tests/bootstrap.php.rpm 2021-08-02 08:27:58.000000000 +0200
+++ ./tests/bootstrap.php 2020-11-10 16:58:06.470107562 +0100 +++ ./tests/bootstrap.php 2021-08-02 08:44:30.257601265 +0200
@@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) { @@ -9,8 +9,8 @@
\ini_set('precision', '14'); */
\ini_set('serialize_precision', '14'); const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
-require_once __DIR__ . '/../vendor/autoload.php'; -$composer = file_exists(__DIR__ . '/../vendor/autoload.php');
+require_once '@PATH@/autoload.php'; -$phar = file_exists(__DIR__ . '/autoload.php');
+require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; +$composer = true;
+require_once __DIR__ . '/_files/CoveredFunction.php'; +$phar = false;
+require_once __DIR__ . '/_files/NamespaceCoveredFunction.php';
+require_once '@PATH@/Framework/Assert/Functions.php'; if ($composer && $phar) {
+require_once __DIR__ . '/autoload.php'; print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL;
@@ -26,10 +26,15 @@ if (!$composer && !$phar) {
if ($composer) {
if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php');
+ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php');
}
- require_once __DIR__ . '/../vendor/autoload.php';
+ require_once PHPUNIT_COMPOSER_INSTALL;
+ require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php';
+ require_once __DIR__ . '/_files/CoveredFunction.php';
+ require_once __DIR__ . '/_files/NamespaceCoveredFunction.php';
+ require_once '@PATH@//Framework/Assert/Functions.php';
+ require_once __DIR__ . '/autoload.php';
}
if ($phar) {

58
phpunit8.spec
View file

@ -1,6 +1,6 @@
# remirepo/fedora spec file for phpunit8 # remirepo/fedora spec file for phpunit8
# #
# Copyright (c) 2010-2020 Remi Collet # Copyright (c) 2010-2021 Remi Collet
# #
# License: CC-BY-SA # License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/ # http://creativecommons.org/licenses/by-sa/4.0/
@ -11,10 +11,10 @@
# For compatibility with SCL # For compatibility with SCL
%undefine __brp_mangle_shebangs %undefine __brp_mangle_shebangs
%global gh_commit 8e86be391a58104ef86037ba8a846524528d784e %global gh_commit 50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984
#global gh_date 20150927 #global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann %global gh_owner sebastianbergmann
%global gh_project phpunit %global gh_project phpunit
# Packagist # Packagist
%global pk_vendor phpunit %global pk_vendor phpunit
@ -24,16 +24,18 @@
%global php_home %{_datadir}/php %global php_home %{_datadir}/php
%global ver_major 8 %global ver_major 8
%global ver_minor 5 %global ver_minor 5
%global specrel 1
%global upstream_version 8.5.21
#global upstream_prever dev
Name: %{pk_project}%{ver_major} Name: %{pk_project}%{ver_major}
Version: 8.5.13 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Release: 1%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major} Summary: The PHP Unit Testing framework version %{ver_major}
License: BSD License: BSD
URL: https://github.com/%{gh_vendor}/%{gh_project} URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: %{name}-%{version}-%{gh_short}.tgz Source0: %{name}-%{upstream_version}-%{gh_short}.tgz
Source1: makesrc.sh Source1: makesrc.sh
# Fix command for autoload # Fix command for autoload
@ -43,11 +45,11 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.2 BuildRequires: php(language) >= 7.2
BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2)
BuildRequires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3) BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3)
BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4)
BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8)
BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3)
BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3)
BuildRequires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) BuildRequires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4)
@ -79,11 +81,11 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "ext-xmlwriter": "*", # "ext-xmlwriter": "*",
# "doctrine/instantiator": "^1.3.1", # "doctrine/instantiator": "^1.3.1",
# "myclabs/deep-copy": "^1.10.0", # "myclabs/deep-copy": "^1.10.0",
# "phar-io/manifest": "^2.0.1", # "phar-io/manifest": "^2.0.3",
# "phar-io/version": "^3.0.2", # "phar-io/version": "^3.0.2",
# "phpspec/prophecy": "^1.10.3", # "phpspec/prophecy": "^1.10.3",
# "phpunit/php-code-coverage": "^7.0.10", # "phpunit/php-code-coverage": "^7.0.10",
# "phpunit/php-file-iterator": "^2.0.2", # "phpunit/php-file-iterator": "^2.0.4",
# "phpunit/php-text-template": "^1.2.1", # "phpunit/php-text-template": "^1.2.1",
# "phpunit/php-timer": "^2.1.2", # "phpunit/php-timer": "^2.1.2",
# "sebastian/comparator": "^3.0.2", # "sebastian/comparator": "^3.0.2",
@ -105,11 +107,11 @@ Requires: php-xml
Requires: php-xmlwriter Requires: php-xmlwriter
Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
Requires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) Requires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2)
Requires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3) Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3)
Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4)
Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8)
Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3)
Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3)
Requires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) Requires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4)
@ -214,7 +216,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php
sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit
ret=0 ret=0
for cmd in php php72 php73 php74 php80; do for cmd in php php72 php73 php74 php80 php81; do
if which $cmd; then if which $cmd; then
$cmd ./phpunit $OPT --verbose || ret=1 $cmd ./phpunit $OPT --verbose || ret=1
fi fi
@ -231,6 +233,32 @@ exit $ret
%changelog %changelog
* Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 8.5.21-1
- update to 8.5.21
* Wed Sep 1 2021 Remi Collet <remi@remirepo.net> - 8.5.20-1
- update to 8.5.20
* Mon Aug 2 2021 Remi Collet <remi@remirepo.net> - 8.5.19-1
- update to 8.5.19
- raise dependency on phar-io/manifest 2.0.3
- raise dependency on phpunit/php-file-iterator 2.0.4
* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 8.5.18-1
- update to 8.5.18
* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 8.5.17-1
- update to 8.5.17
* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 8.5.16-1
- update to 8.5.16
* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 8.5.15-1
- update to 8.5.15
* Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 8.5.14-1
- update to 8.5.14
* Tue Dec 1 2020 Remi Collet <remi@remirepo.net> - 8.5.13-1 * Tue Dec 1 2020 Remi Collet <remi@remirepo.net> - 8.5.13-1
- update to 8.5.13 - update to 8.5.13

2
sources
View file

@ -1 +1 @@
SHA512 (phpunit8-8.5.13-8e86be3.tgz) = bc2e9a4ecd8ef26c55faa9a439cdb5be95b0825f73785a20e03bea40457ce68c44a82da297327f46ffbe309f230e345e2d3546f9590cdcc932f8cdd1aa8cfefb SHA512 (phpunit8-8.5.21-50a58a6.tgz) = 300514111a18da6af56d9e322ad88c1b13992da631078ed468743ba06a7fd2fa60fd85d77b3845e5c521881c1c29579e8f5688835c90719b9ca8bccac73b16ab