Replace fieldModel to formModel in parameters in Utils::class. (#5)

Author: terabytesoftw

CHANGELOG.md

@@ -1,8 +1,9 @@
 # Change Log
 
-## 0.1.2 February 29, 2024
+## 0.2.0 February 29, 2024
 
 - Enh #4: Refactor `getShortNameClass()` method to support optional `suffix` and `lowercase` parameters (@terabytesoftw)
+- Bug #5: Replace `fieldModel` to `formModel` in parameters in `Utils::class` helper (@terabytesoftw)
 
 ## 0.1.1 February 29, 2024
 

src/Utils.php

@@ -96,7 +96,7 @@ public static function generateId(string $prefix = 'id-'): string
      *
      * For example, if {@see generateInputName()} returns `Post[content]`, this method will return `post-content`.
      *
-     * @param string $fieldModel The field model name.
+     * @param string $formModel The form model name.
      * @param string $property The property name or expression.
      * @param string $charset default `UTF-8`.
      *
@@ -106,11 +106,11 @@ public static function generateId(string $prefix = 'id-'): string
      * @return string the generated input ID.
      */
     public static function generateInputId(
-        string $fieldModel = '',
+        string $formModel = '',
         string $property = '',
         string $charset = 'UTF-8'
     ): string {
-        $name = mb_strtolower(self::generateInputName($fieldModel, $property), $charset);
+        $name = mb_strtolower(self::generateInputName($formModel, $property), $charset);
 
         return str_replace(['[]', '][', '[', ']', ' ', '.'], ['', '-', '-', '', '-', '-'], $name);
     }
@@ -127,30 +127,30 @@ public static function generateInputId(
      * setting the `$arrayable` parameter to `true`. For example, if the form name of the `Post` form is `Post`, then
      * the input name generated for the `tags[]` property would be `Post[tags][]`.
      *
-     * @param string $fieldModel The field model name.
+     * @param string $formModel The form model name.
      * @param string $property The property name or expression.
      * @param bool $arrayable Whether to generate an arrayable input name. This is mainly used in tabular data input.
      *
      * @throws InvalidArgumentException If the property name contains non-word characters or empty form name for
      * tabular inputs
      */
-    public static function generateInputName(string $fieldModel, string $property, bool $arrayable = false): string
+    public static function generateInputName(string $formModel, string $property, bool $arrayable = false): string
     {
         if ($arrayable === true) {
             $property = self::generateArrayableName($property);
         }
 
         $data = self::parseProperty($property);
 
-        if ($fieldModel === '' && $data['prefix'] === '') {
+        if ($formModel === '' && $data['prefix'] === '') {
             return $property;
         }
 
-        if ($fieldModel !== '') {
-            return $fieldModel . $data['prefix'] . '[' . $data['name'] . ']' . $data['suffix'];
+        if ($formModel !== '') {
+            return $formModel . $data['prefix'] . '[' . $data['name'] . ']' . $data['suffix'];
         }
 
-        throw new InvalidArgumentException('The field model cannot be empty for tabular inputs.');
+        throw new InvalidArgumentException('The form model name cannot be empty for tabular inputs.');
     }
 
     /**

tests/UtilsTest.php

@@ -85,7 +85,7 @@ public function testGetInputNamewithOnlyCharacters(): void
     public function testGetInputNameExceptionWithTabular(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The field model cannot be empty for tabular inputs.');
+        $this->expectExceptionMessage('The form model name cannot be empty for tabular inputs.');
 
         Utils::generateInputName('', '[0]dates[0]');
     }