wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code formatting for ViewHelper & tests

Browse Source
This commit is contained in:
Anton Terekhov
2012-11-21 15:43:20 +04:00
parent 0d58a907e5
commit 07a244ca35
11 changed files with 87 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/view/helpers/BreadcrumbVeiwHelperTest.php
View File

@ -17,6 +17,9 @@ require_once dirname(__FILE__) . '/../../../view/helpers/BreadcrumbViewHelper.ph
class BreadcrumbViewHelperTest extends PHPUnit_Framework_TestCase class BreadcrumbViewHelperTest extends PHPUnit_Framework_TestCase
{ {
/**
* @var BreadcrumbViewHelper
*/
public $helper; public $helper;
public function setUp() public function setUp()
@ -43,7 +46,7 @@ class BreadcrumbViewHelperTest extends PHPUnit_Framework_TestCase
$this->helper->prepend('Home page', 'home.php'); $this->helper->prepend('Home page', 'home.php');
$this->helper->breadcrumb('Guest page', 'guest.php'); $this->helper->breadcrumb('Guest page', 'guest.php');
$this->helper->append('Leave message', 'feedback.php'); $this->helper->append('Leave message', 'feedback.php');
$this->assertSame(array('Home page' => 'home.php', 'Guest page' => 'guest.php', 'Leave message'=> 'feedback.php'), Registry::get('BreadcrumbViewHelper')); $this->assertSame(array('Home page' => 'home.php', 'Guest page' => 'guest.php', 'Leave message' => 'feedback.php'), Registry::get('BreadcrumbViewHelper'));
$result = $this->helper->__toString(); $result = $this->helper->__toString();
$this->assertSame('<a href="home.php">Home page</a> &gt; <a href="guest.php">Guest page</a> &gt; <a href="feedback.php">Leave message</a>', $result); $this->assertSame('<a href="home.php">Home page</a> &gt; <a href="guest.php">Guest page</a> &gt; <a href="feedback.php">Leave message</a>', $result);
@ -55,6 +58,5 @@ class BreadcrumbViewHelperTest extends PHPUnit_Framework_TestCase
$this->helper->append('Last page', ''); $this->helper->append('Last page', '');
$result = $this->helper->__toString(); $result = $this->helper->__toString();
$this->assertSame('<a href="home.php">Home page</a>-<a href="guest.php">Guest page</a>-<a href="feedback.php">Leave message</a>-Last page', $result); $this->assertSame('<a href="home.php">Home page</a>-<a href="guest.php">Guest page</a>-<a href="feedback.php">Leave message</a>-Last page', $result);
} }
} }

4
tests/view/helpers/GetViewHelperTest.php
View File

@ -19,6 +19,9 @@ require_once dirname(__FILE__) . '/../../../view/helpers/GetViewHelper.php';
class GetViewHelperTest extends PHPUnit_Framework_TestCase class GetViewHelperTest extends PHPUnit_Framework_TestCase
{ {
/**
* @var GetViewHelper
*/
public $helper; public $helper;
public function setUp() public function setUp()
@ -77,5 +80,4 @@ class GetViewHelperTest extends PHPUnit_Framework_TestCase
$result = $this->helper->get(array('b' => 'c d e', 'c' => array('five' => 'six seven'))); $result = $this->helper->get(array('b' => 'c d e', 'c' => array('five' => 'six seven')));
$this->assertSame('?a[one]=1&amp;a[two]=2&amp;b=c+d+e&amp;c[five]=six+seven', $result); $this->assertSame('?a[one]=1&amp;a[two]=2&amp;b=c+d+e&amp;c[five]=six+seven', $result);
} }
} }

3
tests/view/helpers/HeadViewHelperTest.php
View File

@ -17,6 +17,9 @@ require_once dirname(__FILE__) . '/../../../view/helpers/HeadViewHelper.php';
class HeadViewHelperTest extends PHPUnit_Framework_TestCase class HeadViewHelperTest extends PHPUnit_Framework_TestCase
{ {
/**
* @var HeadViewHelper
*/
public $helper; public $helper;
public function setUp() public function setUp()

7
tests/view/helpers/MsgViewHelperTest.php
View File

@ -19,7 +19,9 @@ require_once dirname(__FILE__) . '/../../../exception/GeneralException.php';
class MsgViewHelperTest extends PHPUnit_Framework_TestCase class MsgViewHelperTest extends PHPUnit_Framework_TestCase
{ {
/**
* @var MsgViewHelper
*/
public $helper; public $helper;
public function setUp() public function setUp()
@ -36,8 +38,6 @@ class MsgViewHelperTest extends PHPUnit_Framework_TestCase
$this->assertSame($this->helper, $this->helper->msg('error message', 'error')); $this->assertSame($this->helper, $this->helper->msg('error message', 'error'));
$this->assertSame(array('message' => 'error message', 'type' => 'error'), Session::get('MsgViewHelper')); $this->assertSame(array('message' => 'error message', 'type' => 'error'), Session::get('MsgViewHelper'));
} }
public function testWrongType() public function testWrongType()
@ -71,5 +71,4 @@ class MsgViewHelperTest extends PHPUnit_Framework_TestCase
$result = $this->helper->__toString(); $result = $this->helper->__toString();
$this->assertEmpty($result); $this->assertEmpty($result);
} }
} }

4
tests/view/helpers/TitleViewHelperTest.php
View File

@ -16,7 +16,9 @@ require_once dirname(__FILE__) . '/../../../view/helpers/TitleViewHelper.php';
class TitleViewHelperTest extends PHPUnit_Framework_TestCase class TitleViewHelperTest extends PHPUnit_Framework_TestCase
{ {
/**
* @var TitleViewHelper
*/
public $helper; public $helper;
public function setUp() public function setUp()

2
view/helpers/GetViewHelper.php
View File

@ -43,7 +43,7 @@ class GetViewHelper extends ViewHelper
protected function impl($name, $value) protected function impl($name, $value)
{ {
if (is_array($value)){ if (is_array($value)) {
$result = array(); $result = array();
foreach ($value as $key => $val) { foreach ($value as $key => $val) {
$result[] = $name . '[' . $key . ']=' . urlencode($val); $result[] = $name . '[' . $key . ']=' . urlencode($val);