Merge pull request #8077 from sammyskills/fix/dbgroup-tpl

fix: add dbgroup to model template only when specified as an option

Author: kenjis

Diff for: system/Commands/Generators/ModelGenerator.php

@@ -101,9 +101,8 @@ protected function prepare(string $class): string
             $baseClass = $match[1];
         }
 
-        $table   = is_string($table) ? $table : plural(strtolower($baseClass));
-        $dbGroup = is_string($dbGroup) ? $dbGroup : 'default';
-        $return  = is_string($return) ? $return : 'array';
+        $table  = is_string($table) ? $table : plural(strtolower($baseClass));
+        $return = is_string($return) ? $return : 'array';
 
         if (! in_array($return, ['array', 'object', 'entity'], true)) {
             // @codeCoverageIgnoreStart
@@ -129,6 +128,6 @@ protected function prepare(string $class): string
             $return = "'{$return}'";
         }
 
-        return $this->parseTemplate($class, ['{table}', '{dbGroup}', '{return}'], [$table, $dbGroup, $return]);
+        return $this->parseTemplate($class, ['{dbGroup}', '{table}', '{return}'], [$dbGroup, $table, $return], compact('dbGroup'));
     }
 }

Diff for: system/Commands/Generators/Views/model.tpl.php

@@ -6,7 +6,9 @@
 
 class {class} extends Model
 {
+<?php if (is_string($dbGroup)): ?>
     protected $DBGroup          = '{dbGroup}';
+<?php endif; ?>
     protected $table            = '{table}';
     protected $primaryKey       = 'id';
     protected $useAutoIncrement = true;

Diff for: tests/system/Commands/ModelGeneratorTest.php

@@ -52,7 +52,6 @@ public function testGenerateModel(): void
         $this->assertFileExists($file);
         $this->assertStringContainsString('extends Model', $this->getFileContent($file));
         $this->assertStringContainsString('protected $table            = \'users\';', $this->getFileContent($file));
-        $this->assertStringContainsString('protected $DBGroup          = \'default\';', $this->getFileContent($file));
         $this->assertStringContainsString('protected $returnType       = \'array\';', $this->getFileContent($file));
     }