Remi Collet
parent
f92a680175
commit
f2db977379
5 changed files with 49 additions and 15 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -53,3 +53,4 @@
|
|||
/phpunit9-9.6.15-05017b8.tgz
|
||||
/phpunit9-9.6.16-3767b2c.tgz
|
||||
/phpunit9-9.6.17-1a15698.tgz
|
||||
/phpunit9-9.6.18-32c2c2d.tgz
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
|
|||
COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
|
||||
SHORT=${COMMIT:0:7}
|
||||
|
||||
DATE=$(date -d "$DATE -4 days" +%Y-%m-%d)
|
||||
|
||||
if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
|
||||
echo "$NAME-$VERSION-$SHORT.tgz already there"
|
||||
else
|
||||
|
|
@ -15,11 +17,11 @@ else
|
|||
|
||||
echo "Cloning..."
|
||||
rm -rf $PROJECT-$COMMIT
|
||||
git clone --jobs 8 https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
|
||||
git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
|
||||
|
||||
echo "Getting commit..."
|
||||
pushd $PROJECT-$COMMIT
|
||||
git checkout $COMMIT || exit1
|
||||
git checkout $COMMIT || exit 1
|
||||
cp composer.json ../composer.json
|
||||
popd
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -up ./phpunit.rpm ./phpunit
|
||||
--- ./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
|
||||
--- ./phpunit.rpm 2024-02-26 09:34:48.000000000 +0100
|
||||
+++ ./phpunit 2024-03-06 10:19:22.109376592 +0100
|
||||
@@ -71,27 +71,11 @@ if (isset($GLOBALS['_composer_autoload_p
|
||||
define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']);
|
||||
|
||||
unset($GLOBALS['_composer_autoload_path']);
|
||||
|
|
@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit
|
|||
}
|
||||
|
||||
$options = getopt('', array('prepend:'));
|
||||
@@ -95,4 +79,13 @@ unset($options);
|
||||
@@ -104,4 +88,13 @@ unset($options);
|
||||
|
||||
require PHPUNIT_COMPOSER_INSTALL;
|
||||
|
||||
|
|
@ -48,10 +48,38 @@ diff -up ./phpunit.rpm ./phpunit
|
|||
+ // 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:19:26.914560422 +0100
|
||||
+++ ./src/TextUI/Command.php 2024-03-06 10:19:32.787785106 +0100
|
||||
@@ -600,7 +600,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(), '>');
|
||||
@@ -617,6 +617,7 @@ class Command
|
||||
Version::id(),
|
||||
$latestCompatibleVersion,
|
||||
);
|
||||
+ printf('Try a system update for new phpunit%s package.' . PHP_EOL, $major);
|
||||
}
|
||||
|
||||
if ($notLatest) {
|
||||
@@ -624,6 +625,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/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php
|
||||
--- ./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
|
||||
--- ./src/Util/Xml/SchemaFinder.php.rpm 2024-02-26 09:34:48.000000000 +0100
|
||||
+++ ./src/Util/Xml/SchemaFinder.php 2024-03-06 10:19:22.109376592 +0100
|
||||
@@ -75,6 +75,6 @@ final class SchemaFinder
|
||||
return __PHPUNIT_PHAR_ROOT__ . '/';
|
||||
}
|
||||
|
||||
|
|
@ -60,8 +88,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-12-30 09:04:15.000000000 +0100
|
||||
+++ ./tests/bootstrap.php 2021-12-30 09:04:21.186910890 +0100
|
||||
--- ./tests/bootstrap.php.rpm 2024-02-26 09:34:48.000000000 +0100
|
||||
+++ ./tests/bootstrap.php 2024-03-06 10:19:22.109376592 +0100
|
||||
@@ -9,8 +9,8 @@
|
||||
*/
|
||||
const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
#
|
||||
|
||||
|
||||
%global gh_commit 1a156980d78a6666721b7e8e8502fe210b587fcd
|
||||
%global gh_date 2024-02-23
|
||||
%global gh_commit 32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04
|
||||
%global gh_date 2024-03-21
|
||||
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
|
||||
%global gh_owner sebastianbergmann
|
||||
%global gh_project phpunit
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
%global ver_major 9
|
||||
%global ver_minor 6
|
||||
|
||||
%global upstream_version 9.6.17
|
||||
%global upstream_version 9.6.18
|
||||
#global upstream_prever dev
|
||||
|
||||
Name: %{pk_project}%{ver_major}
|
||||
|
|
@ -262,6 +262,9 @@ exit $ret
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 21 2024 Remi Collet <remi@remirepo.net> - 9.6.18-1
|
||||
- update to 9.6.18
|
||||
|
||||
* Mon Feb 26 2024 Remi Collet <remi@remirepo.net> - 9.6.17-1
|
||||
- update to 9.6.17
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (phpunit9-9.6.17-1a15698.tgz) = 4b2a614588c01dbbd85b6aa47a981b3c803094a92ff16dee7ba3495029c5ce3984eed91448bab6483300fc1bdbfb671a22f78ac3ee38d762590df7b0dff35536
|
||||
SHA512 (phpunit9-9.6.18-32c2c2d.tgz) = fd507fcc71ae2a927515dd2c088fe3714ca6d83bf97568d81e9f5334aa1cc2f205a09eeb02da33d6d1f222ab145c472664264bfaf80bbf67eaf555d1294fe529
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue