v9.5.11
This commit is contained in:
Remi Collet
parent
ea25aae66e
commit
4e85c1f6c0
4 changed files with 30 additions and 26 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -23,3 +23,4 @@
|
|||
/phpunit9-9.5.8-191768c.tgz
|
||||
/phpunit9-9.5.9-ea8c2df.tgz
|
||||
/phpunit9-9.5.10-c814a05.tgz
|
||||
/phpunit9-9.5.11-2406855.tgz
|
||||
|
|
|
|||
|
|
@ -1,19 +1,24 @@
|
|||
diff -up ./phpunit.rpm ./phpunit
|
||||
--- ./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');
|
||||
}
|
||||
--- ./phpunit.rpm 2021-12-30 09:04:15.000000000 +0100
|
||||
+++ ./phpunit 2021-12-30 09:05:07.774778660 +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,16 +29,11 @@ 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/PHPUnit9/autoload.php');
|
||||
}
|
||||
|
||||
$options = getopt('', array('prepend:'));
|
||||
@@ -89,4 +76,8 @@ unset($options);
|
||||
@@ -95,4 +79,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 2021-08-02 09:09:31.000000000 +0200
|
||||
+++ ./src/Util/Xml/SchemaFinder.php 2021-08-02 09:09:33.927568458 +0200
|
||||
--- ./src/Util/Xml/SchemaFinder.php.rpm 2021-12-30 09:04:15.000000000 +0100
|
||||
+++ ./src/Util/Xml/SchemaFinder.php 2021-12-30 09:04:21.186910890 +0100
|
||||
@@ -48,6 +48,6 @@ final class SchemaFinder
|
||||
return __PHPUNIT_PHAR_ROOT__ . '/';
|
||||
}
|
||||
|
|
@ -55,8 +55,8 @@ 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 2021-08-02 09:09:33.928568455 +0200
|
||||
+++ ./tests/bootstrap.php 2021-08-02 09:10:37.377383177 +0200
|
||||
--- ./tests/bootstrap.php.rpm 2021-12-30 09:04:15.000000000 +0100
|
||||
+++ ./tests/bootstrap.php 2021-12-30 09:04:21.186910890 +0100
|
||||
@@ -9,8 +9,8 @@
|
||||
*/
|
||||
const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# For compatibility with SCL
|
||||
%undefine __brp_mangle_shebangs
|
||||
|
||||
%global gh_commit c814a05837f2edb0d1471d6e3f4ab3501ca3899a
|
||||
%global gh_commit 2406855036db1102126125537adb1406f7242fdd
|
||||
#global gh_date 20150927
|
||||
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
|
||||
%global gh_owner sebastianbergmann
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
%global ver_major 9
|
||||
%global ver_minor 5
|
||||
|
||||
%global upstream_version 9.5.10
|
||||
%global upstream_version 9.5.11
|
||||
#global upstream_prever dev
|
||||
|
||||
Name: %{pk_project}%{ver_major}
|
||||
|
|
@ -34,7 +34,7 @@ Release: 1%{?dist}
|
|||
Summary: The PHP Unit Testing framework version %{ver_major}
|
||||
|
||||
License: BSD
|
||||
URL: https://github.com/%{gh_vendor}/%{gh_project}
|
||||
URL: https://github.com/%{gh_owner}/%{gh_project}
|
||||
Source0: %{name}-%{upstream_version}-%{gh_short}.tgz
|
||||
Source1: makesrc.sh
|
||||
|
||||
|
|
@ -232,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 php81; do
|
||||
for cmd in php php74 php80 php81; do
|
||||
if which $cmd; then
|
||||
$cmd ./phpunit $OPT --verbose || ret=1
|
||||
fi
|
||||
|
|
@ -249,6 +249,9 @@ exit $ret
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 9.5.11-1
|
||||
- update to 9.5.11
|
||||
|
||||
* 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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (phpunit9-9.5.10-c814a05.tgz) = f490a35c9be8340f8e7d5583fd9f994b324c93ec3cc1758be32f508570747bb7e31df18dbc93d22ff5db03e432add0022cc4c6834a407e394e5b2d3d6c763fc2
|
||||
SHA512 (phpunit9-9.5.11-2406855.tgz) = 5bdd517dec885c75d950009b17c5f1d2c44e6799043b291019cbf126c021799827eeb98ce571247cd6a1b4b85038f0e02f6a631df50582981e76ed1d07a7ade8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue