tests: Update Registrar tests

Author: neznaika0

Diff for: tests/_support/Config/TestRegistrar.php

@@ -20,13 +20,53 @@
  */
 class TestRegistrar
 {
-    public static function RegistrarConfig()
+    /**
+     * @param array<int|string, mixed> $previous
+     */
+    public static function RegistrarConfig(array $previous = [])
     {
+        if ($previous === []) {
+            return [
+                'bar' => [
+                    'first',
+                    'second',
+                ],
+                'cars' => [
+                    'Trucks' => [
+                        'Volvo' => [
+                            'year'  => 2019,
+                            'color' => 'dark blue',
+                        ],
+                    ],
+                    'Sedans Lux' => [
+                        'Toyota' => [
+                            'year'  => 2025,
+                            'color' => 'silver',
+                        ],
+                    ],
+                ],
+            ];
+        }
+
         return [
             'bar' => [
                 'first',
                 'second',
             ],
+            'cars' => array_replace_recursive($previous['cars'], [
+                'Trucks' => [
+                    'Volvo' => [
+                        'year'  => 2019,
+                        'color' => 'dark blue',
+                    ],
+                ],
+                'Sedans Lux' => [
+                    'Toyota' => [
+                        'year'  => 2025,
+                        'color' => 'silver',
+                    ],
+                ],
+            ]),
         ];
     }
 }

Diff for: tests/system/Config/BaseConfigTest.php

@@ -252,18 +252,87 @@ public function testRecognizesLooseValues(): void
         $this->assertFalse($config->QFALSE);
     }
 
-    public function testRegistrars(): void
+    public function testRegistrarsWithDisabledRegistrarHasData(): void
     {
+        $modules = new Modules();
+
+        $modules->registrarHasData = false;
+        BaseConfig::setModules($modules);
+
         $config              = new RegistrarConfig();
         $config::$registrars = [TestRegistrar::class];
+
         $this->setPrivateProperty($config, 'didDiscovery', true);
         $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
         $method();
 
+        $cars = [
+            'Sedans' => [
+                'Toyota' => [
+                    'year'  => 2018,
+                    'color' => 'silver',
+                ],
+            ],
+            'Trucks' => [
+                'Volvo' => [
+                    'year'  => 2019,
+                    'color' => 'dark blue',
+                ],
+            ],
+            'Sedans Lux' => [
+                'Toyota' => [
+                    'year'  => 2025,
+                    'color' => 'silver',
+                ],
+            ],
+        ];
+
         // no change to unmodified property
         $this->assertSame('bar', $config->foo);
         // add to an existing array property
         $this->assertSame(['baz', 'first', 'second'], $config->bar);
+        // replace some of the keys with another value
+        $this->assertSame($cars, $config->cars);
+    }
+
+    public function testRegistrarsWithEnabledRegistrarHasData(): void
+    {
+        $modules = new Modules();
+
+        $modules->registrarHasData = true;
+        BaseConfig::setModules($modules);
+
+        $config              = new RegistrarConfig();
+        $config::$registrars = [TestRegistrar::class];
+
+        $this->setPrivateProperty($config, 'didDiscovery', true);
+        $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
+        $method();
+
+        $cars = [
+            'Sedans' => [
+                'Toyota' => [
+                    'year'  => 2018,
+                    'color' => 'silver',
+                ],
+            ],
+            'Trucks' => [
+                'Volvo' => [
+                    'year'  => 2019,
+                    'color' => 'dark blue',
+                ],
+            ],
+            'Sedans Lux' => [
+                'Toyota' => [
+                    'year'  => 2025,
+                    'color' => 'silver',
+                ],
+            ],
+        ];
+
+        $this->assertSame('bar', $config->foo);
+        $this->assertSame(['first', 'second'], $config->bar);
+        $this->assertSame($cars, $config->cars);
     }
 
     public function testBadRegistrar(): void

Diff for: tests/system/Config/fixtures/RegistrarConfig.php

@@ -17,4 +17,22 @@ class RegistrarConfig extends CodeIgniter\Config\BaseConfig
     public $bar = [
         'baz',
     ];
+
+    /**
+     * @var array<string, array<string, mixed>>
+     */
+    public $cars = [
+        'Sedans' => [
+            'Toyota' => [
+                'year'  => 2018,
+                'color' => 'silver',
+            ],
+        ],
+        'Trucks' => [
+            'Volvo' => [
+                'year'  => 2019,
+                'color' => 'blue',
+            ],
+        ],
+    ];
 }