Code formatting for ViewHelper & tests

tests/view/helpers/BreadcrumbVeiwHelperTest.php

@@ -16,45 +16,47 @@ require_once dirname(__FILE__) . '/../../../view/helpers/BreadcrumbViewHelper.ph
 
 class BreadcrumbViewHelperTest extends PHPUnit_Framework_TestCase
 {
-    
+
+    /**
+     * @var BreadcrumbViewHelper
+     */
     public $helper;
-    
+
     public function setUp()
     {
         Registry::set('BreadcrumbViewHelper', array());
         $this->helper = new BreadcrumbViewHelper(new PHPView('any'));
     }
-    
+
     public function testTitle()
     {
-        $this->helper->breadcrumb('Guest page', 'guest.php');        
+        $this->helper->breadcrumb('Guest page', 'guest.php');
         $result = Registry::get('BreadcrumbViewHelper');
-        $this->assertSame(array('Guest page' => 'guest.php'), Registry::get('BreadcrumbViewHelper')); 
-        
+        $this->assertSame(array('Guest page' => 'guest.php'), Registry::get('BreadcrumbViewHelper'));
+
         $this->helper->prepend('Leave message', 'feedback.php');
-        $this->assertSame(array('Leave message' => 'feedback.php', 'Guest page' => 'guest.php'), Registry::get('BreadcrumbViewHelper'));     
-        
+        $this->assertSame(array('Leave message' => 'feedback.php', 'Guest page' => 'guest.php'), Registry::get('BreadcrumbViewHelper'));
+
         $this->helper->append('Home page', 'home.php');
-        $this->assertSame(array('Leave message' => 'feedback.php', 'Guest page' => 'guest.php', 'Home page' => 'home.php'), Registry::get('BreadcrumbViewHelper'));   
+        $this->assertSame(array('Leave message' => 'feedback.php', 'Guest page' => 'guest.php', 'Home page' => 'home.php'), Registry::get('BreadcrumbViewHelper'));
     }
-    
+
     public function testToString()
     {
         $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->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();
         $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->helper->setSeparator('-');
         $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>', $result);
-        
+
         $this->helper->append('Last page', '');
         $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);
-        
     }
 }

tests/view/helpers/GetViewHelperTest.php

@@ -18,14 +18,17 @@ require_once dirname(__FILE__) . '/../../../view/helpers/GetViewHelper.php';
 
 class GetViewHelperTest extends PHPUnit_Framework_TestCase
 {
-    
+
+    /**
+     * @var GetViewHelper
+     */
     public $helper;
-    
+
     public function setUp()
     {
         $this->helper = new GetViewHelper(new PHPView('any'));
     }
-    
+
     /**
      * @TODO: GetViewHelper: initialize GetViewHelper::$get with empty array()
      */
@@ -34,7 +37,7 @@ class GetViewHelperTest extends PHPUnit_Framework_TestCase
         $this->setExpectedException('PHPUnit_Framework_Error');
         $this->helper->get(null);
     }
-    
+
     /**
      * @TODO: GetViewHelper: check $_GET not null
      */
@@ -43,7 +46,7 @@ class GetViewHelperTest extends PHPUnit_Framework_TestCase
         $this->setExpectedException('PHPUnit_Framework_Error');
         $result = $this->helper->get('param');
     }
-    
+
     public function testGetWithSingleParam()
     {
         $_GET['a'] = 'b';
@@ -59,7 +62,7 @@ class GetViewHelperTest extends PHPUnit_Framework_TestCase
         $result = $this->helper->get(array('a'));
         $this->assertSame('?b=a', $result);
     }
-    
+
     public function testGetWithArray()
     {
         $_GET['a'] = array('one' => 1, 'two' => 2);
@@ -77,5 +80,4 @@ class GetViewHelperTest extends PHPUnit_Framework_TestCase
         $result = $this->helper->get(array('b' => 'c d e', 'c' => array('five' => 'six seven')));
         $this->assertSame('?a[one]=1&a[two]=2&b=c+d+e&c[five]=six+seven', $result);
     }
-    
 }

tests/view/helpers/HeadViewHelperTest.php

@@ -16,32 +16,35 @@ require_once dirname(__FILE__) . '/../../../view/helpers/HeadViewHelper.php';
 
 class HeadViewHelperTest extends PHPUnit_Framework_TestCase
 {
-    
+
+    /**
+     * @var HeadViewHelper
+     */
     public $helper;
-    
+
     public function setUp()
     {
         Registry::set('HeadViewHelper', array());
         $this->helper = new HeadViewHelper(null);
     }
-    
+
     public function testHead()
     {
-        $this->helper->head('<meta />');        
+        $this->helper->head('<meta />');
         $result = Registry::get('HeadViewHelper');
         $this->assertSame(array('<meta />'), Registry::get('HeadViewHelper'));
-        
-        $this->helper->head('<link />'); 
+
+        $this->helper->head('<link />');
         $this->assertSame(array('<meta />', '<link />'), Registry::get('HeadViewHelper'));
     }
-    
+
     public function testToString()
     {
-        $this->helper->head('<meta />');   
-        $this->helper->head('<link />'); 
-        
+        $this->helper->head('<meta />');
+        $this->helper->head('<link />');
+
         $result = $this->helper->__toString();
-        
+
         $this->assertSame("<meta />\n    <link />\n", $result);
     }
 }

tests/view/helpers/MsgViewHelperTest.php

@@ -19,25 +19,25 @@ require_once dirname(__FILE__) . '/../../../exception/GeneralException.php';
 
 class MsgViewHelperTest extends PHPUnit_Framework_TestCase
 {
-    
+    /**
+     * @var MsgViewHelper
+     */
     public $helper;
-    
+
     public function setUp()
     {
         Session::del('MsgViewHelper');
         $this->helper = new MsgViewHelper(new PHPView(array('path' => 'any')));
     }
-    
+
     public function testMsg()
     {
 
-        $this->helper->msg('new message from test', 'success');        
+        $this->helper->msg('new message from test', 'success');
         $this->assertSame(array('message' => 'new message from test', 'type' => 'success'), Session::get('MsgViewHelper'));
-        
-        $this->assertSame($this->helper, $this->helper->msg('error message', 'error'));        
-        $this->assertSame(array('message' => 'error message', 'type' => 'error'), Session::get('MsgViewHelper'));
-        
 
+        $this->assertSame($this->helper, $this->helper->msg('error message', 'error'));
+        $this->assertSame(array('message' => 'error message', 'type' => 'error'), Session::get('MsgViewHelper'));
     }
 
     public function testWrongType()
@@ -45,13 +45,13 @@ class MsgViewHelperTest extends PHPUnit_Framework_TestCase
         $this->setExpectedException('GeneralException', 'Unknown message type');
         $this->helper->msg('some message', 'wrong');
     }
-    
+
     public function testSuccess()
     {
         $this->helper->success('success message');
         $this->assertSame(array('message' => 'success message', 'type' => 'success'), Session::get('MsgViewHelper'));
     }
-    
+
     public function testError()
     {
         $this->helper->error('error message');
@@ -65,11 +65,10 @@ class MsgViewHelperTest extends PHPUnit_Framework_TestCase
         $result = $this->helper->__toString();
         $this->assertSame('<div class="success">yeah</div>', $result);
     }
-    
+
     public function testToStringEmpty()
     {
         $result = $this->helper->__toString();
         $this->assertEmpty($result);
     }
-    
 }

tests/view/helpers/TitleViewHelperTest.php

@@ -16,32 +16,34 @@ require_once dirname(__FILE__) . '/../../../view/helpers/TitleViewHelper.php';
 
 class TitleViewHelperTest extends PHPUnit_Framework_TestCase
 {
-    
+    /**
+     * @var TitleViewHelper
+     */
     public $helper;
-    
+
     public function setUp()
     {
         Registry::set('TitleViewHelper', array());
         $this->helper = new TitleViewHelper('view');
     }
-    
+
     public function testTitle()
     {
-        $this->helper->title('one');        
+        $this->helper->title('one');
         $result = Registry::get('TitleViewHelper');
         $this->assertSame(array('one'), Registry::get('TitleViewHelper'));
-        
-        $this->helper->title('two'); 
+
+        $this->helper->title('two');
         $this->assertSame(array('one', 'two'), Registry::get('TitleViewHelper'));
     }
-    
+
     public function testSeparator()
     {
-        $this->helper->title('one');        
-        $this->helper->title('two'); 
-        
+        $this->helper->title('one');
+        $this->helper->title('two');
+
         $this->assertSame('one - two', $this->helper->__toString());
         $this->helper->setSeparator('=');
-        $this->assertSame('one=two', $this->helper->__toString());        
+        $this->assertSame('one=two', $this->helper->__toString());
     }
 }

view/helpers/BreadcrumbViewHelper.php

@@ -11,9 +11,9 @@
 
 class BreadcrumbViewHelper extends ViewHelper
 {
-    
+
     protected $separator = ' > ';
-    
+
     public function breadcrumb($text = false, $href = false)
     {
         if ($text) {
@@ -21,22 +21,22 @@ class BreadcrumbViewHelper extends ViewHelper
         }
         return $this;
     }
-    
+
     public function prepend($text, $href)
     {
         Registry::set(__CLASS__, array($text => $href) + Registry::get(__CLASS__, array()));
     }
-    
+
     public function append($text, $href)
     {
         Registry::set(__CLASS__, Registry::get(__CLASS__, array()) + array($text => $href));
     }
-    
+
     public function setSeparator($sep)
     {
         $this->separator = $sep;
     }
-    
+
     public function __toString()
     {
         $data = array();

view/helpers/GetViewHelper.php

@@ -11,9 +11,9 @@
 
 class GetViewHelper extends ViewHelper
 {
-    
+
     protected $get;
-    
+
     public function get($replace)
     {
         $get = $this->getSanitizedRequest();
@@ -29,7 +29,7 @@ class GetViewHelper extends ViewHelper
         }
         return '?' . $this->view->escape(implode('&', $get));
     }
-    
+
     protected function getSanitizedRequest()
     {
         if ($this->get === null) {
@@ -40,10 +40,10 @@ class GetViewHelper extends ViewHelper
         }
         return $this->get;
     }
-    
+
     protected function impl($name, $value)
     {
-        if (is_array($value)){
+        if (is_array($value)) {
             $result = array();
             foreach ($value as $key => $val) {
                 $result[] = $name . '[' . $key . ']=' . urlencode($val);

view/helpers/HeadViewHelper.php

@@ -11,7 +11,7 @@
 
 class HeadViewHelper extends ViewHelper
 {
-    
+
     public function head($string = false)
     {
         if ($string) {
@@ -21,7 +21,7 @@ class HeadViewHelper extends ViewHelper
         }
         return $this;
     }
-    
+
     public function __toString()
     {
         return implode("\n    ", Registry::get(__CLASS__, array())) . "\n";

view/helpers/MsgViewHelper.php

@@ -11,7 +11,7 @@
 
 class MsgViewHelper extends ViewHelper
 {
-    
+
     const SUCCESS = 'success';
     const ERROR = 'error';
     
@@ -27,12 +27,12 @@ class MsgViewHelper extends ViewHelper
         }
         return $this;
     }
-    
+
     public function success($msg)
     {
         Session::set(__CLASS__, array('message' => $msg, 'type' => self::SUCCESS));
     }
-    
+
     public function error($msg)
     {
         Session::set(__CLASS__, array('message' => $msg, 'type' => self::ERROR));

view/helpers/TitleViewHelper.php

@@ -11,9 +11,9 @@
 
 class TitleViewHelper extends ViewHelper
 {
-    
+
     protected $separator = ' - ';
-    
+
     public function title($string = false)
     {
         if ($string) {
@@ -23,12 +23,12 @@ class TitleViewHelper extends ViewHelper
         }
         return $this;
     }
-    
+
     public function setSeparator($sep)
     {
         $this->separator = $sep;
     }
-    
+
     public function __toString()
     {
         return implode($this->separator, Registry::get(__CLASS__, array()));

view/helpers/ViewHelper.php

@@ -11,12 +11,12 @@
 
 abstract class ViewHelper
 {
-    
+
     /**
      * @var PHPView
      */
     protected $view = null;
-    
+
     public function __construct($view)
     {
         $this->view = $view;