Merge pull request nextcloud#52062 from nextcloud/revert/52035

Author: provokateurin

lib/private/RichObjectStrings/Validator.php

@@ -10,8 +10,6 @@
 use OCP\RichObjectStrings\Definitions;
 use OCP\RichObjectStrings\InvalidObjectExeption;
 use OCP\RichObjectStrings\IValidator;
-use OCP\Server;
-use Psr\Log\LoggerInterface;
 
 /**
  * Class Validator
@@ -81,10 +79,10 @@ protected function validateParameter(string $placeholder, array $parameter): voi
 
 		foreach ($parameter as $key => $value) {
 			if (!is_string($key)) {
-				Server::get(LoggerInterface::class)->error('Object for placeholder ' . $placeholder . ' is invalid, key ' . $key . ' is not a string');
+				throw new InvalidObjectExeption('Object for placeholder ' . $placeholder . ' is invalid, key ' . $key . ' is not a string');
 			}
 			if (!is_string($value)) {
-				Server::get(LoggerInterface::class)->error('Object for placeholder ' . $placeholder . ' is invalid, value ' . $value . ' for key ' . $key . ' is not a string');
+				throw new InvalidObjectExeption('Object for placeholder ' . $placeholder . ' is invalid, value ' . $value . ' for key ' . $key . ' is not a string');
 			}
 		}
 	}

tests/lib/RichObjectStrings/ValidatorTest.php

@@ -10,6 +10,7 @@
 
 use OC\RichObjectStrings\Validator;
 use OCP\RichObjectStrings\Definitions;
+use OCP\RichObjectStrings\InvalidObjectExeption;
 use Test\TestCase;
 
 class ValidatorTest extends TestCase {
@@ -36,6 +37,9 @@ public function testValidate(): void {
 		]);
 		$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',
@@ -45,6 +49,7 @@ public function testValidate(): void {
 			],
 		]);
 
+		$this->expectExceptionMessage('Object for placeholder string1 is invalid, key 456 is not a string');
 		$v->validate('test {string1} test.', [
 			'string1' => [
 				'type' => 'user',