From: Guilhem Moulin Date: Mon, 28 Dec 2020 13:44:07 +0100 Subject: Preemptively fix FTBFS with phpunit 10. As of phpunit 9.5.0-3, the test suite passes but spits a bunch of warnings: Warning: Test case class not matching filename is deprecated in /<>/Crypt_GPG-1.6.4/tests/DecryptAndVerifyTest.php Class name was 'DecryptAndVerifyTestCase', expected 'DecryptAndVerifyTest' Warning: Test case class not matching filename is deprecated in /<>/Crypt_GPG-1.6.4/tests/DecryptTest.php Class name was 'DecryptTestCase', expected 'DecryptTest' […] To fix this we simply drop the Case suffix from the class name: for p in Crypt_GPG-*/tests/*Test.php; do t="${p##*/}" t="${t%.php}" if grep -Fxq "class ${t}Case extends Crypt_GPG_TestCase" "$p"; then sed -ri "s/\b${t}Case\b/$t/" -- "$p" fi done Forwarded: not-needed --- Crypt_GPG-1.6.4/tests/DecryptAndVerifyTest.php | 2 +- Crypt_GPG-1.6.4/tests/DecryptTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/DeletePrivateKeyTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/DeletePublicKeyTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/EncryptAndSignTest.php | 2 +- Crypt_GPG-1.6.4/tests/EncryptTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/ExceptionsTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/ExportPrivateKeyTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/ExportPublicKeyTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/GeneralTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/GetFingerprintTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/GetKeysTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/ImportKeyTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/KeyGeneratorTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/KeyTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/SignTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/SignatureTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/SubKeyTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/UserIdTest.php | 4 ++-- Crypt_GPG-1.6.4/tests/VerifyTest.php | 4 ++-- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Crypt_GPG-1.6.4/tests/DecryptAndVerifyTest.php b/Crypt_GPG-1.6.4/tests/DecryptAndVerifyTest.php index 419282e..6abdb01 100644 --- a/Crypt_GPG-1.6.4/tests/DecryptAndVerifyTest.php +++ b/Crypt_GPG-1.6.4/tests/DecryptAndVerifyTest.php @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class DecryptAndVerifyTestCase extends Crypt_GPG_TestCase +class DecryptAndVerifyTest extends Crypt_GPG_TestCase { // string // {{{ testDecryptVerify() diff --git a/Crypt_GPG-1.6.4/tests/DecryptTest.php b/Crypt_GPG-1.6.4/tests/DecryptTest.php index 49e9c66..03968cf 100644 --- a/Crypt_GPG-1.6.4/tests/DecryptTest.php +++ b/Crypt_GPG-1.6.4/tests/DecryptTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit DecryptTestCase + * $ phpunit DecryptTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class DecryptTestCase extends Crypt_GPG_TestCase +class DecryptTest extends Crypt_GPG_TestCase { // string // {{{ testDecrypt() diff --git a/Crypt_GPG-1.6.4/tests/DeletePrivateKeyTest.php b/Crypt_GPG-1.6.4/tests/DeletePrivateKeyTest.php index 7d37f57..ab28184 100644 --- a/Crypt_GPG-1.6.4/tests/DeletePrivateKeyTest.php +++ b/Crypt_GPG-1.6.4/tests/DeletePrivateKeyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit DeletePrivateKeyTestCase + * $ phpunit DeletePrivateKeyTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class DeletePrivateKeyTestCase extends Crypt_GPG_TestCase +class DeletePrivateKeyTest extends Crypt_GPG_TestCase { // {{{ testDeletePrivateKey() diff --git a/Crypt_GPG-1.6.4/tests/DeletePublicKeyTest.php b/Crypt_GPG-1.6.4/tests/DeletePublicKeyTest.php index 621b0bb..6b1629e 100644 --- a/Crypt_GPG-1.6.4/tests/DeletePublicKeyTest.php +++ b/Crypt_GPG-1.6.4/tests/DeletePublicKeyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit DeletePublicKeyTestCase + * $ phpunit DeletePublicKeyTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class DeletePublicKeyTestCase extends Crypt_GPG_TestCase +class DeletePublicKeyTest extends Crypt_GPG_TestCase { // {{{ testDeletePublicKey() diff --git a/Crypt_GPG-1.6.4/tests/EncryptAndSignTest.php b/Crypt_GPG-1.6.4/tests/EncryptAndSignTest.php index 246d5d8..1a7ecdd 100644 --- a/Crypt_GPG-1.6.4/tests/EncryptAndSignTest.php +++ b/Crypt_GPG-1.6.4/tests/EncryptAndSignTest.php @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class EncryptAndSignTestCase extends Crypt_GPG_TestCase +class EncryptAndSignTest extends Crypt_GPG_TestCase { // string // {{{ testEncryptAndSignKeyNotFoundException_invalid_sign_key() diff --git a/Crypt_GPG-1.6.4/tests/EncryptTest.php b/Crypt_GPG-1.6.4/tests/EncryptTest.php index 52bb632..4dbec58 100644 --- a/Crypt_GPG-1.6.4/tests/EncryptTest.php +++ b/Crypt_GPG-1.6.4/tests/EncryptTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit EncryptTestCase + * $ phpunit EncryptTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class EncryptTestCase extends Crypt_GPG_TestCase +class EncryptTest extends Crypt_GPG_TestCase { public function testHasEncryptKeys() { diff --git a/Crypt_GPG-1.6.4/tests/ExceptionsTest.php b/Crypt_GPG-1.6.4/tests/ExceptionsTest.php index b642e50..6e16877 100644 --- a/Crypt_GPG-1.6.4/tests/ExceptionsTest.php +++ b/Crypt_GPG-1.6.4/tests/ExceptionsTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit ExceptionsTestCase + * $ phpunit ExceptionsTest * * * LICENSE: @@ -60,7 +60,7 @@ require_once 'Crypt/GPG/Exceptions.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class ExceptionsTestCase extends Crypt_GPG_TestCase +class ExceptionsTest extends Crypt_GPG_TestCase { // exception // {{{ testException diff --git a/Crypt_GPG-1.6.4/tests/ExportPrivateKeyTest.php b/Crypt_GPG-1.6.4/tests/ExportPrivateKeyTest.php index 7f17826..96d5a3d 100644 --- a/Crypt_GPG-1.6.4/tests/ExportPrivateKeyTest.php +++ b/Crypt_GPG-1.6.4/tests/ExportPrivateKeyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit ExportPrivateKeyTestCase + * $ phpunit ExportPrivateKeyTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class ExportPrivateKeyTestCase extends Crypt_GPG_TestCase +class ExportPrivateKeyTest extends Crypt_GPG_TestCase { // {{{ testExportPrivateKey() diff --git a/Crypt_GPG-1.6.4/tests/ExportPublicKeyTest.php b/Crypt_GPG-1.6.4/tests/ExportPublicKeyTest.php index d3ec804..591af25 100644 --- a/Crypt_GPG-1.6.4/tests/ExportPublicKeyTest.php +++ b/Crypt_GPG-1.6.4/tests/ExportPublicKeyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit ExportPublicKeyTestCase + * $ phpunit ExportPublicKeyTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class ExportPublicKeyTestCase extends Crypt_GPG_TestCase +class ExportPublicKeyTest extends Crypt_GPG_TestCase { // {{{ testExportPublicKey() diff --git a/Crypt_GPG-1.6.4/tests/GeneralTest.php b/Crypt_GPG-1.6.4/tests/GeneralTest.php index 82e7f3d..571b13f 100644 --- a/Crypt_GPG-1.6.4/tests/GeneralTest.php +++ b/Crypt_GPG-1.6.4/tests/GeneralTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit GeneralTestCase + * $ phpunit GeneralTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class GeneralTestCase extends Crypt_GPG_TestCase +class GeneralTest extends Crypt_GPG_TestCase { // {{{ testPublicKeyringFileException() diff --git a/Crypt_GPG-1.6.4/tests/GetFingerprintTest.php b/Crypt_GPG-1.6.4/tests/GetFingerprintTest.php index 7274a28..73b14a6 100644 --- a/Crypt_GPG-1.6.4/tests/GetFingerprintTest.php +++ b/Crypt_GPG-1.6.4/tests/GetFingerprintTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit GetFingerprintTestCase + * $ phpunit GetFingerprintTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class GetFingerprintTestCase extends Crypt_GPG_TestCase +class GetFingerprintTest extends Crypt_GPG_TestCase { // {{{ testGetFingerprint() diff --git a/Crypt_GPG-1.6.4/tests/GetKeysTest.php b/Crypt_GPG-1.6.4/tests/GetKeysTest.php index 2146e48..cb5a3e7 100644 --- a/Crypt_GPG-1.6.4/tests/GetKeysTest.php +++ b/Crypt_GPG-1.6.4/tests/GetKeysTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit GetKeysTestCase + * $ phpunit GetKeysTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class GetKeysTestCase extends Crypt_GPG_TestCase +class GetKeysTest extends Crypt_GPG_TestCase { // {{{ testGetKeys() diff --git a/Crypt_GPG-1.6.4/tests/ImportKeyTest.php b/Crypt_GPG-1.6.4/tests/ImportKeyTest.php index 2a5ec22..dbc174f 100644 --- a/Crypt_GPG-1.6.4/tests/ImportKeyTest.php +++ b/Crypt_GPG-1.6.4/tests/ImportKeyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit ImportKeyTestCase + * $ phpunit ImportKeyTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class ImportKeyTestCase extends Crypt_GPG_TestCase +class ImportKeyTest extends Crypt_GPG_TestCase { // set up // {{{ setUp() diff --git a/Crypt_GPG-1.6.4/tests/KeyGeneratorTest.php b/Crypt_GPG-1.6.4/tests/KeyGeneratorTest.php index 8091dfa..5229593 100644 --- a/Crypt_GPG-1.6.4/tests/KeyGeneratorTest.php +++ b/Crypt_GPG-1.6.4/tests/KeyGeneratorTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit KeyGeneratorTestCase + * $ phpunit KeyGeneratorTest * * * LICENSE: @@ -60,7 +60,7 @@ require_once 'Crypt/GPG/KeyGenerator.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class KeyGeneratorTestCase extends Crypt_GPG_TestCase +class KeyGeneratorTest extends Crypt_GPG_TestCase { // helper methods // {{{ assertKeyEquals() diff --git a/Crypt_GPG-1.6.4/tests/KeyTest.php b/Crypt_GPG-1.6.4/tests/KeyTest.php index 72b2955..8766bdc 100644 --- a/Crypt_GPG-1.6.4/tests/KeyTest.php +++ b/Crypt_GPG-1.6.4/tests/KeyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit KeyTestCase + * $ phpunit KeyTest * * * LICENSE: @@ -70,7 +70,7 @@ require_once 'Crypt/GPG/SubKey.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class KeyTestCase extends Crypt_GPG_TestCase +class KeyTest extends Crypt_GPG_TestCase { // accessors // {{{ testGetSubKeys() diff --git a/Crypt_GPG-1.6.4/tests/SignTest.php b/Crypt_GPG-1.6.4/tests/SignTest.php index 296e69d..43b6235 100644 --- a/Crypt_GPG-1.6.4/tests/SignTest.php +++ b/Crypt_GPG-1.6.4/tests/SignTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit SignTestCase + * $ phpunit SignTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class SignTestCase extends Crypt_GPG_TestCase +class SignTest extends Crypt_GPG_TestCase { public function testHasSignKeys() { diff --git a/Crypt_GPG-1.6.4/tests/SignatureTest.php b/Crypt_GPG-1.6.4/tests/SignatureTest.php index d8aabac..3b4e7b6 100644 --- a/Crypt_GPG-1.6.4/tests/SignatureTest.php +++ b/Crypt_GPG-1.6.4/tests/SignatureTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit SignatureTestCase + * $ phpunit SignatureTest * * * LICENSE: @@ -60,7 +60,7 @@ require_once 'Crypt/GPG/Signature.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class SignatureTestCase extends Crypt_GPG_TestCase +class SignatureTest extends Crypt_GPG_TestCase { // construct // {{{ testConstructFromSignature() diff --git a/Crypt_GPG-1.6.4/tests/SubKeyTest.php b/Crypt_GPG-1.6.4/tests/SubKeyTest.php index 64aec86..8541dee 100644 --- a/Crypt_GPG-1.6.4/tests/SubKeyTest.php +++ b/Crypt_GPG-1.6.4/tests/SubKeyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit SubKeyTestCase + * $ phpunit SubKeyTest * * * LICENSE: @@ -60,7 +60,7 @@ require_once 'Crypt/GPG/SubKey.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class SubKeyTestCase extends Crypt_GPG_TestCase +class SubKeyTest extends Crypt_GPG_TestCase { // construct // {{{ testConstructFromString() diff --git a/Crypt_GPG-1.6.4/tests/UserIdTest.php b/Crypt_GPG-1.6.4/tests/UserIdTest.php index 07271a0..a2728fe 100644 --- a/Crypt_GPG-1.6.4/tests/UserIdTest.php +++ b/Crypt_GPG-1.6.4/tests/UserIdTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit UserIdTestCase + * $ phpunit UserIdTest * * * LICENSE: @@ -60,7 +60,7 @@ require_once 'Crypt/GPG/UserId.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class UserIdTestCase extends Crypt_GPG_TestCase +class UserIdTest extends Crypt_GPG_TestCase { // construct // {{{ testConstructFromString() diff --git a/Crypt_GPG-1.6.4/tests/VerifyTest.php b/Crypt_GPG-1.6.4/tests/VerifyTest.php index fe72f25..8627f8d 100644 --- a/Crypt_GPG-1.6.4/tests/VerifyTest.php +++ b/Crypt_GPG-1.6.4/tests/VerifyTest.php @@ -12,7 +12,7 @@ * * To run these tests, use: * - * $ phpunit VerifyTestCase + * $ phpunit VerifyTest * * * LICENSE: @@ -55,7 +55,7 @@ require_once 'TestCase.php'; * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 * @link http://pear.php.net/package/Crypt_GPG */ -class VerifyTestCase extends Crypt_GPG_TestCase +class VerifyTest extends Crypt_GPG_TestCase { // string // {{{ testVerifyNoDataException_invalid()