summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json35
-rwxr-xr-xmakesrc.sh32
-rw-r--r--phpunit8-rpm.patch127
-rw-r--r--phpunit8.spec318
4 files changed, 379 insertions, 133 deletions
diff --git a/composer.json b/composer.json
index 18db3fc..e5aad89 100644
--- a/composer.json
+++ b/composer.json
@@ -17,39 +17,36 @@
}
],
"support": {
- "issues": "https://github.com/sebastianbergmann/phpunit/issues"
+ "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+ "security": "https://github.com/sebastianbergmann/phpunit/security/policy"
},
"prefer-stable": true,
"require": {
- "php": "^7.2",
+ "php": ">=7.2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "doctrine/instantiator": "^1.2.0",
- "myclabs/deep-copy": "^1.9.1",
- "phar-io/manifest": "^1.0.3",
- "phar-io/version": "^2.0.1",
- "phpspec/prophecy": "^1.8.1",
- "phpunit/php-code-coverage": "^7.0.7",
- "phpunit/php-file-iterator": "^2.0.2",
+ "doctrine/instantiator": "^1.3.1",
+ "myclabs/deep-copy": "^1.10.0",
+ "phar-io/manifest": "^2.0.3",
+ "phar-io/version": "^3.0.2",
+ "phpunit/php-code-coverage": "^7.0.12",
+ "phpunit/php-file-iterator": "^2.0.4",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.1.2",
- "sebastian/comparator": "^3.0.2",
+ "sebastian/comparator": "^3.0.5",
"sebastian/diff": "^3.0.2",
- "sebastian/environment": "^4.2.2",
- "sebastian/exporter": "^3.1.1",
+ "sebastian/environment": "^4.2.3",
+ "sebastian/exporter": "^3.1.5",
"sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
"sebastian/resource-operations": "^2.0.1",
"sebastian/type": "^1.1.3",
"sebastian/version": "^2.0.1"
},
- "require-dev": {
- "ext-PDO": "*"
- },
"config": {
"platform": {
"php": "7.2.0"
@@ -58,9 +55,9 @@
"sort-packages": true
},
"suggest": {
- "phpunit/php-invoker": "^2.0.0",
- "ext-soap": "*",
- "ext-xdebug": "*"
+ "phpunit/php-invoker": "To allow enforcing time limits",
+ "ext-soap": "To be able to generate mocks based on WSDL files",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
},
"bin": [
"phpunit"
@@ -83,7 +80,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "8.4-dev"
+ "dev-master": "8.5-dev"
}
}
}
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..3580b58
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{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}
+
+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 "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 "Cleaning..."
+ rm -rf $PROJECT-$COMMIT
+
+ echo "Done."
+fi
diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch
index 8b70cbd..700bc8a 100644
--- a/phpunit8-rpm.patch
+++ b/phpunit8-rpm.patch
@@ -1,19 +1,24 @@
diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm 2019-02-01 06:41:59.000000000 +0100
-+++ ./phpunit 2019-02-01 08:43:27.079804951 +0100
-@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
- ini_set('date.timezone', 'UTC');
- }
+--- ./phpunit.rpm 2024-03-06 09:33:13.000000000 +0100
++++ ./phpunit 2024-03-06 10:01:01.286282118 +0100
+@@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p
+ define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']);
--foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
-- if (file_exists($file)) {
-- define('PHPUNIT_COMPOSER_INSTALL', $file);
+ unset($GLOBALS['_composer_autoload_path']);
++} else if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) {
++ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n";
++ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php'));
+ } else {
+- foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
+- if (file_exists($file)) {
+- define('PHPUNIT_COMPOSER_INSTALL', $file);
-
-- break;
+- break;
+- }
- }
--}
-
--unset($file);
+- unset($file);
+-}
-
-if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
- fwrite(
@@ -24,48 +29,94 @@ diff -up ./phpunit.rpm ./phpunit
- );
-
- die(1);
-+// Libraries PATH
-+if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) {
-+ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n";
-+ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php'));
-+} else {
+ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit8/autoload.php');
}
$options = getopt('', array('prepend:'));
-@@ -58,4 +45,8 @@ unset($options);
+@@ -95,4 +79,13 @@ unset($options);
require PHPUNIT_COMPOSER_INSTALL;
-PHPUnit\TextUI\Command::main();
-+if (class_exists('PHPUnit_TextUI_Command')) {
-+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
++if (class_exists('PHPUnit\\TextUI\\Application')) {
++ // PHPUnit v10 or newer
++ exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv']));
++} else if (class_exists('PHPUnit_TextUI_Command')) {
++ // PHPUnit v5 or older
++ PHPUnit_TextUI_Command::main();
+} else {
-+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
++ // PHPUnit v6 to v9
++ PHPUnit\TextUI\Command::main();
+}
+diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php
+--- ./src/TextUI/Command.php.rpm 2024-03-06 10:01:47.658055200 +0100
++++ ./src/TextUI/Command.php 2024-03-06 10:07:26.195999614 +0100
+@@ -1144,7 +1144,7 @@ class Command
+ $this->printVersionString();
+
+ $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit');
+- $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . explode('.', Version::series())[0]);
++ $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=explode('.', Version::series())[0]);
+
+ $notLatest = version_compare($latestVersion, Version::id(), '>');
+ $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>');
+@@ -1161,6 +1161,7 @@ class Command
+ Version::id(),
+ $latestCompatibleVersion
+ );
++ printf('Try a system update for new phpunit%s package.' . PHP_EOL, $major);
+ }
+
+ if ($notLatest) {
+@@ -1168,6 +1169,7 @@ class Command
+ 'The latest version is PHPUnit %s.' . PHP_EOL,
+ $latestVersion
+ );
++ printf('Try to install and use the phpunit%s command.' . PHP_EOL, explode('.', $latestVersion)[0]);
+ }
+
+ exit(TestRunner::SUCCESS_EXIT);
diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php
---- ./src/Util/Configuration.php.rpm 2019-02-01 06:41:59.000000000 +0100
-+++ ./src/Util/Configuration.php 2019-02-01 08:43:27.079804951 +0100
-@@ -899,7 +899,7 @@ final class Configuration
+--- ./src/Util/Configuration.php.rpm 2024-03-06 09:33:13.000000000 +0100
++++ ./src/Util/Configuration.php 2024-03-06 10:01:01.286282118 +0100
+@@ -932,7 +932,7 @@ final class Configuration
private function validateConfigurationAgainstSchema(): void
{
- $original = \libxml_use_internal_errors(true);
+ $original = libxml_use_internal_errors(true);
- $xsdFilename = __DIR__ . '/../../phpunit.xsd';
+ $xsdFilename = __DIR__ . '/../phpunit.xsd';
- if (\defined('__PHPUNIT_PHAR_ROOT__')) {
- $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
+ if (defined('__PHPUNIT_PHAR_ROOT__')) {
+ $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm 2019-02-01 08:43:27.080804957 +0100
-+++ ./tests/bootstrap.php 2019-02-01 08:44:59.691284599 +0100
-@@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) {
- \ini_set('precision', '14');
- \ini_set('serialize_precision', '14');
+--- ./tests/bootstrap.php.rpm 2024-03-06 09:33:13.000000000 +0100
++++ ./tests/bootstrap.php 2024-03-06 10:01:01.286282118 +0100
+@@ -9,8 +9,8 @@
+ */
+ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
+
+-$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,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';
+ }
--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 '@PATH@/Framework/Assert/Functions.php';
-+require_once __DIR__ . '/autoload.php';
+ if ($phar) {
diff --git a/phpunit8.spec b/phpunit8.spec
index c69f0d0..59fdc05 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -1,20 +1,21 @@
# remirepo/fedora spec file for phpunit8
#
-# Copyright (c) 2010-2019 Remi Collet
+# Copyright (c) 2010-2024 Remi Collet
#
-# License: CC-BY-SA
+# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
+# remirepo:2
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 57e5e77b62086033528ee1f4063ae03035f57894
+%global gh_commit fce30f306cee78be33ba00c8f9a853f41db0491b
#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,18 +24,20 @@
%global ns_vendor PHPUnit8
%global php_home %{_datadir}/php
%global ver_major 8
-%global ver_minor 4
-%global ver_patch 0
-%global specrel 1
+%global ver_minor 5
+
+%global upstream_version 8.5.37
+#global upstream_prever dev
Name: %{pk_project}%{ver_major}
-Version: %{ver_major}.%{ver_minor}.%{ver_patch}
-Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
+Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release: 2%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
-License: BSD
-URL: https://github.com/%{gh_vendor}/%{gh_project}
-Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+License: BSD-3-Clause
+URL: https://github.com/%{gh_owner}/%{gh_project}
+Source0: %{name}-%{upstream_version}-%{gh_short}.tgz
+Source1: makesrc.sh
# Fix command for autoload
Patch0: %{name}-rpm.patch
@@ -43,19 +46,19 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.2
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2)
-BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2)
-BuildRequires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2)
-BuildRequires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3)
-BuildRequires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2)
-BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.7 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(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(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.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-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-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.5 with php-composer(sebastian/comparator) < 4)
BuildRequires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4)
-BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5)
-BuildRequires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 4)
+BuildRequires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5)
+BuildRequires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4)
BuildRequires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4)
BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
@@ -64,19 +67,19 @@ BuildRequires: (php-composer(sebastian/type) >= 1.1.3 with php-c
BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3)
# remirepo:21
%else
-BuildRequires: php-doctrine-instantiator11 >= 1.2.0
-BuildRequires: php-myclabs-deep-copy19 >= 1.9.1
-BuildRequires: php-phar-io-manifest >= 1.0.3
-BuildRequires: php-phar-io-version >= 2.0.1
-BuildRequires: php-phpspec-prophecy >= 1.8.1
-BuildRequires: php-phpunit-php-code-coverage7 >= 7.0.7
-BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.2
+BuildRequires: php-doctrine-instantiator >= 1.3.1
+BuildRequires: php-myclabs-deep-copy >= 1.10.0
+BuildRequires: php-phar-io-manifest2 >= 2.0.3
+BuildRequires: php-phar-io-version3 >= 3.0.2
+BuildRequires: php-phpspec-prophecy >= 1.10.3
+BuildRequires: php-phpunit-php-code-coverage7 >= 7.0.12
+BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.4
BuildRequires: php-phpunit-Text-Template >= 1.2.1
BuildRequires: php-phpunit-php-timer2 >= 2.1.2
-BuildRequires: php-sebastian-comparator3 >= 3.0.2
+BuildRequires: php-sebastian-comparator3 >= 3.0.5
BuildRequires: php-sebastian-diff3 >= 3.0.2
-BuildRequires: php-sebastian-environment4 >= 4.2.2
-BuildRequires: php-sebastian-exporter3 >= 3.1.1
+BuildRequires: php-sebastian-environment4 >= 4.2.3
+BuildRequires: php-sebastian-exporter3 >= 3.1.5
BuildRequires: php-sebastian-global-state3
BuildRequires: php-sebastian-object-enumerator3 >= 3.0.3
BuildRequires: php-sebastian-resource-operations2 >= 2.0.1
@@ -94,26 +97,25 @@ BuildRequires: php-xmlwriter
BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# From composer.json, "require": {
-# "php": "^7.2",
+# "php": ">=7.2",
# "ext-dom": "*",
# "ext-json": "*",
# "ext-libxml": "*",
# "ext-mbstring": "*",
# "ext-xml": "*",
# "ext-xmlwriter": "*",
-# "doctrine/instantiator": "^1.2.0",
-# "myclabs/deep-copy": "^1.9.1",
-# "phar-io/manifest": "^1.0.3",
-# "phar-io/version": "^2.0.1",
-# "phpspec/prophecy": "^1.8.1",
-# "phpunit/php-code-coverage": "^7.0.7",
-# "phpunit/php-file-iterator": "^2.0.2",
+# "doctrine/instantiator": "^1.3.1",
+# "myclabs/deep-copy": "^1.10.0",
+# "phar-io/manifest": "^2.0.3",
+# "phar-io/version": "^3.0.2",
+# "phpunit/php-code-coverage": "^7.0.10",
+# "phpunit/php-file-iterator": "^2.0.4",
# "phpunit/php-text-template": "^1.2.1",
# "phpunit/php-timer": "^2.1.2",
-# "sebastian/comparator": "^3.0.2",
+# "sebastian/comparator": "^3.0.5",
# "sebastian/diff": "^3.0.2",
-# "sebastian/environment": "^4.2.2",
-# "sebastian/exporter": "^3.1.1",
+# "sebastian/environment": "^4.2.3",
+# "sebastian/exporter": "^3.1.5",
# "sebastian/global-state": "^3.0.0",
# "sebastian/object-enumerator": "^3.0.3",
# "sebastian/resource-operations": "^2.0.1",
@@ -129,19 +131,19 @@ Requires: php-xml
Requires: php-xmlwriter
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2)
-Requires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2)
-Requires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2)
-Requires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3)
-Requires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2)
-Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.7 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(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(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.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-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-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.5 with php-composer(sebastian/comparator) < 4)
Requires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4)
-Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5)
-Requires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 4)
+Requires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5)
+Requires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4)
Requires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4)
Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
Requires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
@@ -154,21 +156,25 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with php-c
Requires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3)
Suggests: php-soap
Suggests: php-xdebug
+# recommends latest versions
+Recommends: phpunit9
+Recommends: phpunit10
+Recommends: phpunit11
# remirepo:21
%else
-Requires: php-doctrine-instantiator11 >= 1.2.0
-Requires: php-myclabs-deep-copy19 >= 1.9.1
-Requires: php-phar-io-manifest >= 1.0.3
-Requires: php-phar-io-version >= 2.0.1
-Requires: php-phpspec-prophecy >= 1.8.1
-Requires: php-phpunit-php-code-coverage7 >= 7.0.7
-Requires: php-phpunit-php-file-iterator2 >= 2.0.2
+Requires: php-doctrine-instantiator >= 1.3.1
+Requires: php-myclabs-deep-copy >= 1.10.0
+Requires: php-phar-io-manifest2 >= 2.0.3
+Requires: php-phar-io-version3 >= 3.0.2
+Requires: php-phpspec-prophecy >= 1.10.3
+Requires: php-phpunit-php-code-coverage7 >= 7.0.12
+Requires: php-phpunit-php-file-iterator2 >= 2.0.4
Requires: php-phpunit-Text-Template >= 1.2.1
Requires: php-phpunit-php-timer2 >= 2.1.2
-Requires: php-sebastian-comparator3 >= 3.0.2
+Requires: php-sebastian-comparator3 >= 3.0.5
Requires: php-sebastian-diff3 >= 3.0.2
-Requires: php-sebastian-environment4 >= 4.2.2
-Requires: php-sebastian-exporter3 >= 3.1.1
+Requires: php-sebastian-environment4 >= 4.2.3
+Requires: php-sebastian-exporter3 >= 3.1.5
Requires: php-sebastian-global-state3
Requires: php-sebastian-object-enumerator3 >= 3.0.3
Requires: php-sebastian-resource-operations2 >= 2.0.1
@@ -186,6 +192,11 @@ Requires: php-pcre
Requires: php-phar
Requires: php-spl
+%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
+Provides: php-composer(phpunit/phpunit) = %{version}
+Provides: phpunit = %{version}-%{release}
+%endif
+
%description
PHPUnit is a programmer-oriented testing framework for PHP.
@@ -199,7 +210,9 @@ Documentation: https://phpunit.readthedocs.io/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p0 -b .rpm
+%patch -P0 -p0 -b .rpm
+
+find . -name \*.rpm -delete -print
%build
@@ -215,7 +228,6 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/Text/Template/Autoload.php',
'%{php_home}/SebastianBergmann/CodeCoverage7/autoload.php',
'%{php_home}/SebastianBergmann/Timer/autoload.php',
- '%{php_home}/Prophecy/autoload.php',
'%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2
'%{php_home}/SebastianBergmann/Comparator3/autoload.php',
'%{php_home}/SebastianBergmann/Environment4/autoload.php',
@@ -225,18 +237,18 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/SebastianBergmann/ResourceOperations2/autoload.php',
'%{php_home}/SebastianBergmann/Type/autoload.php',
'%{php_home}/SebastianBergmann/Version/autoload.php',
- [
- '%{php_home}/Doctrine/Instantiator11/autoload.php',
- '%{php_home}/Doctrine/Instantiator/autoload.php',
- ],
- [
- '%{php_home}/DeepCopy19/autoload.php',
- '%{php_home}/DeepCopy/autoload.php',
- ],
+ '%{php_home}/Doctrine/Instantiator/autoload.php',
+ '%{php_home}/DeepCopy/autoload.php',
'%{php_home}/SebastianBergmann/Invoker/autoload.php',
- '%{php_home}/PharIo/Manifest/autoload.php',
- '%{php_home}/PharIo/Version/autoload.php',
+ '%{php_home}/PharIo/Manifest2/autoload.php',
+ '%{php_home}/PharIo/Version3/autoload.php',
+ // May load Comparator/RecursionContext bad version
+ '%{php_home}/Prophecy/autoload.php',
]);
+// Extensions
+\Fedora\Autoloader\Dependencies::optional(
+ glob("%{php_home}/%{ns_vendor}/Extensions/*/autoload.php")
+);
EOF
cat src/autoload.php
@@ -244,12 +256,15 @@ cat src/autoload.php
--output tests/autoload.php \
--exclude '*/BankAccountTest2.php' \
--exclude '*/regression/Trac/783/OneTest.php' \
+ --exclude 'tests/end-to-end/regression/3889/Issue3889Test.test.php' \
+ --exclude 'tests/end-to-end/regression/3904/Issue3904Test.php' \
tests
%install
mkdir -p %{buildroot}%{php_home}
cp -pr src %{buildroot}%{php_home}/%{ns_vendor}
+mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions
install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name}
install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd
@@ -261,7 +276,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 php72 php73 php74; do
+for cmd in php php81 php82 php83; do
if which $cmd; then
$cmd ./phpunit $OPT --verbose || ret=1
fi
@@ -280,6 +295,157 @@ exit $ret
%changelog
+* Wed Mar 6 2024 Remi Collet <remi@remirepo.net> - 8.5.37-2
+- improve --check-version for RPM
+
+* Wed Mar 6 2024 Remi Collet <remi@remirepo.net> - 8.5.37-1
+- update to 8.5.37
+
+* Fri Dec 22 2023 Remi Collet <remi@remirepo.net> - 8.5.36-2
+- fix possible autoloader issue with phpspec/prophecy
+
+* Sat Dec 2 2023 Remi Collet <remi@remirepo.net> - 8.5.36-1
+- update to 8.5.36 (no change)
+
+* Fri Dec 1 2023 Remi Collet <remi@remirepo.net> - 8.5.35-1
+- update to 8.5.35 (no change)
+
+* Tue Sep 19 2023 Remi Collet <remi@remirepo.net> - 8.5.34-1
+- update to 8.5.34
+
+* Tue Feb 28 2023 Remi Collet <remi@remirepo.net> - 8.5.33-1
+- update to 8.5.33
+
+* Sat Feb 4 2023 Remi Collet <remi@remirepo.net> - 8.5.32-2
+- adapt launcher for phpunit10
+
+* Thu Jan 26 2023 Remi Collet <remi@remirepo.net> - 8.5.32-1
+- update to 8.5.32
+
+* Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 8.5.31-1
+- update to 8.5.31
+
+* Sun Sep 25 2022 Remi Collet <remi@remirepo.net> - 8.5.30-1
+- update to 8.5.30
+- raise dependency on sebastian/comparator 3.0.2
+- raise dependency on sebastian/exporter 3.1.5
+
+* Tue Aug 30 2022 Remi Collet <remi@remirepo.net> - 8.5.29-1
+- update to 8.5.29
+- keep dependency on phpspec/prophecy (optional)
+
+* Fri Jul 29 2022 Remi Collet <remi@remirepo.net> - 8.5.28-1
+- update to 8.5.28
+
+* Mon Jun 20 2022 Remi Collet <remi@remirepo.net> - 8.5.27-1
+- update to 8.5.27
+
+* Mon Apr 4 2022 Remi Collet <remi@remirepo.net> - 8.5.26-1
+- update to 8.5.26
+
+* Thu Mar 17 2022 Remi Collet <remi@remirepo.net> - 8.5.25-1
+- update to 8.5.25
+
+* Sun Mar 6 2022 Remi Collet <remi@remirepo.net> - 8.5.24-1
+- update to 8.5.24 #StandWithUkraine
+
+* Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 8.5.23-1
+- update to 8.5.23
+
+* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 8.5.22-1
+- update to 8.5.22
+
+* 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
+- update to 8.5.13
+
+* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 8.5.12-1
+- update to 8.5.12
+- raise dependency on phar-io/manifest 2.0.1
+- raise dependency on phar-io/version 3.0.2
+
+* Fri Nov 27 2020 Remi Collet <remi@remirepo.net> - 8.5.11-1
+- update to 8.5.11
+- raise dependency on phpunit/php-code-coverage 7.0.12
+
+* Tue Nov 10 2020 Remi Collet <remi@remirepo.net> - 8.5.9-1
+- update to 8.5.9
+- raise dependency on doctrine/instantiator 1.3.1
+- raise dependency on myclabs/deep-copy 1.10.0
+- raise dependency on phpspec/prophecy 1.10.3
+- raise dependency on phpunit/php-code-coverage 7.0.10
+- raise dependency on sebastian/environment 4.2.2
+- raise dependency on sebastian/exporter 3.1.2
+
+* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 8.5.8-2
+- cleanup dependencies
+
+* Mon Jun 22 2020 Remi Collet <remi@remirepo.net> - 8.5.8-1
+- update to 8.5.8
+
+* Mon Jun 22 2020 Remi Collet <remi@remirepo.net> - 8.5.7-1
+- update to 8.5.7
+
+* Mon Jun 15 2020 Remi Collet <remi@remirepo.net> - 8.5.6-1
+- update to 8.5.6
+
+* Sat May 23 2020 Remi Collet <remi@remirepo.net> - 8.5.5-1
+- update to 8.5.5
+- sources from git snapshot
+
+* Thu Apr 23 2020 Remi Collet <remi@remirepo.net> - 8.5.4-1
+- update to 8.5.4
+
+* Tue Mar 31 2020 Remi Collet <remi@remirepo.net> - 8.5.3-1
+- update to 8.5.3
+
+* Tue Mar 17 2020 Remi Collet <remi@remirepo.net> - 8.5.2-2
+- load phpunit-selenium autoloader if present
+- own /usr/share/php/PHPUnit8/Extensions
+
+* Wed Jan 8 2020 Remi Collet <remi@remirepo.net> - 8.5.2-1
+- update to 8.5.2
+
+* Thu Jan 2 2020 Remi Collet <remi@remirepo.net> - 8.5.1-1
+- update to 8.5.1
+
+* Fri Dec 6 2019 Remi Collet <remi@remirepo.net> - 8.5.0-1
+- update to 8.5.0
+
+* Wed Nov 6 2019 Remi Collet <remi@remirepo.net> - 8.4.3-1
+- update to 8.4.3
+
+* Mon Oct 28 2019 Remi Collet <remi@remirepo.net> - 8.4.2-1
+- update to 8.4.2
+
+* Tue Oct 8 2019 Remi Collet <remi@remirepo.net> - 8.4.1-1
+- update to 8.4.1
+
* Fri Oct 4 2019 Remi Collet <remi@remirepo.net> - 8.4.0-1
- update to 8.4.0