| 1 |
commit: e3cc58f44c5055f87d71c5b55122813a9e880a37 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 2 19:51:05 2021 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 2 19:51:05 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cc58f4 |
| 7 |
|
| 8 |
dev-php/PEAR-Crypt_GPG: Fix unit tests for phpunit-8 |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild | 6 ++- |
| 13 |
dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch | 45 ++++++++++++++++++++++ |
| 14 |
2 files changed, 49 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild |
| 17 |
index e0cea4ce1b0..720a949b060 100644 |
| 18 |
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild |
| 19 |
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2020 Gentoo Authors |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
@@ -20,7 +20,9 @@ RDEPEND="app-crypt/gnupg |
| 27 |
dev-lang/php:*[posix,unicode] |
| 28 |
dev-php/PEAR-Console_CommandLine |
| 29 |
dev-php/PEAR-Exception" |
| 30 |
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" |
| 31 |
+BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )" |
| 32 |
+ |
| 33 |
+PATCHES=( "${FILESDIR}/1.6.4-fix-tests.patch" ) |
| 34 |
|
| 35 |
S="${WORKDIR}/${MY_P}" |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch b/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..e4fb835cc34 |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch |
| 43 |
@@ -0,0 +1,45 @@ |
| 44 |
+diff -uarN a/tests/ImportKeyTest.php b/tests/ImportKeyTest.php |
| 45 |
+--- a/tests/ImportKeyTest.php 2020-03-22 08:00:23.000000000 -0400 |
| 46 |
++++ b/tests/ImportKeyTest.php 2021-02-02 14:45:16.561963089 -0500 |
| 47 |
+@@ -60,7 +60,7 @@ |
| 48 |
+ // set up |
| 49 |
+ // {{{ setUp() |
| 50 |
+ |
| 51 |
+- public function setUp() |
| 52 |
++ public function setUp() :void |
| 53 |
+ { |
| 54 |
+ parent::setUp(); |
| 55 |
+ |
| 56 |
+diff -uarN a/tests/KeyGeneratorTest.php b/tests/KeyGeneratorTest.php |
| 57 |
+--- a/tests/KeyGeneratorTest.php 2020-03-22 08:00:23.000000000 -0400 |
| 58 |
++++ b/tests/KeyGeneratorTest.php 2021-02-02 14:42:07.117718685 -0500 |
| 59 |
+@@ -174,7 +174,7 @@ |
| 60 |
+ // }}} |
| 61 |
+ // {{{ setUp() |
| 62 |
+ |
| 63 |
+- public function setUp() |
| 64 |
++ public function setUp() :void |
| 65 |
+ { |
| 66 |
+ parent::setUp(); |
| 67 |
+ $this->generator = new Crypt_GPG_KeyGenerator($this->getOptions()); |
| 68 |
+diff -uarN a/tests/TestCase.php b/tests/TestCase.php |
| 69 |
+--- a/tests/TestCase.php 2020-03-22 08:00:23.000000000 -0400 |
| 70 |
++++ b/tests/TestCase.php 2021-02-02 14:42:36.978387716 -0500 |
| 71 |
+@@ -119,7 +119,7 @@ |
| 72 |
+ // set up |
| 73 |
+ // {{{ setUp() |
| 74 |
+ |
| 75 |
+- public function setUp() |
| 76 |
++ public function setUp() :void |
| 77 |
+ { |
| 78 |
+ // load test configuration file if it exists |
| 79 |
+ $configFilename = __DIR__ . '/config.php'; |
| 80 |
+@@ -567,7 +567,7 @@ |
| 81 |
+ // }}} |
| 82 |
+ // {{{ tearDown() |
| 83 |
+ |
| 84 |
+- public function tearDown() |
| 85 |
++ public function tearDown() :void |
| 86 |
+ { |
| 87 |
+ unset($this->gpg); |
| 88 |
+ |
Archives