From 87907eef69382781994947b961600f073c05aa1e Mon Sep 17 00:00:00 2001 From: Chris Burke Date: Thu, 6 Nov 2014 00:47:52 -0600 Subject: [PATCH] Fix CS issues failing Travis build --- Controller/BoostCakeController.php | 19 ++++++- Test/Case/AllBoostCakeTest.php | 5 ++ .../View/Helper/BoostCakeFormHelperTest.php | 50 +++++++++++++++++++ .../View/Helper/BoostCakeHtmlHelperTest.php | 20 ++++++++ View/Helper/BoostCakeFormHelper.php | 32 ++++++------ View/Helper/BoostCakePaginatorHelper.php | 50 +++++++++++++++++++ 6 files changed, 161 insertions(+), 15 deletions(-) diff --git a/Controller/BoostCakeController.php b/Controller/BoostCakeController.php index aa4812f..ea09f06 100644 --- a/Controller/BoostCakeController.php +++ b/Controller/BoostCakeController.php @@ -14,8 +14,10 @@ class BoostCakeController extends AppController { ); /** - * beforeFilter + * Before filter + * * @throws MethodNotAllowedException + * @return void */ public function beforeFilter() { if (Configure::read('debug') < 1) { @@ -24,9 +26,19 @@ public function beforeFilter() { parent::beforeFilter(); } +/** + * Action for plugin documentation home page + * + * @return void + */ public function index() { } +/** + * Action for Bootstrap 2 example page + * + * @return void + */ public function bootstrap2() { $this->Session->setFlash(__('Alert notice message testing...'), 'alert', array( 'plugin' => 'BoostCake', @@ -41,6 +53,11 @@ public function bootstrap2() { ), 'error'); } +/** + * Action for Bootstrap 3 example page + * + * @return void + */ public function bootstrap3() { $this->Session->setFlash(__('Alert success message testing...'), 'alert', array( 'plugin' => 'BoostCake', diff --git a/Test/Case/AllBoostCakeTest.php b/Test/Case/AllBoostCakeTest.php index dd5d438..53f6e2a 100644 --- a/Test/Case/AllBoostCakeTest.php +++ b/Test/Case/AllBoostCakeTest.php @@ -1,6 +1,11 @@ View = new View(); @@ -40,11 +45,21 @@ public function setUp() { ClassRegistry::addObject('Contact', new Contact()); } +/** + * tearDown + * + * @return void + */ public function tearDown() { unset($this->View); unset($this->Form); } +/** + * testInput + * + * @return void + */ public function testInput() { $result = $this->Form->input('name'); $this->assertTags($result, array( @@ -108,6 +123,11 @@ public function testInput() { )); } +/** + * testBeforeInputAfterInput + * + * @return void + */ public function testBeforeInputAfterInput() { $result = $this->Form->input('name', array( 'beforeInput' => 'Before Input', @@ -127,6 +147,11 @@ public function testBeforeInputAfterInput() { )); } +/** + * testCheckbox + * + * @return void + */ public function testCheckbox() { $result = $this->Form->input('name', array('type' => 'checkbox')); $this->assertTags($result, array( @@ -179,6 +204,11 @@ public function testCheckbox() { )); } +/** + * testCheckboxLabelEscape + * + * @return void + */ public function testCheckboxLabelEscape() { $result = $this->Form->input('name', array( 'type' => 'checkbox', @@ -199,6 +229,11 @@ public function testCheckboxLabelEscape() { )); } +/** + * testSelectMultipleCheckbox + * + * @return void + */ public function testSelectMultipleCheckbox() { $result = $this->Form->select('name', array( @@ -290,6 +325,11 @@ public function testSelectMultipleCheckbox() { )); } +/** + * testRadio + * + * @return void + */ public function testRadio() { $result = $this->Form->input('name', array( 'type' => 'radio', @@ -320,6 +360,11 @@ public function testRadio() { )); } +/** + * testErrorMessage + * + * @return void + */ public function testErrorMessage() { $Contact = ClassRegistry::getObject('Contact'); $Contact->validationErrors['password'] = array('Please provide a password'); @@ -402,6 +447,11 @@ public function testErrorMessage() { )); } +/** + * testPostLink + * + * @return void + */ public function testPostLink() { $result = $this->Form->postLink('Delete', '/posts/delete/1', array( 'block' => 'form' diff --git a/Test/Case/View/Helper/BoostCakeHtmlHelperTest.php b/Test/Case/View/Helper/BoostCakeHtmlHelperTest.php index 45aeeb2..93b3e44 100644 --- a/Test/Case/View/Helper/BoostCakeHtmlHelperTest.php +++ b/Test/Case/View/Helper/BoostCakeHtmlHelperTest.php @@ -4,16 +4,31 @@ class BoostCakeHtmlHelperTest extends CakeTestCase { +/** + * setUp + * + * @return void + */ public function setUp() { parent::setUp(); $View = new View(); $this->Html = new BoostCakeHtmlHelper($View); } +/** + * tearDown + * + * @return void + */ public function tearDown() { unset($this->Html); } +/** + * testUseTag + * + * @return void + */ public function testUseTag() { $result = $this->Html->useTag( 'radio', 'one', 'two', array('three' => 'four'), '' @@ -36,6 +51,11 @@ public function testUseTag() { )); } +/** + * testImage + * + * @return void + */ public function testImage() { $result = $this->Html->image('', array('data-src' => 'holder.js/24x24')); $this->assertTags($result, array( diff --git a/View/Helper/BoostCakeFormHelper.php b/View/Helper/BoostCakeFormHelper.php index 2a4290e..b02af8b 100644 --- a/View/Helper/BoostCakeFormHelper.php +++ b/View/Helper/BoostCakeFormHelper.php @@ -18,7 +18,8 @@ class BoostCakeFormHelper extends FormHelper { /** * Overwrite FormHelper::input() - * Generates a form input element complete with label and wrapper div + * + * - Generates a form input element complete with label and wrapper div * * ### Options * @@ -139,10 +140,11 @@ public function input($fieldName, $options = array()) { /** * Overwrite FormHelper::_divOptions() - * Generate inner and outer div options - * Generate div options for input * - * @param array $options + * - Generate inner and outer div options + * - Generate div options for input + * + * @param array $options Options list. * @return array */ protected function _divOptions($options) { @@ -165,11 +167,12 @@ protected function _divOptions($options) { /** * Overwrite FormHelper::_getInput() - * Wrap `
` input element - * Generates an input element * - * @param type $args - * @return type + * - Wrap `
` input element + * - Generates an input element + * + * @param array $args The options for the input element + * @return string The generated input element */ protected function _getInput($args) { $input = parent::_getInput($args); @@ -203,13 +206,14 @@ protected function _getInput($args) { /** * Overwrite FormHelper::_selectOptions() - * If $attributes['style'] is `` then replace `