From 339e8f9052707485a219d267abf56ed6f0e96a1a Mon Sep 17 00:00:00 2001 From: AD7six Date: Sun, 9 Nov 2014 09:45:59 +0000 Subject: [PATCH] rename property to arrayProperty --- src/Template/Bake/Controller/controller.ctp | 4 ++-- .../Bake/Element/{property.ctp => array_property.ctp} | 0 src/View/Helper/ClassHelper.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/Template/Bake/Element/{property.ctp => array_property.ctp} (100%) diff --git a/src/Template/Bake/Controller/controller.ctp b/src/Template/Bake/Controller/controller.ctp index 7490e66945f..c9b438783e0 100644 --- a/src/Template/Bake/Controller/controller.ctp +++ b/src/Template/Bake/Controller/controller.ctp @@ -37,8 +37,8 @@ use <%= $namespace %>\Controller\AppController; <% endforeach; %> */ class <%= $name %>Controller extends AppController { -<%= $this->Class->property('helpers', $helpers); %> -<%= $this->Class->property('components', $components); %> +<%= $this->Class->arrayProperty('helpers', $helpers); %> +<%= $this->Class->arrayProperty('components', $components); %> <% if (!empty($actions)): %> <% echo trim($actions); %> diff --git a/src/Template/Bake/Element/property.ctp b/src/Template/Bake/Element/array_property.ctp similarity index 100% rename from src/Template/Bake/Element/property.ctp rename to src/Template/Bake/Element/array_property.ctp diff --git a/src/View/Helper/ClassHelper.php b/src/View/Helper/ClassHelper.php index 0ee625d2106..acd9c4c79da 100644 --- a/src/View/Helper/ClassHelper.php +++ b/src/View/Helper/ClassHelper.php @@ -17,7 +17,7 @@ class ClassHelper extends Helper { protected $_defaultConfig = []; /** - * property + * arrayProperty * * Used for generating formatted properties such as component and helper arrays * @@ -26,7 +26,7 @@ class ClassHelper extends Helper { * @param array $params * @return string */ - public function property($name, $value, $params = []) { + public function arrayProperty($name, $value, $params = []) { if (!$value) { return ''; } @@ -38,7 +38,7 @@ public function property($name, $value, $params = []) { 'name' => $name, 'value' => $value ]; - return $this->_View->element('property', $params); + return $this->_View->element('arrayProperty', $params); } }