Make method name better represent what it is going to do.

Refs #5002
cakephp · Oct 30, 2014 · daf73ef · daf73ef
1 parent 9b4ea64
commit daf73ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Core/ConventionsTrait.php b/src/Core/ConventionsTrait.php
@@ -80,7 +80,7 @@ protected function _singularName($name) {
  * @param string $name Name to use
  * @return string Plural name for views
  */
-	protected function _pluralName($name) {
+	protected function _variableName($name) {
 		return Inflector::variable($name);
 	}
 

diff --git a/src/Shell/Task/ControllerTask.php b/src/Shell/Task/ControllerTask.php
@@ -90,10 +90,10 @@ public function bakeActions($controllerName) {
 
 		$modelObj = TableRegistry::get($currentModelName);
 
-		$pluralName = $this->_pluralName($currentModelName);
+		$pluralName = $this->_variableName($currentModelName);
 		$singularName = $this->_singularName($currentModelName);
 		$singularHumanName = $this->_singularHumanName($controllerName);
-		$pluralHumanName = $this->_pluralName($controllerName);
+		$pluralHumanName = $this->_variableName($controllerName);
 
 		$this->Template->set(compact(
 			'plugin', 'admin', 'pluralName', 'singularName',

diff --git a/src/Template/Bake/default/actions/controller_actions.ctp b/src/Template/Bake/default/actions/controller_actions.ctp
@@ -82,7 +82,7 @@ $allAssociations = array_merge(
 		foreach ($editAssociations as $assoc):
 			$association = $modelObj->association($assoc);
 			$otherName = $association->target()->alias();
-			$otherPlural = $this->_pluralName($otherName);
+			$otherPlural = $this->_variableName($otherName);
 			echo "\t\t\${$otherPlural} = \$this->{$currentModelName}->{$otherName}->find('list');\n";
 			$compact[] = "'{$otherPlural}'";
 		endforeach;
@@ -115,7 +115,7 @@ $allAssociations = array_merge(
 		foreach ($editAssociations as $assoc):
 			$association = $modelObj->association($assoc);
 			$otherName = $association->target()->alias();
-			$otherPlural = $this->_pluralName($otherName);
+			$otherPlural = $this->_variableName($otherName);
 			echo "\t\t\${$otherPlural} = \$this->{$currentModelName}->{$otherName}->find('list');\n";
 			$compact[] = "'{$otherPlural}'";
 		endforeach;