Merge pull request #6669 from kenjis/fix-tests-dynamic-properties

test: fix dynamic properties

Author: kenjis

tests/_support/View/SampleClassWithInitController.php

@@ -23,6 +23,8 @@
  */
 class SampleClassWithInitController
 {
+    private ResponseInterface $response;
+
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
         $this->response = $response;

tests/system/Models/GeneralModelTest.php

@@ -71,10 +71,6 @@ public function testMagicGetters(): void
         $this->assertFalse(isset($this->model->foobar));
         $this->assertNull($this->model->foobar);
 
-        $this->model->flavor = 'chocolate';
-        $this->assertTrue(isset($this->model->flavor));
-        $this->assertSame('chocolate', $this->model->flavor);
-
         // from DB
         $this->assertTrue(isset($this->model->DBPrefix));
         $this->assertSame('utf8', $this->model->charset);

tests/system/Models/ValidationModelTest.php

@@ -238,26 +238,25 @@ public function testValidationPassesWithMissingFields(): void
 
     public function testValidationWithGroupName(): void
     {
-        $config = new Validation();
+        $config = new class () extends Validation {
+            public $grouptest = [
+                'name' => [
+                    'required',
+                    'min_length[3]',
+                ],
+                'token' => 'in_list[{id}]',
+            ];
+        };
+        Factories::injectMock('config', 'Validation', $config);
 
-        $config->grouptest = [
-            'name' => [
-                'required',
-                'min_length[3]',
-            ],
-            'token' => 'in_list[{id}]',
-        ];
+        $this->createModel(ValidModel::class);
+        $this->setPrivateProperty($this->model, 'validationRules', 'grouptest');
 
         $data = [
             'name'  => 'abc',
             'id'    => 13,
             'token' => 13,
         ];
-
-        Factories::injectMock('config', 'Validation', $config);
-
-        $this->createModel(ValidModel::class);
-        $this->setPrivateProperty($this->model, 'validationRules', 'grouptest');
         $this->assertTrue($this->model->validate($data));
     }
 

tests/system/View/CellTest.php

@@ -249,6 +249,9 @@ public function testParametersDontMatch()
 
     public function testCallInitControllerIfMethodExists()
     {
-        $this->assertSame(Response::class, $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index'));
+        $this->assertSame(
+            Response::class,
+            $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index')
+        );
     }
 }