Merge pull request #48008 from nextcloud/fix/entity/strict-types

nextcloud · Sep 16, 2024 · 8a32881 · 8a32881
2 parents 1a972d0 + 247b1dd
commit 8a32881
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/public/AppFramework/Db/Entity.php b/lib/public/AppFramework/Db/Entity.php
@@ -54,9 +54,8 @@ public static function fromRow(array $row): static {
 		$instance = new static();
 
 		foreach ($row as $key => $value) {
-			$prop = ucfirst($instance->columnToProperty($key));
-			$setter = 'set' . $prop;
-			$instance->$setter($value);
+			$prop = $instance->columnToProperty($key);
+			$instance->setter($prop, [$value]);
 		}
 
 		$instance->resetUpdatedFields();

diff --git a/tests/lib/AppFramework/Db/EntityTest.php b/tests/lib/AppFramework/Db/EntityTest.php
@@ -27,7 +27,6 @@
  * @method void setTrueOrFalse(bool $trueOrFalse)
  * @method bool getAnotherBool()
  * @method bool isAnotherBool()
- * @method void setAnotherBool(bool $anotherBool)
  * @method string getLongText()
  * @method void setLongText(string $longText)
  */
@@ -47,6 +46,10 @@ public function __construct($name = null) {
 		$this->addType('longText', 'blob');
 		$this->name = $name;
 	}
+
+	public function setAnotherBool(bool $anotherBool): void {
+		parent::setAnotherBool($anotherBool);
+	}
 }
 
 
@@ -71,12 +74,14 @@ public function testResetUpdatedFields(): void {
 	public function testFromRow(): void {
 		$row = [
 			'pre_name' => 'john',
-			'email' => 'john@something.com'
+			'email' => 'john@something.com',
+			'another_bool' => 1,
 		];
 		$this->entity = TestEntity::fromRow($row);
 
 		$this->assertEquals($row['pre_name'], $this->entity->getPreName());
 		$this->assertEquals($row['email'], $this->entity->getEmail());
+		$this->assertEquals($row['another_bool'], $this->entity->getAnotherBool());
 	}