Merge pull request #1390 from alesinicio/develop

Refactor: better handling of dynamic properties for Entities

src/Entities/Entity.php

@@ -24,10 +24,10 @@
  * @method array  getRawData()     Get the raw data passed to this entity
  * @method string getBotUsername() Return the bot name passed to this entity
  */
-#[\AllowDynamicProperties]
 abstract class Entity implements \JsonSerializable
 {
     public static $fixThumbnailRename = true;
+    private $parameters = [];
 
     /**
      * Entity constructor.
@@ -53,6 +53,27 @@ public function __construct(array $data, string $bot_username = '')
         $this->validate();
     }
 
+    /**
+     * Dynamically sets a parameter.
+     *
+     * @param string $name
+     * @param        $value
+     * @return void
+     */
+    public function __set(string $name, $value) : void {
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * Gets a dynamic parameter.
+     *
+     * @param string $name
+     * @return mixed|null
+     */
+    public function __get(string $name) {
+        return $this->parameters[$name] ?? null;
+    }
+
     /**
      * Return the data that should be serialized for Telegram.
      *

tests/Unit/Entities/EntityTest.php

@@ -35,4 +35,16 @@ public function testEscapeMarkdown(): void
         self::assertEquals('\_\*\[\]\(\)\~\`\>\#\+\-\=\|\{\}\.\!', Entity::escapeMarkdownV2('_*[]()~`>#+-=|{}.!'));
         self::assertEquals('\*mark\*\_down\_\~test\~', Entity::escapeMarkdownV2('*mark*_down_~test~'));
     }
+    public function testSettingDynamicParameterWorks(): void {
+        $anonClass = new class([]) extends Entity {};
+
+        $anonClass->newParameter = 'test';
+
+        $this->assertEquals('test', $anonClass->newParameter);
+    }
+    public function testGettingUnknownDynamicParameterReturnsNull(): void {
+        $anonClass = new class([]) extends Entity {};
+
+        $this->assertEquals(null, $anonClass->unknownParameter);
+    }
 }