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 commit3fb51192c0) (cherry picked from commitb626eb3b6f)
This commit is contained in:
Remi Collet
parent
a84202d66f
commit
41b785bb6a
4 changed files with 49 additions and 32 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -12,3 +12,4 @@ clog
|
|||
/phpunit8-8.5.16-cc66f2f.tgz
|
||||
/phpunit8-8.5.17-7906785.tgz
|
||||
/phpunit8-8.5.18-bd5fc77.tgz
|
||||
/phpunit8-8.5.19-496281b.tgz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -up ./phpunit.rpm ./phpunit
|
||||
--- ./phpunit.rpm 2021-06-07 07:13:03.000000000 +0200
|
||||
+++ ./phpunit 2021-06-07 07:13:10.372992677 +0200
|
||||
@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
|
||||
--- ./phpunit.rpm 2021-08-02 08:27:58.000000000 +0200
|
||||
+++ ./phpunit 2021-08-02 08:34:41.313976887 +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/Configuration.php.rpm ./src/Util/Configuration.php
|
||||
--- ./src/Util/Configuration.php.rpm 2021-06-07 07:13:03.000000000 +0200
|
||||
+++ ./src/Util/Configuration.php 2021-06-07 07:13:10.372992677 +0200
|
||||
--- ./src/Util/Configuration.php.rpm 2021-08-02 08:27:58.000000000 +0200
|
||||
+++ ./src/Util/Configuration.php 2021-08-02 08:34:40.070979790 +0200
|
||||
@@ -929,7 +929,7 @@ final class Configuration
|
||||
private function validateConfigurationAgainstSchema(): void
|
||||
{
|
||||
|
|
@ -56,23 +56,34 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php
|
|||
if (defined('__PHPUNIT_PHAR_ROOT__')) {
|
||||
$xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
|
||||
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
|
||||
--- ./tests/bootstrap.php.rpm 2021-06-07 07:13:10.372992677 +0200
|
||||
+++ ./tests/bootstrap.php 2021-06-07 07:15:29.571502817 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
* file that was distributed with this source code.
|
||||
--- ./tests/bootstrap.php.rpm 2021-08-02 08:27:58.000000000 +0200
|
||||
+++ ./tests/bootstrap.php 2021-08-02 08:44:30.257601265 +0200
|
||||
@@ -9,8 +9,8 @@
|
||||
*/
|
||||
if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
|
||||
- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php');
|
||||
+ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php');
|
||||
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';
|
||||
}
|
||||
|
||||
if (!defined('TEST_FILES_PATH')) {
|
||||
@@ -19,3 +19,8 @@ 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';
|
||||
+require_once '@PATH@/Framework/Assert/Functions.php';
|
||||
+require_once __DIR__ . '/autoload.php';
|
||||
if ($phar) {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# For compatibility with SCL
|
||||
%undefine __brp_mangle_shebangs
|
||||
|
||||
%global gh_commit bd5fc77c869e8dd65040dacbad170f074c13796c
|
||||
%global gh_commit 496281b64ec781856ed0a583483b5923b4033722
|
||||
#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 8
|
||||
%global ver_minor 5
|
||||
|
||||
%global upstream_version 8.5.18
|
||||
%global upstream_version 8.5.19
|
||||
#global upstream_prever dev
|
||||
|
||||
Name: %{pk_project}%{ver_major}
|
||||
|
|
@ -45,11 +45,11 @@ BuildArch: noarch
|
|||
BuildRequires: php(language) >= 7.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(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.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.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-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)
|
||||
|
|
@ -81,11 +81,11 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
|
|||
# "ext-xmlwriter": "*",
|
||||
# "doctrine/instantiator": "^1.3.1",
|
||||
# "myclabs/deep-copy": "^1.10.0",
|
||||
# "phar-io/manifest": "^2.0.1",
|
||||
# "phar-io/manifest": "^2.0.3",
|
||||
# "phar-io/version": "^3.0.2",
|
||||
# "phpspec/prophecy": "^1.10.3",
|
||||
# "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-timer": "^2.1.2",
|
||||
# "sebastian/comparator": "^3.0.2",
|
||||
|
|
@ -107,11 +107,11 @@ 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.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(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.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-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)
|
||||
|
|
@ -233,6 +233,11 @@ exit $ret
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (phpunit8-8.5.18-bd5fc77.tgz) = 284a3b0c5ae2041585230c26ef068323ba5540a1cf817fa50584159c67218b2500c90b664d8254acfd8e00c3e4cd3aefe9e879a6e80693e8b5816ab9bb402423
|
||||
SHA512 (phpunit8-8.5.19-496281b.tgz) = 5c0e03be73ce40d347266379dd70d615926ef5a0350bfea013c2952e0deb46aec876cbd24408180a45c0150716495d1394450149b40c7dfe8dc7faa8ba104233
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue