Compare commits

...
Sign in to create a new pull request.

15 commits

Author SHA1 Message Date
Remi Collet
6da624da4e update to 9.5.10
raise dependency on phpunit/php-code-coverage 9.2.7

(cherry picked from commit ea25aae66e)
2021-09-27 07:39:22 +02:00
Remi Collet
8a4516ad56 v9.5.9
(cherry picked from commit 3defe0f96d)
2021-09-01 15:10:31 +02:00
Remi Collet
ef6ab79039 update to 9.5.8
raise dependency on phar-io/manifest 2.0.3

(cherry picked from commit 680d481a3c)
(cherry picked from commit ac26ec57a2)
2021-08-02 09:43:16 +02:00
Remi Collet
aeb412be6f v9.5.7
(cherry picked from commit 505a555fd6)
2021-07-19 14:18:03 +02:00
Remi Collet
c2857b4c47 v9.5.6
(cherry picked from commit 6f615b81e7)
2021-06-23 09:59:28 +02:00
Remi Collet
75e2e814fa update to 9.5.5
raise dependency on sebastian/type 2.3.2

(cherry picked from commit 7687f20165)
2021-06-07 07:56:08 +02:00
Remi Collet
6c53d697ae v9.5.4
(cherry picked from commit 523daf1eaa)
2021-03-23 08:51:07 +01:00
Remi Collet
216be8962c v9.5.3
(cherry picked from commit 66b64a58f3)
2021-03-17 10:37:30 +01:00
Remi Collet
9b246c1578 v9.5.2
(cherry picked from commit 4cfaee29d0)
2021-02-04 07:01:59 +01:00
Remi Collet
c92b1b9f1e update to 9.5.0
raise dependency on phpunit/php-code-coverage 9.2.3

(cherry picked from commit 01f20e632d)
2020-12-07 11:55:38 +01:00
Remi Collet
4e304f7e01 v9.4.4
(cherry picked from commit 96a6751a1d)
2020-12-01 08:27:48 +01:00
Remi Collet
8a25eddf51 v9.4.3
(cherry picked from commit cbb5aac27f)
2020-11-12 08:36:14 +01:00
Remi Collet
e520120d4a v9.4.2
(cherry picked from commit 0c9acbb939)
2020-10-19 15:08:56 +02:00
Remi Collet
e3e159820a v9.4.1
(cherry picked from commit 4b1307212d)
2020-10-12 08:34:24 +02:00
Remi Collet
696bcbf9c4 update to 9.4.0
raise dependency on phpunit/php-code-coverage 9.2

(cherry picked from commit 2d57260283)
2020-10-02 09:48:01 +02:00
5 changed files with 161 additions and 71 deletions

16
.gitignore vendored
View file

@ -7,3 +7,19 @@
/phpunit9-9.2.6-1c6a9e4.tgz
/phpunit9-9.3.8-93d78d8.tgz
/phpunit9-9.3.10-919333f.tgz
/phpunit9-9.3.11-f7316ea.tgz
/phpunit9-9.4.0-ef53346.tgz
/phpunit9-9.4.1-1f09a12.tgz
/phpunit9-9.4.2-3866b2e.tgz
/phpunit9-9.4.3-9fa359f.tgz
/phpunit9-9.4.4-6535e63.tgz
/phpunit9-9.5.0-8e16c22.tgz
/phpunit9-9.5.2-f661659.tgz
/phpunit9-9.5.3-27241ac.tgz
/phpunit9-9.5.4-c73c673.tgz
/phpunit9-9.5.5-89ff45e.tgz
/phpunit9-9.5.6-fb9b833.tgz
/phpunit9-9.5.7-d0dc8b6.tgz
/phpunit9-9.5.8-191768c.tgz
/phpunit9-9.5.9-ea8c2df.tgz
/phpunit9-9.5.10-c814a05.tgz

View file

@ -1,28 +1,32 @@
#!/bin/bash
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)
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)
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..."
rm -rf $PROJECT-$COMMIT
git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
echo "Cloning..."
rm -rf $PROJECT-$COMMIT
git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
echo "Getting commit..."
pushd $PROJECT-$COMMIT
git checkout $COMMIT
cp composer.json ../composer.json
popd
echo "Getting commit..."
pushd $PROJECT-$COMMIT
git checkout $COMMIT || exit1
cp composer.json ../composer.json
popd
echo "Archiving..."
tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
echo "Archiving..."
tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
echo "Cleaning..."
rm -rf $PROJECT-$COMMIT
echo "Cleaning..."
rm -rf $PROJECT-$COMMIT
echo "Done."
echo "Done."
fi

View file

@ -1,7 +1,7 @@
diff -up ./phpunit.rpm ./phpunit
--- ./phpunit.rpm 2020-08-10 12:02:07.000000000 +0200
+++ ./phpunit 2020-08-10 12:02:22.089870229 +0200
@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
--- ./phpunit.rpm 2021-08-02 09:09:31.000000000 +0200
+++ ./phpunit 2021-08-02 09:09:33.927568458 +0200
@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC');
}
@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit
}
$options = getopt('', array('prepend:'));
@@ -58,4 +45,8 @@ unset($options);
@@ -89,4 +76,8 @@ unset($options);
require PHPUNIT_COMPOSER_INSTALL;
@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit
+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
+}
diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php
--- ./src/Util/Xml/SchemaFinder.php.rpm 2020-08-10 12:02:22.089870229 +0200
+++ ./src/Util/Xml/SchemaFinder.php 2020-08-10 12:06:11.098559995 +0200
--- ./src/Util/Xml/SchemaFinder.php.rpm 2021-08-02 09:09:31.000000000 +0200
+++ ./src/Util/Xml/SchemaFinder.php 2021-08-02 09:09:33.927568458 +0200
@@ -48,6 +48,6 @@ final class SchemaFinder
return __PHPUNIT_PHAR_ROOT__ . '/';
}
@ -55,15 +55,33 @@ diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php
}
}
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm 2020-08-10 12:02:07.000000000 +0200
+++ ./tests/bootstrap.php 2020-08-10 12:02:22.089870229 +0200
@@ -14,4 +14,8 @@ if (!\defined('TEST_FILES_PATH')) {
\ini_set('precision', '14');
\ini_set('serialize_precision', '14');
--- ./tests/bootstrap.php.rpm 2021-08-02 09:09:33.928568455 +0200
+++ ./tests/bootstrap.php 2021-08-02 09:10:37.377383177 +0200
@@ -9,8 +9,8 @@
*/
const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once '@PATH@/autoload.php';
+require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php';
+require_once __DIR__ . '/_files/CoveredFunction.php';
+require_once __DIR__ . '/_files/NamespaceCoveredFunction.php';
+require_once __DIR__ . '/autoload.php';
-$composer = file_exists(__DIR__ . '/../vendor/autoload.php');
-$phar = file_exists(__DIR__ . '/autoload.php');
+$composer = true;
+$phar = false;
if ($composer && $phar) {
print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL;
@@ -26,10 +26,14 @@ 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 __DIR__ . '/autoload.php';
}
if ($phar) {

View file

@ -1,6 +1,6 @@
# remirepo/fedora spec file for phpunit9
#
# Copyright (c) 2010-2020 Remi Collet
# Copyright (c) 2010-2021 Remi Collet
#
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
@ -11,10 +11,10 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
%global gh_commit 919333f2d046a89f9238f15d09f17a8f0baa5cc2
%global gh_commit c814a05837f2edb0d1471d6e3f4ab3501ca3899a
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
%global gh_owner sebastianbergmann
%global gh_project phpunit
# Packagist
%global pk_vendor phpunit
@ -23,17 +23,19 @@
%global ns_vendor PHPUnit9
%global php_home %{_datadir}/php
%global ver_major 9
%global ver_minor 3
%global specrel 1
%global ver_minor 5
%global upstream_version 9.5.10
#global upstream_prever dev
Name: %{pk_project}%{ver_major}
Version: 9.3.10
Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 1%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
License: BSD
URL: https://github.com/%{gh_vendor}/%{gh_project}
Source0: %{name}-%{version}-%{gh_short}.tgz
Source0: %{name}-%{upstream_version}-%{gh_short}.tgz
Source1: makesrc.sh
# Fix command for autoload
@ -43,24 +45,24 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.3
BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.1 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(phpspec/prophecy) >= 1.11.1 with php-composer(phpspec/prophecy) < 2)
BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.1.5 with php-composer(phpunit/php-code-coverage) < 10)
BuildRequires: (php-composer(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2)
BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2.7 with php-composer(phpunit/php-code-coverage) < 10)
BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4)
BuildRequires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4)
BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6)
BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2)
BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2)
BuildRequires: (php-composer(sebastian/comparator) >= 4.0.3 with php-composer(sebastian/comparator) < 5)
BuildRequires: (php-composer(sebastian/comparator) >= 4.0.5 with php-composer(sebastian/comparator) < 5)
BuildRequires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5)
BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
BuildRequires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5)
BuildRequires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6)
BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5)
BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
BuildRequires: (php-composer(sebastian/type) >= 2.2.1 with php-composer(sebastian/type) < 3)
BuildRequires: (php-composer(sebastian/type) >= 2.3.4 with php-composer(sebastian/type) < 3)
BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
BuildRequires: php-dom
BuildRequires: php-json
@ -81,25 +83,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "ext-xmlwriter": "*",
# "doctrine/instantiator": "^1.3.1",
# "myclabs/deep-copy": "^1.10.1",
# "phar-io/manifest": "^2.0.1",
# "phar-io/manifest": "^2.0.3",
# "phar-io/version": "^3.0.2",
# "phpspec/prophecy": "^1.11.1",
# "phpunit/php-code-coverage": "^9.1.5",
# "phpunit/php-file-iterator": "^3.0.4",
# "phpunit/php-invoker": "^3.1",
# "phpunit/php-text-template": "^2.0.2",
# "phpunit/php-timer": "^5.0.1",
# "sebastian/cli-parser": "^1.0",
# "sebastian/code-unit": "^1.0.5",
# "sebastian/comparator": "^4.0.3",
# "sebastian/diff": "^4.0.2",
# "sebastian/environment": "^5.1.2",
# "sebastian/exporter": "^4.0.2",
# "sebastian/global-state": "^5.0",
# "sebastian/object-enumerator": "^4.0.2",
# "sebastian/resource-operations": "^3.0.2",
# "sebastian/type": "^2.2.1",
# "sebastian/version": "^3.0.1"
# "phpspec/prophecy": "^1.12.1",
# "phpunit/php-code-coverage": "^9.2.7",
# "phpunit/php-file-iterator": "^3.0.5",
# "phpunit/php-invoker": "^3.1.1",
# "phpunit/php-text-template": "^2.0.3",
# "phpunit/php-timer": "^5.0.2",
# "sebastian/cli-parser": "^1.0.1",
# "sebastian/code-unit": "^1.0.6",
# "sebastian/comparator": "^4.0.5",
# "sebastian/diff": "^4.0.3",
# "sebastian/environment": "^5.1.3",
# "sebastian/exporter": "^4.0.3",
# "sebastian/global-state": "^5.0.1",
# "sebastian/object-enumerator": "^4.0.3",
# "sebastian/resource-operations": "^3.0.3",
# "sebastian/type": "^2.3.4",
# "sebastian/version": "^3.0.2"
Requires: php(language) >= 7.3
Requires: php-cli
Requires: php-dom
@ -110,24 +112,24 @@ Requires: php-xml
Requires: php-xmlwriter
Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
Requires: (php-composer(myclabs/deep-copy) >= 1.10.1 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(phpspec/prophecy) >= 1.11.1 with php-composer(phpspec/prophecy) < 2)
Requires: (php-composer(phpunit/php-code-coverage) >= 9.1.5 with php-composer(phpunit/php-code-coverage) < 10)
Requires: (php-composer(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2)
Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.7 with php-composer(phpunit/php-code-coverage) < 10)
Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4)
Requires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4)
Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
Requires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6)
Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2)
Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2)
Requires: (php-composer(sebastian/comparator) >= 4.0.3 with php-composer(sebastian/comparator) < 5)
Requires: (php-composer(sebastian/comparator) >= 4.0.5 with php-composer(sebastian/comparator) < 5)
Requires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5)
Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
Requires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5)
Requires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6)
Requires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5)
Requires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
Requires: (php-composer(sebastian/type) >= 2.2.1 with php-composer(sebastian/type) < 3)
Requires: (php-composer(sebastian/type) >= 2.3.4 with php-composer(sebastian/type) < 3)
Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
# From composer.json, "suggest": {
# "ext-soap": "*",
@ -230,7 +232,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
ret=0
for cmd in php php73 php74 php80; do
for cmd in php php73 php74 php80 php81; do
if which $cmd; then
$cmd ./phpunit $OPT --verbose || ret=1
fi
@ -247,6 +249,56 @@ exit $ret
%changelog
* Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 9.5.10-1
- update to 9.5.10
- raise dependency on phpunit/php-code-coverage 9.2.7
* Wed Sep 1 2021 Remi Collet <remi@remirepo.net> - 9.5.9-1
- update to 9.5.9
* Mon Aug 2 2021 Remi Collet <remi@remirepo.net> - 9.5.8-1
- update to 9.5.8
- raise dependency on phar-io/manifest 2.0.3
* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 9.5.7-1
- update to 9.5.7
* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 9.5.6-1
- update to 9.5.6
* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 9.5.5-1
- update to 9.5.5
- raise dependency on sebastian/type 2.3.2
* Tue Mar 23 2021 Remi Collet <remi@remirepo.net> - 9.5.4-1
- update to 9.5.4
* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 9.5.3-1
- update to 9.5.3
* Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 9.5.2-1
- update to 9.5.2
* Fri Dec 4 2020 Remi Collet <remi@remirepo.net> - 9.5.0-1
- update to 9.5.0
- raise dependency on phpunit/php-code-coverage 9.2.3
* Tue Dec 1 2020 Remi Collet <remi@remirepo.net> - 9.4.4-1
- update to 9.4.4
* Tue Nov 10 2020 Remi Collet <remi@remirepo.net> - 9.4.3-1
- update to 9.4.3
* Mon Oct 19 2020 Remi Collet <remi@remirepo.net> - 9.4.2-1
- update to 9.4.2
* Mon Oct 12 2020 Remi Collet <remi@remirepo.net> - 9.4.1-1
- update to 9.4.1
* Fri Oct 2 2020 Remi Collet <remi@remirepo.net> - 9.4.0-1
- update to 9.4.0
- raise dependency on phpunit/php-code-coverage 9.2
* Sun Sep 13 2020 Remi Collet <remi@remirepo.net> - 9.3.10-1
- update to 9.3.10

View file

@ -1 +1 @@
SHA512 (phpunit9-9.3.10-919333f.tgz) = c7fb8f635509730d7b94cbdc8461b952e0e71a351e0ed317a71b75a2c7b8c1a24d81f3ea6a0df9b830b5edc05097e1d129f40a70f45f02aea18c497dd956b413
SHA512 (phpunit9-9.5.10-c814a05.tgz) = f490a35c9be8340f8e7d5583fd9f994b324c93ec3cc1758be32f508570747bb7e31df18dbc93d22ff5db03e432add0022cc4c6834a407e394e5b2d3d6c763fc2