Completed
Push — intl ( b391f2...20c33e )
by Fabio
08:04
created
framework/Web/UI/ActiveControls/TActivePager.php 2 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -127,8 +127,7 @@  discard block
 block discarded – undo
127 127
 				$button->setCssClass($this->getButtonCssClass());
128 128
 				return $button;
129 129
 			}
130
-		}
131
-		else if($buttonType===TPagerButtonType::ImageButton)
130
+		} else if($buttonType===TPagerButtonType::ImageButton)
132 131
 		{
133 132
 			$button = new TActiveImageButton;
134 133
 			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
@@ -136,8 +135,7 @@  discard block
 block discarded – undo
136 135
 				$button->Visible = true;
137 136
 			else
138 137
 				$button->Visible = false;
139
-		}
140
-		else
138
+		} else
141 139
 		{
142 140
 			$button=new TActiveButton;
143 141
 			if(!$enabled)
@@ -197,8 +195,7 @@  discard block
 block discarded – undo
197 195
 			TWebControl::render($writer);
198 196
 			if($this->getActiveControl()->canUpdateClientSide())
199 197
 				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
200
-		}
201
-		else
198
+		} else
202 199
 		{
203 200
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
204 201
 		}
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -103,11 +103,11 @@  discard block
 block discarded – undo
103 103
 		);
104 104
 
105 105
 		$this->getControls()->add($list);
106
-		$list->setDataSource(range(1,$this->getPageCount()));
106
+		$list->setDataSource(range(1, $this->getPageCount()));
107 107
 		$list->dataBind();
108 108
 		$list->setSelectedIndex($this->getCurrentPageIndex());
109 109
 		$list->setAutoPostBack(true);
110
-		$list->attachEventHandler('OnSelectedIndexChanged',array($this,'listIndexChanged'));
110
+		$list->attachEventHandler('OnSelectedIndexChanged', array($this, 'listIndexChanged'));
111 111
 		$list->attachEventHandler('OnCallback', array($this, 'handleCallback'));
112 112
 	}
113 113
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
124 124
 	 * @return mixed the button instance
125 125
 	 */
126
-	protected function createPagerButton($buttonType,$enabled,$text,$commandName,$commandParameter)
126
+	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
127 127
 	{
128 128
 		if($buttonType===TPagerButtonType::LinkButton)
129 129
 		{
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
139 139
 		}
140 140
 		else if($buttonType===TPagerButtonType::ImageButton)
141 141
 		{
142
-			$button = new TActiveImageButton;
143
-			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
142
+			$button=new TActiveImageButton;
143
+			$button->setImageUrl($this->getPageImageUrl($text, $commandName));
144 144
 			if($enabled)
145
-				$button->Visible = true;
145
+				$button->Visible=true;
146 146
 			else
147
-				$button->Visible = false;
147
+				$button->Visible=false;
148 148
 		}
149 149
 		else
150 150
 		{
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 
156 156
 		if($buttonType===TPagerButtonType::ImageButton)
157 157
 		{
158
-			$button->ImageUrl = $text;
158
+			$button->ImageUrl=$text;
159 159
 		}
160 160
 
161 161
 		$button->setText($text);
@@ -179,14 +179,14 @@  discard block
 block discarded – undo
179 179
 	 * @param mixed $sender
180 180
 	 * @param TCallbackEventParameter $param
181 181
 	 */
182
-	public function handleCallback ($sender,$param)
182
+	public function handleCallback($sender, $param)
183 183
 	{
184 184
 		// Update all the buttons pagers attached to the same control.
185 185
 		// Dropdown pagers doesn't need to be re-rendered.
186 186
 		$controlToPaginate=$this->getControlToPaginate();
187
-		foreach ($this->getNamingContainer()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false) as $control)
187
+		foreach($this->getNamingContainer()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false) as $control)
188 188
 		{
189
-			if ($control->getMode() !== TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
189
+			if($control->getMode()!==TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
190 190
 			{
191 191
 				$control->render($param->getNewWriter());
192 192
 				// FIXME : With some very fast machine, the getNewWriter() consecutive calls are in the same microsecond, resulting
@@ -198,18 +198,18 @@  discard block
 block discarded – undo
198 198
 		$this->onCallback($param);
199 199
 	}
200 200
 
201
-	public function render ($writer)
201
+	public function render($writer)
202 202
 	{
203 203
 		if($this->getHasPreRendered())
204 204
 		{
205
-			$this->setDisplay(($this->getPageCount()==1)?TDisplayStyle::None:TDisplayStyle::Dynamic);
205
+			$this->setDisplay(($this->getPageCount()==1) ?TDisplayStyle::None : TDisplayStyle::Dynamic);
206 206
 			TWebControl::render($writer);
207 207
 			if($this->getActiveControl()->canUpdateClientSide())
208
-				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
208
+				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
209 209
 		}
210 210
 		else
211 211
 		{
212
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
212
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
213 213
 		}
214 214
 	}
215 215
 }
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TActiveRepeater.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,8 +95,7 @@
 block discarded – undo
95 95
 		if($this->getHasPreRendered()) {
96 96
 			$this->renderRepeater($writer);
97 97
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
98
-		}
99
-		else {
98
+		} else {
100 99
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
101 100
 		}
102 101
 	}
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		parent::setDataSource($value);
58 58
 		if($this->getActiveControl()->canUpdateClientSide()) {
59 59
 			$this->renderPager();
60
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
60
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
61 61
 		}
62 62
 	}
63 63
 
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 	public function render($writer) {
95 95
 		if($this->getHasPreRendered()) {
96 96
 			$this->renderRepeater($writer);
97
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
97
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
98 98
 		}
99 99
 		else {
100
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
100
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
101 101
 		}
102 102
 	}
103 103
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		foreach($pager as $item) {
112 112
 			if($item->ControlToPaginate==$this->ID) {
113 113
 				$writer=$this->getResponse()->createHtmlWriter();
114
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
114
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
115 115
 			}
116 116
 		}
117 117
 	}
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 	 * @param THtmlWriter writer for the rendering purpose
124 124
 	 */
125 125
 	private function renderRepeater($writer) {
126
-		$writer->addAttribute('id',$this->getSurroundingTagID());
126
+		$writer->addAttribute('id', $this->getSurroundingTagID());
127 127
 		$writer->renderBeginTag($this->getSurroundingTag());
128 128
 		parent::render($writer);
129 129
 		$writer->renderEndTag();
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TCallbackClientScript.php 3 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -424,13 +424,11 @@  discard block
 block discarded – undo
424 424
 		{
425 425
 			$boundary = $this->getRenderedContentBoundary($content);
426 426
 			$content = null;
427
-		}
428
-		else if($content instanceof THtmlWriter)
427
+		} else if($content instanceof THtmlWriter)
429 428
 		{
430 429
 			$boundary = $this->getResponseContentBoundary($content);
431 430
 			$content = null;
432
-		}
433
-		else
431
+		} else
434 432
 			$boundary = null;
435 433
 
436 434
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
@@ -477,8 +475,7 @@  discard block
 block discarded – undo
477 475
 		if($content instanceof TControl)
478 476
 		{
479 477
 			$boundary = $this->getRenderedContentBoundary($content);
480
-		}
481
-		elseif($content instanceof THtmlWriter)
478
+		} elseif($content instanceof THtmlWriter)
482 479
 		{
483 480
 			$boundary = $this->getResponseContentBoundary($content);
484 481
 		}
Please login to merge, or discard this patch.
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 */
69 69
 	public function __construct()
70 70
 	{
71
-		$this->_actions = new TList;
71
+		$this->_actions=new TList;
72 72
 	}
73 73
 
74 74
 	/**
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 	public function callClientFunction($function, $params=array())
89 89
 	{
90 90
 		if(!is_array($params))
91
-			$params = array($params);
91
+			$params=array($params);
92 92
 
93 93
 		if(count($params) > 0)
94 94
 		{
95
-			if ($params[0] instanceof ISurroundable)
96
-				$params[0] = $params[0]->getSurroundingTagID();
95
+			if($params[0] instanceof ISurroundable)
96
+				$params[0]=$params[0]->getSurroundingTagID();
97 97
 			elseif($params[0] instanceof TControl)
98
-				$params[0] = $params[0]->getClientID();
98
+				$params[0]=$params[0]->getClientID();
99 99
 		}
100 100
 		$this->_actions->add(array($function => $params));
101 101
 	}
@@ -108,13 +108,13 @@  discard block
 block discarded – undo
108 108
 	 */
109 109
 	public function jQuery($element, $method, $params=array())
110 110
 	{
111
-		if ($element instanceof ISurroundable)
112
-			$element = $element->getSurroundingTagID();
111
+		if($element instanceof ISurroundable)
112
+			$element=$element->getSurroundingTagID();
113 113
 		elseif($element instanceof TControl)
114
-			$element = $element->getClientID();
114
+			$element=$element->getClientID();
115 115
 
116 116
 		if(!is_array($params))
117
-			$params = array($params);
117
+			$params=array($params);
118 118
 
119 119
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
120 120
 	}
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
 	 */
148 148
 	public function select($control, $method='Value', $value=null, $type=null)
149 149
 	{
150
-		$method = TPropertyValue::ensureEnum($method,
150
+		$method=TPropertyValue::ensureEnum($method,
151 151
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
152
-		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
153
-		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
152
+		$type=($type===null) ? $this->getSelectionControlType($control) : $type;
153
+		$total=$this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
154 154
 
155 155
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
156 156
 		if($control instanceof TControl)
157
-			$control = $control->getClientID();
157
+			$control=$control->getClientID();
158 158
 
159 159
 		$this->callClientFunction('Prado.Element.select',
160 160
 				array($control, $type.$method, $value, $total));
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 	public function setAttribute($control, $name, $value)
215 215
 	{
216 216
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
217
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
217
+		if($control instanceof ISurroundable && strtolower($name)!=='disabled')
218 218
 			$control=$control->getSurroundingTagID();
219
-		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
219
+		$this->callClientFunction('Prado.Element.setAttribute', array($control, $name, $value));
220 220
 	}
221 221
 
222 222
 	/**
@@ -226,25 +226,25 @@  discard block
 block discarded – undo
226 226
 	 */
227 227
 	public function setListItems($control, $items)
228 228
 	{
229
-		$options = array();
229
+		$options=array();
230 230
 		if($control instanceof TListControl)
231 231
 		{
232
-			$promptText		= $control->getPromptText();
233
-			$promptValue	= $control->getPromptValue();
232
+			$promptText=$control->getPromptText();
233
+			$promptValue=$control->getPromptValue();
234 234
 
235 235
 			if($promptValue==='')
236
-				$promptValue = $promptText;
236
+				$promptValue=$promptText;
237 237
 
238 238
 			if($promptValue!=='')
239
-				$options[] = array($promptText, $promptValue);
239
+				$options[]=array($promptText, $promptValue);
240 240
 		}
241 241
 
242 242
 		foreach($items as $item)
243 243
 		{
244 244
 			if($item->getHasAttributes())
245
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
245
+				$options[]=array($item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group'));
246 246
 			else
247
-				$options[] = array($item->getText(),$item->getValue());
247
+				$options[]=array($item->getText(), $item->getValue());
248 248
 		}
249 249
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
250 250
 	}
@@ -422,16 +422,16 @@  discard block
 block discarded – undo
422 422
 	{
423 423
 		if($content instanceof TControl)
424 424
 		{
425
-			$boundary = $this->getRenderedContentBoundary($content);
426
-			$content = null;
425
+			$boundary=$this->getRenderedContentBoundary($content);
426
+			$content=null;
427 427
 		}
428 428
 		else if($content instanceof THtmlWriter)
429 429
 		{
430
-			$boundary = $this->getResponseContentBoundary($content);
431
-			$content = null;
430
+			$boundary=$this->getResponseContentBoundary($content);
431
+			$content=null;
432 432
 		}
433 433
 		else
434
-			$boundary = null;
434
+			$boundary=null;
435 435
 
436 436
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
437 437
 	}
@@ -456,11 +456,11 @@  discard block
 block discarded – undo
456 456
 	{
457 457
 		if($writer instanceof THtmlWriter)
458 458
 		{
459
-			$boundary = $this->getResponseContentBoundary($writer);
460
-			$content = null;
459
+			$boundary=$this->getResponseContentBoundary($writer);
460
+			$content=null;
461 461
 		} else {
462
-			$boundary = null;
463
-			$content = $writer;
462
+			$boundary=null;
463
+			$content=$writer;
464 464
 		}
465 465
 
466 466
 		$this->callClientFunction('Prado.Element.evaluateScript', array($content, $boundary));
@@ -476,11 +476,11 @@  discard block
 block discarded – undo
476 476
 	{
477 477
 		if($content instanceof TControl)
478 478
 		{
479
-			$boundary = $this->getRenderedContentBoundary($content);
479
+			$boundary=$this->getRenderedContentBoundary($content);
480 480
 		}
481 481
 		elseif($content instanceof THtmlWriter)
482 482
 		{
483
-			$boundary = $this->getResponseContentBoundary($content);
483
+			$boundary=$this->getResponseContentBoundary($content);
484 484
 		}
485 485
 
486 486
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
@@ -496,8 +496,8 @@  discard block
 block discarded – undo
496 496
 	 */
497 497
 	private function getRenderedContentBoundary($control)
498 498
 	{
499
-		$writer = $this->getResponse()->createHtmlWriter();
500
-		$adapter = $control->getPage()->getAdapter();
499
+		$writer=$this->getResponse()->createHtmlWriter();
500
+		$adapter=$control->getPage()->getAdapter();
501 501
 		$adapter->registerControlToRender($control, $writer);
502 502
 		return $writer->getWriter()->getBoundary();
503 503
 	}
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 	 */
562 562
 	public function fadeTo($element, $value, $duration=500)
563 563
 	{
564
-		$value = TPropertyValue::ensureFloat($value);
564
+		$value=TPropertyValue::ensureFloat($value);
565 565
 		$this->visualEffect('fadeTo', $element, array($duration, $value));
566 566
 	}
567 567
 
Please login to merge, or discard this patch.
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -94,6 +94,7 @@  discard block
 block discarded – undo
94 94
 	 * Executes a client-side statement.
95 95
 	 * @param string javascript function name
96 96
 	 * @param array list of arguments for the function
97
+	 * @param string $function
97 98
 	 */
98 99
 	public function callClientFunction($function, $params=array())
99 100
 	{
@@ -154,6 +155,7 @@  discard block
 block discarded – undo
154 155
 	 * @param string selection method
155 156
 	 * @param string|int the value or index to select/check.
156 157
 	 * @param string selection control type, either 'check' or 'select'
158
+	 * @param string $type
157 159
 	 */
158 160
 	public function select($control, $method='Value', $value=null, $type=null)
159 161
 	{
@@ -423,6 +425,7 @@  discard block
 block discarded – undo
423 425
 	 * @param TControl control element or HTML element id.
424 426
 	 * @param string HTML fragement or the control to be rendered.
425 427
 	 * @param boolean whether to fully replace the element or just its inner content.
428
+	 * @param boolean $self
426 429
 	 * @see insertAbout
427 430
 	 * @see insertBelow
428 431
 	 * @see insertBefore
@@ -481,6 +484,7 @@  discard block
 block discarded – undo
481 484
 	 * Similar to to evaluateScript(), but functions declared in the
482 485
 	 * inline block will be available to page elements.
483 486
 	 * @param THtmlWriter writer for the content.
487
+	 * @param \Prado\TComponent $content
484 488
 	 */
485 489
 	public function appendScriptBlock($content)
486 490
 	{
@@ -502,6 +506,7 @@  discard block
 block discarded – undo
502 506
 	 * component developers. The render() method is defered to be called in the
503 507
 	 * TActivePageAdapter class.
504 508
 	 * @param TControl control to be rendered on callback response.
509
+	 * @param TControl $control
505 510
 	 * @return string the boundary for which the rendered content is wrapped.
506 511
 	 */
507 512
 	private function getRenderedContentBoundary($control)
@@ -514,6 +519,7 @@  discard block
 block discarded – undo
514 519
 
515 520
 	/**
516 521
 	 * @param THtmlWriter the writer responsible for rendering html content.
522
+	 * @param THtmlWriter $html
517 523
 	 * @return string content boundary.
518 524
 	 */
519 525
 	private function getResponseContentBoundary($html)
@@ -533,6 +539,7 @@  discard block
 block discarded – undo
533 539
 	 * @param string visual effect function name.
534 540
 	 * @param TControl control element or element id
535 541
 	 * @param array visual effect key-value pair options.
542
+	 * @param string $type
536 543
 	 */
537 544
 	public function visualEffect($type, $element, $options=array())
538 545
 	{
@@ -640,6 +647,7 @@  discard block
 block discarded – undo
640 647
 	 * @param string visual effect function name.
641 648
 	 * @param TControl control element or element id
642 649
 	 * @param array effect options.
650
+	 * @param string $effect
643 651
 	 */
644 652
 	public function juiEffect($element, $effect, $options=array())
645 653
 	{
Please login to merge, or discard this patch.
framework/Collections/TStack.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,8 +78,7 @@
 block discarded – undo
78 78
 				$this->_d[]=$item;
79 79
 				++$this->_c;
80 80
 			}
81
-		}
82
-		else if($data!==null)
81
+		} else if($data!==null)
83 82
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
84 83
 	}
85 84
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 	/**
149 149
 	 * Returns an iterator for traversing the items in the stack.
150 150
 	 * This method is required by the interface \IteratorAggregate.
151
-	 * @return Iterator an iterator for traversing the items in the stack.
151
+	 * @return \ArrayIterator an iterator for traversing the items in the stack.
152 152
 	 */
153 153
 	public function getIterator()
154 154
 	{
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	public function contains($item)
104 104
 	{
105
-		return array_search($item,$this->_d,true)!==false;
105
+		return array_search($item, $this->_d, true)!==false;
106 106
 	}
107 107
 
108 108
 	/**
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		if($this->_c===0)
117 117
 			throw new TInvalidOperationException('stack_empty');
118 118
 		else
119
-			return $this->_d[$this->_c-1];
119
+			return $this->_d[$this->_c - 1];
120 120
 	}
121 121
 
122 122
 	/**
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	public function push($item)
143 143
 	{
144 144
 		++$this->_c;
145
-		$this->_d[] = $item;
145
+		$this->_d[]=$item;
146 146
 	}
147 147
 
148 148
 	/**
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 */
153 153
 	public function getIterator()
154 154
 	{
155
-		return new \ArrayIterator( $this->_d );
155
+		return new \ArrayIterator($this->_d);
156 156
 	}
157 157
 
158 158
 	/**
Please login to merge, or discard this patch.
framework/Collections/TQueue.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,8 +81,7 @@
 block discarded – undo
81 81
 				$this->_d[]=$item;
82 82
 				++$this->_c;
83 83
 			}
84
-		}
85
-		else if($data!==null)
84
+		} else if($data!==null)
86 85
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
87 86
 	}
88 87
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
 	/**
150 150
 	 * Returns an iterator for traversing the items in the queue.
151 151
 	 * This method is required by the interface \IteratorAggregate.
152
-	 * @return Iterator an iterator for traversing the items in the queue.
152
+	 * @return \ArrayIterator an iterator for traversing the items in the queue.
153 153
 	 */
154 154
 	public function getIterator()
155 155
 	{
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	public function contains($item)
105 105
 	{
106
-		return array_search($item,$this->_d,true)!==false;
106
+		return array_search($item, $this->_d, true)!==false;
107 107
 	}
108 108
 
109 109
 	/**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	public function enqueue($item)
144 144
 	{
145 145
 		++$this->_c;
146
-		$this->_d[] = $item;
146
+		$this->_d[]=$item;
147 147
 	}
148 148
 
149 149
 	/**
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	 */
154 154
 	public function getIterator()
155 155
 	{
156
-		return new \ArrayIterator( $this->_d );
156
+		return new \ArrayIterator($this->_d);
157 157
 	}
158 158
 
159 159
 	/**
Please login to merge, or discard this patch.
framework/Wsat/pages/TWsatGenerateAR.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -16,36 +16,36 @@
 block discarded – undo
16 16
 
17 17
         public function generate($sender)
18 18
         {
19
-                if ($this->IsValid)
19
+                if($this->IsValid)
20 20
                 {
21
-                        $tableName = $this->table_name->Text;
22
-                        $outputFolderNs = $this->output_folder->Text;
23
-                        $classPrefix = $this->class_prefix->Text;
24
-                        $classSuffix = $this->class_suffix->Text;
21
+                        $tableName=$this->table_name->Text;
22
+                        $outputFolderNs=$this->output_folder->Text;
23
+                        $classPrefix=$this->class_prefix->Text;
24
+                        $classSuffix=$this->class_suffix->Text;
25 25
 
26 26
                         try
27 27
                         {
28
-                                $ar_generator = new TWsatARGenerator();
28
+                                $ar_generator=new TWsatARGenerator();
29 29
                                 $ar_generator->setOpFile($outputFolderNs);
30 30
                                 $ar_generator->setClasPrefix($classPrefix);
31 31
                                 $ar_generator->setClassSufix($classSuffix);
32 32
 
33
-                                if ($this->build_rel->Checked)
33
+                                if($this->build_rel->Checked)
34 34
                                         $ar_generator->buildRelations();
35 35
 
36
-                                if ($tableName != "*")
36
+                                if($tableName!="*")
37 37
                                         $ar_generator->generate($tableName);
38 38
                                 else
39 39
                                         $ar_generator->generateAll();
40 40
 
41
-                                $this->feedback_panel->CssClass = "green_panel";
42
-                                $this->generation_msg->Text = "The code has been generated successfully.";
43
-                        } catch (Exception $ex)
41
+                                $this->feedback_panel->CssClass="green_panel";
42
+                                $this->generation_msg->Text="The code has been generated successfully.";
43
+                        } catch(Exception $ex)
44 44
                         {
45
-                                $this->feedback_panel->CssClass = "red_panel";
46
-                                $this->generation_msg->Text = $ex->getMessage();
45
+                                $this->feedback_panel->CssClass="red_panel";
46
+                                $this->generation_msg->Text=$ex->getMessage();
47 47
                         }
48
-                        $this->feedback_panel->Visible = true;
48
+                        $this->feedback_panel->Visible=true;
49 49
                 }
50 50
         }
51 51
 
Please login to merge, or discard this patch.
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -21,44 +21,44 @@
 block discarded – undo
21 21
 class TWsatGenerateAR extends TPage
22 22
 {
23 23
 
24
-        public function generate($sender)
25
-        {
26
-                if ($this->IsValid)
27
-                {
28
-                        $tableName = $this->table_name->Text;
29
-                        $outputFolderNs = $this->output_folder->Text;
30
-                        $classPrefix = $this->class_prefix->Text;
31
-                        $classSuffix = $this->class_suffix->Text;
24
+		public function generate($sender)
25
+		{
26
+				if ($this->IsValid)
27
+				{
28
+						$tableName = $this->table_name->Text;
29
+						$outputFolderNs = $this->output_folder->Text;
30
+						$classPrefix = $this->class_prefix->Text;
31
+						$classSuffix = $this->class_suffix->Text;
32 32
 
33
-                        try
34
-                        {
35
-                                $ar_generator = new TWsatARGenerator();
36
-                                $ar_generator->setOpFile($outputFolderNs);
37
-                                $ar_generator->setClasPrefix($classPrefix);
38
-                                $ar_generator->setClassSufix($classSuffix);
33
+						try
34
+						{
35
+								$ar_generator = new TWsatARGenerator();
36
+								$ar_generator->setOpFile($outputFolderNs);
37
+								$ar_generator->setClasPrefix($classPrefix);
38
+								$ar_generator->setClassSufix($classSuffix);
39 39
 
40
-                                if ($this->build_rel->Checked)
41
-                                        $ar_generator->buildRelations();
40
+								if ($this->build_rel->Checked)
41
+										$ar_generator->buildRelations();
42 42
 
43
-                                if ($tableName != "*")
44
-                                        $ar_generator->generate($tableName);
45
-                                else
46
-                                        $ar_generator->generateAll();
43
+								if ($tableName != "*")
44
+										$ar_generator->generate($tableName);
45
+								else
46
+										$ar_generator->generateAll();
47 47
 
48
-                                $this->feedback_panel->CssClass = "green_panel";
49
-                                $this->generation_msg->Text = "The code has been generated successfully.";
50
-                        } catch (Exception $ex)
51
-                        {
52
-                                $this->feedback_panel->CssClass = "red_panel";
53
-                                $this->generation_msg->Text = $ex->getMessage();
54
-                        }
55
-                        $this->feedback_panel->Visible = true;
56
-                }
57
-        }
48
+								$this->feedback_panel->CssClass = "green_panel";
49
+								$this->generation_msg->Text = "The code has been generated successfully.";
50
+						} catch (Exception $ex)
51
+						{
52
+								$this->feedback_panel->CssClass = "red_panel";
53
+								$this->generation_msg->Text = $ex->getMessage();
54
+						}
55
+						$this->feedback_panel->Visible = true;
56
+				}
57
+		}
58 58
 
59
-        public function preview($sender)
60
-        {
61
-                throw new THttpException(500, "Not implemented yet.");
62
-        }
59
+		public function preview($sender)
60
+		{
61
+				throw new THttpException(500, "Not implemented yet.");
62
+		}
63 63
 
64 64
 }
65 65
\ No newline at end of file
Please login to merge, or discard this patch.
framework/Web/Javascripts/TJavaScript.php 3 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -171,8 +171,7 @@  discard block
 block discarded – undo
171 171
 					}
172 172
 				}
173 173
 				return '{'.$results.'}';
174
-			}
175
-			else
174
+			} else
176 175
 			{
177 176
 				foreach($value as $v)
178 177
 				{
@@ -185,8 +184,7 @@  discard block
 block discarded – undo
185 184
 				}
186 185
 				return '['.$results.']';
187 186
 			}
188
-		}
189
-		else if(is_integer($value))
187
+		} else if(is_integer($value))
190 188
 			return "$value";
191 189
 		else if(is_float($value))
192 190
 		{
@@ -206,8 +204,7 @@  discard block
 block discarded – undo
206 204
 						return str_replace($locale['decimal_point'], '.', "$value");
207 205
 					break;
208 206
 			}
209
-		}
210
-		else if(is_object($value))
207
+		} else if(is_object($value))
211 208
 			if ($value instanceof TJavaScriptLiteral)
212 209
 				return $value->toJavaScriptLiteral();
213 210
 			else
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,6 +77,7 @@  discard block
 block discarded – undo
77 77
 	/**
78 78
 	 * Renders javascript block
79 79
 	 * @param string javascript block
80
+	 * @param string $script
80 81
 	 * @return string rendering result
81 82
 	 */
82 83
 	public static function renderScriptBlock($script)
@@ -97,7 +98,7 @@  discard block
 block discarded – undo
97 98
 	}
98 99
 
99 100
 	/**
100
-	 * @return Marks a string as a javascript function. Once marke, the string is considered as a
101
+	 * @return TJavaScriptLiteral a string as a javascript function. Once marke, the string is considered as a
101 102
 	 * raw javascript function that is not supposed to be encoded by {@link encode}
102 103
 	 */
103 104
 	public static function quoteJsLiteral($js)
@@ -260,6 +261,7 @@  discard block
 block discarded – undo
260 261
 	 * @param string string to be decoded
261 262
 	 * @param bool whether to convert returned objects to associative arrays
262 263
 	 * @param int recursion depth
264
+	 * @param string $value
263 265
 	 * @return mixed decoded variable
264 266
 	 */
265 267
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
@@ -302,7 +304,8 @@  discard block
 block discarded – undo
302 304
 	 * Minimize the size of a javascript script.
303 305
 	 * This method is based on Douglas Crockford's JSMin.
304 306
 	 * @param string code that you want to minimzie
305
-	 * @return minimized version of the code
307
+	 * @param string $code
308
+	 * @return string version of the code
306 309
 	 */
307 310
 	public static function JSMin($code)
308 311
 	{
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	{
35 35
 		$str='';
36 36
 		foreach($files as $file)
37
-			$str.= self::renderScriptFile($file);
37
+			$str.=self::renderScriptFile($file);
38 38
 		return $str;
39 39
 	}
40 40
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	public static function renderScriptBlocks($scripts)
57 57
 	{
58 58
 		if(count($scripts))
59
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
59
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n", $scripts)."\n/*]]>*/\n</script>\n";
60 60
 		else
61 61
 			return '';
62 62
 	}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	public static function renderScriptBlocksCallback($scripts)
70 70
 	{
71 71
 		if(count($scripts))
72
-			return implode("\n",$scripts)."\n";
72
+			return implode("\n", $scripts)."\n";
73 73
 		else
74 74
 			return '';
75 75
 	}
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 */
94 94
 	public static function quoteString($js)
95 95
 	{
96
-		return self::jsonEncode($js,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
96
+		return self::jsonEncode($js, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
97 97
 	}
98 98
 
99 99
 	/**
@@ -154,16 +154,16 @@  discard block
 block discarded – undo
154 154
 	 * @param boolean wether to encode empty strings too. Default to false for BC.
155 155
 	 * @return string the encoded string
156 156
 	 */
157
-	public static function encode($value,$toMap=true,$encodeEmptyStrings=false)
157
+	public static function encode($value, $toMap=true, $encodeEmptyStrings=false)
158 158
 	{
159 159
 		if(is_string($value))
160 160
 			return self::quoteString($value);
161 161
 		else if(is_bool($value))
162
-			return $value?'true':'false';
162
+			return $value ? 'true' : 'false';
163 163
 		else if(is_array($value))
164 164
 		{
165 165
 			$results='';
166
-			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
166
+			if(($n=count($value)) > 0 && array_keys($value)!==range(0, $n - 1))
167 167
 			{
168 168
 				foreach($value as $k=>$v)
169 169
 				{
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 					{
172 172
 						if($results!=='')
173 173
 							$results.=',';
174
-						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
174
+						$results.="'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
175 175
 					}
176 176
 				}
177 177
 				return '{'.$results.'}';
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 					{
185 185
 						if($results!=='')
186 186
 							$results.=',';
187
-						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
187
+						$results.=self::encode($v, $toMap, $encodeEmptyStrings);
188 188
 					}
189 189
 				}
190 190
 				return '['.$results.']';
@@ -212,10 +212,10 @@  discard block
 block discarded – undo
212 212
 			}
213 213
 		}
214 214
 		else if(is_object($value))
215
-			if ($value instanceof TJavaScriptLiteral)
215
+			if($value instanceof TJavaScriptLiteral)
216 216
 				return $value->toJavaScriptLiteral();
217 217
 			else
218
-				return self::encode(get_object_vars($value),$toMap);
218
+				return self::encode(get_object_vars($value), $toMap);
219 219
 		else if($value===null)
220 220
 			return 'null';
221 221
 		else
@@ -227,14 +227,14 @@  discard block
 block discarded – undo
227 227
 	 * @param mixed variable to be encoded
228 228
 	 * @return string encoded string
229 229
 	 */
230
-	public static function jsonEncode($value, $options = 0)
230
+	public static function jsonEncode($value, $options=0)
231 231
 	{
232
-		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
232
+		if(($g=Prado::getApplication()->getGlobalization(false))!==null &&
233 233
 			strtoupper($enc=$g->getCharset())!='UTF-8') {
234 234
 			self::convertToUtf8($value, $enc);
235 235
 		}
236 236
 
237
-		$s = @json_encode($value,$options);
237
+		$s=@json_encode($value, $options);
238 238
 		self::checkJsonError();
239 239
 		return $s;
240 240
 	}
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	private static function convertToUtf8(&$value, $sourceEncoding) {
248 248
 		if(is_string($value))
249 249
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
250
-		else if (is_array($value))
250
+		else if(is_array($value))
251 251
 		{
252 252
 			foreach($value as &$element)
253 253
 				self::convertToUtf8($element, $sourceEncoding);
@@ -262,37 +262,37 @@  discard block
 block discarded – undo
262 262
 	 * @param int recursion depth
263 263
 	 * @return mixed decoded variable
264 264
 	 */
265
-	public static function jsonDecode($value, $assoc = false, $depth = 512)
265
+	public static function jsonDecode($value, $assoc=false, $depth=512)
266 266
 	{
267
-		$s= @json_decode($value, $assoc, $depth);
267
+		$s=@json_decode($value, $assoc, $depth);
268 268
 		self::checkJsonError();
269 269
 		return $s;
270 270
 	}
271 271
 
272 272
 	private static function checkJsonError()
273 273
 	{
274
-		switch ($err = json_last_error())
274
+		switch($err=json_last_error())
275 275
 		{
276 276
 			case JSON_ERROR_NONE:
277 277
 				return;
278 278
 				break;
279 279
 			case JSON_ERROR_DEPTH:
280
-				$msg = 'Maximum stack depth exceeded';
280
+				$msg='Maximum stack depth exceeded';
281 281
 				break;
282 282
 			case JSON_ERROR_STATE_MISMATCH:
283
-				$msg = 'Underflow or the modes mismatch';
283
+				$msg='Underflow or the modes mismatch';
284 284
 				break;
285 285
 			case JSON_ERROR_CTRL_CHAR:
286
-				$msg = 'Unexpected control character found';
286
+				$msg='Unexpected control character found';
287 287
 				break;
288 288
 			case JSON_ERROR_SYNTAX:
289
-				$msg = 'Syntax error, malformed JSON';
289
+				$msg='Syntax error, malformed JSON';
290 290
 				break;
291 291
 			case JSON_ERROR_UTF8:
292
-				$msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
292
+				$msg='Malformed UTF-8 characters, possibly incorrectly encoded';
293 293
 				break;
294 294
 			default:
295
-				$msg = 'Unknown error';
295
+				$msg='Unknown error';
296 296
 				break;
297 297
 		}
298 298
 		throw new \Exception("JSON error ($err): $msg");
Please login to merge, or discard this patch.
framework/Web/TUrlManager.php 2 patches
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -80,12 +80,10 @@  discard block
 block discarded – undo
80 80
 						$name=urlencode($name.'[]');
81 81
 						foreach($value as $v)
82 82
 							$url.=$amp.$name.'='.urlencode($v);
83
-					}
84
-					else
83
+					} else
85 84
 						$url.=$amp.urlencode($name).'='.urlencode($value);
86 85
 				}
87
-			}
88
-			else
86
+			} else
89 87
 			{
90 88
 				foreach($getItems as $name=>$value)
91 89
 				{
@@ -93,8 +91,7 @@  discard block
 block discarded – undo
93 91
 					{
94 92
 						foreach($value as $v)
95 93
 							$url.=$amp.$name.'[]='.$v;
96
-					}
97
-					else
94
+					} else
98 95
 						$url.=$amp.$name.'='.$value;
99 96
 				}
100 97
 			}
@@ -147,14 +144,12 @@  discard block
 block discarded – undo
147 144
 							$getVariables[substr($name,0,$pos)][]=$value;
148 145
 						else
149 146
 							$getVariables[$name]=$value;
150
-					}
151
-					else
147
+					} else
152 148
 						$getVariables[$path]='';
153 149
 				}
154 150
 			}
155 151
 			return $getVariables;
156
-		}
157
-		else
152
+		} else
158 153
 			return array();
159 154
 	}
160 155
 }
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -64,10 +64,10 @@  discard block
 block discarded – undo
64 64
 	 * @return string URL
65 65
 	 * @see parseUrl
66 66
 	 */
67
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
67
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
68 68
 	{
69 69
 		$url=$serviceID.'='.urlencode($serviceParam);
70
-		$amp=$encodeAmpersand?'&amp;':'&';
70
+		$amp=$encodeAmpersand ? '&amp;' : '&';
71 71
 		$request=$this->getRequest();
72 72
 		if(is_array($getItems) || $getItems instanceof \Traversable)
73 73
 		{
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
 		switch($request->getUrlFormat())
104 104
 		{
105 105
 			case THttpRequestUrlFormat::Path:
106
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
106
+				return $request->getApplicationUrl().'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
107 107
 			case THttpRequestUrlFormat::HiddenPath:
108
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
108
+				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
109 109
 			default:
110 110
 				return $request->getApplicationUrl().'?'.$url;
111 111
 		}
@@ -127,24 +127,24 @@  discard block
 block discarded – undo
127 127
 	public function parseUrl()
128 128
 	{
129 129
 		$request=$this->getRequest();
130
-		$pathInfo=trim($request->getPathInfo(),'/');
130
+		$pathInfo=trim($request->getPathInfo(), '/');
131 131
 		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
132 132
 			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
133 133
 			$pathInfo!=='')
134 134
 		{
135 135
 			$separator=$request->getUrlParamSeparator();
136
-			$paths=explode('/',$pathInfo);
136
+			$paths=explode('/', $pathInfo);
137 137
 			$getVariables=array();
138 138
 			foreach($paths as $path)
139 139
 			{
140 140
 				if(($path=trim($path))!=='')
141 141
 				{
142
-					if(($pos=strpos($path,$separator))!==false)
142
+					if(($pos=strpos($path, $separator))!==false)
143 143
 					{
144
-						$name=substr($path,0,$pos);
145
-						$value=substr($path,$pos+1);
146
-						if(($pos=strpos($name,'[]'))!==false)
147
-							$getVariables[substr($name,0,$pos)][]=$value;
144
+						$name=substr($path, 0, $pos);
145
+						$value=substr($path, $pos + 1);
146
+						if(($pos=strpos($name, '[]'))!==false)
147
+							$getVariables[substr($name, 0, $pos)][]=$value;
148 148
 						else
149 149
 							$getVariables[$name]=$value;
150 150
 					}
Please login to merge, or discard this patch.
framework/Web/THttpResponse.php 3 patches
Braces   +5 added lines, -9 removed lines patch added patch discarded remove patch
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 		$status=TPropertyValue::ensureInteger($status);
282 282
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
283 283
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
284
-		}else{
284
+		} else{
285 285
 			if($reason===null || $reason==='') {
286 286
 				throw new TInvalidDataValueException("response_status_reason_missing");
287 287
 			}
@@ -377,8 +377,7 @@  discard block
 block discarded – undo
377 377
 		{
378 378
 			foreach($headers as $h)
379 379
 				header($h);
380
-		}
381
-		else
380
+		} else
382 381
 		{
383 382
 			header('Pragma: public');
384 383
 			header('Expires: 0');
@@ -488,13 +487,11 @@  discard block
 block discarded – undo
488 487
 				{
489 488
 					$this->_bufferOutput = false;
490 489
 					ob_end_flush();
491
-				}
492
-				else
490
+				} else
493 491
 					ob_flush();
494 492
 				flush();
495 493
 			}
496
-		}
497
-		else
494
+		} else
498 495
 			flush();
499 496
 	}
500 497
 
@@ -645,8 +642,7 @@  discard block
 block discarded – undo
645 642
 				$cookie->getSecure(),
646 643
 				$cookie->getHttpOnly()
647 644
 			);
648
-		}
649
-		else {
645
+		} else {
650 646
 			setcookie(
651 647
 				$cookie->getName(),
652 648
 				$cookie->getValue(),
Please login to merge, or discard this patch.
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -233,6 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
 	/**
235 235
 	 * @param string|boolean output charset.
236
+	 * @param string $charset
236 237
 	 */
237 238
 	public function setCharset($charset)
238 239
 	{
@@ -402,6 +403,7 @@  discard block
 block discarded – undo
402 403
 	 * The current application will be terminated after this method is invoked.
403 404
 	 * @param string URL to be redirected to. If the URL is a relative one, the base URL of
404 405
 	 * the current request will be inserted at the beginning.
406
+	 * @param string $url
405 407
 	 */
406 408
 	public function redirect($url)
407 409
 	{
@@ -605,6 +607,7 @@  discard block
 block discarded – undo
605 607
 	 * Sends a header.
606 608
 	 * @param string header
607 609
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
610
+	 * @param string $value
608 611
 	 */
609 612
 	public function appendHeader($value, $replace=true)
610 613
 	{
@@ -630,6 +633,7 @@  discard block
 block discarded – undo
630 633
 	 * Sends a cookie.
631 634
 	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.
632 635
 	 * @param THttpCookie cook to be sent
636
+	 * @param THttpCookie $cookie
633 637
 	 */
634 638
 	public function addCookie($cookie)
635 639
 	{
Please login to merge, or discard this patch.
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -65,13 +65,13 @@  discard block
 block discarded – undo
65 65
  */
66 66
 class THttpResponse extends \Prado\TModule implements \Prado\IO\ITextWriter
67 67
 {
68
-	const DEFAULT_CONTENTTYPE	= 'text/html';
69
-	const DEFAULT_CHARSET		= 'UTF-8';
68
+	const DEFAULT_CONTENTTYPE='text/html';
69
+	const DEFAULT_CHARSET='UTF-8';
70 70
 
71 71
 	/**
72 72
 	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}
73 73
 	 */
74
-	private static $HTTP_STATUS_CODES = array(
74
+	private static $HTTP_STATUS_CODES=array(
75 75
 		100 => 'Continue', 101 => 'Switching Protocols',
76 76
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
77 77
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	 */
203 203
 	public function setCacheControl($value)
204 204
 	{
205
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
205
+		session_cache_limiter(TPropertyValue::ensureEnum($value, array('none', 'nocache', 'private', 'private_no_expire', 'public')));
206 206
 	}
207 207
 
208 208
 	/**
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	 */
211 211
 	public function setContentType($type)
212 212
 	{
213
-		if ($this->_contentTypeHeaderSent)
213
+		if($this->_contentTypeHeaderSent)
214 214
 			throw new \Exception('Unable to alter content-type as it has been already sent');
215
-		$this->_contentType = $type;
215
+		$this->_contentType=$type;
216 216
 	}
217 217
 
218 218
 	/**
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 	 */
237 237
 	public function setCharset($charset)
238 238
 	{
239
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
239
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
240 240
 	}
241 241
 
242 242
 	/**
@@ -277,12 +277,12 @@  discard block
 block discarded – undo
277 277
 	 */
278 278
 	public function setStatusCode($status, $reason=null)
279 279
 	{
280
-		if ($this->_httpHeaderSent)
280
+		if($this->_httpHeaderSent)
281 281
 			throw new \Exception('Unable to alter response as HTTP header already sent');
282 282
 		$status=TPropertyValue::ensureInteger($status);
283 283
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
284 284
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
285
-		}else{
285
+		} else {
286 286
 			if($reason===null || $reason==='') {
287 287
 				throw new TInvalidDataValueException("response_status_reason_missing");
288 288
 			}
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 	public function write($str)
321 321
 	{
322 322
 		// when starting output make sure we send the headers first
323
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
323
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
324 324
 			$this->ensureHeadersSent();
325 325
 		echo $str;
326 326
 	}
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param integer size of file or content in bytes if already known. Defaults to 'null' means auto-detect.
338 338
 	 * @throws TInvalidDataValueException if the file cannot be found
339 339
 	 */
340
-	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null,$forceDownload=true,$clientFileName=null,$fileSize=null)
340
+	public function writeFile($fileName, $content=null, $mimeType=null, $headers=null, $forceDownload=true, $clientFileName=null, $fileSize=null)
341 341
 	{
342 342
 		static $defaultMimeTypes=array(
343 343
 			'css'=>'text/css',
@@ -357,9 +357,9 @@  discard block
 block discarded – undo
357 357
 			$mimeType='text/plain';
358 358
 			if(function_exists('mime_content_type'))
359 359
 				$mimeType=mime_content_type($fileName);
360
-			else if(($ext=strrchr($fileName,'.'))!==false)
360
+			else if(($ext=strrchr($fileName, '.'))!==false)
361 361
 			{
362
-				$ext=substr($ext,1);
362
+				$ext=substr($ext, 1);
363 363
 				if(isset($defaultMimeTypes[$ext]))
364 364
 					$mimeType=$defaultMimeTypes[$ext];
365 365
 			}
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 			$clientFileName=basename($clientFileName);
372 372
 
373 373
 		if($fileSize===null || $fileSize < 0)
374
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
374
+			$fileSize=($content===null ?filesize($fileName) : strlen($content));
375 375
 
376 376
 		$this->sendHttpHeader();
377 377
 		if(is_array($headers))
@@ -385,11 +385,11 @@  discard block
 block discarded – undo
385 385
 			header('Expires: 0');
386 386
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
387 387
 			header("Content-Type: $mimeType");
388
-			$this->_contentTypeHeaderSent = true;
388
+			$this->_contentTypeHeaderSent=true;
389 389
 		}
390 390
 
391 391
 		header('Content-Length: '.$fileSize);
392
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
392
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
393 393
 		header('Content-Transfer-Encoding: binary');
394 394
 		if($content===null)
395 395
 			readfile($fileName);
@@ -429,25 +429,25 @@  discard block
 block discarded – undo
429 429
 
430 430
 		// Under IIS, explicitly send an HTTP response including the status code
431 431
 		// this is handled automatically by PHP on Apache and others
432
-		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
432
+		$isIIS=(stripos($this->getRequest()->getServerSoftware(), "microsoft-iis")!==false);
433 433
 		if($url[0]==='/')
434 434
 			$url=$this->getRequest()->getBaseUrl().$url;
435
-		if ($this->_status >= 300 && $this->_status < 400)
435
+		if($this->_status >= 300 && $this->_status < 400)
436 436
 		{
437 437
 			// The status code has been modified to a valid redirection status, send it
438 438
 			if($isIIS)
439 439
 			{
440
-				header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[
440
+				header('HTTP/1.1 '.$this->_status.' '.self::$HTTP_STATUS_CODES[
441 441
 					array_key_exists($this->_status, self::$HTTP_STATUS_CODES)
442 442
 						? $this->_status
443 443
 						: 302
444 444
 					]);
445 445
 			}
446
-			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
446
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
447 447
 		} else {
448 448
 			if($isIIS)
449 449
 				header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]);
450
-			header('Location: '.str_replace('&amp;','&',$url));
450
+			header('Location: '.str_replace('&amp;', '&', $url));
451 451
 		}
452 452
 
453 453
 		if(!$this->getApplication()->getRequestCompleted())
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	/**
470 470
 	 * Flush the response contents and headers.
471 471
 	 */
472
-	public function flush($continueBuffering = true)
472
+	public function flush($continueBuffering=true)
473 473
 	{
474 474
 		if($this->getHasAdapter())
475 475
 			$this->_adapter->flushContent($continueBuffering);
@@ -491,18 +491,18 @@  discard block
 block discarded – undo
491 491
 	 * This method is used internally. Please use {@link flush} instead.
492 492
 	 * @param boolean whether to continue buffering after flush if buffering was active
493 493
 	 */
494
-	public function flushContent($continueBuffering = true)
494
+	public function flushContent($continueBuffering=true)
495 495
 	{
496
-		Prado::trace("Flushing output",'Prado\Web\THttpResponse');
496
+		Prado::trace("Flushing output", 'Prado\Web\THttpResponse');
497 497
 		$this->ensureHeadersSent();
498 498
 		if($this->_bufferOutput)
499 499
 		{
500 500
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
501
-			if (ob_get_length()>0)
501
+			if(ob_get_length() > 0)
502 502
 			{
503
-				if (!$continueBuffering)
503
+				if(!$continueBuffering)
504 504
 				{
505
-					$this->_bufferOutput = false;
505
+					$this->_bufferOutput=false;
506 506
 					ob_end_flush();
507 507
 				}
508 508
 				else
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
 	 */
520 520
 	protected function ensureHttpHeaderSent()
521 521
 	{
522
-		if (!$this->_httpHeaderSent)
522
+		if(!$this->_httpHeaderSent)
523 523
 			$this->sendHttpHeader();
524 524
 	}
525 525
 
@@ -529,12 +529,12 @@  discard block
 block discarded – undo
529 529
 	protected function sendHttpHeader()
530 530
 	{
531 531
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
532
-		if($this->getRequest()->getHttpProtocolVersion() === null)
532
+		if($this->getRequest()->getHttpProtocolVersion()===null)
533 533
 			$protocol='HTTP/1.1';
534 534
 
535 535
 		header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
536 536
 
537
-		$this->_httpHeaderSent = true;
537
+		$this->_httpHeaderSent=true;
538 538
 	}
539 539
 
540 540
 	/**
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
 	 */
543 543
 	protected function ensureContentTypeHeaderSent()
544 544
 	{
545
-		if (!$this->_contentTypeHeaderSent)
545
+		if(!$this->_contentTypeHeaderSent)
546 546
 			$this->sendContentTypeHeader();
547 547
 	}
548 548
 
@@ -551,9 +551,9 @@  discard block
 block discarded – undo
551 551
 	 */
552 552
 	protected function sendContentTypeHeader()
553 553
 	{
554
-		$contentType=$this->_contentType===null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
554
+		$contentType=$this->_contentType===null ?self::DEFAULT_CONTENTTYPE : $this->_contentType;
555 555
 		$charset=$this->getCharset();
556
-		if($charset === false) {
556
+		if($charset===false) {
557 557
 			$this->appendHeader('Content-Type: '.$contentType);
558 558
 			return;
559 559
 		}
@@ -561,10 +561,10 @@  discard block
 block discarded – undo
561 561
 		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
562 562
 			$charset=$globalization->getCharset();
563 563
 
564
-		if($charset==='') $charset = self::DEFAULT_CHARSET;
564
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
565 565
 		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
566 566
 
567
-		$this->_contentTypeHeaderSent = true;
567
+		$this->_contentTypeHeaderSent=true;
568 568
 	}
569 569
 
570 570
 	/**
@@ -575,8 +575,8 @@  discard block
 block discarded – undo
575 575
 	 */
576 576
 	public function getContents()
577 577
 	{
578
-		Prado::trace("Retrieving output",'Prado\Web\THttpResponse');
579
-		return $this->_bufferOutput?ob_get_contents():'';
578
+		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
579
+		return $this->_bufferOutput ?ob_get_contents() : '';
580 580
 	}
581 581
 
582 582
 	/**
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
 	{
587 587
 		if($this->_bufferOutput)
588 588
 			ob_clean();
589
-		Prado::trace("Clearing output",'Prado\Web\THttpResponse');
589
+		Prado::trace("Clearing output", 'Prado\Web\THttpResponse');
590 590
 	}
591 591
 
592 592
 	/**
@@ -595,19 +595,19 @@  discard block
 block discarded – undo
595 595
 	 */
596 596
 	public function getHeaders($case=null)
597 597
 	{
598
-		$result = array();
599
-		$headers = headers_list();
598
+		$result=array();
599
+		$headers=headers_list();
600 600
 		foreach($headers as $header) {
601
-			$tmp = explode(':', $header);
602
-			$key = trim(array_shift($tmp));
603
-			$value = trim(implode(':', $tmp));
601
+			$tmp=explode(':', $header);
602
+			$key=trim(array_shift($tmp));
603
+			$value=trim(implode(':', $tmp));
604 604
 			if(isset($result[$key]))
605
-				$result[$key] .= ', ' . $value;
605
+				$result[$key].=', '.$value;
606 606
 			else
607
-				$result[$key] = $value;
607
+				$result[$key]=$value;
608 608
 		}
609 609
 
610
-		if($case !== null)
610
+		if($case!==null)
611 611
 			return array_change_key_case($result, $case);
612 612
 
613 613
 		return $result;
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
 	 */
621 621
 	public function appendHeader($value, $replace=true)
622 622
 	{
623
-		Prado::trace("Sending header '$value'",'Prado\Web\THttpResponse');
623
+		Prado::trace("Sending header '$value'", 'Prado\Web\THttpResponse');
624 624
 		header($value, $replace);
625 625
 	}
626 626
 
@@ -633,9 +633,9 @@  discard block
 block discarded – undo
633 633
 	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.
634 634
 	 * @see http://us2.php.net/manual/en/function.error-log.php
635 635
 	 */
636
-	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')
636
+	public function appendLog($message, $messageType=0, $destination='', $extraHeaders='')
637 637
 	{
638
-		error_log($message,$messageType,$destination,$extraHeaders);
638
+		error_log($message, $messageType, $destination, $extraHeaders);
639 639
 	}
640 640
 
641 641
 	/**
Please login to merge, or discard this patch.