改名

Gii/GiiBase.php

@@ -239,9 +239,36 @@ abstract class GiiBase
 
 					$_array = [];
 					foreach ($attribute->getArguments() as $_key => $argument) {
+						$argument = $this->resolveArray($argument);
 						if (is_numeric($_key)) {
 							$_array[] = '\'' . $argument . '\'';
 						} else {
+							if (is_numeric($_key)) {
+								$_array[] = $argument;
+							} else {
+								$_array[] = $_key . ': ' . $argument . '';
+							}
+						}
+					}
+					$over .= "	#[" . end($explode) . "(" . implode(',', $_array) . ")]
+";
+				}
+			}
+
+			$func = $this->getFuncLineContent($class, $classFileName, $val->name) . "\n";
+
+			$content[] = $over . $func;
+		}
+		return implode(PHP_EOL, $content);
+	}
+
+
+	/**
+	 * @param $argument
+	 * @return string
+	 */
+	private function resolveArray($argument): string
+	{
 		if (is_array($argument)) {
 			$__array = [];
 			foreach ($argument as $key => $value) {
@@ -268,25 +295,7 @@ abstract class GiiBase
 		} else {
 			$argument = '\'' . $argument . '\'';
 		}
-
+		return $argument;
-							if (is_numeric($_key)) {
-								$_array[] = $argument;
-							} else {
-								$_array[] = $_key . ': ' . $argument . '';
-							}
-
-						}
-					}
-					$over .= "	#[" . end($explode) . "(" . implode(',', $_array) . ")]
-";
-				}
-			}
-
-			$func = $this->getFuncLineContent($class, $classFileName, $val->name) . "\n";
-
-			$content[] = $over . $func;
-		}
-		return implode(PHP_EOL, $content);
 	}