Completed
Push — master ( 525ea5...e3c757 )
by Jean-Christophe
03:48
created
Ajax/semantic/html/elements/HtmlIcon.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 * @return \Ajax\semantic\html\HtmlIcon
69 69
 	 */
70 70
 	public function setFlipped($sens="horizontally") {
71
-		return $this->addToProperty("class", "flipped " . $sens);
71
+		return $this->addToProperty("class", "flipped ".$sens);
72 72
 	}
73 73
 
74 74
 	/**
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @return \Ajax\semantic\html\HtmlIcon
78 78
 	 */
79 79
 	public function setRotated($sens="clockwise") {
80
-		return $this->addToProperty("class", "rotated " . $sens);
80
+		return $this->addToProperty("class", "rotated ".$sens);
81 81
 	}
82 82
 
83 83
 	/**
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 */
87 87
 	public function asLink($href=NULL) {
88 88
 		if (isset($href)) {
89
-			$this->wrap("<a href='" . $href . "'>", "</a>");
89
+			$this->wrap("<a href='".$href."'>", "</a>");
90 90
 		}
91 91
 		return $this->addToProperty("class", "link");
92 92
 	}
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	public function setBordered($inverted=false) {
104 104
 		$invertedStr="";
105
-		if ($inverted !== false)
105
+		if ($inverted!==false)
106 106
 			$invertedStr=" inverted";
107
-		return $this->addToProperty("class", "bordered" . $invertedStr);
107
+		return $this->addToProperty("class", "bordered".$invertedStr);
108 108
 	}
109 109
 
110 110
 	/**
@@ -116,11 +116,11 @@  discard block
 block discarded – undo
116 116
 	}
117 117
 
118 118
 	public function addLabel($label, $before=false, $icon=NULL) {
119
-		if($before)
119
+		if ($before)
120 120
 			$this->wrap($label);
121 121
 		else
122 122
 			$this->wrap("", $label);
123
-		if(isset($icon))
123
+		if (isset($icon))
124 124
 			$this->addToIcon($icon);
125 125
 		return $this;
126 126
 	}
Please login to merge, or discard this patch.
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -102,8 +102,9 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	public function setBordered($inverted=false) {
104 104
 		$invertedStr="";
105
-		if ($inverted !== false)
106
-			$invertedStr=" inverted";
105
+		if ($inverted !== false) {
106
+					$invertedStr=" inverted";
107
+		}
107 108
 		return $this->addToProperty("class", "bordered" . $invertedStr);
108 109
 	}
109 110
 
@@ -116,12 +117,14 @@  discard block
 block discarded – undo
116 117
 	}
117 118
 
118 119
 	public function addLabel($label, $before=false, $icon=NULL) {
119
-		if($before)
120
-			$this->wrap($label);
121
-		else
122
-			$this->wrap("", $label);
123
-		if(isset($icon))
124
-			$this->addToIcon($icon);
120
+		if($before) {
121
+					$this->wrap($label);
122
+		} else {
123
+					$this->wrap("", $label);
124
+		}
125
+		if(isset($icon)) {
126
+					$this->addToIcon($icon);
127
+		}
125 128
 		return $this;
126 129
 	}
127 130
 
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/html5/HtmlImg.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@
 block discarded – undo
14 14
 	}
15 15
 
16 16
 	public function asAvatar($caption=NULL) {
17
-		if (isset($caption))
18
-			$this->wrap("", $caption);
17
+		if (isset($caption)) {
18
+					$this->wrap("", $caption);
19
+		}
19 20
 			return $this->addToProperty("class", "avatar");
20 21
 	}
21 22
 }
22 23
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/base/constants/Size.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,5 +2,5 @@
 block discarded – undo
2 2
 namespace Ajax\semantic\html\base\constants;
3 3
 	use Ajax\common\BaseEnum;
4 4
 abstract class Size extends BaseEnum {
5
-	const MASSIVE="massive",HUGE="huge",BIG="big",LARGE="large",MEDIUM="",SMALL="small",TINY="tiny",MINI="mini";
5
+	const MASSIVE="massive", HUGE="huge", BIG="big", LARGE="large", MEDIUM="", SMALL="small", TINY="tiny", MINI="mini";
6 6
 }
7 7
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/base/constants/Direction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,5 +2,5 @@
 block discarded – undo
2 2
 namespace Ajax\semantic\html\base\constants;
3 3
 	use Ajax\common\BaseEnum;
4 4
 abstract class Direction extends BaseEnum {
5
-	const RIGHT="right", LEFT="left",DOWN="down",UP="up",NONE="",BELOW="below";
5
+	const RIGHT="right", LEFT="left", DOWN="down", UP="up", NONE="", BELOW="below";
6 6
 }
7 7
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlMenuItem.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -9,27 +9,27 @@
 block discarded – undo
9 9
 class HtmlMenuItem extends HtmlAbsractItem {
10 10
 
11 11
 	public function __construct($identifier, $content) {
12
-		parent::__construct($identifier,"item",$content);
12
+		parent::__construct($identifier, "item", $content);
13 13
 	}
14 14
 
15
-	protected function initContent($content){
16
-		if(\is_array($content)){
17
-			if(JArray::isAssociative($content)===false){
15
+	protected function initContent($content) {
16
+		if (\is_array($content)) {
17
+			if (JArray::isAssociative($content)===false) {
18 18
 				$icon=@$content[0];
19 19
 				$title=@$content[1];
20 20
 				$desc=@$content[2];
21
-			}else{
21
+			}else {
22 22
 				$icon=@$content["icon"];
23 23
 				$title=@$content["title"];
24 24
 				$desc=@$content["description"];
25 25
 			}
26
-			if(isset($icon)===true){
26
+			if (isset($icon)===true) {
27 27
 				$this->setIcon($icon);
28 28
 			}
29
-			if(isset($title)===true){
30
-				$this->setTitle($title,$desc);
29
+			if (isset($title)===true) {
30
+				$this->setTitle($title, $desc);
31 31
 			}
32
-		}else{
32
+		}else {
33 33
 			$this->setContent($content);
34 34
 		}
35 35
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 				$icon=@$content[0];
19 19
 				$title=@$content[1];
20 20
 				$desc=@$content[2];
21
-			}else{
21
+			} else{
22 22
 				$icon=@$content["icon"];
23 23
 				$title=@$content["title"];
24 24
 				$desc=@$content["description"];
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 			if(isset($title)===true){
30 30
 				$this->setTitle($title,$desc);
31 31
 			}
32
-		}else{
32
+		} else{
33 33
 			$this->setContent($content);
34 34
 		}
35 35
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlStepItem.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -8,48 +8,48 @@
 block discarded – undo
8 8
 class HtmlStepItem extends HtmlAbsractItem {
9 9
 
10 10
 	public function __construct($identifier, $content) {
11
-		parent::__construct($identifier,"step",$content);
11
+		parent::__construct($identifier, "step", $content);
12 12
 	}
13
-	protected function initContent($content){
14
-		if(\is_array($content)){
15
-			if(JArray::isAssociative($content)===false){
13
+	protected function initContent($content) {
14
+		if (\is_array($content)) {
15
+			if (JArray::isAssociative($content)===false) {
16 16
 				$icon=@$content[0];
17 17
 				$title=@$content[1];
18 18
 				$desc=@$content[2];
19 19
 				$status=@$content[3];
20
-			}else{
20
+			}else {
21 21
 				$icon=@$content["icon"];
22 22
 				$title=@$content["title"];
23 23
 				$desc=@$content["description"];
24 24
 				$status=@$content["status"];
25 25
 			}
26
-			if(isset($icon)===true){
26
+			if (isset($icon)===true) {
27 27
 				$this->setIcon($icon);
28 28
 			}
29
-			if(isset($status)===true){
29
+			if (isset($status)===true) {
30 30
 				$this->setStatus($status);
31 31
 			}
32
-			if(isset($title)===true){
33
-				$this->setTitle($title,$desc);
32
+			if (isset($title)===true) {
33
+				$this->setTitle($title, $desc);
34 34
 			}
35
-		}else{
35
+		}else {
36 36
 			$this->setContent($content);
37 37
 		}
38 38
 	}
39 39
 
40
-	public function setActive(){
40
+	public function setActive() {
41 41
 		return $this->setStatus(StepStatus::ACTIVE);
42 42
 	}
43 43
 
44
-	public function setCompleted(){
44
+	public function setCompleted() {
45 45
 		return $this->setStatus(StepStatus::COMPLETED);
46 46
 	}
47 47
 
48
-	public function setStatus($status){
48
+	public function setStatus($status) {
49 49
 		return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants());
50 50
 	}
51 51
 
52
-	public function removeStatus(){
52
+	public function removeStatus() {
53 53
 		$this->removePropertyValues("class", StepStatus::getConstants());
54 54
 	}
55 55
 }
56 56
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 				$title=@$content[1];
18 18
 				$desc=@$content[2];
19 19
 				$status=@$content[3];
20
-			}else{
20
+			} else{
21 21
 				$icon=@$content["icon"];
22 22
 				$title=@$content["title"];
23 23
 				$desc=@$content["description"];
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 			if(isset($title)===true){
33 33
 				$this->setTitle($title,$desc);
34 34
 			}
35
-		}else{
35
+		} else{
36 36
 			$this->setContent($content);
37 37
 		}
38 38
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlListItem.php 3 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -9,15 +9,15 @@  discard block
 block discarded – undo
9 9
 	protected $image;
10 10
 
11 11
 	public function __construct($identifier, $content=NULL) {
12
-		parent::__construct($identifier,"item",$content);
12
+		parent::__construct($identifier, "item", $content);
13 13
 	}
14
-	protected function initContent($content){
15
-		if(\is_array($content)){
16
-			if(JArray::isAssociative($content)===false){
14
+	protected function initContent($content) {
15
+		if (\is_array($content)) {
16
+			if (JArray::isAssociative($content)===false) {
17 17
 				$icon=@$content[0];
18 18
 				$title=@$content[1];
19 19
 				$desc=@$content[2];
20
-			}else{
20
+			}else {
21 21
 				$icon=@$content["icon"];
22 22
 				$image=@$content["image"];
23 23
 				$title=@$content["title"];
@@ -25,21 +25,21 @@  discard block
 block discarded – undo
25 25
 				$desc=@$content["description"];
26 26
 				$items=@$content["items"];
27 27
 			}
28
-			if(isset($icon)===true){
28
+			if (isset($icon)===true) {
29 29
 				$this->setIcon($icon);
30 30
 			}
31
-			if(isset($image)===true){
31
+			if (isset($image)===true) {
32 32
 				$this->setImage($image);
33 33
 			}
34
-			if(isset($title)===true){
35
-				$this->setTitle($title,$desc);
36
-			}elseif (isset($header)===true){
37
-				$this->setTitle($header,$desc,"header");
34
+			if (isset($title)===true) {
35
+				$this->setTitle($title, $desc);
36
+			}elseif (isset($header)===true) {
37
+				$this->setTitle($header, $desc, "header");
38 38
 			}
39
-			if(isset($items)===true){
39
+			if (isset($items)===true) {
40 40
 				$this->addList($items);
41 41
 			}
42
-		}else{
42
+		}else {
43 43
 			$this->setContent($content);
44 44
 		}
45 45
 	}
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
 		return $list;
51 51
 	}
52 52
 
53
-	public function getList(){
53
+	public function getList() {
54 54
 		return $this->content["list"];
55 55
 	}
56 56
 
57
-	public function getItem($index){
57
+	public function getItem($index) {
58 58
 		return $this->getList()->getItem($index);
59 59
 	}
60 60
 }
61 61
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 				$icon=@$content[0];
18 18
 				$title=@$content[1];
19 19
 				$desc=@$content[2];
20
-			}else{
20
+			} else{
21 21
 				$icon=@$content["icon"];
22 22
 				$image=@$content["image"];
23 23
 				$title=@$content["title"];
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 			}
34 34
 			if(isset($title)===true){
35 35
 				$this->setTitle($title,$desc);
36
-			}elseif (isset($header)===true){
36
+			} elseif (isset($header)===true){
37 37
 				$this->setTitle($header,$desc,"header");
38 38
 			}
39 39
 			if(isset($items)===true){
40 40
 				$this->addList($items);
41 41
 			}
42
-		}else{
42
+		} else{
43 43
 			$this->setContent($content);
44 44
 		}
45 45
 	}
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -8,6 +8,9 @@
 block discarded – undo
8 8
 class HtmlListItem extends HtmlAbsractItem {
9 9
 	protected $image;
10 10
 
11
+	/**
12
+	 * @param string $identifier
13
+	 */
11 14
 	public function __construct($identifier, $content=NULL) {
12 15
 		parent::__construct($identifier,"item",$content);
13 16
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormField.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -10,33 +10,33 @@  discard block
 block discarded – undo
10 10
 
11 11
 class HtmlFormField extends HtmlSemDoubleElement {
12 12
 	protected $_container;
13
-	public function __construct($identifier, $field,$label=NULL) {
14
-		parent::__construct($identifier, "div","field");
13
+	public function __construct($identifier, $field, $label=NULL) {
14
+		parent::__construct($identifier, "div", "field");
15 15
 		$this->content=array();
16
-		$this->_states=[State::ERROR,State::DISABLED];
17
-		if(isset($label))
16
+		$this->_states=[State::ERROR, State::DISABLED];
17
+		if (isset($label))
18 18
 			$this->setLabel($label);
19 19
 		$this->setField($field);
20 20
 	}
21 21
 
22
-	public function addPointingLabel($label,$pointing=Direction::NONE){
23
-		$labelO=new HtmlLabel("",$label);
22
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
23
+		$labelO=new HtmlLabel("", $label);
24 24
 		$labelO->setPointing($pointing);
25
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
25
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
26 26
 		return $labelO;
27 27
 	}
28 28
 
29
-	public function setLabel($label){
29
+	public function setLabel($label) {
30 30
 		$labelO=$label;
31
-		if(\is_string($label)){
32
-			$labelO=new HtmlSemDoubleElement("","label","");
31
+		if (\is_string($label)) {
32
+			$labelO=new HtmlSemDoubleElement("", "label", "");
33 33
 			$labelO->setContent($label);
34
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
34
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
35 35
 		}
36 36
 		$this->content["label"]=$labelO;
37 37
 	}
38 38
 
39
-	public function setField($field){
39
+	public function setField($field) {
40 40
 		$this->content["field"]=$field;
41 41
 	}
42 42
 
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 	 * Returns the label or null
45 45
 	 * @return mixed
46 46
 	 */
47
-	public function getLabel(){
48
-		if(\array_key_exists("label", $this->content))
47
+	public function getLabel() {
48
+		if (\array_key_exists("label", $this->content))
49 49
 			return $this->content["label"];
50 50
 	}
51 51
 
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
 	 * Return the field
54 54
 	 * @return mixed
55 55
 	 */
56
-	public function getField(){
56
+	public function getField() {
57 57
 		return $this->content["field"];
58 58
 	}
59 59
 
60 60
 	/**
61 61
 	 * puts the label before or behind
62 62
 	 */
63
-	public function swapLabel(){
63
+	public function swapLabel() {
64 64
 		$label=$this->getLabel();
65 65
 		unset($this->content["label"]);
66 66
 		$this->content["label"]=$label;
@@ -71,31 +71,31 @@  discard block
 block discarded – undo
71 71
 	 * @param int $width
72 72
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
73 73
 	 */
74
-	public function setWidth($width){
75
-		if(\is_int($width)){
74
+	public function setWidth($width) {
75
+		if (\is_int($width)) {
76 76
 			$width=Wide::getConstants()["W".$width];
77 77
 		}
78 78
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
79
-		if(isset($this->_container)){
79
+		if (isset($this->_container)) {
80 80
 			$this->_container->setEqualWidth(false);
81 81
 		}
82
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
82
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
83 83
 	}
84 84
 
85 85
 	/**
86 86
 	 * Field displays an error state
87 87
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
88 88
 	 */
89
-	public function setError(){
89
+	public function setError() {
90 90
 		return $this->addToProperty("class", "error");
91 91
 	}
92 92
 
93
-	public function setInline(){
93
+	public function setInline() {
94 94
 		return $this->addToProperty("class", "inline");
95 95
 	}
96 96
 
97
-	public function jsState($state){
98
-		return $this->jsDoJquery("addClass",$state);
97
+	public function jsState($state) {
98
+		return $this->jsDoJquery("addClass", $state);
99 99
 	}
100 100
 
101 101
 	public function setContainer($_container) {
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		return $this;
104 104
 	}
105 105
 
106
-	public function setReadonly(){
106
+	public function setReadonly() {
107 107
 		$this->getField()->setProperty("readonly", "");
108 108
 	}
109 109
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@  discard block
 block discarded – undo
14 14
 		parent::__construct($identifier, "div","field");
15 15
 		$this->content=array();
16 16
 		$this->_states=[State::ERROR,State::DISABLED];
17
-		if(isset($label))
18
-			$this->setLabel($label);
17
+		if(isset($label)) {
18
+					$this->setLabel($label);
19
+		}
19 20
 		$this->setField($field);
20 21
 	}
21 22
 
@@ -45,8 +46,9 @@  discard block
 block discarded – undo
45 46
 	 * @return mixed
46 47
 	 */
47 48
 	public function getLabel(){
48
-		if(\array_key_exists("label", $this->content))
49
-			return $this->content["label"];
49
+		if(\array_key_exists("label", $this->content)) {
50
+					return $this->content["label"];
51
+		}
50 52
 	}
51 53
 
52 54
 	/**
Please login to merge, or discard this patch.
Ajax/php/phalcon/JsUtils.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,8 +56,9 @@
 block discarded – undo
56 56
 		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
57 57
 			$items[]=$action;
58 58
 			foreach ($params as $p){
59
-				if(\is_object($p)===false)
60
-					$items[]=$p;
59
+				if(\is_object($p)===false) {
60
+									$items[]=$p;
61
+				}
61 62
 			}
62 63
 		}
63 64
 		return $items;
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 use Phalcon\Mvc\View;
8 8
 use Phalcon\Mvc\Controller;
9 9
 
10
-class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface{
10
+class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface {
11 11
 	protected $_di;
12 12
 	public function setDi(DiInterface $di) {
13 13
 		$this->_di=$di;
@@ -18,50 +18,50 @@  discard block
 block discarded – undo
18 18
 		return $this->_di;
19 19
 	}
20 20
 
21
-	public function getUrl($url){
21
+	public function getUrl($url) {
22 22
 		return $this->_di->get("url")->get($url);
23 23
 	}
24 24
 
25
-	public function addViewElement($identifier,$content,&$view){
25
+	public function addViewElement($identifier, $content, &$view) {
26 26
 		$controls=$view->getVar("q");
27
-		if (isset($controls) === false) {
28
-			$controls=array ();
27
+		if (isset($controls)===false) {
28
+			$controls=array();
29 29
 		}
30 30
 		$controls[$identifier]=$content;
31 31
 		$view->setVar("q", $controls);
32 32
 	}
33 33
 
34
-	public function createScriptVariable(&$view,$view_var, $output){
35
-		$view->setVar($view_var,$output);
34
+	public function createScriptVariable(&$view, $view_var, $output) {
35
+		$view->setVar($view_var, $output);
36 36
 	}
37 37
 
38
-	public function forward($initialController,$controller,$action,$params=array()){
39
-		$dispatcher = $initialController->dispatcher;
38
+	public function forward($initialController, $controller, $action, $params=array()) {
39
+		$dispatcher=$initialController->dispatcher;
40 40
 		$dispatcher->setControllerName($controller);
41 41
 		$dispatcher->setActionName($action);
42 42
 		$dispatcher->dispatch();
43
-		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) {
43
+		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) {
44 44
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
45 45
 		});
46 46
 		return $template;
47 47
 	}
48 48
 
49
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
50
-		list($controller,$action)=\explode("@", $viewName);
51
-		$template=$initialControllerInstance->view->getRender($controller, $action, $params, function ($view) {
49
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
50
+		list($controller, $action)=\explode("@", $viewName);
51
+		$template=$initialControllerInstance->view->getRender($controller, $action, $params, function($view) {
52 52
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
53 53
 		});
54 54
 		return $template;
55 55
 	}
56 56
 
57
-	public function fromDispatcher($dispatcher){
57
+	public function fromDispatcher($dispatcher) {
58 58
 		$params=$dispatcher->getParams();
59 59
 		$action=$dispatcher->getActionName();
60 60
 		$items=array($dispatcher->getControllerName());
61
-		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
61
+		if (\sizeof($params)>0 || \strtolower($action)!="index") {
62 62
 			$items[]=$action;
63
-			foreach ($params as $p){
64
-				if(\is_object($p)===false)
63
+			foreach ($params as $p) {
64
+				if (\is_object($p)===false)
65 65
 					$items[]=$p;
66 66
 			}
67 67
 		}
Please login to merge, or discard this patch.