Merge remote branch 'origin/2.0' into 2.0-class-loading

Conflicts:
	lib/Cake/View/Helper.php

app/config/database.php.default

@@ -29,7 +29,6 @@
  *
  * driver => The name of a supported driver; valid options are as follows:
  *		mysql 		- MySQL 4 & 5,
- *		mysqli 		- MySQL 4 & 5 Improved Interface (PHP5 only),
  *		sqlite		- SQLite (PHP5 only),
  *		postgres	- PostgreSQL 7 and higher,
  *		mssql		- Microsoft SQL Server 2000 and higher,
@@ -43,19 +42,18 @@
  * Determines whether or not the database should use a persistent connection
  *
  * host =>
- * the host you connect to the database.  To add a socket or port number, use 'port' => #
+ * the host you connect to the database. To add a socket or port number, use 'port' => #
  *
  * prefix =>
  * Uses the given prefix for all the tables in this database.  This setting can be overridden
  * on a per-table basis with the Model::$tablePrefix property.
  *
  * schema =>
- * For Postgresspecifies which schema you would like to use the tables in. Postgres defaults to
+ * For Postgres specifies which schema you would like to use the tables in. Postgres defaults to 'public'.
- * 'public', DB2 defaults to empty.
  *
  * encoding =>
- * For MySQL, MySQLi, Postgres specifies the character encoding to use when connecting to the
+ * For MySQL, Postgres specifies the character encoding to use when connecting to the
- * database.  Uses database default.
+ * database. Uses database default not specified.
  *
  */
 class DATABASE_CONFIG {

cake/tests/cases/libs/controller_test_case.test.php

@@ -84,6 +84,20 @@ if (!class_exists('PostsController')) {
 	}
 }
 
+/**
+ * ControllerTestCaseTest controller
+ */
+class ControllerTestCaseTestController extends AppController {
+
+/**
+ * Uses array
+ *
+ * @param array
+ */
+	public $uses = array('TestPlugin.TestPluginComment');
+
+}
+
 
 /**
  * ControllerTestCaseTest
@@ -98,7 +112,7 @@ class ControllerTestCaseTest extends CakeTestCase {
  * @var array
  * @access public
  */
-	public $fixtures = array('core.post', 'core.author');
+	public $fixtures = array('core.post', 'core.author', 'core.test_plugin_comment');
 
 /**
  * reset environment.
@@ -209,6 +223,22 @@ class ControllerTestCaseTest extends CakeTestCase {
 
 		$result = ClassRegistry::init('TestPlugin.TestPluginComment');
 		$this->assertInstanceOf('TestPluginComment', $result);
+
+		$Tests = $this->Case->generate('ControllerTestCaseTest', array(
+			'models' => array(
+				'TestPlugin.TestPluginComment' => array('save')
+			)
+		));
+		$this->assertInstanceOf('TestPluginComment', $Tests->TestPluginComment);
+		$Tests->TestPluginComment->expects($this->at(0))
+			->method('save')
+			->will($this->returnValue(true));
+		$Tests->TestPluginComment->expects($this->at(1))
+			->method('save')
+			->will($this->returnValue(false));
+		$this->assertTrue($Tests->TestPluginComment->save(array()));
+		$this->assertFalse($Tests->TestPluginComment->save(array()));
+
 	}
 
 /**

cake/tests/lib/controller_test_case.php

@@ -280,8 +280,8 @@ class ControllerTestCase extends CakeTestCase {
 			list($plugin, $name) = pluginSplit($model);
 			$config = array_merge((array)$config, array('name' => $model));
 			$_model = $this->getMock($name, $methods, array($config));
-			ClassRegistry::removeObject($model);
+			ClassRegistry::removeObject($name);
-			ClassRegistry::addObject($model, $_model);
+			ClassRegistry::addObject($name, $_model);
 		}
 
 		foreach ($mocks['components'] as $component => $methods) {

cake/tests/test_app/config/htmlhelper_minimized.ini

@@ -0,0 +1,2 @@
+minimizedAttributeFormat = "format"
+

cake/tests/test_app/config/htmlhelper_tags.php

@@ -0,0 +1,8 @@
+<?php
+
+$config = array(
+	'tags' => array(
+		'form' => 'start form',
+		'formend' => 'finish form'
+	)
+);

cake/tests/test_app/config/no_section.ini

@@ -0,0 +1,2 @@
+some_key = some_value
+bool_key = 1

lib/Cake/Configure/IniReader.php

@@ -71,13 +71,24 @@ class IniReader implements ConfigReaderInterface {
  */
 	public function read($file) {
 		$filename = $this->_path . $file;
+		if (!file_exists($filename)) {
+			$filename .= '.ini';
+			if (!file_exists($filename)) {
+				throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename));
+			}
+		}
 		$contents = parse_ini_file($filename, true);
 		if (!empty($this->_section) && isset($contents[$this->_section])) {
 			$values = $this->_parseNestedValues($contents[$this->_section]);
 		} else {
 			$values = array();
 			foreach ($contents as $section => $attribs) {
-				$values[$section] = $this->_parseNestedValues($attribs);
+				if (is_array($attribs)) {
+					$values[$section] = $this->_parseNestedValues($attribs);
+				} else {
+					$parse = $this->_parseNestedValues(array($attribs));
+					$values[$section] = array_shift($parse);
+				}
 			}
 		}
 		return $values;

lib/Cake/Configure/PhpReader.php

@@ -57,15 +57,21 @@ class PhpReader implements ConfigReaderInterface {
 		if (strpos($key, '..') !== false) {
 			throw new ConfigureException(__('Cannot load configuration files with ../ in them.'));
 		}
+		if (substr($key, -4) === '.php') {
+			$key = substr($key, 0, -4);
+		}
 		list($plugin, $key) = pluginSplit($key);
 		
 		if ($plugin) {
-			$file = App::pluginPath($plugin) . 'config' . DS . $key . '.php';
+			$file = App::pluginPath($plugin) . 'config' . DS . $key;
 		} else {
-			$file = $this->_path . $key . '.php';
+			$file = $this->_path . $key;
 		}
 		if (!file_exists($file)) {
-			throw new ConfigureException(__('Could not load configuration file: ') . $file);
+			$file .= '.php';
+			if (!file_exists($file)) {
+				throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($file, 0, -4), $file));
+			}
 		}
 		include $file;
 		if (!isset($config)) {

lib/Cake/View/Helper.php

@@ -103,30 +103,6 @@ class Helper extends Object {
  */
 	protected $_View;
 
-/**
- * Minimized attributes
- *
- * @var array
- */
-	protected $_minimizedAttributes = array(
-		'compact', 'checked', 'declare', 'readonly', 'disabled', 'selected',
-		'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize'
-	);
-
-/**
- * Format to attribute
- *
- * @var string
- */
-	protected $_attributeFormat = '%s="%s"';
-
-/**
- * Format to attribute
- *
- * @var string
- */
-	protected $_minimizedAttributeFormat = '%s="%s"';
-
 /**
  * Default Constructor
  *
@@ -196,22 +172,6 @@ class Helper extends Object {
 		return $this->{$name} = $value;
 	}
 
-/**
- * Parses tag templates into $this->tags.
- *
- * @param $name file name inside app/config to load.
- * @return array merged tags from config/$name.php
- */
-	public function loadConfig($name = 'tags') {
-		if (file_exists(CONFIGS . $name .'.php')) {
-			require(CONFIGS . $name .'.php');
-			if (isset($tags)) {
-				$this->tags = array_merge($this->tags, $tags);
-			}
-		}
-		return $this->tags;
-	}
-
 /**
  * Finds URL for specified action.
  *
@@ -327,6 +287,7 @@ class Helper extends Object {
 	}
 
 /**
+<<<<<<< HEAD:lib/Cake/View/Helper.php
  * Returns a space-delimited string with items of the $options array. If a
  * key of $options array happens to be one of:
  *
@@ -423,7 +384,7 @@ class Helper extends Object {
  * @return void
  */
 	public function setEntity($entity, $setScope = false) {
-		$view =& $this->_View;
+		$view = $this->_View;
 		if ($setScope) {
 			$view->modelScope = false;
 		} elseif (!empty($view->entityPath) && $view->entityPath == $entity) {
@@ -470,7 +431,7 @@ class Helper extends Object {
 		}
 
 		if (ClassRegistry::isKeySet($model)) {
-			$ModelObj =& ClassRegistry::getObject($model);
+			$ModelObj = ClassRegistry::getObject($model);
 			for ($i = 0; $i < $count; $i++) {
 				if (
 					is_a($ModelObj, 'Model') && 

lib/Cake/View/Helper/FormHelper.php

@@ -316,12 +316,11 @@ class FormHelper extends AppHelper {
 		}
 
 		if (!empty($append)) {
-			$append = sprintf($this->Html->tags['block'], ' style="display:none;"', $append);
+			$append = $this->Html->useTag('block', ' style="display:none;"', $append);
 		}
 
 		$this->setEntity($model . '.', true);
-		$attributes = $this->_parseAttributes($htmlAttributes, null, '');
+		return $this->Html->useTag('form', $htmlAttributes) . $append;
-		return sprintf($this->Html->tags['form'], $attributes) . $append;
 	}
 
 /**
@@ -374,7 +373,7 @@ class FormHelper extends AppHelper {
 			$this->fields = array();
 		}
 		$this->setEntity(null);
-		$out .= $this->Html->tags['formend'];
+		$out .= $this->Html->useTag('formend');
 
 		$this->_View->modelScope = false;
 		return $out;
@@ -409,8 +408,7 @@ class FormHelper extends AppHelper {
 			'value' => urlencode($fields . ':' . $locked),
 			'id' => 'TokenFields' . mt_rand()
 		));
-		$out = sprintf($this->Html->tags['block'], ' style="display:none;"', $out);
+		return $this->Html->useTag('block', ' style="display:none;"', $out);
-		return $out;
 	}
 
 /**
@@ -564,11 +562,7 @@ class FormHelper extends AppHelper {
 			$labelFor = $this->domId($fieldName);
 		}
 
-		return sprintf(
+		return $this->Html->useTag('label', $labelFor, $options, $text);
-			$this->Html->tags['label'],
-			$labelFor,
-			$this->_parseAttributes($options), $text
-		);
 	}
 
 /**
@@ -659,13 +653,9 @@ class FormHelper extends AppHelper {
 		}
 
 		if ($fieldset && $legend) {
-			return sprintf(
+			return $this->Html->useTag('fieldset', $fieldsetClass, $this->Html->useTag('legend', $legend) . $out);
-				$this->Html->tags['fieldset'],
-				$fieldsetClass,
-				sprintf($this->Html->tags['legend'], $legend) . $out
-			);
 		} elseif ($fieldset) {
-			return sprintf($this->Html->tags['fieldset'], $fieldsetClass, $out);
+			return $this->Html->useTag('fieldset', $fieldsetClass, $out);
 		} else {
 			return $out;
 		}
@@ -1021,11 +1011,7 @@ class FormHelper extends AppHelper {
 		}
 		unset($options['hiddenField']);
 
-		return $output . sprintf(
+		return $output . $this->Html->useTag('checkbox', $options['name'], array_diff_key($options, array('name' => '')));
-			$this->Html->tags['checkbox'],
-			$options['name'],
-			$this->_parseAttributes($options, array('name'), null, ' ')
-		);
 	}
 
 /**
@@ -1087,20 +1073,17 @@ class FormHelper extends AppHelper {
 			if (isset($value) && $optValue == $value) {
 				$optionsHere['checked'] = 'checked';
 			}
-			$parsedOptions = $this->_parseAttributes(
-				array_merge($attributes, $optionsHere),
-				array('name', 'type', 'id'), '', ' '
-			);
 			$tagName = Inflector::camelize(
 				$attributes['id'] . '_' . Inflector::slug($optValue)
 			);
 
 			if ($label) {
-				$optTitle =  sprintf($this->Html->tags['label'], $tagName, null, $optTitle);
+				$optTitle = $this->Html->useTag('label', $tagName, '', $optTitle);
 			}
-			$out[] =  sprintf(
+			$allOptions = array_merge($attributes, $optionsHere);
-				$this->Html->tags['radio'], $attributes['name'],
+			$out[] = $this->Html->useTag('radio', $attributes['name'], $tagName,
-				$tagName, $parsedOptions, $optTitle
+				array_diff_key($allOptions, array('name' => '', 'type' => '', 'id' => '')),
+				$optTitle
 			);
 		}
 		$hidden = null;
@@ -1115,10 +1098,7 @@ class FormHelper extends AppHelper {
 		$out = $hidden . implode($inbetween, $out);
 
 		if ($legend) {
-			$out = sprintf(
+			$out = $this->Html->useTag('fieldset', '', $this->Html->useTag('legend', $legend) . $out);
-				$this->Html->tags['fieldset'], '',
-				sprintf($this->Html->tags['legend'], $legend) . $out
-			);
 		}
 		return $out;
 	}
@@ -1156,11 +1136,7 @@ class FormHelper extends AppHelper {
 			$options['type'] = $method;
 		}
 		$options = $this->_initInputField($params[0], $options);
-		return sprintf(
+		return $this->Html->useTag('input', $options['name'], array_diff_key($options, array('name' => '')));
-			$this->Html->tags['input'],
-			$options['name'],
-			$this->_parseAttributes($options, array('name'), null, ' ')
-		);
 	}
 
 /**
@@ -1187,12 +1163,7 @@ class FormHelper extends AppHelper {
 			}
 			unset($options['value']);
 		}
-		return sprintf(
+		return $this->Html->useTag('textarea', $options['name'], array_diff_key($options, array('type' => '', 'name' => '')), $value);
-			$this->Html->tags['textarea'],
-			$options['name'],
-			$this->_parseAttributes($options, array('type', 'name'), null, ' '),
-			$value
-		);
 	}
 
 /**
@@ -1220,11 +1191,7 @@ class FormHelper extends AppHelper {
 			$this->__secure(null, '' . $options['value']);
 		}
 
-		return sprintf(
+		return $this->Html->useTag('hidden', $options['name'], array_diff_key($options, array('name' => '', 'class' => '')));
-			$this->Html->tags['hidden'],
-			$options['name'],
-			$this->_parseAttributes($options, array('name', 'class'), '', ' ')
-		);
 	}
 
 /**
@@ -1245,8 +1212,7 @@ class FormHelper extends AppHelper {
 			$this->__secure(array_merge($field, array($suffix)));
 		}
 
-		$attributes = $this->_parseAttributes($options, array('name'), '', ' ');
+		return $this->Html->useTag('file', $options['name'], array_diff_key($options, array('name' => '')));
-		return sprintf($this->Html->tags['file'], $options['name'], $attributes);
 	}
 
 /**
@@ -1268,12 +1234,7 @@ class FormHelper extends AppHelper {
 		if ($options['escape']) {
 			$title = h($title);
 		}
-		return sprintf(
+		return $this->Html->useTag('button', $options['type'], array_diff_key($options, array('type' => '')), $title);
-			$this->Html->tags['button'],
-			$options['type'],
-			$this->_parseAttributes($options, array('type'), ' ', ''),
-			$title
-		);
 	}
 
 /**
@@ -1410,11 +1371,7 @@ class FormHelper extends AppHelper {
 
 		if (strpos($caption, '://') !== false) {
 			unset($options['type']);
-			$out .=  $before . sprintf(
+			$out .= $before . $this->Html->useTag('submitimage', $caption, $options) . $after;
-				$this->Html->tags['submitimage'],
-				$caption,
-				$this->_parseAttributes($options, null, '', ' ')
-			) . $after;
 		} elseif (preg_match('/\.(jpg|jpe|jpeg|gif|png|ico)$/', $caption)) {
 			unset($options['type']);
 			if ($caption{0} !== '/') {
@@ -1423,17 +1380,10 @@ class FormHelper extends AppHelper {
 				$caption = trim($caption, '/');
 				$url = $this->webroot($caption);
 			}
-			$out .= $before . sprintf(
+			$out .= $before . $this->Html->useTag('submitimage', $url, $options) . $after;
-				$this->Html->tags['submitimage'],
-				$url,
-				$this->_parseAttributes($options, null, '', ' ')
-			) . $after;
 		} else {
 			$options['value'] = $caption;
-			$out .= $before . sprintf(
+			$out .= $before . $this->Html->useTag('submit', $options) . $after;
-				$this->Html->tags['submit'],
-				$this->_parseAttributes($options, null, '', ' ')
-			). $after;
 		}
 
 		if (isset($divOptions)) {
@@ -1526,7 +1476,7 @@ class FormHelper extends AppHelper {
 		if (isset($attributes) && array_key_exists('multiple', $attributes)) {
 			$style = ($attributes['multiple'] === 'checkbox') ? 'checkbox' : null;
 			$template = ($style) ? 'checkboxmultiplestart' : 'selectmultiplestart';
-			$tag = $this->Html->tags[$template];
+			$tag = $template;
 			$hiddenAttributes = array(
 				'value' => '',
 				'id' => $attributes['id'] . ($style ? '' : '_'),
@@ -1535,16 +1485,14 @@ class FormHelper extends AppHelper {
 			);
 			$select[] = $this->hidden(null, $hiddenAttributes);
 		} else {
-			$tag = $this->Html->tags['selectstart'];
+			$tag = 'selectstart';
 		}
 
 		if (!empty($tag) || isset($template)) {
 			if (!isset($secure) || $secure == true) {
 				$this->__secure();
 			}
-			$select[] = sprintf($tag, $attributes['name'], $this->_parseAttributes(
+			$select[] = $this->Html->useTag($tag, $attributes['name'], array_diff_key($attributes, array('name' => '', 'value' => '')));
-				$attributes, array('name', 'value'))
-			);
 		}
 		$emptyMulti = (
 			$showEmpty !== null && $showEmpty !== false && !(
@@ -1568,7 +1516,7 @@ class FormHelper extends AppHelper {
 		));
 
 		$template = ($style == 'checkbox') ? 'checkboxmultipleend' : 'selectend';
-		$select[] = $this->Html->tags[$template];
+		$select[] = $this->Html->useTag($template);
 		return implode("\n", $select);
 	}
 
@@ -2059,9 +2007,9 @@ class FormHelper extends AppHelper {
 			if (is_array($title) && (!isset($title['name']) || !isset($title['value']))) {
 				if (!empty($name)) {
 					if ($attributes['style'] === 'checkbox') {
-						$select[] = $this->Html->tags['fieldsetend'];
+						$select[] = $this->Html->useTag('fieldsetend');
 					} else {
-						$select[] = $this->Html->tags['optiongroupend'];
+						$select[] = $this->Html->useTag('optiongroupend');
 					}
 					$parents[] = $name;
 				}
@@ -2072,9 +2020,9 @@ class FormHelper extends AppHelper {
 				if (!empty($name)) {
 					$name = $attributes['escape'] ? h($name) : $name;
 					if ($attributes['style'] === 'checkbox') {
-						$select[] = sprintf($this->Html->tags['fieldsetstart'], $name);
+						$select[] = $this->Html->useTag('fieldsetstart', $name);
 					} else {
-						$select[] = sprintf($this->Html->tags['optiongroup'], $name, '');
+						$select[] = $this->Html->useTag('optiongroup', $name, '');
 					}
 				}
 				$name = null;
@@ -2119,16 +2067,10 @@ class FormHelper extends AppHelper {
 							$attributes['class'] = 'checkbox';
 						}
 						$label = $this->label(null, $title, $label);
-						$item = sprintf(
+						$item = $this->Html->useTag('checkboxmultiple', $name, $htmlOptions);
-							$this->Html->tags['checkboxmultiple'], $name,
-							$this->_parseAttributes($htmlOptions)
-						);
 						$select[] = $this->Html->div($attributes['class'], $item . $label);
 					} else {
-						$select[] = sprintf(
+						$select[] = $this->Html->useTag('selectoption', $name, $htmlOptions, $title);
-							$this->Html->tags['selectoption'],
-							$name, $this->_parseAttributes($htmlOptions), $title
-						);
 					}
 				}
 			}

lib/Cake/View/Helper/HtmlHelper.php

@@ -32,9 +32,8 @@ class HtmlHelper extends AppHelper {
  * html tags used by this helper.
  *
  * @var array
- * @access public
  */
-	public $tags = array(
+	protected $_tags = array(
 		'meta' => '<meta%s/>',
 		'metalink' => '<link href="%s"%s/>',
 		'link' => '<a href="%s"%s>%s</a>',
@@ -93,6 +92,30 @@ class HtmlHelper extends AppHelper {
 		'javascriptend' => '</script>'
 	);
 
+/**
+ * Minimized attributes
+ *
+ * @var array
+ */
+	protected $_minimizedAttributes = array(
+		'compact', 'checked', 'declare', 'readonly', 'disabled', 'selected',
+		'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize'
+	);
+
+/**
+ * Format to attribute
+ *
+ * @var string
+ */
+	protected $_attributeFormat = '%s="%s"';
+
+/**
+ * Format to attribute
+ *
+ * @var string
+ */
+	protected $_minimizedAttributeFormat = '%s="%s"';
+
 /**
  * Breadcrumbs.
  *
@@ -125,12 +148,26 @@ class HtmlHelper extends AppHelper {
 		'html4-strict'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
 		'html4-trans'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
 		'html4-frame'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+		'html5' => '<!DOCTYPE html>',
 		'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
 		'xhtml-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
 		'xhtml-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
 		'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
 	);
 
+/**
+ * Default Constructor
+ *
+ * @param View $View The View this helper is being attached to.
+ * @param array $settings Configuration settings for the helper.
+ */
+	public function __construct(View $View, $settings = array()) {
+		parent::__construct($View, $settings);
+		if (!empty($settings['configFile'])) {
+			$this->loadConfig($settings['configFile']);
+		}
+	}
+
 /**
  * Adds a link to the breadcrumbs array.
  *
@@ -152,6 +189,7 @@ class HtmlHelper extends AppHelper {
  *  - html4-strict:  HTML4 Strict.
  *  - html4-trans:  HTML4 Transitional.
  *  - html4-frame:  HTML4 Frameset.
+ *  - html5: HTML5.
  *  - xhtml-strict: XHTML1 Strict.
  *  - xhtml-trans: XHTML1 Transitional.
  *  - xhtml-frame: XHTML1 Frameset.
@@ -223,14 +261,14 @@ class HtmlHelper extends AppHelper {
 
 		if (isset($options['link'])) {
 			if (isset($options['rel']) && $options['rel'] === 'icon') {
-				$out = sprintf($this->tags['metalink'], $options['link'], $this->_parseAttributes($options, array('link'), ' ', ' '));
+				$out = sprintf($this->_tags['metalink'], $options['link'], $this->_parseAttributes($options, array('link'), ' ', ' '));
 				$options['rel'] = 'shortcut icon';
 			} else {
 				$options['link'] = $this->url($options['link'], true);
 			}
-			$out .= sprintf($this->tags['metalink'], $options['link'], $this->_parseAttributes($options, array('link'), ' ', ' '));
+			$out .= sprintf($this->_tags['metalink'], $options['link'], $this->_parseAttributes($options, array('link'), ' ', ' '));
 		} else {
-			$out = sprintf($this->tags['meta'], $this->_parseAttributes($options, array('type'), ' ', ' '));
+			$out = sprintf($this->_tags['meta'], $this->_parseAttributes($options, array('type'), ' ', ' '));
 		}
 
 		if ($inline) {
@@ -253,7 +291,7 @@ class HtmlHelper extends AppHelper {
 		if (empty($charset)) {
 			$charset = strtolower(Configure::read('App.encoding'));
 		}
-		return sprintf($this->tags['charset'], (!empty($charset) ? $charset : 'utf-8'));
+		return sprintf($this->_tags['charset'], (!empty($charset) ? $charset : 'utf-8'));
 	}
 
 /**
@@ -313,7 +351,7 @@ class HtmlHelper extends AppHelper {
 			}
 			unset($options['default']);
 		}
-		return sprintf($this->tags['link'], $url, $this->_parseAttributes($options), $title);
+		return sprintf($this->_tags['link'], $url, $this->_parseAttributes($options), $title);
 	}
 
 /**
@@ -368,12 +406,12 @@ class HtmlHelper extends AppHelper {
 		}
 
 		if ($rel == 'import') {
-			$out = sprintf($this->tags['style'], $this->_parseAttributes($options, array('inline'), '', ' '), '@import url(' . $url . ');');
+			$out = sprintf($this->_tags['style'], $this->_parseAttributes($options, array('inline'), '', ' '), '@import url(' . $url . ');');
 		} else {
 			if ($rel == null) {
 				$rel = 'stylesheet';
 			}
-			$out = sprintf($this->tags['css'], $rel, $url, $this->_parseAttributes($options, array('inline'), '', ' '));
+			$out = sprintf($this->_tags['css'], $rel, $url, $this->_parseAttributes($options, array('inline'), '', ' '));
 		}
 
 		if ($options['inline']) {
@@ -439,7 +477,7 @@ class HtmlHelper extends AppHelper {
 			}
 		}
 		$attributes = $this->_parseAttributes($options, array('inline', 'once'), ' ');
-		$out = sprintf($this->tags['javascriptlink'], $url, $attributes);
+		$out = sprintf($this->_tags['javascriptlink'], $url, $attributes);
 
 		if ($options['inline']) {
 			return $out;
@@ -471,9 +509,9 @@ class HtmlHelper extends AppHelper {
 		unset($options['inline'], $options['safe']);
 		$attributes = $this->_parseAttributes($options, ' ', ' ');
 		if ($inline) {
-			return sprintf($this->tags['javascriptblock'], $attributes, $script);
+			return sprintf($this->_tags['javascriptblock'], $attributes, $script);
 		} else {
-			$this->_View->addScript(sprintf($this->tags['javascriptblock'], $attributes, $script));
+			$this->_View->addScript(sprintf($this->_tags['javascriptblock'], $attributes, $script));
 			return null;
 		}
 	}
@@ -652,10 +690,10 @@ class HtmlHelper extends AppHelper {
 			unset($options['url']);
 		}
 
-		$image = sprintf($this->tags['image'], $path, $this->_parseAttributes($options, null, '', ' '));
+		$image = sprintf($this->_tags['image'], $path, $this->_parseAttributes($options, null, '', ' '));
 
 		if ($url) {
-			return sprintf($this->tags['link'], $this->url($url), null, $image);
+			return sprintf($this->_tags['link'], $this->url($url), null, $image);
 		}
 		return $image;
 	}
@@ -673,9 +711,9 @@ class HtmlHelper extends AppHelper {
 	public function tableHeaders($names, $trOptions = null, $thOptions = null) {
 		$out = array();
 		foreach ($names as $arg) {
-			$out[] = sprintf($this->tags['tableheader'], $this->_parseAttributes($thOptions), $arg);
+			$out[] = sprintf($this->_tags['tableheader'], $this->_parseAttributes($thOptions), $arg);
 		}
-		return sprintf($this->tags['tablerow'], $this->_parseAttributes($trOptions), join(' ', $out));
+		return sprintf($this->_tags['tablerow'], $this->_parseAttributes($trOptions), join(' ', $out));
 	}
 
 /**
@@ -725,10 +763,10 @@ class HtmlHelper extends AppHelper {
 				} elseif ($useCount) {
 					$cellOptions['class'] = 'column-' . ++$i;
 				}
-				$cellsOut[] = sprintf($this->tags['tablecell'], $this->_parseAttributes($cellOptions), $cell);
+				$cellsOut[] = sprintf($this->_tags['tablecell'], $this->_parseAttributes($cellOptions), $cell);
 			}
 			$options = $this->_parseAttributes($count % 2 ? $oddTrOptions : $evenTrOptions);
-			$out[] = sprintf($this->tags['tablerow'], $options, implode(' ', $cellsOut));
+			$out[] = sprintf($this->_tags['tablerow'], $options, implode(' ', $cellsOut));
 		}
 		return implode("\n", $out);
 	}
@@ -761,7 +799,27 @@ class HtmlHelper extends AppHelper {
 		} else {
 			$tag = 'tag';
 		}
-		return sprintf($this->tags[$tag], $name, $this->_parseAttributes($options, null, ' ', ''), $text, $name);
+		return sprintf($this->_tags[$tag], $name, $this->_parseAttributes($options, null, ' ', ''), $text, $name);
+	}
+
+/**
+ * Returns a formatted existent block of $tags
+ *
+ * @param string $tag Tag name
+ * @return string Formatted block
+ */
+	public function useTag($tag) {
+		if (!isset($this->_tags[$tag])) {
+			return '';
+		}
+		$args = func_get_args();
+		array_shift($args);
+		foreach ($args as &$arg) {
+			if (is_array($arg)) {
+				$arg = $this->_parseAttributes($arg, null, ' ', '');
+			}
+		}
+		return vsprintf($this->_tags[$tag], $args);
 	}
 
 /**
@@ -812,7 +870,7 @@ class HtmlHelper extends AppHelper {
 		} else {
 			$tag = 'para';
 		}
-		return sprintf($this->tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $text);
+		return sprintf($this->_tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $text);
 	}
 
 /**
@@ -830,7 +888,7 @@ class HtmlHelper extends AppHelper {
 			$options = array();
 		}
 		$items = $this->__nestedListItem($list, $options, $itemOptions, $tag);
-		return sprintf($this->tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $items);
+		return sprintf($this->_tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $items);
 	}
 
 /**
@@ -857,9 +915,145 @@ class HtmlHelper extends AppHelper {
 			} else if (isset($itemOptions['odd']) && $index % 2 != 0) {
 				$itemOptions['class'] = $itemOptions['odd'];
 			}
-			$out .= sprintf($this->tags['li'], $this->_parseAttributes($itemOptions, array('even', 'odd'), ' ', ''), $item);
+			$out .= sprintf($this->_tags['li'], $this->_parseAttributes($itemOptions, array('even', 'odd'), ' ', ''), $item);
 			$index++;
 		}
 		return $out;
 	}
+
+/**
+ * Load Html configs
+ *
+ * @param mixed $configFile String with the config file (load using PhpReader) or an array with file and reader name
+ * @param string $path Path with config file
+ * @return mixed False to error or loaded configs
+ */
+	public function loadConfig($configFile, $path = CONFIGS) {
+		$file = null;
+		$reader = 'php';
+
+		if (!is_array($configFile)) {
+			$file = $configFile;
+		} elseif (isset($configFile[0])) {
+			$file = $configFile[0];
+			if (isset($configFile[1])) {
+				$reader = $configFile[1];
+			}
+		} else {
+			throw new ConfigureException(__('Cannot load the configuration file. Wrong "configFile" configuration.'));
+		}
+
+		$readerClass = Inflector::camelize($reader) . 'Reader';
+		if (!App::import('Lib', 'config/' . $readerClass)) {
+			throw new ConfigureException(__('Cannot load the configuration file. Unknown reader.'));
+		}
+
+		$readerObj = new $readerClass($path);
+		$configs = $readerObj->read($file);
+		if (isset($configs['tags']) && is_array($configs['tags'])) {
+			$this->_tags = array_merge($this->_tags, $configs['tags']);
+		}
+		if (isset($configs['minimizedAttributes']) && is_array($configs['minimizedAttributes'])) {
+			$this->_minimizedAttributes = array_merge($this->_minimizedAttributes, $configs['minimizedAttributes']);
+		}
+		if (isset($configs['docTypes']) && is_array($configs['docTypes'])) {
+			$this->__docTypes = array_merge($this->__docTypes, $configs['docTypes']);
+		}
+		if (isset($configs['attributeFormat'])) {
+			$this->_attributeFormat = $configs['attributeFormat'];
+		}
+		if (isset($configs['minimizedAttributeFormat'])) {
+			$this->_minimizedAttributeFormat = $configs['minimizedAttributeFormat'];
+		}
+		return $configs;
+	}
+
+/**
+ * Returns a space-delimited string with items of the $options array. If a
+ * key of $options array happens to be one of:
+ *
+ * - 'compact'
+ * - 'checked'
+ * - 'declare'
+ * - 'readonly'
+ * - 'disabled'
+ * - 'selected'
+ * - 'defer'
+ * - 'ismap'
+ * - 'nohref'
+ * - 'noshade'
+ * - 'nowrap'
+ * - 'multiple'
+ * - 'noresize'
+ *
+ * And its value is one of:
+ *
+ * - '1' (string)
+ * - 1 (integer)
+ * - true (boolean)
+ * - 'true' (string)
+ *
+ * Then the value will be reset to be identical with key's name.
+ * If the value is not one of these 3, the parameter is not output.
+ *
+ * 'escape' is a special option in that it controls the conversion of
+ *  attributes to their html-entity encoded equivalents.  Set to false to disable html-encoding.
+ *
+ * If value for any option key is set to `null` or `false`, that option will be excluded from output.
+ *
+ * @param array $options Array of options.
+ * @param array $exclude Array of options to be excluded, the options here will not be part of the return.
+ * @param string $insertBefore String to be inserted before options.
+ * @param string $insertAfter String to be inserted after options.
+ * @return string Composed attributes.
+ */
+	public function _parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
+		if (is_array($options)) {
+			$options = array_merge(array('escape' => true), $options);
+
+			if (!is_array($exclude)) {
+				$exclude = array();
+			}
+			$filtered = array_diff_key($options, array_merge(array_flip($exclude), array('escape' => true)));
+			$escape = $options['escape'];
+			$attributes = array();
+
+			foreach ($filtered as $key => $value) {
+				if ($value !== false && $value !== null) {
+					$attributes[] = $this->_formatAttribute($key, $value, $escape);
+				}
+			}
+			$out = implode(' ', $attributes);
+		} else {
+			$out = $options;
+		}
+		return $out ? $insertBefore . $out . $insertAfter : '';
+	}
+
+/**
+ * Formats an individual attribute, and returns the string value of the composed attribute.
+ * Works with minimized attributes that have the same value as their name such as 'disabled' and 'checked'
+ *
+ * @param string $key The name of the attribute to create
+ * @param string $value The value of the attribute to create.
+ * @return string The composed attribute.
+ */
+	protected function _formatAttribute($key, $value, $escape = true) {
+		$attribute = '';
+		if (is_array($value)) {
+			$value = '';
+		}
+
+		if (is_numeric($key)) {
+			$attribute = sprintf($this->_minimizedAttributeFormat, $value, $value);
+		} elseif (in_array($key, $this->_minimizedAttributes)) {
+			if ($value === 1 || $value === true || $value === 'true' || $value === '1' || $value == $key) {
+				$attribute = sprintf($this->_minimizedAttributeFormat, $key, $key);
+			}
+		} else {
+			$attribute = sprintf($this->_attributeFormat, $key, ($escape ? h($value) : $value));
+		}
+		return $attribute;
+	}
+
 }

lib/Cake/View/View.php

@@ -624,7 +624,8 @@ class View extends Object {
 	public function loadHelpers() {
 		$helpers = HelperCollection::normalizeObjectArray($this->helpers);
 		foreach ($helpers as $name => $properties) {
-			$this->Helpers->load($properties['class'], $properties['settings']);
+			list($plugin, $class) = pluginSplit($properties['class']);
+			$this->{$class} = $this->Helpers->load($properties['class'], $properties['settings']);
 		}
 		$this->_helpersLoaded = true;
 	}

lib/Cake/tests/cases/libs/config/ini_reader.test.php

@@ -64,6 +64,22 @@ class IniReaderTest extends CakeTestCase {
 		$this->assertEquals('administrators', $config['groups']);
 	}
 
+/**
+ * test without section
+ *
+ * @return void
+ */
+	public function testReadingWithoutSection() {
+		$reader = new IniReader($this->path);
+		$config = $reader->read('no_section.ini');
+
+		$expected = array(
+			'some_key' => 'some_value',
+			'bool_key' => true
+		);
+		$this->assertEquals($config, $expected);
+	}
+
 /**
  * test that names with .'s get exploded into arrays.
  *
@@ -98,4 +114,15 @@ class IniReaderTest extends CakeTestCase {
 
 		$this->assertFalse($config['bools']['test_null']);
 	}
+
+/**
+ * test read file without extension
+ *
+ * @return void
+ */
+	public function testReadingWithoutExtension() {
+		$reader = new IniReader($this->path);
+		$config = $reader->read('nested');
+		$this->assertTrue($config['bools']['test_on']);
+	}
 }

lib/Cake/tests/cases/libs/config/php_reader.test.php

@@ -38,6 +38,9 @@ class PhpReaderTest extends CakeTestCase {
 		$values = $reader->read('var_test');
 		$this->assertEquals('value', $values['Read']);
 		$this->assertEquals('buried', $values['Deep']['Deeper']['Deepest']);
+
+		$values = $reader->read('var_test.php');
+		$this->assertEquals('value', $values['Read']);
 	}
 
 /**
@@ -84,7 +87,9 @@ class PhpReaderTest extends CakeTestCase {
 		), true);
 		$reader = new PhpReader($this->path);
 		$result = $reader->read('TestPlugin.load');
+		$this->assertTrue(isset($result['plugin_load']));
 
+		$result = $reader->read('TestPlugin.load.php');
 		$this->assertTrue(isset($result['plugin_load']));
 	}
 }

lib/Cake/tests/cases/libs/view/helper.test.php

@@ -183,35 +183,6 @@ class TestHelper extends Helper {
 	}
 }
 
-/**
- * Html5TestHelper class
- *
- * @package       cake.tests.cases.libs.view
- */
-class Html5TestHelper extends TestHelper {
-
-/**
- * Minimized
- *
- * @var array
- */
-	protected $_minimizedAttributes = array('require', 'checked');
-
-/**
- * Allow compact use in HTML
- *
- * @var string
- */
-	protected $_minimizedAttributeFormat = '%s';
-
-/**
- * Test to attribute format
- *
- * @var string
- */
-	protected $_attributeFormat = 'data-%s="%s"';
-}
-
 /**
  * HelperTest class
  *
@@ -819,32 +790,6 @@ class HelperTest extends CakeTestCase {
 		Configure::write('App.www_root', $webRoot);
 	}
 
-/**
- * test parsing attributes.
- *
- * @return void
- */
-	function testParseAttributeCompact() {
-		$helper = new TestHelper($this->View);
-		$compact = array('compact', 'checked', 'declare', 'readonly', 'disabled',
-			'selected', 'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize');
-		
-		foreach ($compact as $attribute) {
-			foreach (array('true', true, 1, '1', $attribute) as $value) {
-				$attrs = array($attribute => $value);
-				$expected = ' ' . $attribute . '="' . $attribute . '"';
-				$this->assertEqual($helper->parseAttributes($attrs), $expected, '%s Failed on ' . $value);
-			}
-		}
-		$this->assertEqual($helper->parseAttributes(array('compact')), ' compact="compact"');
-
-		$helper = new Html5TestHelper($this->View);
-		$expected = ' require';
-		$this->assertEqual($helper->parseAttributes(array('require')), $expected);
-		$this->assertEqual($helper->parseAttributes(array('require' => true)), $expected);
-		$this->assertEqual($helper->parseAttributes(array('require' => false)), '');
-	}
-
 /**
  * test lazy loading helpers is seamless
  *

lib/Cake/tests/cases/libs/view/helpers/form.test.php

@@ -5259,7 +5259,7 @@ class FormHelperTest extends CakeTestCase {
 		));
 
 		$result = $this->Form->postButton('Send', '/', array('data' => array('extra' => 'value')));
-		$this->assertTrue(strpos($result, '<input type="hidden" name="data[extra]" value="value" />') !== false);
+		$this->assertTrue(strpos($result, '<input type="hidden" name="data[extra]"  value="value"/>') !== false);
 	}
 
 /**
@@ -5299,7 +5299,7 @@ class FormHelperTest extends CakeTestCase {
 		));
 
 		$result = $this->Form->postLink('Delete', '/posts/delete', array('data' => array('id' => 1)));
-		$this->assertTrue(strpos($result, '<input type="hidden" name="data[id]" value="1" />') !== false);
+		$this->assertTrue(strpos($result, '<input type="hidden" name="data[id]"  value="1"/>') !== false);
 	}
 
 /**

lib/Cake/tests/cases/libs/view/helpers/html.test.php

@@ -53,6 +53,64 @@ class TheHtmlTestController extends Controller {
 	public $uses = null;
 }
 
+class TestHtmlHelper extends HtmlHelper {
+/**
+ * expose a method as public
+ *
+ * @param string $options 
+ * @param string $exclude 
+ * @param string $insertBefore 
+ * @param string $insertAfter 
+ * @return void
+ */
+	function parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
+		return $this->_parseAttributes($options, $exclude, $insertBefore, $insertAfter);
+	}
+
+/**
+ * Get a protected attribute value
+ *
+ * @param string $attribute
+ * @return mixed
+ */
+	public function getAttribute($attribute) {
+		if (!isset($this->{$attribute})) {
+			return null;
+		}
+		return $this->{$attribute};
+	}
+
+}
+
+/**
+ * Html5TestHelper class
+ *
+ * @package       cake.tests.cases.libs.view.helpers
+ */
+class Html5TestHelper extends TestHtmlHelper {
+
+/**
+ * Minimized
+ *
+ * @var array
+ */
+	protected $_minimizedAttributes = array('require', 'checked');
+
+/**
+ * Allow compact use in HTML
+ *
+ * @var string
+ */
+	protected $_minimizedAttributeFormat = '%s';
+
+/**
+ * Test to attribute format
+ *
+ * @var string
+ */
+	protected $_attributeFormat = 'data-%s="%s"';
+}
+
 /**
  * HtmlHelperTest class
  *
@@ -90,7 +148,7 @@ class HtmlHelperTest extends CakeTestCase {
 	function setUp() {
 		parent::setUp();
 		$this->View = $this->getMock('View', array('addScript'), array(new TheHtmlTestController()));
-		$this->Html = new HtmlHelper($this->View);
+		$this->Html = new TestHtmlHelper($this->View);
 		$this->Html->request = new CakeRequest(null, false);
 		$this->Html->request->webroot = '';
 
@@ -1237,6 +1295,22 @@ class HtmlHelperTest extends CakeTestCase {
 		$this->assertTags($result, array('div' => array('class' => 'class-name'), '<text>', '/div'));
 	}
 
+/**
+ * testUseTag method
+ *
+ * @return void
+ */
+	public function testUseTag() {
+		$result = $this->Html->useTag('formend');
+		$this->assertTags($result, '/form');
+
+		$result = $this->Html->useTag('form', 'test');
+		$this->assertEqual($result, '<form test>');
+
+		$result = $this->Html->useTag('form', array('test' => 'ok'));
+		$this->assertTags($result, array('form' => array('test' => 'ok')));
+	}
+
 /**
  * testDiv method
  *
@@ -1302,4 +1376,82 @@ class HtmlHelperTest extends CakeTestCase {
 			)
 		);
 	}
+
+/**
+ * testLoadConfig method
+ *
+ * @return void
+ */
+
+	public function testLoadConfig() {
+		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+
+		$result = $this->Html->loadConfig('htmlhelper_tags', $path);
+		$expected = array(
+			'tags' => array(
+				'form' => 'start form',
+				'formend' => 'finish form'
+			)
+		);
+		$this->assertEqual($result, $expected);
+		$tags = $this->Html->getAttribute('_tags');
+		$this->assertEqual($tags['form'], 'start form');
+		$this->assertEqual($tags['formend'], 'finish form');
+		$this->assertEqual($tags['selectend'], '</select>');
+
+		$result = $this->Html->loadConfig(array('htmlhelper_minimized.ini', 'ini'), $path);
+		$expected = array(
+			'minimizedAttributeFormat' => 'format'
+		);
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($this->Html->getAttribute('_minimizedAttributeFormat'), 'format');
+	}
+
+/**
+ * testLoadConfigWrongFile method
+ *
+ * @return void
+ * @expectedException ConfigureException
+ */
+	public function testLoadConfigWrongFile() {
+		$result = $this->Html->loadConfig('wrong_file');
+	}
+
+/**
+ * testLoadConfigWrongReader method
+ *
+ * @return void
+ * @expectedException ConfigureException
+ */
+	public function testLoadConfigWrongReader() {
+		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$result = $this->Html->loadConfig(array('htmlhelper_tags', 'wrong_reader'), $path);
+	}
+
+/**
+ * test parsing attributes.
+ *
+ * @return void
+ */
+	function testParseAttributeCompact() {
+		$helper = new TestHtmlHelper($this->View);
+		$compact = array('compact', 'checked', 'declare', 'readonly', 'disabled',
+			'selected', 'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize');
+		
+		foreach ($compact as $attribute) {
+			foreach (array('true', true, 1, '1', $attribute) as $value) {
+				$attrs = array($attribute => $value);
+				$expected = ' ' . $attribute . '="' . $attribute . '"';
+				$this->assertEqual($helper->parseAttributes($attrs), $expected, '%s Failed on ' . $value);
+			}
+		}
+		$this->assertEqual($helper->parseAttributes(array('compact')), ' compact="compact"');
+
+		$helper = new Html5TestHelper($this->View);
+		$expected = ' require';
+		$this->assertEqual($helper->parseAttributes(array('require')), $expected);
+		$this->assertEqual($helper->parseAttributes(array('require' => true)), $expected);
+		$this->assertEqual($helper->parseAttributes(array('require' => false)), '');
+	}
+
 }