From 3551011598b3d0324b67881d6b1d7c4b906de413 Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 14 Oct 2013 14:41:45 +0300 Subject: [PATCH 1/2] Fix Strict (2048): Declaration of BootstrapFormHelper::radio() should be compatible with FormHelper::radio($fieldName, $options = Array, $attributes = Array) [APP/Plugin/TwitterBootstrap/View/Helper/BootstrapFormHelper.php, line 5] --- View/Helper/BootstrapFormHelper.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/View/Helper/BootstrapFormHelper.php b/View/Helper/BootstrapFormHelper.php index bddecc5..371d620 100644 --- a/View/Helper/BootstrapFormHelper.php +++ b/View/Helper/BootstrapFormHelper.php @@ -344,10 +344,11 @@ public function _helpMarkup($options) { * markup for twitter bootstrap styles * * @param array $options + * @param array $attributes * @access public * @return string */ - public function radio($field, $options = array()) { + public function radio($field, $options = array(), $attributes = array()) { if (is_array($field)) { $options = $field; } else { @@ -364,7 +365,7 @@ public function radio($field, $options = array()) { $input = parent::radio( $options["field"], array($key => $val), - array("label" => false, 'hiddenField' => $hiddenField) + $attributes + array("label" => false, 'hiddenField' => $hiddenField) ); $id = array(); preg_match_all("/id=\"[a-zA-Z0-9_-]*\"/", $input, $id); From 237b92daf2ed72df0ebb6b5737026c65965aec2c Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 14 Oct 2013 14:47:43 +0300 Subject: [PATCH 2/2] Strict standards: Declaration of TestBootstrapHelper::_flash_content() should be compatible with BootstrapHelper::_flash_content($key = 'flash') in app/Plugin/TwitterBootstrap/Test/Case/View/Helper/BootstrapHelperTest.php on line 17 --- Test/Case/View/Helper/BootstrapHelperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Case/View/Helper/BootstrapHelperTest.php b/Test/Case/View/Helper/BootstrapHelperTest.php index 945a493..0c0f7e6 100644 --- a/Test/Case/View/Helper/BootstrapHelperTest.php +++ b/Test/Case/View/Helper/BootstrapHelperTest.php @@ -35,7 +35,7 @@ public function getAttribute($attribute) { /** * Overwriting method to return a static string. */ - public function _flash_content($key) { + public function _flash_content($key = 'flash') { return "Flash content"; } }