diff --git a/Test/Case/View/Helper/BackToHelper/LinkButtonTest.php b/Test/Case/View/Helper/BackToHelper/LinkButtonTest.php index f55947a6..d551e2d2 100644 --- a/Test/Case/View/Helper/BackToHelper/LinkButtonTest.php +++ b/Test/Case/View/Helper/BackToHelper/LinkButtonTest.php @@ -81,7 +81,7 @@ public function testLinkButtonWithTitle($title) { //チェック $expected = '' . - ' ' . $title . + ' ' . $title . ''; $this->assertEquals($expected, $result); } @@ -125,7 +125,7 @@ public function testLinkButtonWithIcon($icon) { //チェック if ($icon) { - $expected = ' '; + $expected = ' '; } else { $expected = ''; } @@ -172,9 +172,9 @@ public function testLinkButtonWithIconSize($iconSize) { $expectedIconSize = ''; } $expected = '' . - ' ' . + ' ' . ''; - $this->assertEqual($expected, $result); + $this->assertEquals($expected, $result); } /** @@ -213,9 +213,9 @@ public function testLinkButtonWithEscapeTitle($title, $escapeTitle, $expectedTit //チェック $expected = '' . - ' ' . $expectedTitle . + ' ' . $expectedTitle . ''; - $this->assertEqual($expected, $result); + $this->assertEquals($expected, $result); } } diff --git a/Test/Case/View/Helper/ButtonHelper/CancelAndSaveAndSaveTempTest.php b/Test/Case/View/Helper/ButtonHelper/CancelAndSaveAndSaveTempTest.php index a37844bd..24701515 100644 --- a/Test/Case/View/Helper/ButtonHelper/CancelAndSaveAndSaveTempTest.php +++ b/Test/Case/View/Helper/ButtonHelper/CancelAndSaveAndSaveTempTest.php @@ -140,14 +140,14 @@ public function testCancelAndSaveAndSaveTemp($status, $contentPublishable, $canc private function __assertButtons($result, $cancelUrl, $backUrl, $disapproval, $approval) { //キャンセルのチェック $expected = '' . - ' ' . __d('net_commons', 'Cancel') . + ' ' . __d('net_commons', 'Cancel') . ''; $this->assertTextContains($expected, $result); //戻るのチェック if ($backUrl) { $expected = '' . - ' ' . __d('net_commons', 'BACK') . + ' ' . __d('net_commons', 'BACK') . ''; $this->assertTextContains($expected, $result); } else { diff --git a/View/Helper/BackToHelper.php b/View/Helper/BackToHelper.php index ef8f9f3e..3e896fc0 100644 --- a/View/Helper/BackToHelper.php +++ b/View/Helper/BackToHelper.php @@ -56,7 +56,8 @@ public function button($title, $url, $options = array()) { $options['icon'] = 'remove'; } if ($options['icon'] !== '') { - $iconElement = ' '; + $iconElement = ' '; unset($options['icon']); $title = h($title); @@ -108,7 +109,8 @@ public function linkButton($title, $url, $options = array()) { $icon = Hash::get($options, 'icon', 'remove'); $options = Hash::remove($options, 'icon'); if ($icon) { - $iconElement = ' '; + $iconElement = ' '; } //ボタンサイズ diff --git a/View/Helper/ButtonHelper.php b/View/Helper/ButtonHelper.php index e6831bbd..a1dd98fd 100644 --- a/View/Helper/ButtonHelper.php +++ b/View/Helper/ButtonHelper.php @@ -70,7 +70,7 @@ public function getButtonSize() { public function button($title, $options = array()) { $icon = Hash::get($options, 'icon'); if ($icon) { - $title = ' ' . $title; + $title = ' ' . $title; $options = Hash::remove($options, 'icon'); $options = Hash::insert($options, 'escape', false); } @@ -112,7 +112,7 @@ public function button($title, $options = array()) { public function delete($title, $confirm, $options = array()) { $output = ''; - $title = ' ' . $title; + $title = ' ' . $title; $defaultOptions = array( 'name' => 'delete', @@ -156,24 +156,18 @@ public function delete($title, $confirm, $options = array()) { public function save($title, $options = array()) { if (isset($options['icon'])) { $title = h($title); - $title .= ' '; + $title .= ' '; $options['escape'] = false; } - $defaultOptions = array( - 'name' => 'save', - 'class' => 'btn btn-primary' . $this->getButtonSize() . ' btn-workflow', - 'ng-disabled' => 'sending' - ); - $inputOptions = Hash::merge($defaultOptions, $options); - if (Hash::get($options, 'url')) { $options['url'] = $this->NetCommonsHtml->url(Hash::get($options, 'url')); $inputOptions = Hash::merge(array( 'class' => 'btn btn-primary' . $this->getButtonSize() . ' btn-workflow', 'ng-disabled' => 'sending', - 'ng-click' => 'sending=true', + 'ng-click' => 'sending=true' ), $options); $inputOptions = Hash::remove($inputOptions, 'url'); @@ -265,7 +259,7 @@ public function cancelAndSaveAndSaveTemp($cancelUrl = null, $cancelOptions = [], $cancelOptions = Hash::remove($cancelOptions, 'label'); $output .= $this->Html->link( - ' ' . $label, + ' ' . $label, $cancelUrl, $cancelOptions ); @@ -273,7 +267,8 @@ public function cancelAndSaveAndSaveTemp($cancelUrl = null, $cancelOptions = [], //前へボタン if (isset($backUrl)) { $output .= $this->Html->link( - ' ' . __d('net_commons', 'BACK'), + ' ' . + __d('net_commons', 'BACK'), $backUrl, array( 'class' => 'btn btn-default' . $this->getButtonSize() . ' btn-workflow', @@ -320,7 +315,8 @@ public function search($title, $options = array()) { $options['icon'] = Hash::get($options, 'icon', 'search'); if ($options['icon'] !== '') { - $iconElement = ' '; + $iconElement = ' '; unset($options['icon']); } else { $iconElement = ''; @@ -348,7 +344,8 @@ public function add($title, $options = array()) { $options['icon'] = Hash::get($options, 'icon', 'plus'); if ($options['icon'] !== '') { - $iconElement = ' '; + $iconElement = ' '; unset($options['icon']); } else { $iconElement = '';