From 76445ad680cc8aacf44b1a4c9e5166cd41e21f15 Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 5 Jan 2024 00:59:03 +0100 Subject: [PATCH] Fix up exception messages. --- src/Validation/AtValidation.php | 4 ++-- src/Validation/AuValidation.php | 2 +- src/Validation/BdValidation.php | 4 ++-- src/Validation/BeValidation.php | 4 ++-- src/Validation/CaValidation.php | 4 ++-- src/Validation/ChValidation.php | 4 ++-- src/Validation/CzValidation.php | 4 ++-- src/Validation/DeValidation.php | 2 +- src/Validation/FiValidation.php | 2 +- src/Validation/GbValidation.php | 4 ++-- src/Validation/HrValidation.php | 4 ++-- src/Validation/IdValidation.php | 4 ++-- src/Validation/InValidation.php | 2 +- src/Validation/ItValidation.php | 2 +- src/Validation/JpValidation.php | 2 +- src/Validation/LvValidation.php | 4 ++-- src/Validation/MxValidation.php | 2 +- src/Validation/PtValidation.php | 4 ++-- src/Validation/RoValidation.php | 4 ++-- src/Validation/RsValidation.php | 2 +- src/Validation/SkValidation.php | 4 ++-- src/Validation/TrValidation.php | 2 +- tests/TestCase/Validation/TrValidationTest.php | 12 ++++++++++++ 23 files changed, 47 insertions(+), 35 deletions(-) diff --git a/src/Validation/AtValidation.php b/src/Validation/AtValidation.php index b3a906e..cc3000b 100644 --- a/src/Validation/AtValidation.php +++ b/src/Validation/AtValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -66,6 +66,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/AuValidation.php b/src/Validation/AuValidation.php index 7578bb7..55289b4 100644 --- a/src/Validation/AuValidation.php +++ b/src/Validation/AuValidation.php @@ -68,6 +68,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/BdValidation.php b/src/Validation/BdValidation.php index 95a86d2..77abf2a 100644 --- a/src/Validation/BdValidation.php +++ b/src/Validation/BdValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -66,6 +66,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/BeValidation.php b/src/Validation/BeValidation.php index 01662bc..db0a3af 100644 --- a/src/Validation/BeValidation.php +++ b/src/Validation/BeValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -65,6 +65,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/CaValidation.php b/src/Validation/CaValidation.php index 99360ce..5f5c138 100644 --- a/src/Validation/CaValidation.php +++ b/src/Validation/CaValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -65,6 +65,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/ChValidation.php b/src/Validation/ChValidation.php index c3c0bb3..ac7e5af 100644 --- a/src/Validation/ChValidation.php +++ b/src/Validation/ChValidation.php @@ -55,7 +55,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -67,6 +67,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/CzValidation.php b/src/Validation/CzValidation.php index d6b0f0e..b962d0f 100644 --- a/src/Validation/CzValidation.php +++ b/src/Validation/CzValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -66,6 +66,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/DeValidation.php b/src/Validation/DeValidation.php index 179cd30..a136f55 100644 --- a/src/Validation/DeValidation.php +++ b/src/Validation/DeValidation.php @@ -102,6 +102,6 @@ public static function dob(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/FiValidation.php b/src/Validation/FiValidation.php index 49153bc..795323f 100644 --- a/src/Validation/FiValidation.php +++ b/src/Validation/FiValidation.php @@ -55,7 +55,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** diff --git a/src/Validation/GbValidation.php b/src/Validation/GbValidation.php index f6d40a7..2f4c653 100644 --- a/src/Validation/GbValidation.php +++ b/src/Validation/GbValidation.php @@ -52,7 +52,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -64,6 +64,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/HrValidation.php b/src/Validation/HrValidation.php index 0fcc79d..79d2502 100644 --- a/src/Validation/HrValidation.php +++ b/src/Validation/HrValidation.php @@ -53,7 +53,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -65,6 +65,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/IdValidation.php b/src/Validation/IdValidation.php index 05af745..7bbe661 100644 --- a/src/Validation/IdValidation.php +++ b/src/Validation/IdValidation.php @@ -67,7 +67,7 @@ public static function mobile(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -79,6 +79,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/InValidation.php b/src/Validation/InValidation.php index 2c90464..95c9d63 100644 --- a/src/Validation/InValidation.php +++ b/src/Validation/InValidation.php @@ -67,6 +67,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/ItValidation.php b/src/Validation/ItValidation.php index 5a7295f..f21670f 100644 --- a/src/Validation/ItValidation.php +++ b/src/Validation/ItValidation.php @@ -106,6 +106,6 @@ public static function cf(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/JpValidation.php b/src/Validation/JpValidation.php index 571546f..033fe28 100644 --- a/src/Validation/JpValidation.php +++ b/src/Validation/JpValidation.php @@ -158,6 +158,6 @@ public static function zenkaku(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/LvValidation.php b/src/Validation/LvValidation.php index af92716..216f1e4 100644 --- a/src/Validation/LvValidation.php +++ b/src/Validation/LvValidation.php @@ -42,7 +42,7 @@ class LvValidation extends LocalizedValidation */ public static function postal(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** diff --git a/src/Validation/MxValidation.php b/src/Validation/MxValidation.php index 5ebb696..77c30da 100644 --- a/src/Validation/MxValidation.php +++ b/src/Validation/MxValidation.php @@ -67,6 +67,6 @@ public static function postal(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/PtValidation.php b/src/Validation/PtValidation.php index c032810..db27542 100644 --- a/src/Validation/PtValidation.php +++ b/src/Validation/PtValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -66,6 +66,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/RoValidation.php b/src/Validation/RoValidation.php index 4151cfe..17981b8 100644 --- a/src/Validation/RoValidation.php +++ b/src/Validation/RoValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -66,6 +66,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/RsValidation.php b/src/Validation/RsValidation.php index f635c6c..19cdd0e 100644 --- a/src/Validation/RsValidation.php +++ b/src/Validation/RsValidation.php @@ -128,6 +128,6 @@ public static function jmbg(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/SkValidation.php b/src/Validation/SkValidation.php index 8363858..bc018b9 100644 --- a/src/Validation/SkValidation.php +++ b/src/Validation/SkValidation.php @@ -54,7 +54,7 @@ public static function postal(string $check): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** @@ -66,6 +66,6 @@ public static function phone(string $check): bool */ public static function personId(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } } diff --git a/src/Validation/TrValidation.php b/src/Validation/TrValidation.php index 1841585..d8ae6d2 100644 --- a/src/Validation/TrValidation.php +++ b/src/Validation/TrValidation.php @@ -85,7 +85,7 @@ public static function personId(string $tckn): bool */ public static function phone(string $check): bool { - throw new NotImplementedException(__d('localized', '%s Not implemented yet.')); + throw new NotImplementedException(__d('localized', '`{0}()` Not implemented yet.', __METHOD__)); } /** diff --git a/tests/TestCase/Validation/TrValidationTest.php b/tests/TestCase/Validation/TrValidationTest.php index eff45b9..0eab634 100644 --- a/tests/TestCase/Validation/TrValidationTest.php +++ b/tests/TestCase/Validation/TrValidationTest.php @@ -17,6 +17,7 @@ */ namespace Cake\Localized\Test\TestCase\Validation; +use Cake\Http\Exception\NotImplementedException; use Cake\Localized\Validation\TrValidation; use Cake\TestSuite\TestCase; @@ -56,4 +57,15 @@ public function testPersonId() $this->assertFalse(TrValidation::personId('01216166930')); $this->assertFalse(TrValidation::personId('31216166931')); } + + /** + * @return void + */ + public function testPhone(): void + { + $this->expectException(NotImplementedException::class); + $this->expectExceptionMessage('`Cake\Localized\Validation\TrValidation::phone()` Not implemented yet.'); + + TrValidation::phone(''); + } }