update to 9.5.5

raise dependency on sebastian/type 2.3.2

(cherry picked from commit 7687f20165)
This commit is contained in:
Remi Collet 2021-06-07 07:55:07 +02:00
commit 75e2e814fa
4 changed files with 29 additions and 17 deletions

1
.gitignore vendored
View file

@ -17,3 +17,4 @@
/phpunit9-9.5.2-f661659.tgz
/phpunit9-9.5.3-27241ac.tgz
/phpunit9-9.5.4-c73c673.tgz
/phpunit9-9.5.5-89ff45e.tgz

View file

@ -1,6 +1,6 @@
diff -up ./phpunit.rpm ./phpunit
--- ./phpunit.rpm 2020-08-10 12:02:07.000000000 +0200
+++ ./phpunit 2020-08-10 12:02:22.089870229 +0200
--- ./phpunit.rpm 2021-06-07 07:17:56.000000000 +0200
+++ ./phpunit 2021-06-07 07:18:25.769837276 +0200
@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC');
}
@ -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-06-07 07:17:56.000000000 +0200
+++ ./src/Util/Xml/SchemaFinder.php 2021-06-07 07:18:25.769837276 +0200
@@ -48,6 +48,6 @@ final class SchemaFinder
return __PHPUNIT_PHAR_ROOT__ . '/';
}
@ -55,14 +55,21 @@ 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-06-07 07:18:25.769837276 +0200
+++ ./tests/bootstrap.php 2021-06-07 07:19:32.888583752 +0200
@@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
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 '@PATH@/autoload.php';
if (!defined('TEST_FILES_PATH')) {
@@ -19,3 +19,7 @@ ini_set('precision', '14');
ini_set('serialize_precision', '14');
require_once PHPUNIT_COMPOSER_INSTALL;
+require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php';
+require_once __DIR__ . '/_files/CoveredFunction.php';
+require_once __DIR__ . '/_files/NamespaceCoveredFunction.php';

View file

@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
%global gh_commit c73c6737305e779771147af66c96ca6a7ed8a741
%global gh_commit 89ff45ea9d70e35522fb6654a2ebc221158de276
#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.4
%global upstream_version 9.5.5
#global upstream_prever dev
Name: %{pk_project}%{ver_major}
@ -62,7 +62,7 @@ BuildRequires: (php-composer(sebastian/exporter) >= 4.0.2 with php-c
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.3 with php-composer(sebastian/type) < 3)
BuildRequires: (php-composer(sebastian/type) >= 2.3.2 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
@ -100,7 +100,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "sebastian/global-state": "^5.0.1",
# "sebastian/object-enumerator": "^4.0.3",
# "sebastian/resource-operations": "^3.0.3",
# "sebastian/type": "^2.3",
# "sebastian/type": "^2.3.2",
# "sebastian/version": "^3.0.2"
Requires: php(language) >= 7.3
Requires: php-cli
@ -129,7 +129,7 @@ Requires: (php-composer(sebastian/exporter) >= 4.0.2 with php-c
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.3 with php-composer(sebastian/type) < 3)
Requires: (php-composer(sebastian/type) >= 2.3.2 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": "*",
@ -249,6 +249,10 @@ exit $ret
%changelog
* 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

View file

@ -1 +1 @@
SHA512 (phpunit9-9.5.4-c73c673.tgz) = 78a77632ca721a8ea37e23b52589c8ad5e00212291c84dcf2d0b335cc299d1ee9f1abf440a754c4e986ed485365f5ce9e0fd67dfacd5ffe866ff7fc5abf8101c
SHA512 (phpunit9-9.5.5-89ff45e.tgz) = d1ef4fbdcc4be127adf4b4a14f91d301ef6d045133d090fd70b837e2287e2f90a0a309c28443bf2a87413b681341c6a7ee5476159a4e3bcedcd8ad3c72e53d87