diff options
| author | Kate <26026535+provokateurin@users.noreply.github.com> | 2025-04-08 13:17:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-08 13:17:02 +0200 |
| commit | ba2b7789b686d61c2a9d72b3fb6bfcb4045fc84e (patch) | |
| tree | 11b301e0850f8408109e36a9779a60a5abb0fdd0 | |
| parent | 59444784f2e7b121983ee3ed6b33428b62eb0b27 (diff) | |
| parent | fd156d3408a030c6bb98d9cdaf3790375d766eb5 (diff) | |
| download | nextcloud-server-ba2b7789b686d61c2a9d72b3fb6bfcb4045fc84e.tar.gz nextcloud-server-ba2b7789b686d61c2a9d72b3fb6bfcb4045fc84e.zip | |
Merge pull request #52035 from nextcloud/fix/richobjectstrings/validator-string-key-value-error
refactor(RichObjectStrings): Only log error if key or value is not string in validator
| -rw-r--r-- | lib/private/RichObjectStrings/Validator.php | 6 | ||||
| -rw-r--r-- | tests/lib/RichObjectStrings/ValidatorTest.php | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/private/RichObjectStrings/Validator.php b/lib/private/RichObjectStrings/Validator.php index adc4a8710f7..d7f824f2948 100644 --- a/lib/private/RichObjectStrings/Validator.php +++ b/lib/private/RichObjectStrings/Validator.php @@ -10,6 +10,8 @@ namespace OC\RichObjectStrings; use OCP\RichObjectStrings\Definitions; use OCP\RichObjectStrings\InvalidObjectExeption; use OCP\RichObjectStrings\IValidator; +use OCP\Server; +use Psr\Log\LoggerInterface; /** * Class Validator @@ -79,10 +81,10 @@ class Validator implements IValidator { foreach ($parameter as $key => $value) { if (!is_string($key)) { - throw new InvalidObjectExeption('Object for placeholder ' . $placeholder . ' is invalid, key ' . $key . ' is not a string'); + Server::get(LoggerInterface::class)->error('Object for placeholder ' . $placeholder . ' is invalid, key ' . $key . ' is not a string'); } if (!is_string($value)) { - throw new InvalidObjectExeption('Object for placeholder ' . $placeholder . ' is invalid, value ' . $value . ' for key ' . $key . ' is not a string'); + Server::get(LoggerInterface::class)->error('Object for placeholder ' . $placeholder . ' is invalid, value ' . $value . ' for key ' . $key . ' is not a string'); } } } diff --git a/tests/lib/RichObjectStrings/ValidatorTest.php b/tests/lib/RichObjectStrings/ValidatorTest.php index c5f88394a33..cbd54a0374c 100644 --- a/tests/lib/RichObjectStrings/ValidatorTest.php +++ b/tests/lib/RichObjectStrings/ValidatorTest.php @@ -10,7 +10,6 @@ namespace Test\RichObjectStrings; use OC\RichObjectStrings\Validator; use OCP\RichObjectStrings\Definitions; -use OCP\RichObjectStrings\InvalidObjectExeption; use Test\TestCase; class ValidatorTest extends TestCase { @@ -37,9 +36,6 @@ class ValidatorTest extends TestCase { ]); $this->addToAssertionCount(2); - $this->expectException(InvalidObjectExeption::class); - - $this->expectExceptionMessage('Object for placeholder string1 is invalid, value 123 for key key is not a string'); $v->validate('test {string1} test.', [ 'string1' => [ 'type' => 'user', @@ -49,7 +45,6 @@ class ValidatorTest extends TestCase { ], ]); - $this->expectExceptionMessage('Object for placeholder string1 is invalid, key 456 is not a string'); $v->validate('test {string1} test.', [ 'string1' => [ 'type' => 'user', |