Skip to content
This repository
Browse code

Fix coding standard issues in View/

  • Loading branch information...
commit acccdcde1f8818378c12459139e9cda6b46c705d 1 parent 0df239d
Mark Story authored March 03, 2012
17  lib/Cake/View/Helper.php
... ...
@@ -1,11 +1,5 @@
1 1
 <?php
2 2
 /**
3  
- * Backend for helpers.
4  
- *
5  
- * Internal methods for the Helpers.
6  
- *
7  
- * PHP 5
8  
- *
9 3
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
10 4
  * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
11 5
  *
@@ -146,7 +140,6 @@ class Helper extends Object {
146 140
 		'autoplay', 'controls', 'loop', 'muted'
147 141
 	);
148 142
 
149  
-
150 143
 /**
151 144
  * Default Constructor
152 145
  *
@@ -255,11 +248,11 @@ public function webroot($file) {
255 248
 				$file = str_replace('/', '\\', $file);
256 249
 			}
257 250
 
258  
-			if (file_exists(Configure::read('App.www_root') . 'theme' . DS . $this->theme . DS  . $file)) {
  251
+			if (file_exists(Configure::read('App.www_root') . 'theme' . DS . $this->theme . DS . $file)) {
259 252
 				$webPath = "{$this->request->webroot}theme/" . $theme . $asset[0];
260 253
 			} else {
261 254
 				$themePath = App::themePath($this->theme);
262  
-				$path = $themePath . 'webroot' . DS  . $file;
  255
+				$path = $themePath . 'webroot' . DS . $file;
263 256
 				if (file_exists($path)) {
264 257
 					$webPath = "{$this->request->webroot}theme/" . $theme . $asset[0];
265 258
 				}
@@ -414,13 +407,13 @@ public function clean($output) {
414 407
  */
415 408
 	protected function _parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
416 409
 		if (!is_string($options)) {
417  
-			$options = (array) $options + array('escape' => true);
  410
+			$options = (array)$options + array('escape' => true);
418 411
 
419 412
 			if (!is_array($exclude)) {
420 413
 				$exclude = array();
421 414
 			}
422 415
 
423  
-			$exclude =  array('escape' => true) + array_flip($exclude);
  416
+			$exclude = array('escape' => true) + array_flip($exclude);
424 417
 			$escape = $options['escape'];
425 418
 			$attributes = array();
426 419
 
@@ -532,7 +525,6 @@ public function setEntity($entity, $setScope = false) {
532 525
 			}
533 526
 		}
534 527
 		$this->_entityPath = $entity;
535  
-		return;
536 528
 	}
537 529
 
538 530
 /**
@@ -899,4 +891,5 @@ protected function _clean() {
899 891
 		} while ($oldstring != $this->_cleaned);
900 892
 		$this->_cleaned = str_replace(array("&amp;", "&lt;", "&gt;"), array("&amp;amp;", "&amp;lt;", "&amp;gt;"), $this->_cleaned);
901 893
 	}
  894
+
902 895
 }
1  lib/Cake/View/Helper/CacheHelper.php
@@ -317,4 +317,5 @@ protected function _writeFile($content, $timestamp, $useCallbacks = false) {
317 317
 		$file .= $content;
318 318
 		return cache('views' . DS . $cache, $file, $timestamp);
319 319
 	}
  320
+
320 321
 }
111  lib/Cake/View/Helper/FormHelper.php
... ...
@@ -1,11 +1,5 @@
1 1
 <?php
2 2
 /**
3  
- * Automatic generation of HTML FORMs from given data.
4  
- *
5  
- * Used for scaffolding.
6  
- *
7  
- * PHP 5
8  
- *
9 3
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
10 4
  * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
11 5
  *
@@ -154,11 +148,11 @@ protected function _getModel($model) {
154 148
 		}
155 149
 
156 150
 		$this->_models[$model] = $object;
157  
-		if (!$object) {;
  151
+		if (!$object) {
158 152
 			return null;
159 153
 		}
160 154
 
161  
-		$this->fieldset[$model] = array('fields' => null, 'key' =>  $object->primaryKey, 'validates' => null);
  155
+		$this->fieldset[$model] = array('fields' => null, 'key' => $object->primaryKey, 'validates' => null);
162 156
 		return $object;
163 157
 	}
164 158
 
@@ -183,58 +177,58 @@ protected function _getModel($model) {
183 177
  * @return mixed information extracted for the special key and field in a model
184 178
  */
185 179
 	protected function _introspectModel($model, $key, $field = null) {
186  
-			$object = $this->_getModel($model);
187  
-			if (!$object) {
188  
-				return;
189  
-			}
  180
+		$object = $this->_getModel($model);
  181
+		if (!$object) {
  182
+			return;
  183
+		}
190 184
 
191  
-			if ($key === 'key') {
192  
-				return $this->fieldset[$model]['key'] = $object->primaryKey;
193  
-			}
  185
+		if ($key === 'key') {
  186
+			return $this->fieldset[$model]['key'] = $object->primaryKey;
  187
+		}
194 188
 
195  
-			if ($key === 'fields') {
196  
-				if (!isset($this->fieldset[$model]['fields'])) {
197  
-					$fields = $this->fieldset[$model]['fields'] = $object->schema();
198  
-					foreach ($object->hasAndBelongsToMany as $alias => $assocData) {
199  
-						$this->fieldset[$object->alias]['fields'][$alias] = array('type' => 'multiple');
200  
-					}
201  
-				}
202  
-				if (empty($field)) {
203  
-					return $this->fieldset[$model]['fields'];
204  
-				} elseif (isset($this->fieldset[$model]['fields'][$field])) {
205  
-					return $this->fieldset[$model]['fields'][$field];
206  
-				} else {
207  
-					return isset($object->hasAndBelongsToMany[$field]) ? array('type' => 'multiple') : null;
  189
+		if ($key === 'fields') {
  190
+			if (!isset($this->fieldset[$model]['fields'])) {
  191
+				$fields = $this->fieldset[$model]['fields'] = $object->schema();
  192
+				foreach ($object->hasAndBelongsToMany as $alias => $assocData) {
  193
+					$this->fieldset[$object->alias]['fields'][$alias] = array('type' => 'multiple');
208 194
 				}
209 195
 			}
210  
-
211  
-			if ($key === 'errors' && !isset($this->validationErrors[$model])) {
212  
-				$this->validationErrors[$model] =& $object->validationErrors;
213  
-				return $this->validationErrors[$model];
214  
-			} elseif ($key === 'errors' && isset($this->validationErrors[$model])) {
215  
-				return $this->validationErrors[$model];
  196
+			if (empty($field)) {
  197
+				return $this->fieldset[$model]['fields'];
  198
+			} elseif (isset($this->fieldset[$model]['fields'][$field])) {
  199
+				return $this->fieldset[$model]['fields'][$field];
  200
+			} else {
  201
+				return isset($object->hasAndBelongsToMany[$field]) ? array('type' => 'multiple') : null;
216 202
 			}
  203
+		}
217 204
 
218  
-			if ($key === 'validates' && !isset($this->fieldset[$model]['validates'])) {
219  
-				$validates = array();
220  
-				if (!empty($object->validate)) {
221  
-					foreach ($object->validate as $validateField => $validateProperties) {
222  
-						if ($this->_isRequiredField($validateProperties)) {
223  
-							$validates[$validateField] = true;
224  
-						}
  205
+		if ($key === 'errors' && !isset($this->validationErrors[$model])) {
  206
+			$this->validationErrors[$model] =& $object->validationErrors;
  207
+			return $this->validationErrors[$model];
  208
+		} elseif ($key === 'errors' && isset($this->validationErrors[$model])) {
  209
+			return $this->validationErrors[$model];
  210
+		}
  211
+
  212
+		if ($key === 'validates' && !isset($this->fieldset[$model]['validates'])) {
  213
+			$validates = array();
  214
+			if (!empty($object->validate)) {
  215
+				foreach ($object->validate as $validateField => $validateProperties) {
  216
+					if ($this->_isRequiredField($validateProperties)) {
  217
+						$validates[$validateField] = true;
225 218
 					}
226 219
 				}
227  
-				$this->fieldset[$model]['validates'] = $validates;
228 220
 			}
  221
+			$this->fieldset[$model]['validates'] = $validates;
  222
+		}
229 223
 
230  
-			if ($key === 'validates') {
231  
-				if (empty($field)) {
232  
-					return $this->fieldset[$model]['validates'];
233  
-				} else {
234  
-					return isset($this->fieldset[$model]['validates'][$field]) ?
235  
-						$this->fieldset[$model]['validates'] : null;
236  
-				}
  224
+		if ($key === 'validates') {
  225
+			if (empty($field)) {
  226
+				return $this->fieldset[$model]['validates'];
  227
+			} else {
  228
+				return isset($this->fieldset[$model]['validates'][$field]) ?
  229
+					$this->fieldset[$model]['validates'] : null;
237 230
 			}
  231
+		}
238 232
 	}
239 233
 
240 234
 /**
@@ -675,9 +669,9 @@ public function error($field, $text = null, $options = array()) {
675 669
 			$tmp = array();
676 670
 			foreach ($error as &$e) {
677 671
 				if (isset($text[$e])) {
678  
-					$tmp []= $text[$e];
  672
+					$tmp[] = $text[$e];
679 673
 				} else {
680  
-					$tmp []= $e;
  674
+					$tmp[] = $e;
681 675
 				}
682 676
 			}
683 677
 			$text = $tmp;
@@ -702,16 +696,16 @@ public function error($field, $text = null, $options = array()) {
702 696
 				$listParams = array();
703 697
 				if (isset($options['listOptions'])) {
704 698
 					if (is_string($options['listOptions'])) {
705  
-						$listParams []= $options['listOptions'];
  699
+						$listParams[] = $options['listOptions'];
706 700
 					} else {
707 701
 						if (isset($options['listOptions']['itemOptions'])) {
708  
-							$listParams []= $options['listOptions']['itemOptions'];
  702
+							$listParams[] = $options['listOptions']['itemOptions'];
709 703
 							unset($options['listOptions']['itemOptions']);
710 704
 						} else {
711  
-							$listParams []= array();
  705
+							$listParams[] = array();
712 706
 						}
713 707
 						if (isset($options['listOptions']['tag'])) {
714  
-							$listParams []= $options['listOptions']['tag'];
  708
+							$listParams[] = $options['listOptions']['tag'];
715 709
 							unset($options['listOptions']['tag']);
716 710
 						}
717 711
 						array_unshift($listParams, $options['listOptions']);
@@ -1028,7 +1022,7 @@ public function input($fieldName, $options = array()) {
1028 1022
 			$options['maxlength'] = $fieldDef['length'];
1029 1023
 		}
1030 1024
 		if ($autoLength && $fieldDef['type'] == 'float') {
1031  
-			$options['maxlength'] = array_sum(explode(',', $fieldDef['length']))+1;
  1025
+			$options['maxlength'] = array_sum(explode(',', $fieldDef['length'])) + 1;
1032 1026
 		}
1033 1027
 
1034 1028
 		$divOptions = array();
@@ -1999,7 +1993,7 @@ public function month($fieldName, $attributes = array()) {
1999 1993
 			$attributes['value'] = null;
2000 1994
 		}
2001 1995
 		$defaults = array('monthNames' => true);
2002  
-		$attributes = array_merge($defaults, (array) $attributes);
  1996
+		$attributes = array_merge($defaults, (array)$attributes);
2003 1997
 		$monthNames = $attributes['monthNames'];
2004 1998
 		unset($attributes['monthNames']);
2005 1999
 
@@ -2229,7 +2223,7 @@ public function dateTime($fieldName, $dateFormat = 'DMY', $timeFormat = '12', $a
2229 2223
 			'minYear' => null, 'maxYear' => null, 'separator' => '-',
2230 2224
 			'interval' => 1, 'monthNames' => true
2231 2225
 		);
2232  
-		$attributes = array_merge($defaults, (array) $attributes);
  2226
+		$attributes = array_merge($defaults, (array)$attributes);
2233 2227
 		if (isset($attributes['minuteInterval'])) {
2234 2228
 			$attributes['interval'] = $attributes['minuteInterval'];
2235 2229
 			unset($attributes['minuteInterval']);
@@ -2592,4 +2586,5 @@ protected function _initInputField($field, $options = array()) {
2592 2586
 		$this->_secure($secure, $fieldName);
2593 2587
 		return $result;
2594 2588
 	}
  2589
+
2595 2590
 }
6  lib/Cake/View/Helper/HtmlHelper.php
@@ -431,7 +431,7 @@ public function css($path, $rel = null, $options = array()) {
431 431
 			foreach ($path as $i) {
432 432
 				$out .= "\n\t" . $this->css($i, $rel, $options);
433 433
 			}
434  
-			if (empty($options['block']))  {
  434
+			if (empty($options['block'])) {
435 435
 				return $out . "\n";
436 436
 			}
437 437
 			return;
@@ -523,7 +523,7 @@ public function script($url, $options = array()) {
523 523
 			foreach ($url as $i) {
524 524
 				$out .= "\n\t" . $this->script($i, $options);
525 525
 			}
526  
-			if (empty($options['block']))  {
  526
+			if (empty($options['block'])) {
527 527
 				return $out . "\n";
528 528
 			}
529 529
 			return null;
@@ -645,7 +645,7 @@ public function style($data, $oneline = true) {
645 645
 			return $data;
646 646
 		}
647 647
 		$out = array();
648  
-		foreach ($data as $key=> $value) {
  648
+		foreach ($data as $key => $value) {
649 649
 			$out[] = $key . ':' . $value . ';';
650 650
 		}
651 651
 		if ($oneline) {
8  lib/Cake/View/Helper/JqueryEngineHelper.php
@@ -38,6 +38,7 @@
38 38
  * @package       Cake.View.Helper
39 39
  */
40 40
 class JqueryEngineHelper extends JsBaseEngineHelper {
  41
+
41 42
 /**
42 43
  * Option mappings for jQuery
43 44
  *
@@ -149,7 +150,7 @@ protected function _methodTemplate($method, $template, $options, $extraSafeKeys
149 150
  */
150 151
 	public function get($selector) {
151 152
 		if ($selector == 'window' || $selector == 'document') {
152  
-			$this->selection = $this->jQueryObject . '(' . $selector .')';
  153
+			$this->selection = $this->jQueryObject . '(' . $selector . ')';
153 154
 		} else {
154 155
 			$this->selection = $this->jQueryObject . '("' . $selector . '")';
155 156
 		}
@@ -258,7 +259,7 @@ public function request($url, $options = array()) {
258 259
 		if (isset($options['update'])) {
259 260
 			$wrapCallbacks = isset($options['wrapCallbacks']) ? $options['wrapCallbacks'] : true;
260 261
 			$success = '';
261  
-			if (isset($options['success']) AND !empty($options['success'])) {
  262
+			if (isset($options['success']) && !empty($options['success'])) {
262 263
 				$success .= $options['success'];
263 264
 			}
264 265
 			$success .= $this->jQueryObject . '("' . $options['update'] . '").html(data);';
@@ -276,7 +277,7 @@ public function request($url, $options = array()) {
276 277
 		}
277 278
 		$options = $this->_prepareCallbacks('request', $options);
278 279
 		$options = $this->_parseOptions($options, $callbacks);
279  
-		return $this->jQueryObject . '.ajax({' . $options .'});';
  280
+		return $this->jQueryObject . '.ajax({' . $options . '});';
280 281
 	}
281 282
 
282 283
 /**
@@ -356,4 +357,5 @@ public function serializeForm($options = array()) {
356 357
 		}
357 358
 		return $selector . $method;
358 359
 	}
  360
+
359 361
 }
15  lib/Cake/View/Helper/JsBaseEngineHelper.php
... ...
@@ -1,9 +1,5 @@
1 1
 <?php
2 2
 /**
3  
- * JsEngineBaseClass
4  
- *
5  
- * PHP 5
6  
- *
7 3
  * CakePHP :  Rapid Development Framework (http://cakephp.org)
8 4
  * Copyright 2005-2011, Cake Software Foundation, Inc.
9 5
  *
@@ -60,16 +56,6 @@
60 56
 	protected $_callbackArguments = array();
61 57
 
62 58
 /**
63  
- * Constructor.
64  
- *
65  
- * @param View $View
66  
- * @param array $settings
67  
- */
68  
-	public function __construct($View, $settings = array()) {
69  
-		parent::__construct($View, $settings);
70  
-	}
71  
-
72  
-/**
73 59
  * Create an `alert()` message in Javascript
74 60
  *
75 61
  * @param string $message Message you want to alter.
@@ -602,4 +588,5 @@ protected function _toQuerystring($parameters) {
602 588
 		}
603 589
 		return $out;
604 590
 	}
  591
+
605 592
 }
1  lib/Cake/View/Helper/JsHelper.php
@@ -430,4 +430,5 @@ protected function _getHtmlOptions($options, $additional = array()) {
430 430
 		}
431 431
 		return array($options, $htmlOptions);
432 432
 	}
  433
+
433 434
 }
16  lib/Cake/View/Helper/MootoolsEngineHelper.php
... ...
@@ -1,17 +1,5 @@
1 1
 <?php
2 2
 /**
3  
- * MooTools Engine Helper for JsHelper
4  
- *
5  
- * Provides MooTools specific Javascript for JsHelper.
6  
- * Assumes that you have the following MooTools packages
7  
- *
8  
- * - Remote, Remote.HTML, Remote.JSON
9  
- * - Fx, Fx.Tween, Fx.Morph
10  
- * - Selectors, DomReady,
11  
- * - Drag, Drag.Move
12  
- *
13  
- * PHP 5
14  
- *
15 3
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
16 4
  * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
17 5
  *
@@ -41,6 +29,7 @@
41 29
  * @package       Cake.View.Helper
42 30
  */
43 31
 class MootoolsEngineHelper extends JsBaseEngineHelper {
  32
+
44 33
 /**
45 34
  * Option mappings for MooTools
46 35
  *
@@ -133,7 +122,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
133 122
 	public function get($selector) {
134 123
 		$this->_multipleSelection = false;
135 124
 		if ($selector == 'window' || $selector == 'document') {
136  
-			$this->selection = "$(" . $selector .")";
  125
+			$this->selection = "$(" . $selector . ")";
137 126
 			return $this;
138 127
 		}
139 128
 		if (preg_match('/^#[^\s.]+$/', $selector)) {
@@ -383,4 +372,5 @@ public function serializeForm($options = array()) {
383 372
 		}
384 373
 		return $selection . $method;
385 374
 	}
  375
+
386 376
 }
9  lib/Cake/View/Helper/NumberHelper.php
@@ -33,11 +33,15 @@
33 33
  */
34 34
 class NumberHelper extends AppHelper {
35 35
 
36  
-/** CakeNumber instance
  36
+/**
  37
+ * CakeNumber instance
  38
+ *
  39
+ * @var CakeNumber
37 40
  */
38 41
 	protected $_engine = null;
39 42
 
40  
-/* Default Constructor
  43
+/**
  44
+ * Default Constructor
41 45
  *
42 46
  * ### Settings:
43 47
  *
@@ -46,6 +50,7 @@ class NumberHelper extends AppHelper {
46 50
  *
47 51
  * @param View $View The View this helper is being attached to.
48 52
  * @param array $settings Configuration settings for the helper
  53
+ * @throws CakeException When the engine class could not be found.
49 54
  */
50 55
 	public function __construct(View $View, $settings = array()) {
51 56
 		$settings = Set::merge(array('engine' => 'CakeNumber'), $settings);
12  lib/Cake/View/Helper/PaginatorHelper.php
@@ -690,7 +690,7 @@ public function numbers($options = array()) {
690 690
 			$start = $params['page'] - ($modulus - ($end - $params['page']));
691 691
 			if ($start <= 1) {
692 692
 				$start = 1;
693  
-				$end = $params['page'] + ($modulus  - $params['page']) + 1;
  693
+				$end = $params['page'] + ($modulus - $params['page']) + 1;
694 694
 			}
695 695
 
696 696
 			if ($first && $start > 1) {
@@ -705,8 +705,7 @@ public function numbers($options = array()) {
705 705
 			$out .= $before;
706 706
 
707 707
 			for ($i = $start; $i < $params['page']; $i++) {
708  
-				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options), compact('class'))
709  
-					. $separator;
  708
+				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options), compact('class')) . $separator;
710 709
 			}
711 710
 
712 711
 			if ($class) {
@@ -719,8 +718,7 @@ public function numbers($options = array()) {
719 718
 
720 719
 			$start = $params['page'] + 1;
721 720
 			for ($i = $start; $i < $end; $i++) {
722  
-				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options), compact('class'))
723  
-					. $separator;
  721
+				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options), compact('class')) . $separator;
724 722
 			}
725 723
 
726 724
 			if ($end != $params['page']) {
@@ -823,8 +821,7 @@ public function first($first = '<< first', $options = array()) {
823 821
 			$out .= $after;
824 822
 		} elseif ($params['page'] > 1 && is_string($first)) {
825 823
 			$options += array('rel' => 'first');
826  
-			$out = $this->Html->tag($tag, $this->link($first, array('page' => 1), $options), compact('class'))
827  
-				. $after;
  824
+			$out = $this->Html->tag($tag, $this->link($first, array('page' => 1), $options), compact('class')) . $after;
828 825
 		}
829 826
 		return $out;
830 827
 	}
@@ -897,4 +894,5 @@ public function last($last = 'last >>', $options = array()) {
897 894
 		}
898 895
 		return $out;
899 896
 	}
  897
+
900 898
 }
8  lib/Cake/View/Helper/PrototypeEngineHelper.php
@@ -31,6 +31,7 @@
31 31
  * @package       Cake.View.Helper
32 32
  */
33 33
 class PrototypeEngineHelper extends JsBaseEngineHelper {
  34
+
34 35
 /**
35 36
  * Is the current selection a multiple selection? or is it just a single element.
36 37
  *
@@ -119,7 +120,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
119 120
 	public function get($selector) {
120 121
 		$this->_multiple = false;
121 122
 		if ($selector == 'window' || $selector == 'document') {
122  
-			$this->selection = "$(" . $selector .")";
  123
+			$this->selection = "$(" . $selector . ")";
123 124
 			return $this;
124 125
 		}
125 126
 		if (preg_match('/^#[^\s.]+$/', $selector)) {
@@ -219,7 +220,7 @@ public function effect($name, $options = array()) {
219 220
 			case 'fadeIn':
220 221
 			case 'fadeOut':
221 222
 				$name = ($name == 'fadeIn') ? 'appear' : 'fade';
222  
-				$effect = $this->selection . '.' . $name .'(' . substr($optionString, 2) . ');';
  223
+				$effect = $this->selection . '.' . $name . '(' . substr($optionString, 2) . ');';
223 224
 			break;
224 225
 		}
225 226
 		return $effect;
@@ -233,7 +234,7 @@ public function effect($name, $options = array()) {
233 234
  * @return string The completed ajax call.
234 235
  */
235 236
 	public function request($url, $options = array()) {
236  
-		$url = '"'. $this->url($url) . '"';
  237
+		$url = '"' . $this->url($url) . '"';
237 238
 		$options = $this->_mapOptions('request', $options);
238 239
 		$type = '.Request';
239 240
 		$data = null;
@@ -365,4 +366,5 @@ public function serializeForm($options = array()) {
365 366
 		}
366 367
 		return $selection . $method;
367 368
 	}
  369
+
368 370
 }
3  lib/Cake/View/Helper/RssHelper.php
@@ -326,7 +326,7 @@ public function elem($name, $attrib = array(), $content = null, $endTag = true)
326 326
 		if ($cdata && !empty($content)) {
327 327
 			$content = '<![CDATA[' . $content . ']]>';
328 328
 		}
329  
-		$xml .= '>' . $content . '</' . $name. '>';
  329
+		$xml .= '>' . $content . '</' . $name . '>';
330 330
 		$elem = Xml::build($xml, array('return' => 'domdocument'));
331 331
 		$nodes = $elem->getElementsByTagName($bareName);
332 332
 		foreach ($attrib as $key => $value) {
@@ -341,4 +341,5 @@ public function elem($name, $attrib = array(), $content = null, $endTag = true)
341 341
 		$xml = trim(substr($xml, strpos($xml, '?>') + 2));
342 342
 		return $xml;
343 343
 	}
  344
+
344 345
 }
1  lib/Cake/View/Helper/SessionHelper.php
@@ -159,4 +159,5 @@ public function flash($key = 'flash', $attrs = array()) {
159 159
 	public function valid() {
160 160
 		return CakeSession::valid();
161 161
 	}
  162
+
162 163
 }
1  lib/Cake/View/Helper/TextHelper.php
@@ -63,6 +63,7 @@ class TextHelper extends AppHelper {
63 63
  *
64 64
  * @param View $View the view object the helper is attached to.
65 65
  * @param array $settings Settings array Settings array
  66
+ * @throws CakeException when the engine class could not be found.
66 67
  */
67 68
 	public function __construct(View $View, $settings = array()) {
68 69
 		$settings = Set::merge(array('engine' => 'String'), $settings);
1  lib/Cake/View/Helper/TimeHelper.php
@@ -47,6 +47,7 @@ class TimeHelper extends AppHelper {
47 47
  *
48 48
  * @param View $View the view object the helper is attached to.
49 49
  * @param array $settings Settings array Settings array
  50
+ * @throws CakeException When the engine class could not be found.
50 51
  */
51 52
 	public function __construct(View $View, $settings = array()) {
52 53
 		$settings = Set::merge(array('engine' => 'CakeTime'), $settings);
1  lib/Cake/View/HelperCollection.php
@@ -152,4 +152,5 @@ public function trigger($callback, $params = array(), $options = array()) {
152 152
 		}
153 153
 		return parent::trigger($callback, $params, $options);
154 154
 	}
  155
+
155 156
 }
11  lib/Cake/View/MediaView.php
@@ -58,6 +58,7 @@
58 58
  * @package       Cake.View
59 59
  */
60 60
 class MediaView extends View {
  61
+
61 62
 /**
62 63
  * Indicates whether response gzip compression was enabled for this class
63 64
  *
@@ -66,15 +67,6 @@ class MediaView extends View {
66 67
 	protected  $_compressionEnabled = false;
67 68
 
68 69
 /**
69  
- * Constructor
70  
- *
71  
- * @param Controller $controller The controller with viewVars
72  
- */
73  
-	public function __construct(Controller $controller = null) {
74  
-		parent::__construct($controller);
75  
-	}
76  
-
77  
-/**
78 70
  * Display or download the given file
79 71
  *
80 72
  * @param string $view Not used
@@ -242,4 +234,5 @@ protected function _flushBuffer() {
242 234
 		@flush();
243 235
 		@ob_flush();
244 236
 	}
  237
+
245 238
 }
1  lib/Cake/View/ScaffoldView.php
@@ -87,4 +87,5 @@ protected function _getViewFileName($name = null) {
87 87
 
88 88
 		throw new MissingViewException($paths[0] . $name . $this->ext);
89 89
 	}
  90
+
90 91
 }
1  lib/Cake/View/ViewBlock.php
@@ -154,4 +154,5 @@ public function active() {
154 154
 	public function unclosed() {
155 155
 		return $this->_active;
156 156
 	}
  157
+
157 158
 }

0 notes on commit acccdcd

Please sign in to comment.
Something went wrong with that request. Please try again.