From a87d31cc7f570a1ac03abc2c04b04f71e4f6c955 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 2 Nov 2009 00:07:02 -0500
Subject: [PATCH 001/112] Fixing $cacheAction requiring the inclusion of the
 controller name for view cache files to be generated.  This behavior makes
 the cache helper behave as documented. Test cases added.  Fixes #232

---
 cake/libs/view/helpers/cache.php              | 16 +++-
 .../cases/libs/view/helpers/cache.test.php    | 90 ++++++++++++++++---
 2 files changed, 92 insertions(+), 14 deletions(-)

diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 8f43ecf9e..34a43ba1d 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -75,24 +75,32 @@ class CacheHelper extends AppHelper {
 		$useCallbacks = false;
 		if (is_array($this->cacheAction)) {
 			$controller = Inflector::underscore($this->controllerName);
+			$controllerAlternate = Inflector::variable($this->controllerName);
+
 			$check = str_replace('/', '_', $this->here);
-			$replace = str_replace('/', '_', $this->base);
+			$basePath = str_replace('/', '_', $this->base);
+
 			$match = str_replace($this->base, '', $this->here);
 			$match = str_replace('//', '/', $match);
 			$match = str_replace('/' . $controller . '/', '', $match);
+			$match = str_replace('/' . $controllerAlternate . '/', '', $match);
 			$match = str_replace('/' . $this->controllerName . '/', '', $match);
-			$check = str_replace($replace, '', $check);
+
+			$check = str_replace($basePath, '', $check);
 			$check = str_replace('_' . $controller . '_', '', $check);
 			$check = str_replace('_' . $this->controllerName . '_', '', $check);
+			$check = str_replace('_' . $controllerAlternate . '_', '', $match);
+
 			$check = Inflector::slug($check);
-			$check = preg_replace('/^_+/', '', $check);
+			$check = trim($check, '_');
+
 			$keys = str_replace('/', '_', array_keys($this->cacheAction));
 			$found = array_keys($this->cacheAction);
 			$index = null;
 			$count = 0;
 
 			foreach ($keys as $key => $value) {
-				if (strpos($check, $value) === 0) {
+				if (strpos($check, rtrim($value, '_')) === 0) {
 					$index = $found[$count];
 					break;
 				}
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index fc450ecc9..66b913642 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -29,14 +29,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 }
 App::import('Core', array('Controller', 'Model', 'View'));
 App::import('Helper', 'Cache');
-/**
- * TestCacheHelper class
- *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
- */
-class TestCacheHelper extends CacheHelper {
-}
+
 /**
  * CacheTestController class
  *
@@ -81,7 +74,8 @@ class CacheHelperTest extends CakeTestCase {
  */
 	function setUp() {
 		$this->Controller = new CacheTestController();
-		$this->Cache = new TestCacheHelper();
+		$this->Cache = new CacheHelper();
+		$this->_cacheSettings = Configure::read('Cache');
 		Configure::write('Cache.check', true);
 		Configure::write('Cache.disable', false);
 	}
@@ -112,6 +106,7 @@ class CacheHelperTest extends CakeTestCase {
  */
 	function tearDown() {
 		unset($this->Cache);
+		Configure::write('Cache', $this->_cacheSettings);
 	}
 /**
  * test cache parsing with no cake:nocache tags in view file.
@@ -201,7 +196,7 @@ class CacheHelperTest extends CakeTestCase {
  */
 	function testComplexNoCache () {
 		$this->Controller->cache_parsing();
-		$this->Controller->cacheAction = array('cacheTest' => 21600);
+		$this->Controller->cacheAction = array('cache_complex' => 21600);
 		$this->Controller->here = '/cacheTest/cache_complex';
 		$this->Controller->action = 'cache_complex';
 		$this->Controller->layout = 'multi_cache';
@@ -247,6 +242,81 @@ class CacheHelperTest extends CakeTestCase {
 		//$this->assertPattern('/6\. in element with no cache tags/', $contents);
 		$this->assertPattern('/7\. layout after content and after element with no cache tags/', $contents);
 	}
+/**
+ * test cacheAction set to a boolean
+ *
+ * @return void
+ **/
+	function testCacheActionArray() {
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing' => 21600
+		);
+		$this->Controller->here = '/cache_test/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cache_test_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+
+
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing/' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+
+
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing/33' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing/33';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing_33.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+		
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing/33' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertFalse(file_exists($filename));
+	}
 /**
  * testCacheEmptySections method
  *

From 9d2628f699dbae93c90b47579b78d8c7aba64dd8 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 2 Nov 2009 00:07:16 -0500
Subject: [PATCH 002/112] Removing tab

---
 cake/libs/view/view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 1ed8c01cb..199359f9f 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -686,7 +686,7 @@ class View extends Object {
 				$cache->helpers = $this->helpers;
 				$cache->action = $this->action;
 				$cache->controllerName = $this->name;
-				$cache->layout	= $this->layout;
+				$cache->layout = $this->layout;
 				$cache->cacheAction = $this->cacheAction;
 				$cache->cache($___viewFn, $out, $cached);
 			}

From 6b043c6c57da5d2d3f0538170e8aa964b2789039 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 2 Nov 2009 21:37:20 -0500
Subject: [PATCH 003/112] Updating doc blocks for paginator helper.

---
 cake/libs/view/helpers/paginator.php | 146 +++++++++++++++++++--------
 1 file changed, 103 insertions(+), 43 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 0e8505ecf..8362337ac 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -48,20 +48,20 @@ class PaginatorHelper extends AppHelper {
  *
  * The values that may be specified are:
  *
- *  - <i>$options['format']</i> Format of the counter. Supported formats are 'range' and 'pages'
- *   and custom (default). In the default mode the supplied string is parsed and constants are replaced
- *   by their actual values.
- *   Constants: %page%, %pages%, %current%, %count%, %start%, %end% .
- *  - <i>$options['separator']</i> The separator of the actual page and number of pages (default: ' of ').
- *  - <i>$options['url']</i> Url of the action. See Router::url()
- *  - <i>$options['url']['sort']</i>  the key that the recordset is sorted.
- *  - <i>$options['url']['direction']</i> Direction of the sorting (default: 'asc').
- *  - <i>$options['url']['page']</i> Page # to display.
- *  - <i>$options['model']</i> The name of the model.
- *  - <i>$options['escape']</i> Defines if the title field for the link should be escaped (default: true).
- *  - <i>$options['update']</i> DOM id of the element updated with the results of the AJAX call.
- *                             If this key isn't specified Paginator will use plain HTML links.
- *  - <i>$options['indicator']</i> DOM id of the element that will be shown when doing AJAX requests.
+ *  - `$options['format']` Format of the counter. Supported formats are 'range' and 'pages'
+ *    and custom (default). In the default mode the supplied string is parsed and constants are replaced
+ *    by their actual values.
+ *    Constants: %page%, %pages%, %current%, %count%, %start%, %end% .
+ *  - `$options['separator']` The separator of the actual page and number of pages (default: ' of ').
+ *  - `$options['url']` Url of the action. See Router::url()
+ *  - `$options['url']['sort']`  the key that the recordset is sorted.
+ *  - `$options['url']['direction']` Direction of the sorting (default: 'asc').
+ *  - `$options['url']['page']` Page # to display.
+ *  - `$options['model']` The name of the model.
+ *  - `$options['escape']` Defines if the title field for the link should be escaped (default: true).
+ *  - `$options['update']` DOM id of the element updated with the results of the AJAX call.
+ *     If this key isn't specified Paginator will use plain HTML links.
+ *  - `$options['indicator']` DOM id of the element that will be shown when doing AJAX requests.
  *
  * @var array
  */
@@ -69,7 +69,7 @@ class PaginatorHelper extends AppHelper {
 /**
  * Gets the current paging parameters from the resultset for the given model
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
+ * @param string $model Optional model name.  Uses the default if none is specified.
  * @return array The array of paging parameters for the paginated resultset.
  */
 	function params($model = null) {
@@ -84,7 +84,7 @@ class PaginatorHelper extends AppHelper {
 /**
  * Sets default options for all pagination links
  *
- * @param  mixed $options Default options for pagination links. If a string is supplied - it
+ * @param mixed $options Default options for pagination links. If a string is supplied - it
  * is used as the DOM id element to update. See #options for list of keys.
  */
 	function options($options = array()) {
@@ -113,7 +113,7 @@ class PaginatorHelper extends AppHelper {
 /**
  * Gets the current page of the recordset for the given model
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
+ * @param string $model Optional model name.  Uses the default if none is specified.
  * @return string The current page number of the recordset.
  */
 	function current($model = null) {
@@ -127,8 +127,8 @@ class PaginatorHelper extends AppHelper {
 /**
  * Gets the current key by which the recordset is sorted
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
- * @param  mixed $options Options for pagination links. See #options for list of keys.
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param mixed $options Options for pagination links. See #options for list of keys.
  * @return string The name of the key by which the recordset is being sorted, or
  *  null if the results are not currently sorted.
  */
@@ -158,8 +158,8 @@ class PaginatorHelper extends AppHelper {
 /**
  * Gets the current direction the recordset is sorted
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
- * @param  mixed $options Options for pagination links. See #options for list of keys.
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param mixed $options Options for pagination links. See #options for list of keys.
  * @return string The direction by which the recordset is being sorted, or
  *  null if the results are not currently sorted.
  */
@@ -185,6 +185,12 @@ class PaginatorHelper extends AppHelper {
 /**
  * Generates a "previous" link for a set of paged records
  *
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
  * @param  string $title Title for the link. Defaults to '<< Previous'.
  * @param  mixed $options Options for pagination link. See #options for list of keys.
  * @param  string $disabledTitle Title when the link is disabled.
@@ -197,10 +203,16 @@ class PaginatorHelper extends AppHelper {
 /**
  * Generates a "next" link for a set of paged records
  *
- * @param  string $title Title for the link. Defaults to 'Next >>'.
- * @param  mixed $options Options for pagination link. See #options for list of keys.
- * @param  string $disabledTitle Title when the link is disabled.
- * @param  mixed $disabledOptions Options for the disabled pagination link. See #options for list of keys.
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param string $title Title for the link. Defaults to 'Next >>'.
+ * @param mixed $options Options for pagination link. See above for list of keys.
+ * @param string $disabledTitle Title when the link is disabled.
+ * @param mixed $disabledOptions Options for the disabled pagination link. See above for list of keys.
  * @return string A "next" link or or $disabledTitle text if the link is disabled.
  */
 	function next($title = 'Next >>', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
@@ -210,10 +222,15 @@ class PaginatorHelper extends AppHelper {
  * Generates a sorting link. Sets named parameters for the sort and direction.  Handles
  * direction switching automatically.
  *
+ * Options:
+ *
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
  * @param string $title Title for the link.
  * @param string $key The name of the key that the recordset should be sorted.  If $key is null
  *   $title will be used for the key, and a title will be generated by inflection.
- * @param array $options Options for sorting link. See #options for list of keys.
+ * @param array $options Options for sorting link. See above for list of keys.
  * @return string A link sorting default by 'asc'. If the resultset is sorted 'asc' by the specified
  *  key the returned link will sort by 'desc'.
  */
@@ -244,9 +261,16 @@ class PaginatorHelper extends AppHelper {
 /**
  * Generates a plain or Ajax link with pagination parameters
  *
- * @param  string $title Title for the link.
- * @param  mixed $url Url for the action. See Router::url()
- * @param  array $options Options for the link. See #options for list of keys.
+ * Options
+ *
+ * - `update` The Id of the DOM element you wish to update.  Creates Ajax enabled links
+ *    with the AjaxHelper.
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param string $title Title for the link.
+ * @param mixed $url Url for the action. See Router::url()
+ * @param array $options Options for the link. See #options for list of keys.
  * @return string A link with pagination parameters.
  */
 	function link($title, $url = array(), $options = array()) {
@@ -271,9 +295,9 @@ class PaginatorHelper extends AppHelper {
 /**
  * Merges passed URL options with current pagination state to generate a pagination URL.
  *
- * @param  array $options Pagination/URL options array
- * @param  boolean $asArray
- * @param  string $model Which model to paginate on
+ * @param array $options Pagination/URL options array
+ * @param boolean $asArray Return the url as an array, or a URI string 
+ * @param string $model Which model to paginate on
  * @return mixed By default, returns a full pagination URL string for use in non-standard contexts (i.e. JavaScript)
  */
 	function url($options = array(), $asArray = false, $model = null) {
@@ -328,7 +352,7 @@ class PaginatorHelper extends AppHelper {
 /**
  * Returns true if the given result set is not at the first page
  *
- * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param string $model Optional model name. Uses the default if none is specified.
  * @return boolean True if the result set is not at the first page.
  */
 	function hasPrev($model = null) {
@@ -346,8 +370,8 @@ class PaginatorHelper extends AppHelper {
 /**
  * Returns true if the given result set has the page number given by $page
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
- * @param  int $page The page number - if not set defaults to 1.
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param int $page The page number - if not set defaults to 1.
  * @return boolean True if the given result set has the specified page number.
  */
 	function hasPage($model = null, $page = 1) {
@@ -389,7 +413,16 @@ class PaginatorHelper extends AppHelper {
 /**
  * Returns a counter string for the paged result set
  *
- * @param  mixed $options Options for the counter string. See #options for list of keys.
+ * Options
+ *
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel();
+ * - `format` The format string you want to use, defaults to 'pages' Which generates output like '1 of 5'
+ *    set to 'range' to generate output like '1 - 3 of 13'.  Can also be set to a custom string, containing 
+ *    the following placeholders `%page%`, `%pages%`, `%current%`, `%count%`, `%start%`, `%end%` and any
+ *    custom content you would like.
+ * - `separator` The separator string to use, default to ' of '
+ *
+ * @param mixed $options Options for the counter string. See #options for list of keys.
  * @return string Counter string.
  */
 	function counter($options = array()) {
@@ -400,8 +433,8 @@ class PaginatorHelper extends AppHelper {
 		$options = array_merge(
 			array(
 				'model' => $this->defaultModel(),
-				'format' => 'pages',
-				'separator' => ' of '
+				'format' => 'pages'
+				'separator' => __(' of ', true)
 			),
 		$options);
 
@@ -446,7 +479,20 @@ class PaginatorHelper extends AppHelper {
  * Returns a set of numbers for the paged result set
  * uses a modulus to decide how many numbers to show on each side of the current page (default: 8)
  *
- * @param  mixed $options Options for the numbers, (before, after, model, modulus, separator)
+ * Options
+ *
+ * - `before` Content to be inserted before the numbers
+ * - `after` Content to be inserted after the numbers
+ * - `model` Model to create numbers for, defaults to PaginatorHelper::defaultModel()
+ * - `modulus` how many numbers to include on either side of the current page, defaults to 8.
+ * - `separator` Separator content defaults to ' | '
+ * - `tag` The tag to wrap links in, defaults to 'span'
+ * - `first` Whether you want first links generated, set to an integer to define the number of 'first' 
+ *    links to generate
+ * - `last` Whether you want last links generated, set to an integer to define the number of 'last' 
+ *    links to generate
+ *
+ * @param mixed $options Options for the numbers, (before, after, model, modulus, separator)
  * @return string numbers string.
  */
 	function numbers($options = array()) {
@@ -555,8 +601,15 @@ class PaginatorHelper extends AppHelper {
 /**
  * Returns a first or set of numbers for the first pages
  *
- * @param  mixed $first if string use as label for the link, if numeric print page numbers
- * @param  mixed $options
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `before` Content to insert before the link/tag
+ * - `model` The model to use defaults to PaginatorHelper::defaultModel()
+ * - `separator` Content between the generated links, defaults to ' | '
+ *
+ * @param mixed $first if string use as label for the link, if numeric print page numbers
+ * @param mixed $options
  * @return string numbers string.
  */
 	function first($first = '<< first', $options = array()) {
@@ -599,8 +652,15 @@ class PaginatorHelper extends AppHelper {
 /**
  * Returns a last or set of numbers for the last pages
  *
- * @param  mixed $last if string use as label for the link, if numeric print page numbers
- * @param  mixed $options
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `before` Content to insert before the link/tag
+ * - `model` The model to use defaults to PaginatorHelper::defaultModel()
+ * - `separator` Content between the generated links, defaults to ' | '
+ *
+ * @param mixed $last if string use as label for the link, if numeric print page numbers
+ * @param mixed $options Array of options
  * @return string numbers string.
  */
 	function last($last = 'last >>', $options = array()) {

From 133299c653ecd0139b12e898a186f3c15dfdaf8b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 3 Nov 2009 09:02:17 -0500
Subject: [PATCH 004/112] Removing duplicate constructor from ShellDispatcher.
 Fixes warnings under PHP5.3. Fixes #132

---
 cake/console/cake.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cake/console/cake.php b/cake/console/cake.php
index 2210beecf..cfd118302 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -118,14 +118,6 @@ class ShellDispatcher {
  * @param array $args the argv.
  */
 	function ShellDispatcher($args = array()) {
-		$this->__construct($args);
-	}
-/**
- * Constructor
- *
- * @param array $args the argv.
- */
-	function __construct($args = array()) {
 		set_time_limit(0);
 		$this->__initConstants();
 		$this->parseParams($args);

From d63218c0a09c26bebc5c5104e63be2f144ee9101 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 3 Nov 2009 09:52:59 -0500
Subject: [PATCH 005/112] Fixing error in previous commit.

---
 cake/libs/view/helpers/paginator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 8362337ac..9fa185ddc 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -433,7 +433,7 @@ class PaginatorHelper extends AppHelper {
 		$options = array_merge(
 			array(
 				'model' => $this->defaultModel(),
-				'format' => 'pages'
+				'format' => 'pages',
 				'separator' => __(' of ', true)
 			),
 		$options);

From 8c46cc49fbc234f1d760b5757aa322201e0a1161 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 3 Nov 2009 13:14:38 -0500
Subject: [PATCH 006/112] Fixing issue in Dispatcher::cached() where plugins
 ending in asset extensions would be incorrectly handled. Test added Fixes
 #237

---
 cake/dispatcher.php                                | 14 +++++++++-----
 cake/tests/cases/dispatcher.test.php               | 11 ++++++++++-
 .../plugins/plugin_js/vendors/js/plugin_js.js      |  1 +
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index ca147f305..b2b1d81d4 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -598,15 +598,19 @@ class Dispatcher extends Object {
 				$this->_stop();
 			}
 			$isAsset = false;
-			$assets = array('js' => 'text/javascript', 'css' => 'text/css', 'gif' => 'image/gif', 'jpg' => 'image/jpeg', 'png' => 'image/png');
+			$assets = array(
+				'js' => 'text/javascript', 'css' => 'text/css',
+				'gif' => 'image/gif', 'jpg' => 'image/jpeg', 'png' => 'image/png'
+			);
 			$ext = array_pop(explode('.', $url));
 
 			foreach ($assets as $type => $contentType) {
 				if ($type === $ext) {
-					if ($type === 'css' || $type === 'js') {
-						$pos = strpos($url, $type . '/');
+					$parts = explode('/', $url);
+					if ($parts[0] === 'css' || $parts[0] === 'js' || $parts[0] === 'img') {
+						$pos = 0;
 					} else {
-						$pos = strpos($url, 'img/');
+						$pos = strlen($parts[0]);
 					}
 					$isAsset = true;
 					break;
@@ -624,7 +628,7 @@ class Dispatcher extends Object {
 				$paths = array();
 
 				if ($pos > 0) {
-					$plugin = substr($url, 0, $pos - 1);
+					$plugin = substr($url, 0, $pos);
 					$url = preg_replace('/^' . preg_quote($plugin, '/') . '\//i', '', $url);
 					$pluginPaths = Configure::read('pluginPaths');
 					$count = count($pluginPaths);
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index 613c8949a..4ea07969b 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -1711,7 +1711,7 @@ class DispatcherTest extends CakeTestCase {
 
 		Configure::write('debug', 0);
 		ob_start();
-		$Dispatcher->dispatch('/img/test.jpg');
+		$Dispatcher->dispatch('img/test.jpg');
 		$result = ob_get_clean();
 		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS . 'img' . DS . 'test.jpg');
 		$this->assertEqual($file, $result);
@@ -1756,6 +1756,15 @@ class DispatcherTest extends CakeTestCase {
 		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' .DS . 'vendors' . DS . 'img' . DS . 'cake.icon.gif');
 		$this->assertEqual($file, $result);
 
+
+		Configure::write('debug', 2);
+		$Dispatcher->params = $Dispatcher->parseParams('plugin_js/js/plugin_js.js');
+		ob_start();
+		$Dispatcher->cached('plugin_js/js/plugin_js.js');
+		$result = ob_get_clean();
+		$expected = "alert('win sauce');";
+		$this->assertEqual($result, $expected);
+
 		header('Content-type: text/html');//reset the header content-type without page can render as plain text.
 	}
 /**
diff --git a/cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js b/cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js
new file mode 100644
index 000000000..ac52468f6
--- /dev/null
+++ b/cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js
@@ -0,0 +1 @@
+alert('win sauce');
\ No newline at end of file

From e609875754103913927f4bab7f67323aa6529165 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 4 Nov 2009 12:36:17 -0500
Subject: [PATCH 007/112] Updating Model::invalidFields, so returning false
 from beforeValidate() will abort both the validation and saving() of the
 record. Tests added to check beforeSave, beforeValidate, and beforeDelete
 return values. Fixes #257

---
 cake/libs/model/model.php                     |  4 +-
 .../cases/libs/model/model_delete.test.php    | 15 ++++++
 .../cases/libs/model/model_write.test.php     | 34 ++++++++++++
 cake/tests/cases/libs/model/models.php        | 53 ++++++++++++++++++-
 4 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index abf93d39c..84b096fbe 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -2359,7 +2359,7 @@ class Model extends Overloadable {
 			) ||
 			$this->beforeValidate($options) === false
 		) {
-			return $this->validationErrors;
+			return false;
 		}
 
 		if (!isset($this->validate) || empty($this->validate)) {
@@ -2793,7 +2793,7 @@ class Model extends Overloadable {
 	function afterDelete() {
 	}
 /**
- * Called during save operations, before validation. Please note that custom
+ * Called during validation operations, before validation. Please note that custom
  * validation rules can be defined in $validate.
  *
  * @return boolean True if validate operation should continue, false to abort
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index 6d30d2bdf..2be205e92 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -565,7 +565,22 @@ class ModelDeleteTest extends BaseModelTest {
 		));
 		$this->assertEqual($result['Monkey'], $expected);
 	}
+/**
+ * test that beforeDelete returning false can abort deletion.
+ *
+ * @return void
+ **/
+	function testBeforeDeleteDeleteAbortion() {
+		$this->loadFixtures('Post');
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeDeleteReturn = false;
 
+		$result = $Model->delete(1);
+		$this->assertFalse($result);
+
+		$exists = $Model->findById(1);
+		$this->assertTrue(is_array($exists));
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index 3d023ce11..4d969cca9 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -601,6 +601,40 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $TestModel->validates();
 		$this->assertTrue($result);
 	}
+/**
+ * test that beforeValidate returning false can abort saves.
+ *
+ * @return void
+ **/
+	function testBeforeValidateSaveAbortion() {
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeValidateReturn = false;
+		
+		$data = array(
+			'title' => 'new article',
+			'body' => 'this is some text.'
+		);
+		$Model->create();
+		$result = $Model->save($data);
+		$this->assertFalse($result);
+	}
+/**
+ * test that beforeSave returning false can abort saves.
+ *
+ * @return void
+ **/
+	function testBeforeSaveSaveAbortion() {
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeSaveReturn = false;
+
+		$data = array(
+			'title' => 'new article',
+			'body' => 'this is some text.'
+		);
+		$Model->create();
+		$result = $Model->save($data);
+		$this->assertFalse($result);
+	}
 /**
  * testValidates method
  *
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index 64541c4fd..f601b82aa 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -1749,7 +1749,58 @@ class AssociationTest2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Callback extends CakeTestModel {
-	//
+	
+}
+/**
+ * CallbackPostTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class CallbackPostTestModel extends CakeTestModel {
+	var $useTable = 'posts';
+/**
+ * variable to control return of beforeValidate
+ *
+ * @var string
+ */
+	var $beforeValidateReturn = true;
+/**
+ * variable to control return of beforeSave
+ *
+ * @var string
+ */
+	var $beforeSaveReturn = true;
+/**
+ * variable to control return of beforeDelete
+ *
+ * @var string
+ */
+	var $beforeDeleteReturn = true;
+/**
+ * beforeSave callback
+ *
+ * @return void
+ **/
+	function beforeSave($options) {
+		return $this->beforeSaveReturn;
+	}
+/**
+ * beforeValidate callback
+ *
+ * @return void
+ **/
+	function beforeValidate($options) {
+		return $this->beforeValidateReturn;
+	}
+/**
+ * beforeDelete callback
+ *
+ * @return void
+ **/
+	function beforeDelete($cascade = true) {
+		return $this->beforeDeleteReturn;
+	}
 }
 /**
  * Uuid class

From b4f6dd9c6e304164c8b0fc64d29d7de82617c23e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 4 Nov 2009 22:57:43 -0500
Subject: [PATCH 008/112] Adding tests and support for binary columns in model
 task. Fixes #241

---
 cake/console/libs/tasks/model.php                  | 1 +
 cake/tests/cases/console/libs/tasks/model.test.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 2d75be9ba..b962a13df 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -870,6 +870,7 @@ class ModelTask extends Shell {
 								case 'integer':
 									$insert = 1;
 								break;
+								case 'binary':
 								case 'string';
 									$insert = "Lorem ipsum dolor sit amet";
 									if (!empty($value['length'])) {
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index b273b69cc..a2e7f5c54 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -53,7 +53,7 @@ Mock::generatePartial(
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class ModelTaskTest extends CakeTestCase {
-	var $fixtures = array('core.datatype');
+	var $fixtures = array('core.datatype', 'core.binary_test');
 /**
  * setUp method
  *
@@ -84,7 +84,9 @@ class ModelTaskTest extends CakeTestCase {
 		$this->Task->setReturnValue('createFile', true);
 		$result = $this->Task->fixture('Datatype');
 		$this->assertPattern('/float_field\' => 1/', $result);
-		
+
+		$result = $this->Task->fixture('BinaryTest');
+		$this->assertPattern("/'data' => 'Lorem ipsum dolor sit amet'/", $result);
 	}
 }
 ?>
\ No newline at end of file

From 0327f15395f561df4fd2c05af81094bb6d8cfa5a Mon Sep 17 00:00:00 2001
From: Ernst Mayerhofer <e.mayerhofer@bluemonkeys.at>
Date: Thu, 5 Nov 2009 19:21:53 +0100
Subject: [PATCH 009/112] paginator works with limit 0 now too

---
 cake/tests/cases/libs/controller/controller.test.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 8c7b3204c..555296d1f 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -511,6 +511,13 @@ class ControllerTest extends CakeTestCase {
 		$Controller->paginate('ControllerPost');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
+		
+		$Controller->paginate = array('limit' => 0);
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], false);
 	}
 /**
  * testPaginateExtraParams method

From 4bbfcbff7e90fab42bef39e01003113dc715a3b0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 6 Nov 2009 00:44:21 -0500
Subject: [PATCH 010/112] Fixing limit:0 and controller::paginate.  Removes
 possibilty to generate sql errors by inputting invalid limit options. Tests
 updated.  Refs #264

---
 cake/libs/controller/controller.php               |  5 +++--
 .../cases/libs/controller/controller.test.php     | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index b1d3c4d72..273d51e23 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -1044,8 +1044,9 @@ class Controller extends Object {
 			$type = $defaults[0];
 			unset($defaults[0]);
 		}
-
-		extract($options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options));
+		$options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options);
+		$options['limit'] = (empty($options['limit']) || !is_numeric($options['limit'])) ? 1 : $options['limit'];
+		extract($options);
 
 		if (is_array($scope) && !empty($scope)) {
 			$conditions = array_merge($conditions, $scope);
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 555296d1f..4b978a03e 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -511,13 +511,22 @@ class ControllerTest extends CakeTestCase {
 		$Controller->paginate('ControllerPost');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
-		
+
+		$Controller->passedArgs = array();
 		$Controller->paginate = array('limit' => 0);
 		$Controller->paginate('ControllerPost');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
+		
+		$Controller->passedArgs = array();
+		$Controller->paginate = array('limit' => 'garbage!');
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
 	}
 /**
  * testPaginateExtraParams method

From 4deaf27cc02ed29766f6d6d5aca3b1f4220741b0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 6 Nov 2009 09:31:57 -0500
Subject: [PATCH 011/112] Removing deprecated code in Html::css() Minor
 refactoring in HtmlHelper methods. Fixes #268

---
 cake/libs/view/helpers/html.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index e02ea1e1a..533dd9721 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -356,7 +356,7 @@ class HtmlHelper extends AppHelper {
  *
  * #### Options 
  *
- * - `inline` If set to false, the generated tag appears in the head tag of the layout.
+ * - `inline` If set to false, the generated tag appears in the head tag of the layout. Defaults to true
  *
  * @param mixed $path The name of a CSS style sheet or an array containing names of
  *   CSS stylesheets. If `$path` is prefixed with '/', the path will be relative to the webroot
@@ -367,13 +367,13 @@ class HtmlHelper extends AppHelper {
  * @access public
  */
 	function css($path, $rel = null, $options = array()) {
-		$inline = isset($options['inline']) ? $options['inline'] : true;
+		$options += array('inline' => true);
 		if (is_array($path)) {
 			$out = '';
 			foreach ($path as $i) {
-				$out .= "\n\t" . $this->css($i, $rel, $options, $inline);
+				$out .= "\n\t" . $this->css($i, $rel, $options);
 			}
-			if ($inline)  {
+			if ($options['inline'])  {
 				return $out . "\n";
 			}
 			return;
@@ -402,7 +402,7 @@ class HtmlHelper extends AppHelper {
 		}
 
 		if ($rel == 'import') {
-			$out = sprintf($this->tags['style'], $this->_parseAttributes($options, null, '', ' '), '@import url(' . $url . ');');
+			$out = sprintf($this->tags['style'], $this->_parseAttributes($options, array('inline'), '', ' '), '@import url(' . $url . ');');
 		} else {
 			if ($rel == null) {
 				$rel = 'stylesheet';
@@ -411,7 +411,7 @@ class HtmlHelper extends AppHelper {
 		}
 		$out = $this->output($out);
 
-		if ($inline) {
+		if ($options['inline']) {
 			return $out;
 		} else {
 			$view =& ClassRegistry::getObject('view');
@@ -472,12 +472,10 @@ class HtmlHelper extends AppHelper {
 				$url = str_replace(JS_URL, 'cjs/', $url);
 			}
 		}
-		$inline = $options['inline'];
-		unset($options['inline'], $options['once']);
-		$attributes = $this->_parseAttributes($options, ' ', ' ');
+		$attributes = $this->_parseAttributes($options, array('inline', 'once'), ' ');
 		$out = $this->output(sprintf($this->tags['javascriptlink'], $url, $attributes));
 
-		if ($inline) {
+		if ($options['inline']) {
 			return $out;
 		} else {
 			$view =& ClassRegistry::getObject('view');
@@ -497,8 +495,7 @@ class HtmlHelper extends AppHelper {
  * @return mixed string or null depending on the value of `$options['inline']`
  **/
 	function scriptBlock($script, $options = array()) {
-		$defaultOptions = array('safe' => true, 'inline' => true);
-		$options = array_merge($defaultOptions, $options);
+		$options += array('safe' => true, 'inline' => true);
 		if ($options['safe']) {
 			$script  = "\n" . '//<![CDATA[' . "\n" . $script . "\n" . '//]]>' . "\n";
 		}
@@ -527,8 +524,7 @@ class HtmlHelper extends AppHelper {
  * @return void
  **/
 	function scriptStart($options = array()) {
-		$defaultOptions = array('safe' => true, 'inline' => true);
-		$options = array_merge($defaultOptions, $options);
+		$options += array('safe' => true, 'inline' => true);
 		$this->_scriptBlockOptions = $options;
 		ob_start();
 		return null;

From 30dc0cfe569ea3f10d325c4e59d5642143c88424 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 7 Nov 2009 10:40:48 -0500
Subject: [PATCH 012/112] Removing unused $view property from CacheHelper.
 Fixes #272

---
 cake/libs/view/helpers/cache.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 34a43ba1d..f27663b4f 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -48,13 +48,6 @@ class CacheHelper extends AppHelper {
  * @access private
  */
 	var $__match = array();
-/**
- * holds the View object passed in final call to CacheHelper::cache()
- *
- * @var View
- * @access public
- */
-	var $view;
 /**
  * cache action time
  *

From dd0c4a64c5ec65940a6a60fea771d65ea77289e8 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Wed, 4 Nov 2009 12:31:39 +0100
Subject: [PATCH 013/112] Test to prove ticket #253

---
 .../cases/libs/model/behaviors/containable.test.php   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index ca16f3188..b1d995ccb 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3380,6 +3380,17 @@ class ContainableBehaviorTest extends CakeTestCase {
 		));
 		$this->assertEqual($expected, $this->Article->User->hasOne);
 
+		$this->Article->User->bindModel($userHasOne, false);
+		$expected = $this->Article->User->hasOne;
+		$this->Article->find('all', array(
+			'contain' => array(
+				'User' => array(
+					'Comment' => array('fields' => array('created'))
+				)
+			)
+		));
+		$this->assertEqual($expected, $this->Article->User->hasOne);
+		
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
 		$this->Article->find('all', array(

From 6db91b0f49b71dcc1200dfb9fb95841bfb1525a1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 7 Nov 2009 17:43:18 -0500
Subject: [PATCH 014/112] Fixing issues in ContainableBehavior that could leave
 models unbound when 'fields' was used as part of containment conditions. 
 Fixes #253

---
 cake/libs/model/behaviors/containable.php                  | 2 +-
 cake/tests/cases/libs/model/behaviors/containable.test.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index ed5dd6d5d..9bec011a2 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -155,7 +155,7 @@ class ContainableBehavior extends ModelBehavior {
 							if (!$reset && empty($instance->__backOriginalAssociation)) {
 								$instance->__backOriginalAssociation = $backupBindings;
 							} else if ($reset) {
-								$instance->__backAssociation[$type] = $instance->{$type};
+								$instance->__backAssociation[$type] = $backupBindings[$type];
 							}
 							$instance->{$type}[$assoc] = array_merge($instance->{$type}[$assoc], $model['keep'][$assoc]);
 						}
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index b1d995ccb..d5ae197c8 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3390,7 +3390,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 			)
 		));
 		$this->assertEqual($expected, $this->Article->User->hasOne);
-		
+
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
 		$this->Article->find('all', array(

From 82a2b1a01957ccbfd3a6abe31133f49b9005bced Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 7 Nov 2009 17:53:14 -0500
Subject: [PATCH 015/112] Changing import of Dispatcher to direct require.
 Modifying order of operations in Configure::__loadBootstrap() moving
 inclusion of app/config/bootstrap.php after the creation of core cache
 configs.  This allows App::import() to be used in the bootstrap file with
 cached paths.

---
 cake/bootstrap.php      | 2 +-
 cake/libs/configure.php | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index 0a28e5558..f9aa7b438 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -48,5 +48,5 @@ error_reporting(E_ALL & ~E_DEPRECATED);
 
 	$url = null;
 
-	App::import('Core', array('Dispatcher'));
+	require CAKE . 'dispatcher.php';
 ?>
\ No newline at end of file
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 05cb2875e..985890cfe 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -652,10 +652,6 @@ class Configure extends Object {
 				trigger_error(sprintf(__("Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
 			}
 
-			if (!include(CONFIGS . 'bootstrap.php')) {
-				trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
-			}
-
 			if (Configure::read('Cache.disable') !== true) {
 				$cache = Cache::config('default');
 
@@ -692,6 +688,11 @@ class Configure extends Object {
 				}
 				Cache::config('default');
 			}
+
+			if (!include(CONFIGS . 'bootstrap.php')) {
+				trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
+			}
+
 			Configure::buildPaths(compact(
 				'modelPaths', 'viewPaths', 'controllerPaths', 'helperPaths', 'componentPaths',
 				'behaviorPaths', 'pluginPaths', 'vendorPaths', 'localePaths', 'shellPaths'

From 95cafc713824bb4f981299fcb7c9520094b05b8c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 8 Nov 2009 13:46:45 -0500
Subject: [PATCH 016/112] Adding missing help text.

---
 cake/console/libs/bake.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php
index 7f1f0ad67..33f0c4055 100644
--- a/cake/console/libs/bake.php
+++ b/cake/console/libs/bake.php
@@ -231,6 +231,8 @@ class BakeShell extends Shell {
 		$this->out("\n\tbake model\n\t\tbakes a model. run 'bake model help' for more info");
 		$this->out("\n\tbake view\n\t\tbakes views. run 'bake view help' for more info");
 		$this->out("\n\tbake controller\n\t\tbakes a controller. run 'bake controller help' for more info");
+		$this->out("\n\tbake fixture\n\t\tbakes fixtures. run 'bake fixture help' for more info.");
+		$this->out("\n\tbake test\n\t\tbakes unit tests. run 'bake test help' for more info.");
 		$this->out();
 
 	}

From 6b79c8d375f80770497061a92ed582401d00314e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 8 Nov 2009 14:07:25 -0500
Subject: [PATCH 017/112] Adding checks for parent classname when converting
 error method names.  Fixes #273

---
 cake/libs/error.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cake/libs/error.php b/cake/libs/error.php
index 26ef72a52..7861ec269 100644
--- a/cake/libs/error.php
+++ b/cake/libs/error.php
@@ -108,10 +108,13 @@ class ErrorHandler extends Object {
 		if (!in_array(strtolower($method), array_map('strtolower', get_class_methods($this)))) {
 			$method = 'error';
 		}
-
 		if ($method !== 'error') {
 			if (Configure::read('debug') == 0) {
-				$parentMethods = get_class_methods(get_parent_class($this));
+				$parentClass = get_parent_class($this);
+				if (strtolower($parentClass) != 'errorhandler') {
+					$method = 'error404';
+				}
+				$parentMethods = get_class_methods($parentClass);
 				if (in_array($method, $parentMethods)) {
 					$method = 'error404';
 				}

From a7a6dc8c43fddb2f78226f136203b851a80f6328 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 8 Nov 2009 14:12:18 -0500
Subject: [PATCH 018/112] Fixing issue where SecurityComponent::_validatePost
 could generate notices if elements were removed from _Token array. Tests
 Added Fixed #228

---
 cake/libs/controller/components/security.php  |  2 +-
 .../controller/components/security.test.php   | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 96d140256..64e0af936 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -545,7 +545,7 @@ class SecurityComponent extends Object {
 		}
 		$data = $controller->data;
 
-		if (!isset($data['_Token']) || !isset($data['_Token']['fields'])) {
+		if (!isset($data['_Token']) || !isset($data['_Token']['fields']) || !isset($data['_Token']['key'])) {
 			return false;
 		}
 		$token = $data['_Token']['key'];
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 0aa80c393..d3a3fff5a 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -527,6 +527,31 @@ DIGEST;
 		);
 		$this->assertTrue($this->Controller->Security->validatePost($this->Controller));
 	}
+/**
+ * test that validatePost fails if any of its required fields are missing.
+ *
+ * @return void
+ **/
+	function testValidatePostFormHacking() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3An%3A1%3A%7Bv%3A0%3B';
+		$fields .= 'f%3A11%3A%22Zbqry.inyvq%22%3B%7D';
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('key')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result, 'validatePost passed when fields were missing. %s');
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result, 'validatePost passed when key was missing. %s');
+	}
 /**
  * Tests validation of checkbox arrays
  *

From c4b493c934d9b24281a2cf07a4b82b719266882a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 8 Nov 2009 22:22:08 -0500
Subject: [PATCH 019/112] Manually merging changes from ModelTask in 1.2 to
 FixtureTask Adding test cases for FixtureTask.

---
 cake/console/libs/tasks/fixture.php            |  4 +++-
 .../cases/console/libs/tasks/fixture.test.php  | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php
index 631ee2b04..98c1ecea8 100644
--- a/cake/console/libs/tasks/fixture.php
+++ b/cake/console/libs/tasks/fixture.php
@@ -277,9 +277,11 @@ class FixtureTask extends Shell {
 				}
 				switch ($fieldInfo['type']) {
 					case 'integer':
+					case 'float':
 						$insert = $i + 1;
 					break;
-					case 'string';
+					case 'string':
+					case 'binary':
 						$isPrimaryUuid = (
 							isset($fieldInfo['key']) && strtolower($fieldInfo['key']) == 'primary' &&
 							isset($fieldInfo['length']) && $fieldInfo['length'] == 36
diff --git a/cake/tests/cases/console/libs/tasks/fixture.test.php b/cake/tests/cases/console/libs/tasks/fixture.test.php
index 3839010e4..926758d19 100644
--- a/cake/tests/cases/console/libs/tasks/fixture.test.php
+++ b/cake/tests/cases/console/libs/tasks/fixture.test.php
@@ -61,7 +61,7 @@ class FixtureTaskTest extends CakeTestCase {
  *
  * @var array
  **/
-	var $fixtures = array('core.article', 'core.comment');
+	var $fixtures = array('core.article', 'core.comment', 'core.datatype', 'core.binary_test');
 
 /**
  * startTest method
@@ -259,6 +259,22 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->assertNoPattern('/var \$records/', $result);
 	}
 
+/**
+ * test record generation with float and binary types
+ *
+ * @return void
+ **/
+	function testRecordGenerationForBinaryAndFloat() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$result = $this->Task->bake('Article', 'datatypes');
+		$this->assertPattern("/'float_field' => 1/", $result);
+
+		$result = $this->Task->bake('Article', 'binary_tests');
+		$this->assertPattern("/'data' => 'Lorem ipsum dolor sit amet'/", $result);
+	}
+
 /**
  * Test that file generation includes headers and correct path for plugins.
  *

From fa1b7f617fbfee20b6f4c599a07ff852bcb3bdf5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 9 Nov 2009 14:07:19 -0500
Subject: [PATCH 020/112] Fixing issues caused by merge with 1.2.

---
 cake/libs/configure.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 67e00df56..3bdc14e8f 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -403,6 +403,11 @@ class Configure extends Object {
 				}
 				Cache::config('default');
 			}
+
+			if (!include(CONFIGS . 'bootstrap.php')) {
+				trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
+			}
+
 			if (App::path('controllers') == array()) {
 				App::build(array(
 					'models' => $modelPaths, 'views' => $viewPaths, 'controllers' => $controllerPaths,
@@ -411,15 +416,6 @@ class Configure extends Object {
 					'shells' => $shellPaths, 'libs' => $libPaths
 				));
 			}
-
-			if (!include(CONFIGS . 'bootstrap.php')) {
-				trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
-			}
-
-			Configure::buildPaths(compact(
-				'modelPaths', 'viewPaths', 'controllerPaths', 'helperPaths', 'componentPaths',
-				'behaviorPaths', 'pluginPaths', 'vendorPaths', 'localePaths', 'shellPaths'
-			));
 		}
 	}
 }

From 26e19caad5bef4be6f2313d842f77395a16fbac2 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Tue, 10 Nov 2009 10:30:13 +1100
Subject: [PATCH 021/112] Removing unnecessary getInstance() calls.

---
 cake/libs/security.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cake/libs/security.php b/cake/libs/security.php
index a595f5143..b90f8c0b1 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -61,7 +61,6 @@ class Security extends Object {
  * @static
  */
 	function inactiveMins() {
-		$_this =& Security::getInstance();
 		switch (Configure::read('Security.level')) {
 			case 'high':
 				return 10;
@@ -179,7 +178,6 @@ class Security extends Object {
 			return '';
 		}
 
-		$_this =& Security::getInstance();
 		if (!defined('CIPHER_SEED')) {
 			//This is temporary will change later
 			define('CIPHER_SEED', '76859309657453542496749683645');

From d251a1d5ca4acadabaad5bba9ced84d47d980f31 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Mon, 9 Nov 2009 18:30:09 +0100
Subject: [PATCH 022/112] Adding config() call to ensure that DATABASE_CONFIG
 has been loaded before attempting to use it. refs #277

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/console/libs/tasks/db_config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index f138de1b0..6635fe8c0 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -258,6 +258,7 @@ class DbConfigTask extends Shell {
 		$oldConfigs = array();
 
 		if (file_exists($filename)) {
+			config('database');
 			$db = new $this->databaseClassName;
 			$temp = get_class_vars(get_class($db));
 

From c810b3cde4097a5077c01f983959c68d10fac3d3 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Mon, 9 Nov 2009 21:01:30 +0100
Subject: [PATCH 023/112] Making ProjectTask bake constants with DS instead of
 hardcoded / or \. Makes developing/deploying to mixed systems easier.

refs #278

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/console/libs/tasks/project.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index 0d50e2013..ba966514c 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -224,7 +224,7 @@ class ProjectTask extends Shell {
 			$File =& new File($path . 'webroot' . DS . 'index.php');
 			$contents = $File->read();
 			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
-				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '" . CAKE_CORE_INCLUDE_PATH . "');", $contents);
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', ". (strpos(CAKE_CORE_INCLUDE_PATH, '/')===0? " DS . '":"'") . str_replace('/', '\' . DS . \'', trim(CAKE_CORE_INCLUDE_PATH, '/')) . "');", $contents);
 				if (!$File->write($result)) {
 					return false;
 				}
@@ -235,7 +235,7 @@ class ProjectTask extends Shell {
 			$File =& new File($path . 'webroot' . DS . 'test.php');
 			$contents = $File->read();
 			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
-				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '" . CAKE_CORE_INCLUDE_PATH . "');", $contents);
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', ". (strpos(CAKE_CORE_INCLUDE_PATH, '/')===0? " DS . '":"'") . str_replace('/', '\' . DS . \'', trim(CAKE_CORE_INCLUDE_PATH, '/')) . "');", $contents);
 				if (!$File->write($result)) {
 					return false;
 				}

From adaa2b689c35869052c6b218011516d77a7d2f0d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 9 Nov 2009 20:10:24 -0500
Subject: [PATCH 024/112] Adding test case for previous commit. Fixing function
 for non-windows paths.

---
 cake/console/libs/tasks/project.php              |  3 ++-
 .../cases/console/libs/tasks/project.test.php    | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index ba966514c..388276e60 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -224,7 +224,8 @@ class ProjectTask extends Shell {
 			$File =& new File($path . 'webroot' . DS . 'index.php');
 			$contents = $File->read();
 			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
-				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', ". (strpos(CAKE_CORE_INCLUDE_PATH, '/')===0? " DS . '":"'") . str_replace('/', '\' . DS . \'', trim(CAKE_CORE_INCLUDE_PATH, '/')) . "');", $contents);
+				$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', " . $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "');", $contents);
 				if (!$File->write($result)) {
 					return false;
 				}
diff --git a/cake/tests/cases/console/libs/tasks/project.test.php b/cake/tests/cases/console/libs/tasks/project.test.php
index 27813f7d0..d86dd447d 100644
--- a/cake/tests/cases/console/libs/tasks/project.test.php
+++ b/cake/tests/cases/console/libs/tasks/project.test.php
@@ -130,6 +130,22 @@ class ProjectTaskTest extends CakeTestCase {
 		$this->assertNoPattern('/DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi/', $contents, 'Default Salt left behind. %s');
 	}
 
+/**
+ * Test that index.php is generated correctly.
+ *
+ * @return void
+ **/
+	function testIndexPhpGeneration() {
+		$this->_setupTestProject();
+		
+		$path = $this->Task->path . 'bake_test_app' . DS;
+		$this->Task->corePath($path);
+
+		$file =& new File($path . 'webroot' . DS . 'index.php');
+		$contents = $file->read();
+		$this->assertNoPattern('/define\(\'CAKE_CORE_INCLUDE_PATH\', \'ROOT/', $contents);
+	}
+
 /**
  * test getPrefix method, and that it returns Routing.prefix or writes to config file.
  *

From f0628d100b04fee67f6e0dc392c08145003ed423 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 9 Nov 2009 21:00:19 -0500
Subject: [PATCH 025/112] Fixing issues with getting values from habtm data
 after form posting and validation has failed. Tests added. Refs #279

---
 cake/libs/view/helper.php                  |  4 +++-
 cake/tests/cases/libs/view/helper.test.php | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 4528176ad..c1c57f58d 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -646,7 +646,9 @@ class Helper extends Overloadable {
 		}
 
 		$habtmKey = $this->field();
-		if (empty($result) && isset($this->data[$habtmKey]) && is_array($this->data[$habtmKey])) {
+		if (empty($result) && isset($this->data[$habtmKey][$habtmKey])) {
+			$result = $this->data[$habtmKey][$habtmKey];
+		} elseif (empty($result) && isset($this->data[$habtmKey]) && is_array($this->data[$habtmKey])) {
 			if (ClassRegistry::isKeySet($habtmKey)) {
 				$model =& ClassRegistry::getObject($habtmKey);
 				$result = $this->__selectedArray($this->data[$habtmKey], $model->primaryKey);
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 16d105792..59b46bf8a 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -367,6 +367,26 @@ class HelperTest extends CakeTestCase {
 		$this->Helper->setEntity('Post.2.created.year');
 		$result = $this->Helper->value('Post.2.created.year');
 		$this->assertEqual($result, '2008');
+
+		$this->Helper->data = array('HelperTestTag' => array('HelperTestTag' => ''));
+		$this->Helper->setEntity('HelperTestTag.HelperTestTag');
+		$result = $this->Helper->value('HelperTestTag.HelperTestTag');
+		$this->assertEqual($result, '');
+
+		$this->Helper->data = array('HelperTestTag' => array('HelperTestTag' => array(2, 3, 4)));
+		$this->Helper->setEntity('HelperTestTag.HelperTestTag');
+		$result = $this->Helper->value('HelperTestTag.HelperTestTag');
+		$this->assertEqual($result, array(2, 3, 4));
+
+		$this->Helper->data = array(
+			'HelperTestTag' => array(
+				array('id' => 3),
+				array('id' => 5)
+			)
+		);
+		$this->Helper->setEntity('HelperTestTag.HelperTestTag');
+		$result = $this->Helper->value('HelperTestTag.HelperTestTag');
+		$this->assertEqual($result, array(3 => 3, 5 => 5));
 	}
 
 /**

From 2af5318e7a829a976caf852ca71fa9e7a0bafd0b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 9 Nov 2009 23:54:59 -0500
Subject: [PATCH 026/112] Moving import in ModelTask to fix issue running bake
 model all.

---
 app/tmp/cache/views/empty         | 0
 cake/console/libs/tasks/model.php | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100755 app/tmp/cache/views/empty

diff --git a/app/tmp/cache/views/empty b/app/tmp/cache/views/empty
deleted file mode 100755
index e69de29bb..000000000
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 46eb54f6e..8d616a71a 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -80,6 +80,8 @@ class ModelTask extends Shell {
  * @access public
  */
 	function execute() {
+		App::import('Model', 'Model', false);
+
 		if (empty($this->args)) {
 			$this->__interactive();
 		}
@@ -165,8 +167,6 @@ class ModelTask extends Shell {
  * @access private
  */
 	function __interactive() {
-		App::import('Model', 'Model', false);
-
 		$this->hr();
 		$this->out(sprintf("Bake Model\nPath: %s", $this->path));
 		$this->hr();

From b39b38aac99909b1cc8a9b2b0486c6563f5c8e60 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 10 Nov 2009 09:17:54 -0500
Subject: [PATCH 027/112] Adding missing variable. Adding Test case for
 previous commit.

---
 cake/console/libs/tasks/project.php                  | 3 ++-
 cake/tests/cases/console/libs/tasks/project.test.php | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index 388276e60..de2b91e68 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -236,7 +236,8 @@ class ProjectTask extends Shell {
 			$File =& new File($path . 'webroot' . DS . 'test.php');
 			$contents = $File->read();
 			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
-				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', ". (strpos(CAKE_CORE_INCLUDE_PATH, '/')===0? " DS . '":"'") . str_replace('/', '\' . DS . \'', trim(CAKE_CORE_INCLUDE_PATH, '/')) . "');", $contents);
+				$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', " . $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "');", $contents);
 				if (!$File->write($result)) {
 					return false;
 				}
diff --git a/cake/tests/cases/console/libs/tasks/project.test.php b/cake/tests/cases/console/libs/tasks/project.test.php
index d86dd447d..7190f35da 100644
--- a/cake/tests/cases/console/libs/tasks/project.test.php
+++ b/cake/tests/cases/console/libs/tasks/project.test.php
@@ -144,6 +144,10 @@ class ProjectTaskTest extends CakeTestCase {
 		$file =& new File($path . 'webroot' . DS . 'index.php');
 		$contents = $file->read();
 		$this->assertNoPattern('/define\(\'CAKE_CORE_INCLUDE_PATH\', \'ROOT/', $contents);
+
+		$file =& new File($path . 'webroot' . DS . 'test.php');
+		$contents = $file->read();
+		$this->assertNoPattern('/define\(\'CAKE_CORE_INCLUDE_PATH\', \'ROOT/', $contents);
 	}
 
 /**

From 0d37beca754d0e31baaed775e4d83310147d8bc1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 10 Nov 2009 09:23:43 -0500
Subject: [PATCH 028/112] Removing duplicate variable assignment.

---
 cake/console/libs/tasks/project.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index de2b91e68..6194fab31 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -236,7 +236,6 @@ class ProjectTask extends Shell {
 			$File =& new File($path . 'webroot' . DS . 'test.php');
 			$contents = $File->read();
 			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
-				$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
 				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', " . $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "');", $contents);
 				if (!$File->write($result)) {
 					return false;

From db526ddfb7baf86919090e6b2379828a09d32906 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Tue, 10 Nov 2009 09:15:10 +0100
Subject: [PATCH 029/112] Fixing docblock in bootstrap.php, adding missing
 quote.

refs #280

Signed-off-by: Mark Story <mark@mark-story.com>
---
 app/config/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index 861972966..40f33296c 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -29,7 +29,7 @@
  *     'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
  *     'models' =>  array('/full/path/to/models/', '/next/full/path/to/models/'),
  *     'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
- *     'controllers' => array(/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ *     'controllers' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
  *     'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
  *     'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
  *     'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),

From 63ee8f0fcdf1903851a6a90c11b15383aa042079 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 10 Nov 2009 21:20:39 -0500
Subject: [PATCH 030/112] Starting pass through validation handling.
 Implemented phone, and postal pass throughs. Adding tests.

---
 cake/libs/validation.php                  | 38 +++++++++++++++++++++--
 cake/tests/cases/libs/validation.test.php | 34 ++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 643cf3d1c..8f5c59694 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -672,12 +672,16 @@ class Validation extends Object {
 		if (is_null($_this->regex)) {
 			switch ($_this->country) {
 				case 'us':
+				case 'all':
+				case 'can':
 				// includes all NANPA members. see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories
-				default:
 					$_this->regex  = '/^(?:\+?1)?[-. ]?\\(?[2-9][0-8][0-9]\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$/';
 				break;
 			}
 		}
+		if (empty($_this->regex)) {
+			return $_this->_pass('phone', $check, $country);
+		}
 		return $_this->_check();
 	}
 
@@ -698,6 +702,9 @@ class Validation extends Object {
 		if (is_array($check)) {
 			$_this->_extract($check);
 		}
+		if (empty($country)) {
+			$_this->country = 'us';
+		}
 
 		if (is_null($_this->regex)) {
 			switch ($_this->country) {
@@ -715,11 +722,13 @@ class Validation extends Object {
 					$_this->regex  = '/^[1-9]{1}[0-9]{3}$/i';
 					break;
 				case 'us':
-				default:
 					$_this->regex  = '/\\A\\b[0-9]{5}(?:-[0-9]{4})?\\b\\z/i';
 					break;
 			}
 		}
+		if (empty($_this->regex)) {
+			return $_this->_pass('postal', $check, $country);
+		}
 		return $_this->_check();
 	}
 
@@ -834,6 +843,31 @@ class Validation extends Object {
 		return call_user_func_array(array(&$object, $method), array($check, $args));
 	}
 
+/**
+ * Attempts to pass unhandled Validation locales to a class starting with $classPrefix
+ * and ending with Validation.  For example $classPrefix = 'nl', the class would be
+ * `NlValidation`.
+ *
+ * @param string $method The method to call on the other class.
+ * @param mixed $check The value to check or an array of parameters for the method to be called.
+ * @param string $classPrefix The prefix for the class to do the validation.
+ * @return mixed Return of Passed method, false on failure
+ * @access protected
+ **/
+	function _pass($method, $check, $classPrefix) {
+		$className = ucwords($classPrefix) . 'Validation';
+		if (!class_exists($className)) {
+			trigger_error(sprintf(__('Could not find %s class, unable to complete validation.', true), $className), E_USER_WARNING);
+			return false;
+		}
+		if (!method_exists($className, $method)) {
+			trigger_error(sprintf(__('Method %s does not exist on %s unable to complete validation.', true), $method, $className), E_USER_WARNING);
+			return false;
+		}
+		$check = (array)$check;
+		return call_user_func_array(array($className, $method), $check);
+	}
+
 /**
  * Runs a regular expression match.
  *
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 768c78991..aafef8988 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -41,6 +41,25 @@ class CustomValidator {
 	}
 }
 
+/**
+ * TestNlValidation class
+ *
+ * Used to test pass through of Validation
+ *
+ * @package cake.tests.cases.libs
+ */
+class TestNlValidation {
+/**
+ * postal function, for testing postal pass through.
+ *
+ * @param string $check
+ * @return void
+ */
+	function postal($check) {
+		return true;
+	}
+}
+
 /**
  * Test Case for Validation Class
  *
@@ -1998,6 +2017,21 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::postal('13089-3333'));
 	}
 
+/**
+ * test the pass through calling of an alternate locale with postal()
+ *
+ * @return void
+ **/
+	function testPassThroughMethod() {
+		$this->assertTrue(Validation::postal('text', null, 'testNl'));
+
+		$this->expectError('Could not find AUTOFAILValidation class, unable to complete validation.');
+		Validation::postal('text', null, 'AUTOFAIL');
+
+		$this->expectError('Method phone does not exist on TestNlValidation unable to complete validation.');
+		Validation::phone('text', null, 'testNl');
+	}
+
 /**
  * testSsn method
  *

From 47e6f332d7264ddfe3345a5c853e6a59edfc056d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 10 Nov 2009 23:35:45 -0500
Subject: [PATCH 031/112] Reformatting doc blocks.

---
 cake/libs/validation.php | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 8f5c59694..c4d97b6ef 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -213,8 +213,8 @@ class Validation extends Object {
  *
  * @param mixed $check credit card number to validate
  * @param mixed $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit cards
- * 							if an array is used only the values of the array are checked.
- * 							Example: array('amex', 'bankcard', 'maestro')
+ *    if an array is used only the values of the array are checked.
+ *    Example: array('amex', 'bankcard', 'maestro')
  * @param boolean $deep set to true this will check the Luhn algorithm of the credit card.
  * @param string $regex A custom regex can also be passed, this will be used instead of the defined regex values
  * @return boolean Success
@@ -608,12 +608,14 @@ class Validation extends Object {
 /**
  * Validate a multiple select.
  *
+ * Valid Options 
+ * 
+ * - in => provide a list of choices that selections must be made from
+ * - max => maximun number of non-zero choices that can be made
+ * - min => minimum number of non-zero choices that can be made
+ *
  * @param mixed $check Value to check
  * @param mixed $options Options for the check.
- * 	Valid options
- *	  in => provide a list of choices that selections must be made from
- *	  max => maximun number of non-zero choices that can be made
- * 	  min => minimum number of non-zero choices that can be made
  * @return boolean Success
  * @access public
  */
@@ -792,13 +794,14 @@ class Validation extends Object {
  * Checks that a value is a valid URL according to http://www.w3.org/Addressing/URL/url-spec.txt
  *
  * The regex checks for the following component parts:
- * 	a valid, optional, scheme
- * 		a valid ip address OR
- * 		a valid domain name as defined by section 2.3.1 of http://www.ietf.org/rfc/rfc1035.txt
- *	  with an optional port number
- *	an optional valid path
- *	an optional query string (get parameters)
- *	an optional fragment (anchor tag)
+ *
+ * - a valid, optional, scheme
+ * - a valid ip address OR 
+ *   a valid domain name as defined by section 2.3.1 of http://www.ietf.org/rfc/rfc1035.txt
+ *   with an optional port number
+ * - an optional valid path
+ * - an optional query string (get parameters)
+ * - an optional fragment (anchor tag)
  *
  * @param string $check Value to check
  * @param boolean $strict Require URL to be prefixed by a valid scheme (one of http(s)/ftp(s)/file/news/gopher)

From 61d56cd2754470f1fe6fb834d8600f19c5f092fd Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 11 Nov 2009 09:56:35 -0500
Subject: [PATCH 032/112] Changing order of text in project task. Making
 ProjectTask::getPrefix silent when interactive = false. Making ProjectTask
 silent from View task if all or a controller name is provided.

---
 cake/console/libs/tasks/project.php | 33 ++++++++++++++++++-----------
 cake/console/libs/tasks/view.php    |  1 +
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index 6194fab31..9ed44c6a6 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -281,30 +281,39 @@ class ProjectTask extends Shell {
 		$admin = '';
 		$prefixes = Configure::read('Routing.prefixes');
 		if (!empty($prefixes)) {
+			if ($this->interactive) {
+				$this->out();
+				$this->out(__('You have more than one routing prefix configured', true));
+			}
 			if (count($prefixes) == 1) {
 				return $prefixes[0] . '_';
 			}
 			$options = array();
 			foreach ($prefixes as $i => $prefix) {
 				$options[] = $i + 1;
-				$this->out($i + 1 . '. ' . $prefix);
+				if ($this->interactive) {
+					$this->out($i + 1 . '. ' . $prefix);
+				}
 			}
 			$selection = $this->in(__('Please choose a prefix to bake with.', true), $options, 1);
 			return $prefixes[$selection - 1] . '_';
 		}
-
-		$this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.');
-		$this->out(__('What would you like the prefix route to be?', true));
-		$this->out(__('Example: www.example.com/admin/controller', true));
-		while ($admin == '') {
-			$admin = $this->in(__("What would you like the prefix route to be?", true), null, 'admin');
-		}
-		if ($this->cakeAdmin($admin) !== true) {
-			$this->out(__('Unable to write to /app/config/core.php.', true));
+		if ($this->interactive) {
+			$this->hr();
 			$this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.');
-			$this->_stop();
+			$this->out(__('What would you like the prefix route to be?', true));
+			$this->out(__('Example: www.example.com/admin/controller', true));
+			while ($admin == '') {
+				$admin = $this->in(__("Enter a routing prefix:", true), null, 'admin');
+			}
+			if ($this->cakeAdmin($admin) !== true) {
+				$this->out(__('Unable to write to /app/config/core.php.', true));
+				$this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.');
+				$this->_stop();
+			}
+			return $admin . '_';
 		}
-		return $admin . '_';
+		return '';
 	}
 
 /**
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index 1bad40f5a..e330775b2 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -112,6 +112,7 @@ class ViewTask extends Shell {
 		$this->controllerName = Inflector::camelize($this->args[0]);
 		$this->controllerPath = Inflector::underscore($this->controllerName);
 
+		$this->Project->interactive = false;
 		if (strtolower($this->args[0]) == 'all') {
 			return $this->all();
 		}

From 8cab87fd8e8f8a7b18877063671d4058b6ed7b24 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Wed, 11 Nov 2009 20:14:24 -0200
Subject: [PATCH 033/112] Fixing fixtures path when using a fixture inside a
 plugin.

---
 cake/tests/lib/cake_test_case.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index b290778ce..55f9dd4c0 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -765,11 +765,10 @@ class CakeTestCase extends UnitTestCase {
 				$pluginName = $parts[1];
 				$fixture = $parts[2];
 				$fixturePaths = array(
-					APP . 'plugins' . DS . $pluginName . DS . 'tests' . DS . 'fixtures',
+					App::pluginPath($pluginName) . 'tests' . DS . 'fixtures',
 					TESTS . 'fixtures',
 					VENDORS . 'tests' . DS . 'fixtures'
 				);
-				$fixturesPaths[0] = App::pluginPath($pluginName) . DS . 'tests' . DS . 'fixtures';
 			} else {
 				$fixturePaths = array(
 					TESTS . 'fixtures',

From 2ea6047c80b556614d131facb98c59f26e0cae35 Mon Sep 17 00:00:00 2001
From: slunicko <sluniicko@gmail.com>
Date: Thu, 12 Nov 2009 05:03:57 +0100
Subject: [PATCH 034/112] Fixing deprecated Routing.admin usage in
 config/core.php

---
 app/config/core.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/config/core.php b/app/config/core.php
index 1f5751f23..dde3ee4b2 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -72,15 +72,15 @@
 /**
  * Uncomment the define below to use CakePHP admin routes.
  *
- * The value of the define determines the name of the route
- * and its associated controller actions:
+ * The value of the define determines the names of the routes
+ * and their associated controller actions:
  *
  * 'admin' -> admin_index() and /admin/controller/index
  * 'superuser' -> superuser_index() and /superuser/controller/index
  *
  * [Note Routing.admin is deprecated in 1.3.  Use Routing.prefixes instead]
  */
-	//Configure::write('Routing.admin', 'admin');
+	//Configure::write('Routing.prefixes', array('admin'));
 
 /**
  * Uncomment the define below to use CakePHP prefix routes.

From 38f578199de3ff6b6debbe8c17d73762354fd6d0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 12 Nov 2009 09:32:45 -0500
Subject: [PATCH 035/112] Changing new Model() for ClassRegistry::init(). Fixes
 issues when baking admin and non-admin methods for a controller that uses
 bound translations + TranslateBehavior.  Fixes #245

---
 cake/console/libs/tasks/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index efc363106..c49735ed8 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -252,7 +252,7 @@ class ControllerTask extends Shell {
 			exit;
 		}
 		$actions = null;
-		$modelObj =& new $currentModelName();
+		$modelObj =& ClassRegistry::init($currentModelName);
 		$controllerPath = $this->_controllerPath($controllerName);
 		$pluralName = $this->_pluralName($currentModelName);
 		$singularName = Inflector::variable($currentModelName);

From 1c8a2f232bbe66cce3d0915b7f91d5b1ad16b100 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Thu, 10 Sep 2009 09:28:55 -0400
Subject: [PATCH 036/112] Changes Model::find() to allow modification of
 DataSource connection during callbacks.

---
 cake/libs/model/model.php                       |  4 +++-
 cake/tests/cases/libs/model/model_read.test.php | 17 +++++++++++++++++
 cake/tests/cases/libs/model/models.php          | 12 ++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 84b096fbe..4f1934def 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1948,7 +1948,6 @@ class Model extends Overloadable {
 			list($type, $query) = array($conditions, $fields);
 		}
 
-		$db =& ConnectionManager::getDataSource($this->useDbConfig);
 		$this->findQueryType = $type;
 		$this->id = $this->getID();
 
@@ -1995,6 +1994,9 @@ class Model extends Overloadable {
 			}
 		}
 
+		if (!$db =& ConnectionManager::getDataSource($this->useDbConfig)) {
+			return false;
+		}
 		$results = $db->read($this, $query);
 		$this->resetAssociations();
 		$this->findQueryType = null;
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index eec0cfe70..74def2ae4 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -4899,6 +4899,23 @@ class ModelReadTest extends BaseModelTest {
 		$expected = array('mariano', 'nate', 'larry', 'garrett');
 		$this->assertEqual($result, $expected);
 	}
+
+	/**
+	 * Tests that the database configuration assigned to the model can be changed using
+	 * (before|after)Find callbacks
+	 *
+	 * @return void
+	 */
+	function testCallbackSourceChange() {
+		$this->loadFixtures('Post');
+		$TestModel = new Post();
+		$this->assertEqual(3, count($TestModel->find('all')));
+
+		$this->expectError(new PatternExpectation('/Non-existent data source foo/i'));
+		$this->expectError(new PatternExpectation('/Only variable references/i'));
+		$this->assertFalse($TestModel->find('all', array('connection' => 'foo')));
+	}
+
 /**
  * testMultipleBelongsToWithSameClass method
  *
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index f601b82aa..086eda794 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -763,6 +763,18 @@ class Post extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Author');
+
+	function beforeFind($queryData) {
+		if (isset($queryData['connection'])) {
+			$this->useDbConfig = $queryData['connection'];
+		}
+		return true;
+	}
+
+	function afterFind($results) {
+		$this->useDbConfig = 'test_suite';
+		return $results;
+	}
 }
 /**
  * Author class

From 2c5fa171e0aced91a2e47378507ad46ef981f790 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 00:43:40 -0500
Subject: [PATCH 037/112] Updating CakeSchema to pass a Model object into
 DboSource::fullTableName(); Fixes schema's not correctly reading
 tablePrefixes. Fixes #290

---
 cake/libs/model/cake_schema.php                  |  2 +-
 cake/tests/cases/libs/model/cake_schema.test.php | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
index 28008cbd2..989a529f0 100644
--- a/cake/libs/model/cake_schema.php
+++ b/cake/libs/model/cake_schema.php
@@ -245,7 +245,7 @@ class CakeSchema extends Object {
 
 				if (is_object($Object) && $Object->useTable !== false) {
 					$Object->setDataSource($connection);
-					$table = $db->fullTableName($Object->useTable, false);
+					$table = $db->fullTableName($Object, false);
 
 					if (in_array($table, $currentTables)) {
 						$key = array_search($table, $currentTables);
diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php
index 7b00d7b39..0a2dac13a 100644
--- a/cake/tests/cases/libs/model/cake_schema.test.php
+++ b/cake/tests/cases/libs/model/cake_schema.test.php
@@ -457,8 +457,17 @@ class CakeSchemaTest extends CakeTestCase {
 		ConnectionManager::create('schema_prefix', $config);
 		$read = $this->Schema->read(array('connection' => 'schema_prefix', 'models' => false));
 		$this->assertTrue(empty($read['tables']));
-	}
 
+		$SchemaPost =& ClassRegistry::init('SchemaPost');
+		$SchemaPost->table = 'sts';
+		$SchemaPost->tablePrefix = 'po';
+		$read = $this->Schema->read(array(
+			'connection' => 'test_suite',
+			'name' => 'TestApp',
+			'models' => array('SchemaPost')
+		));
+		$this->assertFalse(isset($read['tables']['missing']['posts']), 'Posts table was not read from tablePrefix %s');
+	}
 /**
  * test reading schema from plugins.
  *

From 13f9b79dc92fc81fa1dfc83c0e694c0a4c03bf25 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 09:15:31 -0500
Subject: [PATCH 038/112] Removing console/libs/templates.  Has been moved in
 1.3 and a merge with 1.2 added it again.

---
 cake/console/libs/templates/skel/views/layouts/xml/default.ctp | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 cake/console/libs/templates/skel/views/layouts/xml/default.ctp

diff --git a/cake/console/libs/templates/skel/views/layouts/xml/default.ctp b/cake/console/libs/templates/skel/views/layouts/xml/default.ctp
deleted file mode 100644
index 566ca2158..000000000
--- a/cake/console/libs/templates/skel/views/layouts/xml/default.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php echo $xml->header(); ?>
-<?php echo $content_for_layout; ?>
\ No newline at end of file

From ea482442ffa046117b9e6d49cad2c99ce7d643b6 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Fri, 13 Nov 2009 14:23:33 +0100
Subject: [PATCH 039/112] test to prove ticket #291

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/tests/cases/libs/inflector.test.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index 2c293bb53..3823dbc72 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -109,6 +109,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::singularize('faxes'), 'fax');
 		$this->assertEqual(Inflector::singularize('waxes'), 'wax');
 		$this->assertEqual(Inflector::singularize('waves'), 'wave');
+		$this->assertEqual(Inflector::singularize('bureaus'), 'bureau');
 		$this->assertEqual(Inflector::singularize(''), '');
 	}
 /**
@@ -153,6 +154,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::pluralize('glove'), 'gloves');
 		$this->assertEqual(Inflector::pluralize('crisis'), 'crises');
 		$this->assertEqual(Inflector::pluralize('wave'), 'waves');
+		$this->assertEqual(Inflector::pluralize('bureau'), 'bureaus');
 		$this->assertEqual(Inflector::pluralize(''), '');
 	}
 /**
@@ -228,6 +230,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::classify('artists_genres'), 'ArtistsGenre');
 		$this->assertEqual(Inflector::classify('file_systems'), 'FileSystem');
 		$this->assertEqual(Inflector::classify('news'), 'News');
+		$this->assertEqual(Inflector::classify('bureaus'), 'Bureau');
 	}
 /**
  * testTableNaming method
@@ -239,6 +242,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::tableize('ArtistsGenre'), 'artists_genres');
 		$this->assertEqual(Inflector::tableize('FileSystem'), 'file_systems');
 		$this->assertEqual(Inflector::tableize('News'), 'news');
+		$this->assertEqual(Inflector::tableize('Bureau'), 'bureaus');
 	}
 /**
  * testHumanization method

From a67a97722a40283f0f3a430fdf0ac12ac095b4c3 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Fri, 13 Nov 2009 14:36:33 +0100
Subject: [PATCH 040/112] refs #291

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/inflector.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 71f07b4e3..863072dfd 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -305,6 +305,7 @@ class Inflector extends Object {
 			'/(m)en$/i' => '\1an',
 			'/(c)hildren$/i' => '\1\2hild',
 			'/(n)ews$/i' => '\1\2ews',
+			'/eaus$/' => 'eau',
 			'/^(.*us)$/' => '\\1',
 			'/s$/i' => '');
 

From d302ed1bfa86fe24a1c441c50a790ee4c364fd49 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 09:44:51 -0500
Subject: [PATCH 041/112] Fixing comment block formatting.

---
 cake/tests/cases/libs/model/model_read.test.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 74def2ae4..2a183d159 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -4899,13 +4899,12 @@ class ModelReadTest extends BaseModelTest {
 		$expected = array('mariano', 'nate', 'larry', 'garrett');
 		$this->assertEqual($result, $expected);
 	}
-
-	/**
-	 * Tests that the database configuration assigned to the model can be changed using
-	 * (before|after)Find callbacks
-	 *
-	 * @return void
-	 */
+/**
+ * Tests that the database configuration assigned to the model can be changed using
+ * (before|after)Find callbacks
+ *
+ * @return void
+ */
 	function testCallbackSourceChange() {
 		$this->loadFixtures('Post');
 		$TestModel = new Post();
@@ -4915,7 +4914,6 @@ class ModelReadTest extends BaseModelTest {
 		$this->expectError(new PatternExpectation('/Only variable references/i'));
 		$this->assertFalse($TestModel->find('all', array('connection' => 'foo')));
 	}
-
 /**
  * testMultipleBelongsToWithSameClass method
  *

From 8d407ac9152e587347457461487bf7e0a7ee0012 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 09:45:25 -0500
Subject: [PATCH 042/112] Adding test to form helper to increase code coverage.

---
 cake/tests/cases/libs/view/helpers/form.test.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index a0241322f..c1d90823a 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -4633,6 +4633,21 @@ class FormHelperTest extends CakeTestCase {
 			'/fieldset'
 		);
 		$this->assertTags($result, $expected);
+
+		$this->Form->data = array();
+		$this->Form->params['controller'] = 'contacts';
+		$this->Form->params['models'] = array('Contact');
+		$result = $this->Form->create(array('url' => array('action' => 'index', 'param')));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param'
+			),
+			'fieldset' => array('style' => 'preg:/display\s*\:\s*none;\s*/'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+		
 	}
 /**
  * Test base form url when url param is passed with multiple parameters (&)

From bfde6b81fefd882f7bec8c365dbb4bbf8cb320fb Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 09:45:25 -0500
Subject: [PATCH 043/112] Adding test to form helper to increase code coverage.

---
 cake/tests/cases/libs/view/helpers/form.test.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 471573250..81a8b032a 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -5049,6 +5049,21 @@ class FormHelperTest extends CakeTestCase {
 			'/fieldset'
 		);
 		$this->assertTags($result, $expected);
+
+		$this->Form->data = array();
+		$this->Form->params['controller'] = 'contacts';
+		$this->Form->params['models'] = array('Contact');
+		$result = $this->Form->create(array('url' => array('action' => 'index', 'param')));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param'
+			),
+			'fieldset' => array('style' => 'preg:/display\s*\:\s*none;\s*/'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+		
 	}
 
 /**

From d93c94f70249236790adca70b94338e95b2fc4c5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 09:53:31 -0500
Subject: [PATCH 044/112] Fixing failing test, picked in from 1.2.

---
 cake/libs/view/helpers/form.php                  | 3 ++-
 cake/tests/cases/libs/view/helpers/form.test.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 002f86622..8fb6888cf 100755
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -172,7 +172,8 @@ class FormHelper extends AppHelper {
 		if (is_array($model) && empty($options)) {
 			$options = $model;
 			$model = null;
-		} elseif (empty($model) && $model !== false && !empty($this->params['models'])) {
+		}
+		if (empty($model) && $model !== false && !empty($this->params['models'])) {
 			$model = $this->params['models'][0];
 			$this->defaultModel = $this->params['models'][0];
 		} elseif (empty($model) && empty($this->params['models'])) {
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 81a8b032a..2f46d62b5 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -5056,14 +5056,14 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->create(array('url' => array('action' => 'index', 'param')));
 		$expected = array(
 			'form' => array(
-				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param'
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param',
+				'accept-charset' => 'utf-8'
 			),
 			'fieldset' => array('style' => 'preg:/display\s*\:\s*none;\s*/'),
 			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
 			'/fieldset'
 		);
 		$this->assertTags($result, $expected);
-		
 	}
 
 /**

From 360ea2a46a6ee55a1e5cae9a4da567dd69afb862 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 10:24:36 -0500
Subject: [PATCH 045/112] Adding extract task to Console Group test.

---
 cake/tests/groups/console.group.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cake/tests/groups/console.group.php b/cake/tests/groups/console.group.php
index 209ddaca0..4f632fbaf 100644
--- a/cake/tests/groups/console.group.php
+++ b/cake/tests/groups/console.group.php
@@ -53,16 +53,16 @@ class ConsoleGroupTest extends TestSuite {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'shell');
 
 		$path = CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'tasks' . DS;
-
+		
 		TestManager::addTestFile($this, $path . 'controller');
-		TestManager::addTestFile($this, $path . 'model');
-		TestManager::addTestFile($this, $path . 'view');
-		TestManager::addTestFile($this, $path . 'fixture');
-		TestManager::addTestFile($this, $path . 'test');
 		TestManager::addTestFile($this, $path . 'db_config');
+		TestManager::addTestFile($this, $path . 'extract');
+		TestManager::addTestFile($this, $path . 'fixture');
+		TestManager::addTestFile($this, $path . 'model');
 		TestManager::addTestFile($this, $path . 'plugin');
 		TestManager::addTestFile($this, $path . 'project');
-		
+		TestManager::addTestFile($this, $path . 'test');
+		TestManager::addTestFile($this, $path . 'view');
 	}
 }
 ?>
\ No newline at end of file

From ffbd6f5dc81534366b64f09e2c03afb9c6c2de52 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 10:26:57 -0500
Subject: [PATCH 046/112] Removing duplicated section.

---
 app/config/core.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/config/core.php b/app/config/core.php
index dde3ee4b2..3deed81c8 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -70,21 +70,11 @@
 	//Configure::write('App.baseUrl', env('SCRIPT_NAME'));
 
 /**
- * Uncomment the define below to use CakePHP admin routes.
+ * Uncomment the define below to use CakePHP prefix routes.
  *
  * The value of the define determines the names of the routes
  * and their associated controller actions:
  *
- * 'admin' -> admin_index() and /admin/controller/index
- * 'superuser' -> superuser_index() and /superuser/controller/index
- *
- * [Note Routing.admin is deprecated in 1.3.  Use Routing.prefixes instead]
- */
-	//Configure::write('Routing.prefixes', array('admin'));
-
-/**
- * Uncomment the define below to use CakePHP prefix routes.
- *
  * Set to an array of prefixes you want to use in your application. Use for 
  * admin or other prefixed routes.
  *
@@ -93,6 +83,8 @@
  * Enables:
  *	`admin_index()` and `/admin/controller/index`
  *	`manager_index()` and `/manager/controller/index`
+ *
+ * [Note Routing.admin is deprecated in 1.3.  Use Routing.prefixes instead]
  */
 	//Configure::write('Routing.prefixes', array('admin'));
 

From 9376826aa4232a103494166de1a60a84671c2064 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 14:42:40 -0500
Subject: [PATCH 047/112] Fixing HttpSocket::buildUri when host key is empty.
 Tests added Fixes #271

---
 cake/libs/http_socket.php                  | 4 ++--
 cake/tests/cases/libs/http_socket.test.php | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index 793618ece..97d2e080b 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -564,7 +564,8 @@ class HttpSocket extends CakeSocket {
 		$stripIfEmpty = array(
 			'query' => '?%query',
 			'fragment' => '#%fragment',
-			'user' => '%user:%pass@'
+			'user' => '%user:%pass@',
+			'host' => '%host:%port/'
 		);
 
 		foreach ($stripIfEmpty as $key => $strip) {
@@ -577,7 +578,6 @@ class HttpSocket extends CakeSocket {
 		if (array_key_exists($uri['scheme'], $defaultPorts) && $defaultPorts[$uri['scheme']] == $uri['port']) {
 			$uriTemplate = str_replace(':%port', null, $uriTemplate);
 		}
-
 		foreach ($uri as $property => $value) {
 			$uriTemplate = str_replace('%'.$property, $value, $uriTemplate);
 		}
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index 2dbc193d9..581e1c697 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -925,6 +925,9 @@ class HttpSocketTest extends CakeTestCase {
 		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'port' => 23));
 		$this->assertIdentical($r, 'http://www.cakephp.org:23/');
 
+		$r = $this->Socket->buildUri(array('path' => 'www.google.com/search', 'query' => 'q=cakephp'));
+		$this->assertIdentical($r, 'http://www.google.com/search?q=cakephp');
+
 		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'scheme' => 'https', 'port' => 79));
 		$this->assertIdentical($r, 'https://www.cakephp.org:79/');
 

From 5092262d4d390bddf524f41145b1fcd0815866a9 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sat, 14 Nov 2009 23:18:31 +1100
Subject: [PATCH 048/112] Reformatting and adding missing documentation blocks.

---
 cake/tests/cases/console/cake.test.php        |  38 ++--
 cake/tests/cases/console/libs/acl.test.php    |  47 +++--
 cake/tests/cases/console/libs/api.test.php    |   2 +-
 cake/tests/cases/console/libs/bake.test.php   |  15 +-
 cake/tests/cases/console/libs/schema.test.php |  47 +++--
 cake/tests/cases/console/libs/shell.test.php  |   8 +-
 .../console/libs/tasks/controller.test.php    |  51 +++--
 .../console/libs/tasks/db_config.test.php     |   9 +-
 .../cases/console/libs/tasks/fixture.test.php |  36 ++--
 .../cases/console/libs/tasks/model.test.php   |  80 ++++---
 .../cases/console/libs/tasks/plugin.test.php  |  18 +-
 .../cases/console/libs/tasks/project.test.php |  24 ++-
 .../console/libs/tasks/template.test.php      |  15 +-
 .../cases/console/libs/tasks/test.test.php    | 198 +++++++++++++++---
 .../cases/console/libs/tasks/view.test.php    | 186 ++++++++++++++--
 15 files changed, 591 insertions(+), 183 deletions(-)

diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php
index ffec66489..317afe851 100644
--- a/cake/tests/cases/console/cake.test.php
+++ b/cake/tests/cases/console/cake.test.php
@@ -83,8 +83,8 @@ class TestShellDispatcher extends ShellDispatcher {
 /**
  * _initEnvironment method
  *
- * @access protected
  * @return void
+ * @access protected
  */
 	function _initEnvironment() {
 	}
@@ -92,8 +92,8 @@ class TestShellDispatcher extends ShellDispatcher {
 /**
  * stderr method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function stderr($string) {
 		$this->stderr .= rtrim($string, ' ');
@@ -102,8 +102,8 @@ class TestShellDispatcher extends ShellDispatcher {
 /**
  * stdout method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function stdout($string, $newline = true) {
 		if ($newline) {
@@ -116,8 +116,8 @@ class TestShellDispatcher extends ShellDispatcher {
 /**
  * clear method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function clear() {
 
@@ -126,8 +126,8 @@ class TestShellDispatcher extends ShellDispatcher {
 /**
  * _stop method
  *
- * @access protected
  * @return void
+ * @access protected
  */
 	function _stop($status = 0) {
 		$this->stopped = 'Stopped with status: ' . $status;
@@ -138,8 +138,8 @@ class TestShellDispatcher extends ShellDispatcher {
  * getShell
  *
  * @param mixed $plugin
- * @access public
  * @return mixed
+ * @access public
  */
 	function getShell($plugin = null) {
 		return $this->_getShell($plugin);
@@ -149,8 +149,8 @@ class TestShellDispatcher extends ShellDispatcher {
  * _getShell
  *
  * @param mixed $plugin
- * @access protected
  * @return mixed
+ * @access protected
  */
 	function _getShell($plugin = null) {
 		if (isset($this->TestShell)) {
@@ -171,8 +171,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * setUp method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function setUp() {
 		App::build(array(
@@ -189,8 +189,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * tearDown method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function tearDown() {
 		App::build();
@@ -199,8 +199,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * testParseParams method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParams() {
 		$Dispatcher =& new TestShellDispatcher();
@@ -458,8 +458,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * testBuildPaths method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBuildPaths() {
 		$Dispatcher =& new TestShellDispatcher();
@@ -481,8 +481,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * Verify loading of (plugin-) shells
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testGetShell() {
 		$this->skipIf(class_exists('SampleShell'), '%s SampleShell Class already loaded');
@@ -510,8 +510,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * Verify correct dispatch of Shell subclasses with a main method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatchShellWithMain() {
 		Mock::generate('Shell', 'MockWithMainShell', array('main', '_secret'));
@@ -601,8 +601,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * Verify correct dispatch of Shell subclasses without a main method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatchShellWithoutMain() {
 		Mock::generate('Shell', 'MockWithoutMainShell', array('initDb', '_secret'));
@@ -673,8 +673,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * Verify correct dispatch of custom classes with a main method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatchNotAShellWithMain() {
 		Mock::generate('Object', 'MockWithMainNotAShell',
@@ -753,8 +753,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * Verify correct dispatch of custom classes without a main method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatchNotAShellWithoutMain() {
 		Mock::generate('Object', 'MockWithoutMainNotAShell',
@@ -824,8 +824,8 @@ class ShellDispatcherTest extends CakeTestCase {
  * Verify that a task is called instead of the shell if the first arg equals
  * the name of the task
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatchTask() {
 		Mock::generate('Shell', 'MockWeekShell', array('main'));
@@ -872,8 +872,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * Verify shifting of arguments
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testShiftArgs() {
 		$Dispatcher =& new TestShellDispatcher();
@@ -902,8 +902,8 @@ class ShellDispatcherTest extends CakeTestCase {
 /**
  * testHelpCommand method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testHelpCommand() {
 		$Dispatcher =& new TestShellDispatcher();
diff --git a/cake/tests/cases/console/libs/acl.test.php b/cake/tests/cases/console/libs/acl.test.php
index d94e4a5bc..deb23daeb 100644
--- a/cake/tests/cases/console/libs/acl.test.php
+++ b/cake/tests/cases/console/libs/acl.test.php
@@ -52,13 +52,21 @@ Mock::generate('AclComponent', 'MockAclShellAclComponent');
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class AclShellTest extends CakeTestCase {
+
+/**
+ * Fixtures
+ *
+ * @var array
+ * @access public
+ */
 	var $fixtures = array('core.aco', 'core.aro', 'core.aros_aco');
 
 /**
  * configure Configure for testcase
  *
  * @return void
- **/
+ * @access public
+ */
 	function startCase() {
 		$this->_aclDb = Configure::read('Acl.database');
 		$this->_aclClass = Configure::read('Acl.classname');
@@ -71,7 +79,8 @@ class AclShellTest extends CakeTestCase {
  * restore Environment settings
  *
  * @return void
- **/
+ * @access public
+ */
 	function endCase() {
 		Configure::write('Acl.database', $this->_aclDb);
 		Configure::write('Acl.classname', $this->_aclClass);
@@ -107,7 +116,8 @@ class AclShellTest extends CakeTestCase {
  * test that model.foreign_key output works when looking at acl rows
  *
  * @return void
- **/
+ * @access public
+ */
 	function testViewWithModelForeignKeyOutput() {
 		$this->Task->command = 'view';
 		$this->Task->startup();
@@ -132,7 +142,8 @@ class AclShellTest extends CakeTestCase {
  * test view with an argument
  *
  * @return void
- **/
+ * @access public
+ */
 	function testViewWithArgument() {
 		$this->Task->args = array('aro', 'admins');
 		$this->Task->expectAt(0, 'out', array('Aro tree:'));
@@ -146,7 +157,8 @@ class AclShellTest extends CakeTestCase {
  * test the method that splits model.foreign key. and that it returns an array.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testParsingModelAndForeignKey() {
 		$result = $this->Task->parseIdentifier('Model.foreignKey');
 		$expected = array('model' => 'Model', 'foreign_key' => 'foreignKey');
@@ -162,7 +174,8 @@ class AclShellTest extends CakeTestCase {
  * test creating aro/aco nodes
  *
  * @return void
- **/
+ * @access public
+ */
 	function testCreate() {
 		$this->Task->args = array('aro', 'root', 'User.1');
 		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/created/'), '*'));
@@ -202,7 +215,8 @@ class AclShellTest extends CakeTestCase {
  * test the delete method with different node types.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testDelete() {
 		$this->Task->args = array('aro', 'AuthUser.1');
 		$this->Task->expectAt(0, 'out', array(new NoPatternExpectation('/not/'), true));
@@ -217,7 +231,8 @@ class AclShellTest extends CakeTestCase {
  * test setParent method.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testSetParent() {
 		$this->Task->args = array('aro', 'AuthUser.2', 'root');
 		$this->Task->setParent();
@@ -231,7 +246,8 @@ class AclShellTest extends CakeTestCase {
  * test grant
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGrant() {
 		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
 		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/Permission granted/'), true));
@@ -246,7 +262,8 @@ class AclShellTest extends CakeTestCase {
  * test deny
  *
  * @return void
- **/
+ * @access public
+ */
 	function testDeny() {
 		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
 		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/Permission denied/'), true));
@@ -261,7 +278,8 @@ class AclShellTest extends CakeTestCase {
  * test checking allowed and denied perms
  *
  * @return void
- **/
+ * @access public
+ */
 	function testCheck() {
 		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', '*');
 		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/not allowed/'), true));
@@ -284,7 +302,8 @@ class AclShellTest extends CakeTestCase {
  * test inherit and that it 0's the permission fields.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testInherit() {
 		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
 		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/Permission granted/'), true));
@@ -303,7 +322,8 @@ class AclShellTest extends CakeTestCase {
  * test getting the path for an aro/aco
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetPath() {
 		$this->Task->args = array('aro', 'AuthUser.2');
 		$this->Task->expectAt(1, 'out', array('[1] ROOT'));
@@ -311,6 +331,5 @@ class AclShellTest extends CakeTestCase {
 		$this->Task->expectAt(3, 'out', array('    [4] Elrond'));
 		$this->Task->getPath();
 	}
-
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/api.test.php b/cake/tests/cases/console/libs/api.test.php
index f14f51a33..efb216581 100644
--- a/cake/tests/cases/console/libs/api.test.php
+++ b/cake/tests/cases/console/libs/api.test.php
@@ -76,8 +76,8 @@ class ApiShellTest extends CakeTestCase {
 /**
  * Test that method names are detected properly including those with no arguments.
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testMethodNameDetection () {
 		$this->Shell->setReturnValueAt(0, 'in', 'q');
diff --git a/cake/tests/cases/console/libs/bake.test.php b/cake/tests/cases/console/libs/bake.test.php
index cdd42cf39..831456adf 100644
--- a/cake/tests/cases/console/libs/bake.test.php
+++ b/cake/tests/cases/console/libs/bake.test.php
@@ -61,14 +61,16 @@ class BakeShellTestCase extends CakeTestCase {
  * fixtures
  *
  * @var array
- **/
+ * @access public
+ */
 	var $fixtures = array('core.user');
 
 /**
  * start test
  *
  * @return void
- **/
+ * @access public
+ */
 	function startTest() {
 		$this->Dispatch =& new BakeShellMockShellDispatcher();
 		$this->Shell =& new MockBakeShell();
@@ -80,7 +82,8 @@ class BakeShellTestCase extends CakeTestCase {
  * endTest method
  *
  * @return void
- **/
+ * @access public
+ */
 	function endTest() {
 		unset($this->Dispatch, $this->Shell);
 	}
@@ -89,7 +92,8 @@ class BakeShellTestCase extends CakeTestCase {
  * test bake all
  *
  * @return void
- **/
+ * @access public
+ */
 	function testAllWithModelName() {
 		$this->Shell->Model =& new BakeShellMockModelTask();
 		$this->Shell->Controller =& new BakeShellMockControllerTask();
@@ -118,4 +122,5 @@ class BakeShellTestCase extends CakeTestCase {
 		$this->Shell->args = array('User');
 		$this->Shell->all();
 	}
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/schema.test.php b/cake/tests/cases/console/libs/schema.test.php
index 8f7ffd7fa..898b21208 100644
--- a/cake/tests/cases/console/libs/schema.test.php
+++ b/cake/tests/cases/console/libs/schema.test.php
@@ -115,7 +115,14 @@ class SchemaShellTestSchema extends CakeSchema {
  */
 class SchemaShellTest extends CakeTestCase {
 
+/**
+ * Fixtures
+ *
+ * @var array
+ * @access public
+ */
 	var $fixtures = array('core.article', 'core.user', 'core.post', 'core.auth_user');
+
 /**
  * startTest method
  *
@@ -142,7 +149,8 @@ class SchemaShellTest extends CakeTestCase {
  * test startup method
  *
  * @return void
- **/
+ * @access public
+ */
 	function testStartup() {
 		$this->Shell->startup();
 		$this->assertTrue(isset($this->Shell->Schema));
@@ -177,7 +185,8 @@ class SchemaShellTest extends CakeTestCase {
  * Test View - and that it dumps the schema file to stdout
  *
  * @return void
- **/
+ * @access public
+ */
 	function testView() {
 		$this->Shell->startup();
 		$this->Shell->Schema->path = APP . 'config' . DS . 'schema';
@@ -191,7 +200,8 @@ class SchemaShellTest extends CakeTestCase {
  * test that view() can find plugin schema files.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testViewWithPlugins() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
@@ -214,7 +224,8 @@ class SchemaShellTest extends CakeTestCase {
  * test dump() with sql file generation
  *
  * @return void
- **/
+ * @access public
+ */
 	function testDumpWithFileWriting() {
 		$this->Shell->params = array(
 			'name' => 'i18n',
@@ -242,7 +253,8 @@ class SchemaShellTest extends CakeTestCase {
  * test that dump() can find and work with plugin schema files.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testDumpFileWritingWithPlugins() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
@@ -271,6 +283,7 @@ class SchemaShellTest extends CakeTestCase {
  * test generate with snapshot generation
  *
  * @return void
+ * @access public
  */
 	function testGenerateSnaphot() {
 		$this->Shell->path = TMP;
@@ -290,7 +303,8 @@ class SchemaShellTest extends CakeTestCase {
  * test generate without a snapshot.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGenerateNoOverwrite() {
 		touch(TMP . 'schema.php');
 		$this->Shell->params['file'] = 'schema.php';
@@ -309,7 +323,8 @@ class SchemaShellTest extends CakeTestCase {
  * test generate with overwriting of the schema files.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGenerateOverwrite() {
 		touch(TMP . 'schema.php');
 		$this->Shell->params['file'] = 'schema.php';
@@ -334,7 +349,8 @@ class SchemaShellTest extends CakeTestCase {
  * in a plugin.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGenerateWithPlugins() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
@@ -363,7 +379,8 @@ class SchemaShellTest extends CakeTestCase {
  * Test schema run create with no table args.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testCreateNoArgs() {
 		$this->Shell->params = array(
 			'connection' => 'test_suite',
@@ -386,7 +403,8 @@ class SchemaShellTest extends CakeTestCase {
  * Test schema run create with no table args.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testCreateWithTableArgs() {
 		$this->Shell->params = array(
 			'connection' => 'test_suite',
@@ -411,7 +429,8 @@ class SchemaShellTest extends CakeTestCase {
  * test run update with a table arg.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testUpdateWithTable() {
 		$this->Shell->params = array(
 			'connection' => 'test_suite',
@@ -434,7 +453,8 @@ class SchemaShellTest extends CakeTestCase {
  * test that the plugin param creates the correct path in the schema object.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testPluginParam() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
@@ -454,7 +474,8 @@ class SchemaShellTest extends CakeTestCase {
  * test that using Plugin.name with write.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testPluginDotSyntaxWithCreate() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
index f47bceac3..707a04779 100644
--- a/cake/tests/cases/console/libs/shell.test.php
+++ b/cake/tests/cases/console/libs/shell.test.php
@@ -46,7 +46,7 @@ Mock::generatePartial('ShellDispatcher', 'TestShellMockShellDispatcher', array(
  */
 class TestShell extends Shell {
 
-/*
+/**
  * name property
  *
  * @var name
@@ -257,8 +257,8 @@ class ShellTest extends CakeTestCase {
 /**
  * testNl
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testNl() {
 		$this->assertEqual($this->Shell->nl(), "\n");
@@ -271,8 +271,8 @@ class ShellTest extends CakeTestCase {
 /**
  * testHr
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testHr() {
 		$bar = '---------------------------------------------------------------';
@@ -296,8 +296,8 @@ class ShellTest extends CakeTestCase {
 /**
  * testError
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testError() {
 		$this->Shell->Dispatch->expectAt(0, 'stderr', array("Error: Foo Not Found\n"));
diff --git a/cake/tests/cases/console/libs/tasks/controller.test.php b/cake/tests/cases/console/libs/tasks/controller.test.php
index 5b29fc7cc..0a40bb229 100644
--- a/cake/tests/cases/console/libs/tasks/controller.test.php
+++ b/cake/tests/cases/console/libs/tasks/controller.test.php
@@ -88,7 +88,8 @@ class ControllerTaskTest extends CakeTestCase {
  * fixtures
  *
  * @var array
- **/
+ * @access public
+ */
 	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
 
 /**
@@ -124,7 +125,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test ListAll
  *
  * @return void
- **/
+ * @access public
+ */
 	function testListAll() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->interactive = true;
@@ -153,7 +155,8 @@ class ControllerTaskTest extends CakeTestCase {
  * Test that getName interacts with the user and returns the controller name.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetName() {
 		$this->Task->setReturnValue('in', 1);
 
@@ -180,7 +183,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test helper interactions
  *
  * @return void
- **/
+ * @access public
+ */
 	function testDoHelpers() {
 		$this->Task->setReturnValue('in', 'n');
 		$result = $this->Task->doHelpers();
@@ -203,7 +207,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test component interactions
  *
  * @return void
- **/
+ * @access public
+ */
 	function testDoComponents() {
 		$this->Task->setReturnValue('in', 'n');
 		$result = $this->Task->doComponents();
@@ -226,7 +231,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test Confirming controller user interaction
  *
  * @return void
- **/
+ * @access public
+ */
 	function testConfirmController() {
 		$controller = 'Posts';
 		$scaffold = false;
@@ -244,7 +250,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test the bake method
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBake() {
 		$helpers = array('Ajax', 'Time');
 		$components = array('Acl', 'Auth');
@@ -267,7 +274,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test bake() with a -plugin param
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeWithPlugin() {
 		$this->Task->plugin = 'ControllerTest';
 		$helpers = array('Ajax', 'Time');
@@ -289,7 +297,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test that bakeActions is creating the correct controller Code. (Using sessions)
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeActionsUsingSessions() {
 		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
 			'Testing bakeActions requires Article, Comment & Tag Model to be undefined. %s');
@@ -332,7 +341,8 @@ class ControllerTaskTest extends CakeTestCase {
  * Test baking with Controller::flash() or no sessions.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeActionsWithNoSessions() {
 		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
 			'Testing bakeActions requires Article, Tag, Comment Models to be undefined. %s');
@@ -367,7 +377,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test baking a test
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeTest() {
 		$this->Task->plugin = 'ControllerTest';
 		$this->Task->connection = 'test_suite';
@@ -383,7 +394,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test Interactive mode.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testInteractive() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path';
@@ -407,7 +419,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test that execute runs all when the first arg == all
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteIntoAll() {
 		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
 			'Execute into all could not be run as an Article, Tag or Comment model was already loaded. %s');
@@ -432,7 +445,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test that `cake bake controller foos` works.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithController() {
 		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
 			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
@@ -455,7 +469,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test that `cake bake controller foo scaffold` works.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithPublicParam() {
 		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
 			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
@@ -478,7 +493,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test that `cake bake controller foos both` works.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithControllerAndBoth() {
 		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
 			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
@@ -502,7 +518,8 @@ class ControllerTaskTest extends CakeTestCase {
  * test that `cake bake controller foos admin` works.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithControllerAndAdmin() {
 		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
 			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
diff --git a/cake/tests/cases/console/libs/tasks/db_config.test.php b/cake/tests/cases/console/libs/tasks/db_config.test.php
index a637c8403..e28554955 100644
--- a/cake/tests/cases/console/libs/tasks/db_config.test.php
+++ b/cake/tests/cases/console/libs/tasks/db_config.test.php
@@ -104,7 +104,8 @@ class DbConfigTaskTest extends CakeTestCase {
  * Test the getConfig method.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetConfig() {
 		$this->Task->setReturnValueAt(0, 'in', 'otherOne');
 		$result = $this->Task->getConfig();
@@ -115,7 +116,8 @@ class DbConfigTaskTest extends CakeTestCase {
  * test that initialize sets the path up.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testInitialize() {
 		$this->assertTrue(empty($this->Task->path));
 		$this->Task->initialize();
@@ -128,7 +130,8 @@ class DbConfigTaskTest extends CakeTestCase {
  * test execute and by extension __interactive
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteIntoInteractive() {
 		$this->Task->initialize();
 
diff --git a/cake/tests/cases/console/libs/tasks/fixture.test.php b/cake/tests/cases/console/libs/tasks/fixture.test.php
index 926758d19..65678cbd4 100644
--- a/cake/tests/cases/console/libs/tasks/fixture.test.php
+++ b/cake/tests/cases/console/libs/tasks/fixture.test.php
@@ -60,7 +60,8 @@ class FixtureTaskTest extends CakeTestCase {
  * fixtures
  *
  * @var array
- **/
+ * @access public
+ */
 	var $fixtures = array('core.article', 'core.comment', 'core.datatype', 'core.binary_test');
 
 /**
@@ -94,7 +95,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test that initialize sets the path
  *
  * @return void
- **/
+ * @access public
+ */
 	function testConstruct() {
 		$this->Dispatch->params['working'] = DS . 'my' . DS . 'path';
 		$Task =& new FixtureTask($this->Dispatch);
@@ -107,7 +109,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test import option array generation
  *
  * @return void
- **/
+ * @access public
+ */
 	function testImportOptions() {
 		$this->Task->setReturnValueAt(0, 'in', 'y');
 		$this->Task->setReturnValueAt(1, 'in', 'y');
@@ -136,7 +139,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test generating a fixture with database conditions.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testImportRecordsFromDatabaseWithConditions() {
 		$this->Task->setReturnValueAt(0, 'in', 'WHERE 1=1 LIMIT 10');
 		$this->Task->connection = 'test_suite';
@@ -155,7 +159,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test that execute passes runs bake depending with named model.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithNamedModel() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -169,7 +174,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test that execute runs all() when args[0] = all
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteIntoAll() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -189,7 +195,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test using all() with -count and -records
  *
  * @return void
- **/
+ * @access public
+ */
 	function testAllWithCountAndRecordsFlags() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -210,7 +217,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test interactive mode of execute
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteInteractive() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -228,7 +236,8 @@ class FixtureTaskTest extends CakeTestCase {
  * Test that bake works
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBake() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -263,7 +272,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test record generation with float and binary types
  *
  * @return void
- **/
+ * @access public
+ */
 	function testRecordGenerationForBinaryAndFloat() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -279,7 +289,8 @@ class FixtureTaskTest extends CakeTestCase {
  * Test that file generation includes headers and correct path for plugins.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGenerateFixtureFile() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -296,7 +307,8 @@ class FixtureTaskTest extends CakeTestCase {
  * test generating files into plugins.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGeneratePluginFixtureFile() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index 059678ce5..484cbe06c 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -65,7 +65,8 @@ class ModelTaskTest extends CakeTestCase {
  * fixtures
  *
  * @var array
- **/
+ * @access public
+ */
 	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag', 'core.category_thread');
 
 /**
@@ -99,7 +100,8 @@ class ModelTaskTest extends CakeTestCase {
  * Test that listAll scans the database connection and lists all the tables in it.s
  *
  * @return void
- **/
+ * @access public
+ */
 	function testListAll() {
 		$this->Task->expectAt(1, 'out', array('1. Article'));
 		$this->Task->expectAt(2, 'out', array('2. ArticlesTag'));
@@ -126,7 +128,8 @@ class ModelTaskTest extends CakeTestCase {
  * Test that getName interacts with the user and returns the model name.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetName() {
 		$this->Task->setReturnValue('in', 1);
 
@@ -153,7 +156,8 @@ class ModelTaskTest extends CakeTestCase {
  * Test table name interactions
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetTableName() {
 		$this->Task->setReturnValueAt(0, 'in', 'y');
 		$result = $this->Task->getTable('Article', 'test_suite');
@@ -171,7 +175,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that initializing the validations works.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testInitValidations() {
 		$result = $this->Task->initValidations();
 		$this->assertTrue(in_array('notempty', $result));
@@ -182,7 +187,8 @@ class ModelTaskTest extends CakeTestCase {
  * tests the guessing features of validation
  *
  * @return void
- **/
+ * @access public
+ */
 	function testFieldValidationGuessing() {
 		$this->Task->interactive = false;
 		$this->Task->initValidations();
@@ -210,7 +216,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that interactive field validation works and returns multiple validators.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testInteractiveFieldValidation() {
 		$this->Task->initValidations();
 		$this->Task->interactive = true;
@@ -228,7 +235,8 @@ class ModelTaskTest extends CakeTestCase {
  * test the validation Generation routine
  *
  * @return void
- **/
+ * @access public
+ */
 	function testNonInteractiveDoValidation() {
 		$Model =& new MockModelTaskModel();
 		$Model->primaryKey = 'id';
@@ -289,7 +297,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that finding primary key works
  *
  * @return void
- **/
+ * @access public
+ */
 	function testFindPrimaryKey() {
 		$fields = array(
 			'one' => array(),
@@ -307,7 +316,8 @@ class ModelTaskTest extends CakeTestCase {
  * test finding Display field
  *
  * @return void
- **/
+ * @access public
+ */
 	function testFindDisplayField() {
 		$fields = array('id' => array(), 'tagname' => array(), 'body' => array(),
 			'created' => array(), 'modified' => array());
@@ -327,7 +337,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that belongsTo generation works.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBelongsToGeneration() {
 		$model = new Model(array('ds' => 'test_suite', 'name' => 'Comment'));
 		$result = $this->Task->findBelongsTo($model, array());
@@ -347,7 +358,6 @@ class ModelTaskTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 
-
 		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
 		$result = $this->Task->findBelongsTo($model, array());
 		$expected = array(
@@ -366,7 +376,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that hasOne and/or hasMany relations are generated properly.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testHasManyHasOneGeneration() {
 		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
 		$this->Task->connection = 'test_suite';
@@ -390,7 +401,6 @@ class ModelTaskTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 
-
 		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
 		$result = $this->Task->findHasOneAndMany($model, array());
 		$expected = array(
@@ -413,10 +423,11 @@ class ModelTaskTest extends CakeTestCase {
 	}
 
 /**
- * test that habtm generation works
+ * Test that HABTM generation works
  *
  * @return void
- **/
+ * @access public
+ */
 	function testHasAndBelongsToManyGeneration() {
 		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
 		$this->Task->connection = 'test_suite';
@@ -440,7 +451,8 @@ class ModelTaskTest extends CakeTestCase {
  * test non interactive doAssociations
  *
  * @return void
- **/
+ * @access public
+ */
 	function testDoAssociationsNonInteractive() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->interactive = false;
@@ -464,14 +476,14 @@ class ModelTaskTest extends CakeTestCase {
 				),
 			),
 		);
-
 	}
 
 /**
  * Ensure that the fixutre object is correctly called.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeFixture() {
 		$this->Task->Fixture->expectAt(0, 'bake', array('Article', 'articles'));
 		$this->Task->bakeFixture('Article', 'articles');
@@ -484,7 +496,8 @@ class ModelTaskTest extends CakeTestCase {
  * Ensure that the test object is correctly called.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeTest() {
 		$this->Task->Test->expectAt(0, 'bake', array('Model', 'Article'));
 		$this->Task->bakeTest('Article');
@@ -498,7 +511,8 @@ class ModelTaskTest extends CakeTestCase {
  * a question for the hasOne is also not asked.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testConfirmAssociations() {
 		$associations = array(
 			'hasOne' => array(
@@ -538,7 +552,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that inOptions generates questions and only accepts a valid answer
  *
  * @return void
- **/
+ * @access public
+ */
 	function testInOptions() {
 		$options = array('one', 'two', 'three');
 		$this->Task->expectAt(0, 'out', array('1. one'));
@@ -558,7 +573,8 @@ class ModelTaskTest extends CakeTestCase {
  * test baking validation
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeValidation() {
 		$validate = array(
 			'name' => array(
@@ -586,7 +602,8 @@ class ModelTaskTest extends CakeTestCase {
  * test baking relations
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeRelations() {
 		$associations = array(
 			'belongsTo' => array(
@@ -640,7 +657,8 @@ class ModelTaskTest extends CakeTestCase {
  * test bake() with a -plugin param
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeWithPlugin() {
 		$this->Task->plugin = 'ControllerTest';
 
@@ -660,7 +678,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that execute passes runs bake depending with named model.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithNamedModel() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -675,7 +694,8 @@ class ModelTaskTest extends CakeTestCase {
  * test that execute runs all() when args[0] = all
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteIntoAll() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -707,7 +727,8 @@ class ModelTaskTest extends CakeTestCase {
  * test the interactive side of bake.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteIntoInteractive() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
@@ -736,7 +757,8 @@ class ModelTaskTest extends CakeTestCase {
  * test using bake interactively with a table that does not exist.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithNonExistantTableName() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
diff --git a/cake/tests/cases/console/libs/tasks/plugin.test.php b/cake/tests/cases/console/libs/tasks/plugin.test.php
index 396aff542..078d1c902 100644
--- a/cake/tests/cases/console/libs/tasks/plugin.test.php
+++ b/cake/tests/cases/console/libs/tasks/plugin.test.php
@@ -72,7 +72,8 @@ class PluginTaskTest extends CakeTestCase {
  * startCase methods
  *
  * @return void
- **/
+ * @access public
+ */
 	function startCase() {
 		$this->_paths = $paths = App::path('plugins');
 		$this->_testPath = array_push($paths, TMP . 'tests' . DS);
@@ -83,7 +84,8 @@ class PluginTaskTest extends CakeTestCase {
  * endCase
  *
  * @return void
- **/
+ * @access public
+ */
 	function endCase() {
 		App::build(array('plugins' => $this->_paths));
 	}
@@ -102,7 +104,8 @@ class PluginTaskTest extends CakeTestCase {
  * test bake()
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeFoldersAndFiles() {
 		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
 		$this->Task->setReturnValueAt(1, 'in', 'y');
@@ -196,7 +199,8 @@ class PluginTaskTest extends CakeTestCase {
  * test execute with no args, flowing into interactive,
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithNoArgs() {
 		$this->Task->setReturnValueAt(0, 'in', 'TestPlugin');
 		$this->Task->setReturnValueAt(1, 'in', '3');
@@ -221,7 +225,8 @@ class PluginTaskTest extends CakeTestCase {
  * Test Execute
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithOneArg() {
 		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
 		$this->Task->setReturnValueAt(1, 'in', 'y');
@@ -245,7 +250,8 @@ class PluginTaskTest extends CakeTestCase {
  * test execute chaining into MVC parts
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithTwoArgs() {
 		$this->Task->Model =& new PluginTestMockModelTask();
 		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
diff --git a/cake/tests/cases/console/libs/tasks/project.test.php b/cake/tests/cases/console/libs/tasks/project.test.php
index 7190f35da..08f33778b 100644
--- a/cake/tests/cases/console/libs/tasks/project.test.php
+++ b/cake/tests/cases/console/libs/tasks/project.test.php
@@ -84,7 +84,8 @@ class ProjectTaskTest extends CakeTestCase {
  * creates a test project that is used for testing project task.
  *
  * @return void
- **/
+ * @access protected
+ */
 	function _setupTestProject() {
 		$skel = CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS . 'templates' . DS . 'skel';
 		$this->Task->setReturnValueAt(0, 'in', 'y');
@@ -96,7 +97,8 @@ class ProjectTaskTest extends CakeTestCase {
  * test bake() method and directory creation.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBake() {
 		$this->_setupTestProject();
 
@@ -117,7 +119,8 @@ class ProjectTaskTest extends CakeTestCase {
  * test generation of Security.salt
  *
  * @return void
- **/
+ * @access public
+ */
 	function testSecuritySaltGeneration() {
 		$this->_setupTestProject();
 
@@ -134,7 +137,8 @@ class ProjectTaskTest extends CakeTestCase {
  * Test that index.php is generated correctly.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testIndexPhpGeneration() {
 		$this->_setupTestProject();
 		
@@ -154,7 +158,8 @@ class ProjectTaskTest extends CakeTestCase {
  * test getPrefix method, and that it returns Routing.prefix or writes to config file.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetPrefix() {
 		Configure::write('Routing.prefixes', array('admin'));
 		$result = $this->Task->getPrefix();
@@ -176,7 +181,8 @@ class ProjectTaskTest extends CakeTestCase {
  * test cakeAdmin() writing core.php
  *
  * @return void
- **/
+ * @access public
+ */
 	function testCakeAdmin() {
 		$file =& new File(CONFIGS . 'core.php');
 		$contents = $file->read();;
@@ -196,7 +202,8 @@ class ProjectTaskTest extends CakeTestCase {
  * test getting the prefix with more than one prefix setup
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetPrefixWithMultiplePrefixes() {
 		Configure::write('Routing.prefixes', array('admin', 'ninja', 'shinobi'));
 		$this->_setupTestProject();
@@ -211,7 +218,8 @@ class ProjectTaskTest extends CakeTestCase {
  * Test execute method with one param to destination folder.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecute() {
 		$this->Task->params['skel'] = CAKE_CORE_INCLUDE_PATH . DS . CAKE . DS . 'console' . DS. 'templates' . DS . 'skel';
 		$this->Task->params['working'] = TMP . 'tests' . DS;
diff --git a/cake/tests/cases/console/libs/tasks/template.test.php b/cake/tests/cases/console/libs/tasks/template.test.php
index ca98599bc..243d2aba0 100644
--- a/cake/tests/cases/console/libs/tasks/template.test.php
+++ b/cake/tests/cases/console/libs/tasks/template.test.php
@@ -81,7 +81,8 @@ class TemplateTaskTest extends CakeTestCase {
  * test that set sets variables
  *
  * @return void
- **/
+ * @access public
+ */
 	function testSet() {
 		$this->Task->set('one', 'two');
 		$this->assertTrue(isset($this->Task->templateVars['one']));
@@ -98,7 +99,8 @@ class TemplateTaskTest extends CakeTestCase {
  * test finding themes installed in
  *
  * @return void
- **/
+ * @access public
+ */
 	function testFindingInstalledThemesForBake() {
 		$consoleLibs = CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS;
 		$this->Task->Dispatch->shellPaths = array($consoleLibs);
@@ -111,7 +113,8 @@ class TemplateTaskTest extends CakeTestCase {
  * that the user is not bugged.  If there are more, find and return the correct theme name
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetThemePath() {
 		$defaultTheme = CAKE_CORE_INCLUDE_PATH . DS . dirname(CONSOLE_LIBS) . 'templates' . DS . 'default' .DS;
 		$this->Task->templatePaths = array('default' => $defaultTheme);
@@ -136,7 +139,8 @@ class TemplateTaskTest extends CakeTestCase {
  * test generate
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGenerate() {
 		App::build(array(
 			'shells' => array(
@@ -155,7 +159,8 @@ class TemplateTaskTest extends CakeTestCase {
  * ensure fallback to default works.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGenerateWithTemplateFallbacks() {
 		App::build(array(
 			'shells' => array(
diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php
index 203a51cf6..d6c9dae97 100644
--- a/cake/tests/cases/console/libs/tasks/test.test.php
+++ b/cake/tests/cases/console/libs/tasks/test.test.php
@@ -49,17 +49,48 @@ Mock::generatePartial(
 );
 
 /**
- * Test subject models for fixture generation
- **/
+ * Test Article model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class TestTaskArticle extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'TestTaskArticle';
+
+/**
+ * Table name to use
+ *
+ * @var string
+ * @access public
+ */
 	var $useTable = 'articles';
+
+/**
+ * HasMany Associations
+ *
+ * @var array
+ * @access public
+ */
 	var $hasMany = array(
 		'Comment' => array(
 			'className' => 'TestTask.TestTaskComment',
 			'foreignKey' => 'article_id',
 		)
 	);
+
+/**
+ * Has and Belongs To Many Associations
+ *
+ * @var array
+ * @access public
+ */
 	var $hasAndBelongsToMany = array(
 		'Tag' => array(
 			'className' => 'TestTaskTag',
@@ -68,19 +99,65 @@ class TestTaskArticle extends Model {
 			'associationForeignKey' => 'tag_id'
 		)
 	);
+
+/**
+ * Example public method
+ *
+ * @return void
+ * @access public
+ */
 	function doSomething() {
-
 	}
+
+/**
+ * Example Secondary public method
+ *
+ * @return void
+ * @access public
+ */
 	function doSomethingElse() {
-
 	}
-	function _innerMethod() {
 
+/**
+ * Example protected method
+ *
+ * @return void
+ * @access protected
+ */
+	function _innerMethod() {
 	}
 }
+
+/**
+ * Tag Testing Model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class TestTaskTag extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'TestTaskTag';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
 	var $useTable = 'tags';
+
+/**
+ * Has and Belongs To Many Associations
+ *
+ * @var array
+ * @access public
+ */
 	var $hasAndBelongsToMany = array(
 		'Article' => array(
 			'className' => 'TestTaskArticle',
@@ -92,14 +169,44 @@ class TestTaskTag extends Model {
 }
 
 /**
- * Simulated Plugin
- **/
+ * Simulated plugin
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class TestTaskAppModel extends Model {
-
 }
+
+/**
+ * Testing AppMode (TaskComment)
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class TestTaskComment extends TestTaskAppModel {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'TestTaskComment';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
 	var $useTable = 'comments';
+
+/**
+ * Belongs To Associations
+ *
+ * @var array
+ * @access public
+ */
 	var $belongsTo = array(
 		'Article' => array(
 			'className' => 'TestTaskArticle',
@@ -108,8 +215,28 @@ class TestTaskComment extends TestTaskAppModel {
 	);
 }
 
+/**
+ * Test Task Comments Controller
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class TestTaskCommentsController extends Controller {
+
+/**
+ * Controller Name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'TestTaskComments';
+
+/**
+ * Models to use
+ *
+ * @var array
+ * @access public
+ */
 	var $uses = array('TestTaskComment', 'TestTaskTag');
 }
 
@@ -121,6 +248,12 @@ class TestTaskCommentsController extends Controller {
  */
 class TestTaskTest extends CakeTestCase {
 
+/**
+ * Fixtures
+ *
+ * @var string
+ * @access public
+ */
 	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
 
 /**
@@ -150,8 +283,8 @@ class TestTaskTest extends CakeTestCase {
 /**
  * Test that file path generation doesn't continuously append paths.
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testFilePathGeneration() {
 		$file = TESTS . 'cases' . DS . 'models' . DS . 'my_class.test.php';
@@ -176,7 +309,7 @@ class TestTaskTest extends CakeTestCase {
  * methods into the test case.
  *
  * @return void
- **/
+ */
 	function testMethodIntrospection() {
 		$result = $this->Task->getTestableMethods('TestTaskArticle');
 		$expected = array('dosomething', 'dosomethingelse');
@@ -187,7 +320,8 @@ class TestTaskTest extends CakeTestCase {
  * test that the generation of fixtures works correctly.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testFixtureArrayGenerationFromModel() {
 		$subject = ClassRegistry::init('TestTaskArticle');
 		$result = $this->Task->generateFixtureList($subject);
@@ -201,7 +335,8 @@ class TestTaskTest extends CakeTestCase {
  * test that the generation of fixtures works correctly.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testFixtureArrayGenerationFromController() {
 		$subject = new TestTaskCommentsController();
 		$result = $this->Task->generateFixtureList($subject);
@@ -215,7 +350,8 @@ class TestTaskTest extends CakeTestCase {
  * test user interaction to get object type
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetObjectType() {
 		$this->Task->expectOnce('_stop');
 		$this->Task->setReturnValueAt(0, 'in', 'q');
@@ -230,7 +366,8 @@ class TestTaskTest extends CakeTestCase {
  * creating test subjects should clear the registry so the registry is always fresh
  *
  * @return void
- **/
+ * @access public
+ */
 	function testRegistryClearWhenBuildingTestObjects() {
 		ClassRegistry::flush();
 		$model = ClassRegistry::init('TestTaskComment');
@@ -254,7 +391,8 @@ class TestTaskTest extends CakeTestCase {
  * test that getClassName returns the user choice as a classname.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetClassName() {
 		$objects = App::objects('model');
 		$skip = $this->skipIf(empty($objects), 'No models in app, this test will fail. %s');
@@ -275,7 +413,8 @@ class TestTaskTest extends CakeTestCase {
  * Test the user interaction for defining additional fixtures.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetUserFixtures() {
 		$this->Task->setReturnValueAt(0, 'in', 'y');
 		$this->Task->setReturnValueAt(1, 'in', 'app.pizza, app.topping, app.side_dish');
@@ -288,7 +427,8 @@ class TestTaskTest extends CakeTestCase {
  * test that resolving classnames works
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetRealClassname() {
 		$result = $this->Task->getRealClassname('Model', 'Post');
 		$this->assertEqual($result, 'Post');
@@ -311,7 +451,8 @@ class TestTaskTest extends CakeTestCase {
  * as PHP4 classnames are all lower case, breaking the plugin path inflection.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeModelTest() {
 		$this->Task->setReturnValue('createFile', true);
 		$this->Task->setReturnValue('isLoadableClass', true);
@@ -344,7 +485,8 @@ class TestTaskTest extends CakeTestCase {
  * causing issues with inflection of path name from classname.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeControllerTest() {
 		$this->Task->setReturnValue('createFile', true);
 		$this->Task->setReturnValue('isLoadableClass', true);
@@ -377,7 +519,8 @@ class TestTaskTest extends CakeTestCase {
  * test Constructor generation ensure that constructClasses is called for controllers
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGenerateContsructor() {
 		$result = $this->Task->generateConstructor('controller', 'PostsController');
 		$expected = "new TestPostsController();\n\t\t\$this->Posts->constructClasses();\n";
@@ -396,7 +539,8 @@ class TestTaskTest extends CakeTestCase {
  * Test that mock class generation works for the appropriate classes
  *
  * @return void
- **/
+ * @access public
+ */
 	function testMockClassGeneration() {
 		$result = $this->Task->hasMockClass('controller');
 		$this->assertTrue($result);
@@ -406,7 +550,8 @@ class TestTaskTest extends CakeTestCase {
  * test bake() with a -plugin param
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeWithPlugin() {
 		$this->Task->plugin = 'TestTest';
 
@@ -419,7 +564,8 @@ class TestTaskTest extends CakeTestCase {
  * Test filename generation for each type + plugins
  *
  * @return void
- **/
+ * @access public
+ */
 	function testTestCaseFileName() {
 		$this->Task->path = '/my/path/tests/';
 
@@ -453,7 +599,8 @@ class TestTaskTest extends CakeTestCase {
  * test execute with a type defined
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithOneArg() {
 		$this->Task->args[0] = 'Model';
 		$this->Task->setReturnValueAt(0, 'in', 'TestTaskTag');
@@ -466,7 +613,8 @@ class TestTaskTest extends CakeTestCase {
  * test execute with type and class name defined
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithTwoArgs() {
 		$this->Task->args = array('Model', 'TestTaskTag');
 		$this->Task->setReturnValueAt(0, 'in', 'TestTaskTag');
diff --git a/cake/tests/cases/console/libs/tasks/view.test.php b/cake/tests/cases/console/libs/tasks/view.test.php
index ebf6156f9..be7e9321c 100644
--- a/cake/tests/cases/console/libs/tasks/view.test.php
+++ b/cake/tests/cases/console/libs/tasks/view.test.php
@@ -49,10 +49,36 @@ Mock::generatePartial(
 Mock::generate('ControllerTask', 'ViewTaskMockControllerTask');
 Mock::generate('ProjectTask', 'ViewTaskMockProjectTask');
 
+/**
+ * Test View Task Comment Model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class ViewTaskComment extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'ViewTaskComment';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
 	var $useTable = 'comments';
 
+/**
+ * Belongs To Associations
+ *
+ * @var array
+ * @access public
+ */
 	var $belongsTo = array(
 		'Article' => array(
 			'className' => 'ViewTaskArticle',
@@ -61,46 +87,143 @@ class ViewTaskComment extends Model {
 	);
 }
 
+/**
+ * Test View Task Article Model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class ViewTaskArticle extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'ViewTaskArticle';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
 	var $useTable = 'articles';
 }
 
+/**
+ * Test View Task Comments Controller 
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class ViewTaskCommentsController extends Controller {
+
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'ViewTaskComments';
 
+/**
+ * Testing public controller action
+ *
+ * @return void
+ * @access public
+ */
 	function index() {
-
 	}
-	function add() {
 
+/**
+ * Testing public controller action
+ *
+ * @return void
+ * @access public
+ */
+	function add() {
 	}
 }
 
+/**
+ * Test View Task Articles Controller
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
 class ViewTaskArticlesController extends Controller {
+
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
 	var $name = 'ViewTaskArticles';
 
+/**
+ * Test public controller action
+ *
+ * @return void
+ * @access public
+ */
 	function index() {
-
 	}
+
+/**
+ * Test public controller action
+ *
+ * @return void
+ * @access public
+ */
 	function add() {
-
 	}
 
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
 	function admin_index() {
-
 	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
 	function admin_add() {
-
 	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
 	function admin_view() {
-
 	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
 	function admin_edit() {
-
 	}
-	function admin_delete() {
 
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
+	function admin_delete() {
 	}
 }
 
@@ -112,6 +235,12 @@ class ViewTaskArticlesController extends Controller {
  */
 class ViewTaskTest extends CakeTestCase {
 
+/**
+ * Fixtures
+ *
+ * @var array
+ * @access public
+ */
 	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
 
 /**
@@ -148,7 +277,8 @@ class ViewTaskTest extends CakeTestCase {
  * Test getContent and parsing of Templates.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetContent() {
 		$vars = array(
 			'modelClass' => 'TestViewModel',
@@ -178,7 +308,8 @@ class ViewTaskTest extends CakeTestCase {
  * test getContent() using an admin_prefixed action.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testGetContentWithAdminAction() {
 		$_back = Configure::read('Routing');
 		Configure::write('Routing.prefixes', array('admin'));
@@ -212,7 +343,8 @@ class ViewTaskTest extends CakeTestCase {
  * test Bake method
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBake() {
 		$this->Task->controllerName = 'ViewTaskComments';
 		$this->Task->controllerPath = 'view_task_comments';
@@ -237,7 +369,8 @@ class ViewTaskTest extends CakeTestCase {
  * test bake() with a -plugin param
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeWithPlugin() {
 		$this->Task->controllerName = 'ViewTaskComments';
 		$this->Task->controllerPath = 'view_task_comments';
@@ -252,7 +385,8 @@ class ViewTaskTest extends CakeTestCase {
  * test bake actions baking multiple actions.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testBakeActions() {
 		$this->Task->controllerName = 'ViewTaskComments';
 		$this->Task->controllerPath = 'view_task_comments';
@@ -277,7 +411,8 @@ class ViewTaskTest extends CakeTestCase {
  * test baking a customAction (non crud)
  *
  * @return void
- **/
+ * @access public
+ */
 	function testCustomAction() {
 		$this->Task->controllerName = 'ViewTaskComments';
 		$this->Task->controllerPath = 'view_task_comments';
@@ -295,7 +430,8 @@ class ViewTaskTest extends CakeTestCase {
  * Test all()
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteIntoAll() {
 		$this->Task->args[0] = 'all';
 
@@ -313,7 +449,8 @@ class ViewTaskTest extends CakeTestCase {
  * test `cake bake view $controller view`
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithActionParam() {
 		$this->Task->args[0] = 'ViewTaskComments';
 		$this->Task->args[1] = 'view';
@@ -328,7 +465,8 @@ class ViewTaskTest extends CakeTestCase {
  * Ensure that views are only baked for actions that exist in the controller.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithController() {
 		$this->Task->args[0] = 'ViewTaskComments';
 
@@ -344,7 +482,8 @@ class ViewTaskTest extends CakeTestCase {
  * Which only bakes admin methods, not non-admin methods.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithControllerAndAdminFlag() {
 		$_back = Configure::read('Routing');
 		Configure::write('Routing.prefixes', array('admin'));
@@ -366,7 +505,8 @@ class ViewTaskTest extends CakeTestCase {
  * test execute into interactive.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteInteractive() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->args = array();
@@ -403,7 +543,8 @@ class ViewTaskTest extends CakeTestCase {
  * test `cake bake view posts index list`
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteWithAlternateTemplates() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->args = array('ViewTaskComments', 'index', 'list');
@@ -421,7 +562,8 @@ class ViewTaskTest extends CakeTestCase {
  * test execute into interactive() with admin methods.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testExecuteInteractiveWithAdmin() {
 		Configure::write('Routing.prefixes', array('admin'));
 		$this->Task->connection = 'test_suite';

From 0977b3fe1531e2a86cf632cc8616b25f252bba2d Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sat, 14 Nov 2009 23:19:25 +1100
Subject: [PATCH 049/112] Standardising docblock endings throughout.

---
 cake/console/libs/acl.php                     |   6 +-
 cake/console/libs/schema.php                  |   6 +-
 cake/console/libs/shell.php                   |   2 +-
 cake/console/libs/tasks/controller.php        |  12 +-
 cake/console/libs/tasks/db_config.php         |   4 +-
 cake/console/libs/tasks/fixture.php           |  18 +--
 cake/console/libs/tasks/model.php             |  38 +++---
 cake/console/libs/tasks/plugin.php            |   2 +-
 cake/console/libs/tasks/project.php           |   2 +-
 cake/console/libs/tasks/template.php          |  14 +-
 cake/console/libs/tasks/test.php              |  40 +++---
 cake/console/libs/tasks/view.php              |   8 +-
 cake/libs/cake_log.php                        |  18 +--
 cake/libs/cake_session.php                    |   2 +-
 cake/libs/configure.php                       |   2 +-
 cake/libs/controller/component.php            |   2 +-
 cake/libs/controller/components/cookie.php    |   2 +-
 cake/libs/inflector.php                       |  10 +-
 cake/libs/log/file_log.php                    |   6 +-
 cake/libs/magic_db.php                        |   4 +-
 cake/libs/model/cake_schema.php               |   6 +-
 cake/libs/model/datasources/datasource.php    |   2 +-
 cake/libs/model/datasources/dbo/dbo_adodb.php |   2 +-
 cake/libs/model/datasources/dbo/dbo_db2.php   |   2 +-
 .../model/datasources/dbo/dbo_firebird.php    |   4 +-
 cake/libs/model/datasources/dbo/dbo_mssql.php |   2 +-
 cake/libs/model/datasources/dbo/dbo_mysql.php |   4 +-
 .../libs/model/datasources/dbo/dbo_mysqli.php |   2 +-
 cake/libs/model/datasources/dbo/dbo_odbc.php  |   2 +-
 .../model/datasources/dbo/dbo_postgres.php    |   2 +-
 .../libs/model/datasources/dbo/dbo_sqlite.php |   2 +-
 .../libs/model/datasources/dbo/dbo_sybase.php |   2 +-
 cake/libs/model/datasources/dbo_source.php    |   6 +-
 cake/libs/router.php                          |   4 +-
 cake/libs/view/helper.php                     |   2 +-
 cake/libs/view/helpers/html.php               |  12 +-
 cake/libs/view/helpers/javascript.php         |   2 +-
 cake/libs/view/helpers/jquery_engine.php      |  30 ++---
 cake/libs/view/helpers/js.php                 | 100 +++++++-------
 cake/libs/view/helpers/mootools_engine.php    |  26 ++--
 cake/libs/view/helpers/number.php             |   6 +-
 cake/libs/view/helpers/paginator.php          |   4 +-
 cake/libs/view/helpers/prototype_engine.php   |  28 ++--
 cake/libs/view/helpers/rss.php                |   2 +-
 cake/libs/view/view.php                       |   2 +-
 cake/tests/cases/basics.test.php              |  53 ++++----
 cake/tests/cases/dispatcher.test.php          | 123 +++++++++---------
 cake/tests/cases/libs/cake_log.test.php       |  12 +-
 cake/tests/cases/libs/cake_test_case.test.php |   4 +-
 .../cases/libs/cake_test_fixture.test.php     |   2 +-
 .../cases/libs/code_coverage_manager.test.php |   4 +-
 cake/tests/cases/libs/configure.test.php      |   4 +-
 .../cases/libs/controller/component.test.php  |   2 +-
 .../libs/controller/components/auth.test.php  |  12 +-
 .../components/request_handler.test.php       |  10 +-
 .../controller/components/security.test.php   |   4 +-
 .../cases/libs/controller/controller.test.php |   8 +-
 .../controller/controller_merge_vars.test.php |  69 +++++-----
 .../cases/libs/controller/scaffold.test.php   |  22 ++--
 cake/tests/cases/libs/error.test.php          |   4 +-
 cake/tests/cases/libs/folder.test.php         |   2 +-
 cake/tests/cases/libs/log/file_log.test.php   |   2 +-
 cake/tests/cases/libs/magic_db.test.php       |   2 +-
 .../cases/libs/model/cake_schema.test.php     |   8 +-
 .../model/datasources/dbo/dbo_adodb.test.php  |   2 +-
 .../model/datasources/dbo/dbo_mysql.test.php  |  10 +-
 .../model/datasources/dbo/dbo_mysqli.test.php |   2 +-
 .../datasources/dbo/dbo_postgres.test.php     |   4 +-
 .../model/datasources/dbo/dbo_sqlite.test.php |   6 +-
 .../model/datasources/dbo_source.test.php     |  10 +-
 .../cases/libs/model/model_behavior.test.php  |   4 +-
 .../cases/libs/model/model_delete.test.php    |   2 +-
 .../libs/model/model_integration.test.php     |   8 +-
 .../cases/libs/model/model_read.test.php      |   4 +-
 .../libs/model/model_validation.test.php      |   2 +-
 .../cases/libs/model/model_write.test.php     |  10 +-
 cake/tests/cases/libs/model/models.php        |  10 +-
 cake/tests/cases/libs/object.test.php         |  10 +-
 cake/tests/cases/libs/router.test.php         |  10 +-
 cake/tests/cases/libs/string.test.php         |   2 +-
 cake/tests/cases/libs/validation.test.php     |   2 +-
 cake/tests/cases/libs/view/helper.test.php    |   6 +-
 .../cases/libs/view/helpers/cache.test.php    |   6 +-
 .../cases/libs/view/helpers/form.test.php     |  24 ++--
 .../cases/libs/view/helpers/html.test.php     |  12 +-
 .../libs/view/helpers/javascript.test.php     |   4 +-
 .../libs/view/helpers/jquery_engine.test.php  |  26 ++--
 .../tests/cases/libs/view/helpers/js.test.php |  48 +++----
 .../view/helpers/mootools_engine.test.php     |  26 ++--
 .../libs/view/helpers/paginator.test.php      |   4 +-
 .../view/helpers/prototype_engine.test.php    |  26 ++--
 .../cases/libs/view/helpers/session.test.php  |   2 +-
 cake/tests/cases/libs/view/view.test.php      |   8 +-
 cake/tests/cases/libs/xml.test.php            |   6 +-
 cake/tests/lib/cake_reporter.php              |   6 +-
 cake/tests/lib/cake_test_fixture.php          |   2 +-
 cake/tests/lib/cake_text_reporter.php         |   6 +-
 97 files changed, 559 insertions(+), 552 deletions(-)

diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index 13796f8cc..6bd6bc0bf 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -236,7 +236,7 @@ class AclShell extends Shell {
  * @param integer $indent indent level.
  * @return void
  * @access protected
- **/
+ */
 	function _outputNode($class, $node, $indent) {
 		$indent = str_repeat('  ', $indent);
 		$data = $node[$class];
@@ -521,7 +521,7 @@ class AclShell extends Shell {
  *
  * @param string $identifier Identifier to parse
  * @return mixed a string for aliases, and an array for model.foreignKey
- **/
+ */
 	function parseIdentifier($identifier) {
 		if (preg_match('/^([\w]+)\.(.*)$/', $identifier, $matches)) {
 			return array(
@@ -539,7 +539,7 @@ class AclShell extends Shell {
  * @param string $class Class type you want (Aro/Aco)
  * @param mixed $identifier A mixed identifier for finding the node.
  * @return int Integer of NodeId. Will trigger an error if nothing is found.
- **/
+ */
 	function _getNodeId($class, $identifier) {
 		$node = $this->Acl->{$class}->node($identifier);
 		if (empty($node)) {
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index 78fdf0ecb..b6c69708a 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -242,7 +242,7 @@ class SchemaShell extends Shell {
  * Run database create commands.  Alias for run create.
  *
  * @return void
- **/
+ */
 	function create() {
 		list($Schema, $table) = $this->_loadSchema();
 		$this->__create($Schema, $table);
@@ -252,7 +252,7 @@ class SchemaShell extends Shell {
  * Run database create commands.  Alias for run create.
  *
  * @return void
- **/
+ */
 	function update() {
 		list($Schema, $table) = $this->_loadSchema();
 		$this->__update($Schema, $table);
@@ -262,7 +262,7 @@ class SchemaShell extends Shell {
  * Prepares the Schema objects for database operations.
  *
  * @return void
- **/
+ */
 	function _loadSchema() {
 		$name = $plugin = null;
 		if (isset($this->params['name'])) {
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index 6452a8a9b..0a481db60 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -642,7 +642,7 @@ class Shell extends Object {
  *
  * @param string $pluginName Name of the plugin you want ie. DebugKit
  * @return string $path path to the correct plugin.
- **/
+ */
 	function _pluginPath($pluginName) {
 		return App::pluginPath($pluginName);
 	}
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index cc88dcd42..9c6fd14e5 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -113,7 +113,7 @@ class ControllerTask extends Shell {
  *
  * @access public
  * @return void
- **/
+ */
 	function all() {
 		$this->interactive = false;
 		$this->listAll($this->connection, false);
@@ -219,7 +219,7 @@ class ControllerTask extends Shell {
  * Confirm a to be baked controller with the user
  *
  * @return void
- **/
+ */
 	function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) {
 		$this->out();
 		$this->hr();
@@ -257,7 +257,7 @@ class ControllerTask extends Shell {
  * Interact with the user and ask about which methods (admin or regular they want to bake)
  *
  * @return array Array containing (bakeRegular, bakeAdmin) answers
- **/
+ */
 	function _askAboutMethods() {
 		$wannaBakeCrud = $this->in(
 			__("Would you like to create some basic class methods \n(index(), add(), view(), edit())?", true),
@@ -348,7 +348,7 @@ class ControllerTask extends Shell {
  * Interact with the user and get a list of additional helpers
  *
  * @return array Helpers that the user wants to use.
- **/
+ */
 	function doHelpers() {
 		return $this->_doPropertyChoices(
 			__("Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?", true),
@@ -360,7 +360,7 @@ class ControllerTask extends Shell {
  * Interact with the user and get a list of additional components
  *
  * @return array Components the user wants to use.
- **/
+ */
 	function doComponents() {
 		return $this->_doPropertyChoices(
 			__("Would you like this controller to use any components?", true),
@@ -374,7 +374,7 @@ class ControllerTask extends Shell {
  * @param string $prompt A yes/no question to precede the list
  * @param sting $example A question for a comma separated list, with examples.
  * @return array Array of values for property.
- **/
+ */
 	function _doPropertyChoices($prompt, $example) {
 		$proceed = $this->in($prompt, array('y','n'), 'n');
 		$property = array();
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index 6635fe8c0..b9253558a 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -53,7 +53,7 @@ class DbConfigTask extends Shell {
  * Used for testing.
  *
  * @var string
- **/
+ */
 	var $databaseClassName = 'DATABASE_CONFIG';
 
 /**
@@ -351,7 +351,7 @@ class DbConfigTask extends Shell {
  * Get a user specified Connection name
  *
  * @return void
- **/
+ */
 	function getConfig() {
 		App::import('Model', 'ConnectionManager', false);
 
diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php
index 98c1ecea8..82dec5869 100644
--- a/cake/console/libs/tasks/fixture.php
+++ b/cake/console/libs/tasks/fixture.php
@@ -54,14 +54,14 @@ class FixtureTask extends Shell {
  * The db connection being used for baking
  *
  * @var string
- **/
+ */
 	var $connection = null;
 
 /**
  * Schema instance
  *
  * @var object
- **/
+ */
 	var $_Schema = null;
 
 /**
@@ -103,7 +103,7 @@ class FixtureTask extends Shell {
  *
  * @access public
  * @return void
- **/
+ */
 	function all() {
 		$this->interactive = false;
 		$this->Model->interactive = false;
@@ -140,7 +140,7 @@ class FixtureTask extends Shell {
  *
  * @param string $modelName Name of model you are dealing with.
  * @return array Array of import options.
- **/
+ */
 	function importOptions($modelName) {
 		$options = array();
 		$doSchema = $this->in(__('Would you like to import schema for this fixture?', true), array('y', 'n'), 'n');
@@ -230,7 +230,7 @@ class FixtureTask extends Shell {
  * @param string $fixture Contents of the fixture file.
  * @access public
  * @return void
- **/
+ */
 	function generateFixtureFile($model, $otherVars) {
 		$defaults = array('table' => null, 'schema' => null, 'records' => null, 'import' => null, 'fields' => null);
 		$vars = array_merge($defaults, $otherVars);
@@ -255,7 +255,7 @@ class FixtureTask extends Shell {
  *
  * @param array $table Table schema array
  * @return string fields definitions
- **/
+ */
 	function _generateSchema($tableInfo) {
 		$schema = $this->_Schema->generateTable('f', $tableInfo);
 		return substr($schema, 10, -2);
@@ -266,7 +266,7 @@ class FixtureTask extends Shell {
  *
  * @param array $table Table schema array
  * @return array Array of records to use in the fixture.
- **/
+ */
 	function _generateRecords($tableInfo, $recordCount = 1) {
 		$records = array();
 		for ($i = 0; $i < $recordCount; $i++) {
@@ -337,7 +337,7 @@ class FixtureTask extends Shell {
  *
  * @param array $records Array of records to be converted to string
  * @return string A string value of the $records array.
- **/
+ */
 	function _makeRecordString($records) {
 		$out = "array(\n";
 		foreach ($records as $record) {
@@ -360,7 +360,7 @@ class FixtureTask extends Shell {
  * @param string $modelName name of the model to take records from.
  * @param string $useTable Name of table to use.
  * @return array Array of records.
- **/
+ */
 	function _getRecordsFromTable($modelName, $useTable = null) {
 		if ($this->interactive) {
 			$condition = null;
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 8d616a71a..30cce0e0d 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -64,14 +64,14 @@ class ModelTask extends Shell {
  * Holds tables found on connection.
  *
  * @var array
- **/
+ */
 	var $__tables = array();
 
 /**
  * Holds validation method map.
  *
  * @var array
- **/
+ */
 	var $__validations = array();
 
 /**
@@ -109,7 +109,7 @@ class ModelTask extends Shell {
  * Bake all models at once.
  *
  * @return void
- **/
+ */
 	function all() {
 		$this->listAll($this->connection, false);
 		$unitTestExists = $this->_checkUnitTest();
@@ -129,7 +129,7 @@ class ModelTask extends Shell {
  *
  * @param string $className Name of class you want model to be.
  * @return object Model instance
- **/
+ */
 	function &_getModelObject($className) {
 		$object = new Model(array('name' => $className, 'ds' => $this->connection));
 		return $object;
@@ -142,7 +142,7 @@ class ModelTask extends Shell {
  * @param string $prompt Prompt to use for options list.
  * @param integer $default The default option for the given prompt.
  * @return result of user choice.
- **/
+ */
 	function inOptions($options, $prompt = null, $default = null) {
 		$valid = false;
 		$max = count($options);
@@ -262,7 +262,7 @@ class ModelTask extends Shell {
  * @param string $associations Collection of associations.
  * @access protected
  * @return void
- **/
+ */
 	function _printAssociation($modelName, $type, $associations) {
 		if (!empty($associations[$type])) {
 			for ($i = 0; $i < count($associations[$type]); $i++) {
@@ -278,7 +278,7 @@ class ModelTask extends Shell {
  * @param array $fields Array of fields that might have a primary key.
  * @return string Name of field that is a primary key.
  * @access public
- **/
+ */
 	function findPrimaryKey($fields) {
 		foreach ($fields as $name => $field) {
 			if (isset($field['key']) && $field['key'] == 'primary') {
@@ -293,7 +293,7 @@ class ModelTask extends Shell {
  *
  * @param array $fields Array of fields to look for and choose as a displayField
  * @return mixed Name of field to use for displayField or false if the user declines to choose
- **/
+ */
 	function findDisplayField($fields) {
 		$fieldNames = array_keys($fields);
 		$prompt = __("A displayField could not be automatically detected\nwould you like to choose one?", true);
@@ -337,7 +337,7 @@ class ModelTask extends Shell {
  * Populate the __validations array
  *
  * @return void
- **/
+ */
 	function initValidations() {
 		$options = $choices = array();
 		if (class_exists('Validation')) {
@@ -363,7 +363,7 @@ class ModelTask extends Shell {
  * @param string $fieldName Name of field to be validated.
  * @param array $metaData metadata for field
  * @return array Array of validation for the field.
- **/
+ */
 	function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
 		$defaultChoice = count($this->__validations);
 		$validate = $alreadyChosen = array();
@@ -484,7 +484,7 @@ class ModelTask extends Shell {
  * @param object $model Model instance of model being generated.
  * @param array $associations Array of inprogress associations
  * @return array $associations with belongsTo added in.
- **/
+ */
 	function findBelongsTo(&$model, $associations) {
 		$fields = $model->schema();
 		foreach ($fields as $fieldName => $field) {
@@ -513,7 +513,7 @@ class ModelTask extends Shell {
  * @param object $model Model instance being generated
  * @param array $associations Array of inprogress associations
  * @return array $associations with hasOne and hasMany added in.
- **/
+ */
 	function findHasOneAndMany(&$model, $associations) {
 		$foreignKey = $this->_modelKey($model->name);
 		foreach ($this->__tables as $otherTable) {
@@ -556,7 +556,7 @@ class ModelTask extends Shell {
  * @param object $model Model instance being generated
  * @param array $associations Array of inprogress associations
  * @return array $associations with hasAndBelongsToMany added in.
- **/
+ */
 	function findHasAndBelongsToMany(&$model, $associations) {
 		$foreignKey = $this->_modelKey($model->name);
 		foreach ($this->__tables as $otherTable) {
@@ -596,7 +596,7 @@ class ModelTask extends Shell {
  * @param array $model Temporary Model instance.
  * @param array $associations Array of associations to be confirmed.
  * @return array Array of confirmed associations
- **/
+ */
 	function confirmAssociations(&$model, $associations) {
 		foreach ($associations as $type => $settings) {
 			if (!empty($associations[$type])) {
@@ -624,7 +624,7 @@ class ModelTask extends Shell {
  * @param object $model Temporary model instance
  * @param array $associations Array of associations.
  * @return array Array of associations.
- **/
+ */
 	function doMoreAssociations($model, $associations) {
 		$prompt = __('Would you like to define some additional model associations?', true);
 		$wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n');
@@ -689,7 +689,7 @@ class ModelTask extends Shell {
  * Finds all possible keys to use on custom associations.
  *
  * @return array array of tables and possible keys
- **/
+ */
 	function _generatePossibleKeys() {
 		$possible = array();
 		foreach ($this->__tables as $otherTable) {
@@ -782,7 +782,7 @@ class ModelTask extends Shell {
  * @param string $modelName Name of the model you want a table for.
  * @param string $useDbConfig Name of the database config you want to get tables from.
  * @return void
- **/
+ */
 	function getTable($modelName, $useDbConfig = null) {
 		if (!isset($useDbConfig)) {
 			$useDbConfig = $this->connection;
@@ -811,7 +811,7 @@ class ModelTask extends Shell {
  *
  * @param string $useDbConfig Connection name to scan.
  * @return array Array of tables in the database.
- **/
+ */
 	function getAllTables($useDbConfig = null) {
 		if (!isset($useDbConfig)) {
 			$useDbConfig = $this->connection;
@@ -906,7 +906,7 @@ class ModelTask extends Shell {
  * @access public
  * @return void
  * @see FixtureTask::bake
- **/
+ */
 	function bakeFixture($className, $useTable = null) {
 		$this->Fixture->connection = $this->connection;
 		$this->Fixture->plugin = $this->plugin;
diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php
index 05309bdcc..03b563dc1 100644
--- a/cake/console/libs/tasks/plugin.php
+++ b/cake/console/libs/tasks/plugin.php
@@ -204,7 +204,7 @@ class PluginTask extends Shell {
  * find and change $this->path to the user selection
  *
  * @return void
- **/
+ */
 	function findPath($pathOptions) {
 		$valid = false;
 		$max = count($pathOptions);
diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index 6194fab31..196273fb3 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -30,7 +30,7 @@ class ProjectTask extends Shell {
  * configs path (used in testing).
  *
  * @var string
- **/
+ */
 	var $configPath = null;
 
 /**
diff --git a/cake/console/libs/tasks/template.php b/cake/console/libs/tasks/template.php
index fcf835492..422b775c1 100644
--- a/cake/console/libs/tasks/template.php
+++ b/cake/console/libs/tasks/template.php
@@ -23,7 +23,7 @@ class TemplateTask extends Shell {
  * variables to add to template scope
  *
  * @var array
- **/
+ */
 	var $templateVars = array();
 
 /**
@@ -31,7 +31,7 @@ class TemplateTask extends Shell {
  * Contains a list of $theme => $path
  *
  * @var array
- **/
+ */
 	var $templatePaths = array();
 
 /**
@@ -39,7 +39,7 @@ class TemplateTask extends Shell {
  *
  * @access public
  * @return void
- **/
+ */
 	function initialize() {
 		$this->templatePaths = $this->_findThemes();
 	}
@@ -50,7 +50,7 @@ class TemplateTask extends Shell {
  * Bake themes are directories not named `skel` inside a `vendors/shells/templates` path.
  *
  * @return array Array of bake themes that are installed.
- **/
+ */
 	function _findThemes() {
 		$paths = App::path('shells');
 		$core = array_pop($paths);
@@ -128,7 +128,7 @@ class TemplateTask extends Shell {
  * @param string $vars Additional vars to set to template scope.
  * @access public
  * @return contents of generated code template
- **/
+ */
 	function generate($directory, $filename, $vars = null) {
 		if ($vars !== null) {
 			$this->set($vars);
@@ -156,7 +156,7 @@ class TemplateTask extends Shell {
  * If there is more than one installed theme user interaction will happen
  *
  * @return string returns the path to the selected theme.
- **/
+ */
 	function getThemePath() {
 		if (count($this->templatePaths) == 1) {
 			$paths = array_values($this->templatePaths);
@@ -193,7 +193,7 @@ class TemplateTask extends Shell {
  * @param string $filename lower_case_underscored filename you want.
  * @access public
  * @return string filename will exit program if template is not found.
- **/
+ */
 	function _findTemplate($path, $directory, $filename) {
 		$themeFile = $path . $directory . DS . $filename . '.ctp';
 		if (file_exists($themeFile)) {
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
index b4a1929da..06cf9c5bb 100644
--- a/cake/console/libs/tasks/test.php
+++ b/cake/console/libs/tasks/test.php
@@ -46,28 +46,28 @@ class TestTask extends Shell {
  * Tasks used.
  *
  * @var array
- **/
+ */
 	var $tasks = array('Template');
 
 /**
  * class types that methods can be generated for
  *
  * @var array
- **/
+ */
 	var $classTypes =  array('Model', 'Controller', 'Component', 'Behavior', 'Helper');
 
 /**
  * Internal list of fixtures that have been added so far.
  *
  * @var string
- **/
+ */
 	var $_fixtures = array();
 
 /**
  * Flag for interactive mode
  *
  * @var boolean
- **/
+ */
 	var $interactive = false;
 
 /**
@@ -164,7 +164,7 @@ class TestTask extends Shell {
  * Interact with the user and get their chosen type. Can exit the script.
  *
  * @return string Users chosen type.
- **/
+ */
 	function getObjectType() {
 		$this->hr();
 		$this->out(__("Select an object type:", true));
@@ -188,7 +188,7 @@ class TestTask extends Shell {
  *
  * @param string $objectType Type of object to list classes for i.e. Model, Controller.
  * @return string Class name the user chose.
- **/
+ */
 	function getClassName($objectType) {
 		$options = App::objects(strtolower($objectType));
 		$this->out(sprintf(__('Choose a %s class', true), $objectType));
@@ -209,7 +209,7 @@ class TestTask extends Shell {
  * Currently only model, and controller are supported
  *
  * @return boolean
- **/
+ */
 	function typeCanDetectFixtures($type) {
 		$type = strtolower($type);
 		return ($type == 'controller' || $type == 'model');
@@ -219,7 +219,7 @@ class TestTask extends Shell {
  * Check if a class with the given type is loaded or can be loaded.
  *
  * @return boolean
- **/
+ */
 	function isLoadableClass($type, $class) {
 		return App::import($type, $class);
 	}
@@ -229,7 +229,7 @@ class TestTask extends Shell {
  * So that fixtures can be detected
  *
  * @return object
- **/
+ */
 	function &buildTestSubject($type, $class) {
 		ClassRegistry::flush();
 		App::import($type, $class);
@@ -246,7 +246,7 @@ class TestTask extends Shell {
  * Gets the real class name from the cake short form.
  *
  * @return string Real classname
- **/
+ */
 	function getRealClassName($type, $class) {
 		if (strtolower($type) == 'model') {
 			return $class;
@@ -260,7 +260,7 @@ class TestTask extends Shell {
  *
  * @param string $className Name of class to look at.
  * @return array Array of method names.
- **/
+ */
 	function getTestableMethods($className) {
 		$classMethods = get_class_methods($className);
 		$parentMethods = get_class_methods(get_parent_class($className));
@@ -280,7 +280,7 @@ class TestTask extends Shell {
  *
  * @param object The object you want to generate fixtures for.
  * @return array Array of fixtures to be included in the test.
- **/
+ */
 	function generateFixtureList(&$subject) {
 		$this->_fixtures = array();
 		if (is_a($subject, 'Model')) {
@@ -297,7 +297,7 @@ class TestTask extends Shell {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _processModel(&$subject) {
 		$this->_addFixture($subject->name);
 		$associated = $subject->getAssociated();
@@ -321,7 +321,7 @@ class TestTask extends Shell {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _processController(&$subject) {
 		$subject->constructClasses();
 		$models = array(Inflector::classify($subject->name));
@@ -339,7 +339,7 @@ class TestTask extends Shell {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _addFixture($name) {
 		$parent = get_parent_class($name);
 		$prefix = 'app.';
@@ -355,7 +355,7 @@ class TestTask extends Shell {
  * Interact with the user to get additional fixtures they want to use.
  *
  * @return void
- **/
+ */
 	function getUserFixtures() {
 		$proceed = $this->in(__('Bake could not detect fixtures, would you like to add some?', true), array('y','n'), 'n');
 		$fixtures = array();
@@ -373,7 +373,7 @@ class TestTask extends Shell {
  * Controllers require a mock class.
  *
  * @return boolean
- **/
+ */
 	function hasMockClass($type) {
 		$type = strtolower($type);
 		return $type == 'controller';
@@ -383,7 +383,7 @@ class TestTask extends Shell {
  * Generate a constructor code snippet for the type and classname
  *
  * @return string Constructor snippet for the thing you are building.
- **/
+ */
 	function generateConstructor($type, $fullClassName) {
 		$type = strtolower($type);
 		if ($type == 'model') {
@@ -401,7 +401,7 @@ class TestTask extends Shell {
  * and get the plugin path if needed.
  *
  * @return string filename the test should be created on
- **/
+ */
 	function testCaseFileName($type, $className) {
 		$path = $this->path;
 		if (isset($this->plugin)) {
@@ -418,7 +418,7 @@ class TestTask extends Shell {
  * Show help file.
  *
  * @return void
- **/
+ */
 	function help() {
 		$this->hr();
 		$this->out("Usage: cake bake test <type> <class>");
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index 1bad40f5a..5a1b0a0b3 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -144,7 +144,7 @@ class ViewTask extends Shell {
  * Get a list of actions that can / should have views baked for them.
  *
  * @return array Array of action names that should be baked
- **/
+ */
 	function _methodsToBake() {
 		$methods =  array_diff(
 			array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
@@ -176,7 +176,7 @@ class ViewTask extends Shell {
  * Bake All views for All controllers.
  *
  * @return void
- **/
+ */
 	function all() {
 		$this->Controller->interactive = false;
 		$tables = $this->Controller->listAll($this->connection, false);
@@ -308,7 +308,7 @@ class ViewTask extends Shell {
  *
  * @param array $actions Array of actions to make files for.
  * @return void
- **/
+ */
 	function bakeActions($actions, $vars) {
 		foreach ($actions as $action) {
 			$content = $this->getContent($action, $vars);
@@ -320,7 +320,7 @@ class ViewTask extends Shell {
  * handle creation of baking a custom action view file
  *
  * @return void
- **/
+ */
 	function customAction() {
 		$action = '';
 		while ($action == '') {
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index 571cb1c4b..a2300abb2 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -60,7 +60,7 @@ class CakeLog {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_streams = array();
 
 /**
@@ -68,7 +68,7 @@ class CakeLog {
  *
  * @return void
  * @static
- **/
+ */
 	function &getInstance() {
 		static $instance = array();
 		if (!isset($instance[0])) {
@@ -85,7 +85,7 @@ class CakeLog {
  * @param array $config Array of configuration information for the logger
  * @return boolean success of configuration.
  * @static
- **/
+ */
 	function config($key, $config) {
 		if (empty($config['engine'])) {
 			trigger_error(__('Missing logger classname', true), E_USER_WARNING);
@@ -107,7 +107,7 @@ class CakeLog {
  *
  * @return mixed boolean false on any failures, string of classname to use if search was successful.\
  * @access protected
- **/
+ */
 	function _getLogger($loggerName) {
 		$plugin = null;
 		if (strpos($loggerName, '.') !== false) {
@@ -139,7 +139,7 @@ class CakeLog {
  *
  * @return array
  * @static
- **/
+ */
 	function streams() {
 		$self = CakeLog::getInstance();
 		return array_keys($self->_streams);
@@ -152,7 +152,7 @@ class CakeLog {
  * @param string $keyname Key name of callable to remove.
  * @return void
  * @static
- **/
+ */
 	function remove($streamName) {
 		$self = CakeLog::getInstance();
 		unset($self->_streams[$streamName]);
@@ -167,7 +167,7 @@ class CakeLog {
  * @param array $config Array of config information for the LogStream
  * @return boolean success
  * @static
- **/
+ */
 	function addStream($key, $config) {
 		$self = CakeLog::getInstance();
 		$self->_streams[$key] = $config;
@@ -178,7 +178,7 @@ class CakeLog {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _autoConfig() {
 		if (!class_exists('FileLog')) {
 			App::import('Core', 'log/FileLog');
@@ -235,7 +235,7 @@ class CakeLog {
  * @param integer $line Line that triggered the error
  * @param array $context Context
  * @return void
- **/
+ */
 	function handleError($code, $description, $file = null, $line = null, $context = null) {
 		if ($code === 2048 || $code === 8192) {
 			return;
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index 357c2ec67..957af54ff 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -244,7 +244,7 @@ class CakeSession extends Object {
  *
  * @return boolean
  * @deprecated Use CakeSession::delete instead
- **/
+ */
 	function del($name) {
 		trigger_error('CakeSession::del() is deprecated, use CakeSession::delete() instead.', E_USER_WARNING);
 		return $this->delete($name);
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 3bdc14e8f..fb86ed3b3 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -685,7 +685,7 @@ class App extends Object {
  *
  * @param string $plugin CamelCased plugin name to find the path of.
  * @return string full path to the plugin.
- **/
+ */
 	function pluginPath($plugin) {
 		$_this =& App::getInstance();
 		$pluginDir = Inflector::underscore($plugin);
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index f4ed6a4cb..081c81a5e 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -56,7 +56,7 @@ class Component extends Object {
  *
  * @var array
  * @access private
- **/
+ */
 	var $__settings = array();
 
 /**
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index 9ddfc24ca..62331b1e2 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -263,7 +263,7 @@ class CookieComponent extends Object {
 
 /**
  * @deprecated use delete()
- **/
+ */
 	function del($key) {
 		trigger_error('Deprecated method, use CookieComponent::delete instead', E_USER_WARNING);
 		return $this->delete($key);
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index ba82dd919..2ae7d1393 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -37,7 +37,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_plural = array(
 		'rules' => array(
 			'/(s)tatus$/i' => '\1\2tatuses',
@@ -105,7 +105,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_singular = array(
 		'rules' => array(
 			'/(s)tatuses$/i' => '\1\2tatus',
@@ -155,7 +155,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_uninflected = array(
 		'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
 		'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
@@ -176,7 +176,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_pluralized = array();
 
 /**
@@ -184,7 +184,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_singularized = array();
 
 /**
diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php
index 76c0e50b9..e726bf231 100644
--- a/cake/libs/log/file_log.php
+++ b/cake/libs/log/file_log.php
@@ -31,7 +31,7 @@ class FileLog {
  * Path to save log files on.
  *
  * @var string
- **/
+ */
 	var $_path = null;
 
 /**
@@ -43,7 +43,7 @@ class FileLog {
  *
  * @param array $options Options for the FileLog, see above.
  * @return void
- **/
+ */
 	function FileLog($options = array()) {
 		$options += array('path' => LOGS);
 		$this->_path = $options['path'];
@@ -55,7 +55,7 @@ class FileLog {
  * @param string $type The type of log you are making.
  * @param string $message The message you want to log.
  * @return boolean success of write.
- **/
+ */
 	function write($type, $message) {
 		$debugTypes = array('notice', 'info', 'debug');
 
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index fd8965851..feb780b0e 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -36,7 +36,7 @@ class MagicDb extends Object {
  * Holds the parsed MagicDb for this class instance
  *
  * @var array
- **/
+ */
 	var $db = array();
 
 /**
@@ -45,7 +45,7 @@ class MagicDb extends Object {
  * @var $magicDb mixed Can be an array containing the db, a magic db as a string, or a filename pointing to a magic db in .db or magic.db.php format
  * @return boolean Returns false if reading / validation failed or true on success.
  * @author        Felix
- **/
+ */
 	function read($magicDb = null) {
 		if (!is_string($magicDb) && !is_array($magicDb)) {
 			return false;
diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
index 28008cbd2..82b9bdafa 100644
--- a/cake/libs/model/cake_schema.php
+++ b/cake/libs/model/cake_schema.php
@@ -63,7 +63,7 @@ class CakeSchema extends Object {
  * plugin name.
  *
  * @var string
- **/
+ */
 	var $plugin = null;
 
 /**
@@ -382,7 +382,7 @@ class CakeSchema extends Object {
  * @param string $table Table name you want returned.
  * @param array $fields Array of field information to generate the table with.
  * @return string Variable declaration for a schema class
- **/
+ */
 	function generateTable($table, $fields) {
 		$out = "\tvar \${$table} = array(\n";
 		if (is_array($fields)) {
@@ -573,7 +573,7 @@ class CakeSchema extends Object {
  * @param array $new New indexes
  * @param array $old Old indexes
  * @return mixed False on failure, or an array of parameters to add & drop.
- **/
+ */
 	function _compareTableParameters($new, $old) {
 		if (!is_array($new) || !is_array($old)) {
 			return false;
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index 1e0d904ec..b4742cdfa 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -404,7 +404,7 @@ class DataSource extends Object {
  * before establishing a connection.
  *
  * @return boolean Whether or not the Datasources conditions for use are met.
- **/
+ */
 	function enabled() {
 		return true;
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index ae9c20b81..ec4f2a763 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -123,7 +123,7 @@ class DboAdodb extends DboSource {
  * Check that AdoDB is available.
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return function_exists('NewADOConnection');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 1f44cb03a..25e4f0d0d 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -144,7 +144,7 @@ class DboDb2 extends DboSource {
  * Check that the DB2 extension is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('ibm_db2');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index cfafb9f0c..d5a00c133 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -117,7 +117,7 @@ class DboFirebird extends DboSource {
  * Firebird Transaction commands.
  *
  * @var array
- **/
+ */
 	var $_commands = array(
 		'begin'	   => 'SET TRANSACTION',
 		'commit'   => 'COMMIT',
@@ -143,7 +143,7 @@ class DboFirebird extends DboSource {
  * Check that the interbase extension is loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('interbase');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index b698f1c97..1424332f4 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -162,7 +162,7 @@ class DboMssql extends DboSource {
  * Check that MsSQL is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('mssql');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 01ca7cf4d..f4b77f0a3 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -352,7 +352,7 @@ class DboMysqlBase extends DboSource {
  * @param array $parameters Parameters to add & drop.
  * @return array Array of table property alteration statementes.
  * @todo Implement this method.
- **/
+ */
 	function _alterTableParameters($table, $parameters) {
 		if (isset($parameters['change'])) {
 			return $this->buildTableParameters($parameters['change']);
@@ -530,7 +530,7 @@ class DboMysql extends DboMysqlBase {
  * Check whether the MySQL extension is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('mysql');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index f1b45020b..6826024b2 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -87,7 +87,7 @@ class DboMysqli extends DboMysqlBase {
  * Check that MySQLi is installed/enabled
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('mysqli');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index 6cde21b24..a53687ad9 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -110,7 +110,7 @@ class DboOdbc extends DboSource {
  * Check if the ODBC extension is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('odbc');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index ac2861373..33c97c815 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -127,7 +127,7 @@ class DboPostgres extends DboSource {
  * Check if PostgreSQL is enabled/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('pgsql');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 0932303a6..f431f540c 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -141,7 +141,7 @@ class DboSqlite extends DboSource {
  * Check that SQLite is enabled/installed
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('sqlite');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 023beb28b..0551a92b3 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -109,7 +109,7 @@ class DboSybase extends DboSource {
  * Check that one of the sybase extensions is installed
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('sybase') || extension_loaded('sybase_ct');
 	}
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 72bdbdc05..8fd796675 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -495,7 +495,7 @@ class DboSource extends DataSource {
  *
  * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
  * @return array Array of queries run as an array
- **/
+ */
 	function getLog($sorted = false) {
 		if ($sorted) {
 			$log = sortByKey($this->_queriesLog, 'took', 'desc', SORT_NUMERIC);
@@ -967,7 +967,7 @@ class DboSource extends DataSource {
  * @param object $model Model being merged onto
  * @param object $linkModel Model being merged
  * @return void
- **/
+ */
 	function __mergeHasMany(&$resultSet, $merge, $association, &$model, &$linkModel) {
 		foreach ($resultSet as $i => $value) {
 			$count = 0;
@@ -2483,7 +2483,7 @@ class DboSource extends DataSource {
  * @param array $columnData The array of column data.
  * @param string $position The position type to use. 'beforeDefault' or 'afterDefault' are common
  * @return string a built column with the field parameters added.
- **/
+ */
 	function _buildFieldParameters($columnString, $columnData, $position) {
 		foreach ($this->fieldParameters as $paramName => $value) {
 			if (isset($columnData[$paramName]) && $value['position'] == $position) {
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 3484c11d5..0b94b3907 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -161,7 +161,7 @@ class Router {
  * Builds __prefixes
  *
  * @return void
- **/
+ */
 	function Router() {
 		$this->__setPrefixes();
 	}
@@ -173,7 +173,7 @@ class Router {
  * @return void
  * @access private
  * @todo Remove support for Routing.admin in future versions.
- **/
+ */
 	function __setPrefixes() {
 		$routing = Configure::read('Routing');
 		if (!empty($routing['admin'])) {
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index c1c57f58d..030b17fe1 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -225,7 +225,7 @@ class Helper extends Overloadable {
  *
  * @param string $path The file path to timestamp, the path must be inside WWW_ROOT
  * @return string Path with a timestamp added, or not.
- **/
+ */
 	function assetTimestamp($path) {
 		$timestampEnabled = (
 			(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index c7492558b..f86c84087 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -143,14 +143,14 @@ class HtmlHelper extends AppHelper {
  *
  * @var array
  * @access private
- **/
+ */
 	var $__includedScripts = array();
 /**
  * Options for the currently opened script block buffer if any.
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_scriptBlockOptions = array();
 /**
  * Document type definitions
@@ -436,7 +436,7 @@ class HtmlHelper extends AppHelper {
  * @param mixed $options Array of options, and html attributes see above. If boolean sets $options['inline'] = value
  * @return mixed String of <script /> tags or null if $inline is false or if $once is true and the file has been
  *   included before.
- **/
+ */
 	function script($url, $options = array()) {
 		if (is_bool($options)) {
 			list($inline, $options) = array($options, array());
@@ -492,7 +492,7 @@ class HtmlHelper extends AppHelper {
  * @param string $script The script to wrap
  * @param array $options The options to use.
  * @return mixed string or null depending on the value of `$options['inline']`
- **/
+ */
 	function scriptBlock($script, $options = array()) {
 		$options += array('safe' => true, 'inline' => true);
 		if ($options['safe']) {
@@ -521,7 +521,7 @@ class HtmlHelper extends AppHelper {
  *
  * @param array $options Options for the code block.
  * @return void
- **/
+ */
 	function scriptStart($options = array()) {
 		$options += array('safe' => true, 'inline' => true);
 		$this->_scriptBlockOptions = $options;
@@ -534,7 +534,7 @@ class HtmlHelper extends AppHelper {
  * used when the scriptBlock was started
  *
  * @return mixed depending on the settings of scriptStart() either a script tag or null
- **/
+ */
 	function scriptEnd() {
 		$buffer = ob_get_clean();
 		$options = $this->_scriptBlockOptions;
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 4fb814449..c4732a5ca 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -319,7 +319,7 @@ class JavascriptHelper extends AppHelper {
  * Encode a string into JSON.  Converts and escapes necessary characters.
  *
  * @return void
- **/
+ */
 	function _utf8ToHex($string) {
 		$length = strlen($string);
 		$return = '';
diff --git a/cake/libs/view/helpers/jquery_engine.php b/cake/libs/view/helpers/jquery_engine.php
index 3509ecd61..7c592f6e3 100644
--- a/cake/libs/view/helpers/jquery_engine.php
+++ b/cake/libs/view/helpers/jquery_engine.php
@@ -27,7 +27,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * Option mappings for jQuery
  *
  * @var array
- **/
+ */
 	var $_optionMap = array(
 		'request' => array(
 			'type' => 'dataType',
@@ -55,7 +55,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * callback arguments lists
  *
  * @var string
- **/
+ */
 	var $_callbackArguments = array(
 		'slider' => array(
 			'start' => 'event, ui',
@@ -103,7 +103,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * when jQuery is put into noConflict() mode.
  *
  * @var string
- **/
+ */
 	 var $jQueryObject = '$';
 
 /**
@@ -116,7 +116,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param string $callbacks Array of callback / special options.
  * @access public
  * @return string
- **/
+ */
 	function _methodTemplate($method, $template, $options, $extraSafeKeys = array()) {
 		$options = $this->_mapOptions($method, $options);
 		$options = $this->_prepareCallbacks($method, $options);
@@ -133,7 +133,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		if ($selector == 'window' || $selector == 'document') {
 			$this->selection = $this->jQueryObject . '(' . $selector .')';
@@ -155,7 +155,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		$defaults = array('wrap' => true, 'stop' => true);
 		$options = array_merge($defaults, $options);
@@ -175,7 +175,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		$this->get('document');
 		return $this->event('ready', $functionBody, array('stop' => false));
@@ -187,7 +187,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param string $method The method you want to apply to the selection
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		return $this->selection . '.each(function () {' . $callback . '});';
 	}
@@ -199,7 +199,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
  * @see JsBaseEngineHelper::effect()
- **/
+ */
 	function effect($name, $options = array()) {
 		$speed = null;
 		if (isset($options['speed']) && in_array($options['speed'], array('fast', 'slow'))) {
@@ -230,7 +230,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param mixed $url
  * @param array $options
  * @return string The completed ajax call.
- **/
+ */
 	function request($url, $options = array()) {
 		$url = $this->url($url);
 		$options = $this->_mapOptions('request', $options);
@@ -266,7 +266,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the sortable.
  * @return string Completed sortable script.
  * @see JsHelper::sortable() for options list.
- **/
+ */
 	function sortable($options = array()) {
 		$template = '%s.sortable({%s});';
 		return $this->_methodTemplate('sortable', $template, $options);
@@ -280,7 +280,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the draggable element.
  * @return string Completed Draggable script.
  * @see JsHelper::drag() for options list.
- **/
+ */
 	function drag($options = array()) {
 		$template = '%s.draggable({%s});';
 		return $this->_methodTemplate('drag', $template, $options);
@@ -294,7 +294,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable element.
  * @return string Completed Droppable script.
  * @see JsHelper::drop() for options list.
- **/
+ */
 	function drop($options = array()) {
 		$template = '%s.droppable({%s});';
 		return $this->_methodTemplate('drop', $template, $options);
@@ -308,7 +308,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable element.
  * @return string Completed Slider script.
  * @see JsHelper::slider() for options list.
- **/
+ */
 	function slider($options = array()) {
 		$callbacks = array('start', 'change', 'slide', 'stop');
 		$template = '%s.slider({%s});';
@@ -322,7 +322,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Options for the serialization
  * @return string completed form serialization script
  * @see JsHelper::serializeForm() for option list.
- **/
+ */
 	function serializeForm($options = array()) {
 		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
 		$selector = $this->selection;
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index d0ccb5689..1352074c8 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -26,20 +26,20 @@
  *
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
- **/
+ */
 class JsHelper extends AppHelper {
 /**
  * Whether or not you want scripts to be buffered or output.
  *
  * @var boolean
- **/
+ */
 	var $bufferScripts = true;
 
 /**
  * helpers
  *
  * @var array
- **/
+ */
 	var $helpers = array('Html', 'Form');
 
 /**
@@ -47,14 +47,14 @@ class JsHelper extends AppHelper {
  *
  * @var array
  * @see JsHelper::set()
- **/
+ */
 	var $__jsVars = array();
 
 /**
  * Scripts that are queued for output
  *
  * @var array
- **/
+ */
 	var $__bufferedScripts = array();
 
 /**
@@ -62,14 +62,14 @@ class JsHelper extends AppHelper {
  *
  * @var string
  * @access private
- **/
+ */
 	var $__engineName;
 
 /**
  * The javascript variable created by set() variables.
  *
  * @var string
- **/
+ */
 	var $setVariable = APP_DIR;
 
 /**
@@ -78,7 +78,7 @@ class JsHelper extends AppHelper {
  * @param array $settings Settings array contains name of engine helper.
  * @access public
  * @return void
- **/
+ */
 	function __construct($settings = array()) {
 		$className = 'Jquery';
 		if (is_array($settings) && isset($settings[0])) {
@@ -115,7 +115,7 @@ class JsHelper extends AppHelper {
  * @param array $params Parameters for the method being called.
  * @access public
  * @return mixed Depends on the return of the dispatched method, or it could be an instance of the EngineHelper
- **/
+ */
 	function call__($method, $params) {
 		if (isset($this->{$this->__engineName}) && method_exists($this->{$this->__engineName}, $method)) {
 			$buffer = false;
@@ -158,7 +158,7 @@ class JsHelper extends AppHelper {
  * @param array $options Options to use for encoding JSON.  See JsBaseEngineHelper::object() for more details.
  * @return string encoded JSON
  * @deprecated Remove when support for PHP4 and Object::object are removed.
- **/
+ */
 	function object($data = array(), $options = array()) {
 		return $this->{$this->__engineName}->object($data, $options);
 	}
@@ -178,7 +178,7 @@ class JsHelper extends AppHelper {
  *
  * @param array $options options for the code block
  * @return string completed javascript tag.
- **/
+ */
 	function writeBuffer($options = array()) {
 		$defaults = array('onDomReady' => true, 'inline' => true, 'cache' => false, 'clear' => true, 'safe' => true);
 		$options = array_merge($defaults, $options);
@@ -208,7 +208,7 @@ class JsHelper extends AppHelper {
  * Write a script to the cached scripts.
  *
  * @return void
- **/
+ */
 	function buffer($script) {
 		$this->__bufferedScripts[] = $script;
 	}
@@ -218,7 +218,7 @@ class JsHelper extends AppHelper {
  *
  * @param boolean $clear Whether or not to clear the script caches (default true)
  * @return array Array of scripts added to the request.
- **/
+ */
 	function getBuffer($clear = true) {
 		$this->_createVars();
 		$scripts = $this->__bufferedScripts;
@@ -233,7 +233,7 @@ class JsHelper extends AppHelper {
  * Generates the object string for variables passed to javascript.
  *
  * @return string
- **/
+ */
 	function _createVars() {
 		if (!empty($this->__jsVars)) {
 			$setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'var ' . $this->setVariable;
@@ -258,7 +258,7 @@ class JsHelper extends AppHelper {
  * @param mixed $url Mixed either a string URL or an cake url array.
  * @param array $options Options for both the HTML element and Js::request()
  * @return string Completed link. If buffering is disabled a script tag will be returned as well.
- **/
+ */
 	function link($title, $url = null, $options = array()) {
 		if (!isset($options['id'])) {
 			$options['id'] = 'link-' . intval(mt_rand());
@@ -293,7 +293,7 @@ class JsHelper extends AppHelper {
  * @param mixed $one
  * @param mixed $two
  * @return void
- **/
+ */
 	function set($one, $two = null) {
 		$data = null;
 		if (is_array($one)) {
@@ -322,7 +322,7 @@ class JsHelper extends AppHelper {
  * @param string $title The display text of the submit button.
  * @param array $options Array of options to use.
  * @return string Completed submit button.
- **/
+ */
 	function submit($caption = null, $options = array()) {
 		if (!isset($options['id'])) {
 			$options['id'] = 'submit-' . intval(mt_rand());
@@ -364,7 +364,7 @@ class JsHelper extends AppHelper {
  * @param array $options Options to filter.
  * @param array $additional Array of additional keys to extract and include in the return options array.
  * @return array Array of options for non-js.
- **/
+ */
 	function _getHtmlOptions(&$options, $additional = array()) {
 		$htmlKeys = array_merge(array('class', 'id', 'escape', 'onblur', 'onfocus', 'rel', 'title'), $additional);
 		$htmlOptions = array();
@@ -388,14 +388,14 @@ class JsHelper extends AppHelper {
  * Abstract Base Class for All JsEngines to extend. Provides generic methods.
  *
  * @package cake.view.helpers
- **/
+ */
 class JsBaseEngineHelper extends AppHelper {
 /**
  * Determines whether native JSON extension is used for encoding.  Set by object constructor.
  *
  * @var boolean
  * @access public
- **/
+ */
 	var $useNative = false;
 
 /**
@@ -403,7 +403,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @var string
  * @access public
- **/
+ */
 	var $selection;
 
 /**
@@ -412,7 +412,7 @@ class JsBaseEngineHelper extends AppHelper {
  * for end user use though.
  *
  * @var array
- **/
+ */
 	var $_optionMap = array();
 
 /**
@@ -420,21 +420,21 @@ class JsBaseEngineHelper extends AppHelper {
  * This allows specific 'end point' methods to be automatically buffered by the JsHelper.
  *
  * @var array
- **/
+ */
 	var $bufferedMethods = array('event', 'sortable', 'drag', 'drop', 'slider');
 
 /**
  * Contains a list of callback names -> default arguments.
  *
  * @var array
- **/
+ */
 	var $_callbackArguments = array();
 
 /**
  * Constructor.
  *
  * @return void
- **/
+ */
 	function __construct() {
 		$this->useNative = function_exists('json_encode');
 	}
@@ -445,7 +445,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $message Message you want to alter.
  * @access public
  * @return string completed alert()
- **/
+ */
 	function alert($message) {
 		return 'alert("' . $this->escape($message) . '");';
 	}
@@ -456,7 +456,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param  mixed $url
  * @param  array  $options
  * @return string completed redirect in javascript
- **/
+ */
 	function redirect($url = null) {
 		return 'window.location = "' . Router::url($url) . '";';
 	}
@@ -467,7 +467,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $message Message you want confirmed.
  * @access public
  * @return string completed confirm()
- **/
+ */
 	function confirm($message) {
 		return 'confirm("' . $this->escape($message) . '");';
 	}
@@ -479,7 +479,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $message Message to use in the confirm dialog.
  * @access public
  * @return string
- **/
+ */
 	function confirmReturn($message) {
 		$out = 'var _confirm = ' . $this->confirm($message);
 		$out .= "if (!_confirm) {\n\treturn false;\n}";
@@ -493,7 +493,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $default Default message
  * @access public
  * @return string completed prompt()
- **/
+ */
 	function prompt($message, $default = '') {
 		return 'prompt("' . $this->escape($message) . '", "' . $this->escape($default) . '");';
 	}
@@ -511,7 +511,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $options Set of options, see above.
  * @return string A JSON code block
  * @access public
- **/
+ */
 	function object($data = array(), $options = array()) {
 		$defaultOptions = array(
 			'prefix' => '', 'postfix' => '',
@@ -571,7 +571,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param boolean $quoteStrings If false, leaves string values unquoted
  * @return string a JavaScript-safe/JSON representation of $val
  * @access public
- **/
+ */
 	function value($val, $quoteString = true) {
 		switch (true) {
 			case (is_array($val) || is_object($val)):
@@ -611,7 +611,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param  string $script String that needs to get escaped.
  * @return string Escaped string.
  * @access public
- **/
+ */
 	function escape($string) {
 		App::import('Core', 'Multibyte');
 		return $this->_utf8ToHex($string);
@@ -621,7 +621,7 @@ class JsBaseEngineHelper extends AppHelper {
  * Encode a string into JSON.  Converts and escapes necessary characters.
  *
  * @return void
- **/
+ */
 	function _utf8ToHex($string) {
 		$length = strlen($string);
 		$return = '';
@@ -716,7 +716,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		trigger_error(sprintf(__('%s does not have get() implemented', true), get_class($this)), E_USER_WARNING);
 		return $this;
@@ -734,7 +734,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		trigger_error(sprintf(__('%s does not have event() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -744,7 +744,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		trigger_error(sprintf(__('%s does not have domReady() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -754,7 +754,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		trigger_error(sprintf(__('%s does not have each() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -781,7 +781,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $name The name of the effect to trigger.
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
- **/
+ */
 	function effect($name, $options) {
 		trigger_error(sprintf(__('%s does not have effect() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -810,7 +810,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param mixed $url Array or String URL to target with the request.
  * @param array $options Array of options. See above for cross library supported options
  * @return string XHR request.
- **/
+ */
 	function request($url, $options = array()) {
 		trigger_error(sprintf(__('%s does not have request() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -833,7 +833,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param array $options Options array see above.
  * @return string Completed drag script
- **/
+ */
 	function drag($options = array()) {
 		trigger_error(sprintf(__('%s does not have drag() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -854,7 +854,7 @@ class JsBaseEngineHelper extends AppHelper {
  * - `leave` - Event fired when a drag is removed from a drop zone without being dropped.
  *
  * @return string Completed drop script
- **/
+ */
 	function drop($options = array()) {
 		trigger_error(sprintf(__('%s does not have drop() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -878,7 +878,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param array $options Array of options for the sortable. See above.
  * @return string Completed sortable script.
- **/
+ */
 	function sortable() {
 		trigger_error(sprintf(__('%s does not have sortable() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -901,7 +901,7 @@ class JsBaseEngineHelper extends AppHelper {
  * - `complete` - Fired when the user stops sliding the handle
  *
  * @return string Completed slider script
- **/
+ */
 	function slider() {
 		trigger_error(sprintf(__('%s does not have slider() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -919,7 +919,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param array $options options for serialization generation.
  * @return string completed form serialization script
- **/
+ */
 	function serializeForm() {
 		trigger_error(
 			sprintf(__('%s does not have serializeForm() implemented', true), get_class($this)), E_USER_WARNING
@@ -935,7 +935,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $safeKeys Keys that should not be escaped.
  * @return string
  * @access protected
- **/
+ */
 	function _parseOptions($options, $safeKeys = array()) {
 		$out = array();
 		$safeKeys = array_flip($safeKeys);
@@ -957,7 +957,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $options Array of options to map.
  * @return array Array of mapped options.
  * @access protected
- **/
+ */
 	function _mapOptions($method, $options) {
 		if (!isset($this->_optionMap[$method])) {
 			return $options;
@@ -980,7 +980,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $callbacks Additional Keys that contain callbacks
  * @access protected
  * @return array Array of options with callbacks added.
- **/
+ */
 	function _prepareCallbacks($method, $options, $callbacks = array()) {
 		$wrapCallbacks = true;
 		if (isset($options['wrapCallbacks'])) {
@@ -1016,7 +1016,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $method Name of method processing options for.
  * @param array $options Array of options to process.
  * @return string Parsed options string.
- **/
+ */
 	function _processOptions($method, $options) {
 		$options = $this->_mapOptions($method, $options);
 		$options = $this->_prepareCallbacks($method, $options);
@@ -1030,7 +1030,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $parameters Array of parameters to convert to a query string
  * @return string Querystring fragment
  * @access protected
- **/
+ */
 	function _toQuerystring($parameters) {
 		$out = '';
 		$keys = array_keys($parameters);
diff --git a/cake/libs/view/helpers/mootools_engine.php b/cake/libs/view/helpers/mootools_engine.php
index 07b4587f2..7fe26e33b 100644
--- a/cake/libs/view/helpers/mootools_engine.php
+++ b/cake/libs/view/helpers/mootools_engine.php
@@ -32,7 +32,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * Option mappings for MooTools
  *
  * @var array
- **/
+ */
 	var $_optionMap = array(
 		'request' => array(
 			'complete' => 'onComplete',
@@ -70,7 +70,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * Contains a list of callback names -> default arguments.
  *
  * @var array
- **/
+ */
 	var $_callbackArguments = array(
 		'slider' => array(
 			'onTick' => 'position',
@@ -116,7 +116,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		$this->_multipleSelection = false;
 		if ($selector == 'window' || $selector == 'document') {
@@ -144,7 +144,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		$defaults = array('wrap' => true, 'stop' => true);
 		$options = array_merge($defaults, $options);
@@ -165,7 +165,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		$this->selection = 'window';
 		return $this->event('domready', $functionBody, array('stop' => false));
@@ -177,7 +177,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param string $method The method you want to apply to the selection
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		return $this->selection . '.each(function (item, index) {' . $callback . '});';
 	}
@@ -189,7 +189,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
  * @see JsBaseEngineHelper::effect()
- **/
+ */
 	function effect($name, $options = array()) {
 		$speed = null;
 		if (isset($options['speed']) && in_array($options['speed'], array('fast', 'slow'))) {
@@ -231,7 +231,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param mixed $url
  * @param array $options
  * @return string The completed ajax call.
- **/
+ */
 	function request($url, $options = array()) {
 		$url = $this->url($url);
 		$options = $this->_mapOptions('request', $options);
@@ -270,7 +270,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the sortable.
  * @return string Completed sortable script.
  * @see JsHelper::sortable() for options list.
- **/
+ */
 	function sortable($options = array()) {
 		$options = $this->_processOptions('sortable', $options);
 		return 'var jsSortable = new Sortables(' . $this->selection . ', {' . $options . '});';
@@ -284,7 +284,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the draggable.
  * @return string Completed draggable script.
  * @see JsHelper::drag() for options list.
- **/
+ */
 	function drag($options = array()) {
 		$options = $this->_processOptions('drag', $options);
 		return $this->selection . '.makeDraggable({' . $options . '});';
@@ -303,7 +303,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable.
  * @return string Completed droppable script.
  * @see JsHelper::drop() for options list.
- **/
+ */
 	function drop($options = array()) {
 		if (empty($options['drag'])) {
 			trigger_error(
@@ -333,7 +333,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the slider.
  * @return string Completed slider script.
  * @see JsHelper::slider() for options list.
- **/
+ */
 	function slider($options = array()) {
 		$slider = $this->selection;
 		$this->get($options['handle']);
@@ -358,7 +358,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options.
  * @return string Completed serializeForm() snippet
  * @see JsHelper::serializeForm()
- **/
+ */
 	function serializeForm($options = array()) {
 		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
 		$selection = $this->selection;
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 959ab3afa..6503c234e 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -36,7 +36,7 @@ class NumberHelper extends AppHelper {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_currencies = array(
 		'USD' => array(
 			'before' => '$', 'after' => 'c', 'zero' => 0, 'places' => 2, 'thousands' => ',',
@@ -57,7 +57,7 @@ class NumberHelper extends AppHelper {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_currencyDefaults = array(
 		'before'=>'', 'after' => '', 'zero' => '0', 'places' => 2, 'thousands' => ',',
 		'decimals' => '.','negative' => '()', 'escape' => true
@@ -222,7 +222,7 @@ class NumberHelper extends AppHelper {
  * @param string $formatName The format name to be used in the future.
  * @param array $options The array of options for this format.
  * @return void
- **/
+ */
 	function addFormat($formatName, $options) {
 		$this->_currencies[$formatName] = $options + $this->_currencyDefaults;
 	}
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 547385f22..45ffb488d 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -46,7 +46,7 @@ class PaginatorHelper extends AppHelper {
  * The class used for 'Ajax' pagination links.
  *
  * @var string
- **/
+ */
 	var $_ajaxHelperClass = 'Js';
 
 /**
@@ -83,7 +83,7 @@ class PaginatorHelper extends AppHelper {
  * The chosen custom helper must implement a `link()` method.
  *
  * @return void
- **/
+ */
 	function __construct($config = array()) {
 		$ajaxProvider = isset($config['ajax']) ? $config['ajax'] : 'Js';
 		$this->helpers[] = $ajaxProvider;
diff --git a/cake/libs/view/helpers/prototype_engine.php b/cake/libs/view/helpers/prototype_engine.php
index 090946281..cc5aeb041 100644
--- a/cake/libs/view/helpers/prototype_engine.php
+++ b/cake/libs/view/helpers/prototype_engine.php
@@ -27,13 +27,13 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * Is the current selection a multiple selection? or is it just a single element.
  *
  * @var boolean
- **/
+ */
 	var $_multiple = false;
 /**
  * Option mappings for Prototype
  *
  * @var array
- **/
+ */
 	var $_optionMap = array(
 		'request' => array(
 			'async' => 'asynchronous',
@@ -73,7 +73,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * Contains a list of callback names -> default arguments.
  *
  * @var array
- **/
+ */
 	var $_callbackArguments = array(
 		'slider' => array(
 			'onSlide' => 'value',
@@ -108,7 +108,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		$this->_multiple = false;
 		if ($selector == 'window' || $selector == 'document') {
@@ -135,7 +135,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		$defaults = array('wrap' => true, 'stop' => true);
 		$options = array_merge($defaults, $options);
@@ -155,7 +155,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		$this->selection = 'document';
 		return $this->event('dom:loaded', $functionBody, array('stop' => false));
@@ -166,7 +166,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param string $method The method you want to apply to the selection
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		return $this->selection . '.each(function (item, index) {' . $callback . '});';
 	}
@@ -179,7 +179,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
  * @see JsBaseEngineHelper::effect()
- **/
+ */
 	function effect($name, $options = array()) {
 		$effect = '';
 		$optionString = null;
@@ -220,7 +220,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param mixed $url
  * @param array $options
  * @return string The completed ajax call.
- **/
+ */
 	function request($url, $options = array()) {
 		$url = '"'. $this->url($url) . '"';
 		$options = $this->_mapOptions('request', $options);
@@ -255,7 +255,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the sortable.
  * @return string Completed sortable script.
  * @see JsHelper::sortable() for options list.
- **/
+ */
 	function sortable($options = array()) {
 		$options = $this->_processOptions('sortable', $options);
 		if (!empty($options)) {
@@ -271,7 +271,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the draggable.
  * @return string Completed draggable script.
  * @see JsHelper::draggable() for options list.
- **/
+ */
 	function drag($options = array()) {
 		$options = $this->_processOptions('drag', $options);
 		if (!empty($options)) {
@@ -290,7 +290,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable.
  * @return string Completed droppable script.
  * @see JsHelper::droppable() for options list.
- **/
+ */
 	function drop($options = array()) {
 		$options = $this->_processOptions('drop', $options);
 		if (!empty($options)) {
@@ -306,7 +306,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the slider.
  * @return string Completed slider script.
  * @see JsHelper::slider() for options list.
- **/
+ */
 	function slider($options = array()) {
 		$slider = $this->selection;
 		$this->get($options['handle']);
@@ -330,7 +330,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options.
  * @return string Completed serializeForm() snippet
  * @see JsHelper::serializeForm()
- **/
+ */
 	function serializeForm($options = array()) {
 		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
 		$selection = $this->selection;
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index 6938a1b19..c0bc776c2 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -34,7 +34,7 @@ class RssHelper extends XmlHelper {
  *
  * @var array
  * @access public
- **/
+ */
 	var $helpers = array('Time');
 
 /**
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 970341f7c..af8d49127 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -252,7 +252,7 @@ class View extends Object {
  * Holds View output.
  *
  * @var string
- **/
+ */
 	var $output = false;
 
 /**
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 75c21f523..eb87b7b00 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -33,8 +33,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * setUp method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function setUp() {
 		App::build(array(
@@ -46,8 +46,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * tearDown method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function tearDown() {
 		App::build();
@@ -58,7 +58,8 @@ class BasicsTest extends CakeTestCase {
  * test the array_diff_key compatibility function.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testArrayDiffKey() {
 		$one = array('one' => 1, 'two' => 2, 'three' => 3);
 		$two = array('one' => 'one', 'two' => 'two');
@@ -175,8 +176,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test uses()
  *
- * @access public
  * @return void
+ * @access public
  * @deprecated
  */
 	function testUses() {
@@ -194,8 +195,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test h()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testH() {
 		$string = '<foo>';
@@ -211,8 +212,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test a()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testA() {
 		$result = a('this', 'that', 'bar');
@@ -222,8 +223,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test aa()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAa() {
 		$result = aa('a', 'b', 'c', 'd');
@@ -238,8 +239,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test am()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAm() {
 		$result = am(array('one', 'two'), 2, 3, 4);
@@ -254,8 +255,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test cache()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testCache() {
 		$_cacheDisable = Configure::read('Cache.disable');
@@ -290,8 +291,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test clearCache()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testClearCache() {
 		$cacheOff = Configure::read('Cache.disable');
@@ -338,8 +339,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -362,8 +363,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __n()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__n() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -390,8 +391,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __d()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__d() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -418,8 +419,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __dn()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__dn() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -450,8 +451,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __c()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__c() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -474,8 +475,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __dc()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__dc() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -506,8 +507,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __dcn()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__dcn() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -534,8 +535,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test LogError()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testLogError() {
 		@unlink(LOGS . 'error.log');
@@ -552,8 +553,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test fileExistsInPath()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testFileExistsInPath() {
 		$this->skipUnless(function_exists('ini_set'), '%s ini_set function not available');
@@ -597,8 +598,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test convertSlash()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testConvertSlash() {
 		$result = convertSlash('\path\to\location\\');
@@ -613,8 +614,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test debug()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDebug() {
 		ob_start();
@@ -637,8 +638,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test pr()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPr() {
 		ob_start();
@@ -657,8 +658,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test params()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParams() {
 		$this->assertNull(params('weekend'));
@@ -675,8 +676,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test stripslashes_deep()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testStripslashesDeep() {
 		$this->skipIf(ini_get('magic_quotes_sybase') === '1', '%s magic_quotes_sybase is on');
@@ -713,8 +714,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test stripslashes_deep() with magic_quotes_sybase on
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testStripslashesDeepSybase() {
 		$this->skipUnless(ini_get('magic_quotes_sybase') === '1', '%s magic_quotes_sybase is off');
@@ -747,8 +748,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test ife()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testIfe() {
 		$this->assertEqual(ife(true, 'a', 'b'), 'a');
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index be2134d4e..4838cabc2 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -41,8 +41,8 @@ class TestDispatcher extends Dispatcher {
  * @param mixed $controller
  * @param mixed $params
  * @param mixed $missingAction
- * @access protected
  * @return void
+ * @access protected
  */
 	function _invoke(&$controller, $params) {
 		restore_error_handler();
@@ -60,8 +60,8 @@ class TestDispatcher extends Dispatcher {
  * cakeError method
  *
  * @param mixed $filename
- * @access public
  * @return void
+ * @access public
  */
 	function cakeError($filename, $params) {
 		return array($filename, $params);
@@ -70,8 +70,8 @@ class TestDispatcher extends Dispatcher {
 /**
  * _stop method
  *
- * @access protected
  * @return void
+ * @access protected
  */
 	function _stop() {
 		return true;
@@ -114,8 +114,8 @@ class MyPluginController extends MyPluginAppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -124,8 +124,8 @@ class MyPluginController extends MyPluginAppController {
 /**
  * add method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function add() {
 		return true;
@@ -135,8 +135,8 @@ class MyPluginController extends MyPluginAppController {
  * admin_add method
  *
  * @param mixed $id
- * @access public
  * @return void
+ * @access public
  */
 	function admin_add($id = null) {
 		return $id;
@@ -171,8 +171,8 @@ class SomePagesController extends AppController {
  * display method
  *
  * @param mixed $page
- * @access public
  * @return void
+ * @access public
  */
 	function display($page = null) {
 		return $page;
@@ -181,8 +181,8 @@ class SomePagesController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -191,8 +191,8 @@ class SomePagesController extends AppController {
 /**
  * protected method
  *
- * @access protected
  * @return void
+ * @access protected
  */
 	function _protected() {
 		return true;
@@ -201,8 +201,8 @@ class SomePagesController extends AppController {
 /**
  * redirect method overriding
  *
- * @access public
  * @return void
+ * @access public
  */
 	function redirect() {
 		echo 'this should not be accessible';
@@ -237,8 +237,8 @@ class OtherPagesController extends MyPluginAppController {
  * display method
  *
  * @param mixed $page
- * @access public
  * @return void
+ * @access public
  */
 	function display($page = null) {
 		return $page;
@@ -247,8 +247,8 @@ class OtherPagesController extends MyPluginAppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -282,8 +282,8 @@ class TestDispatchPagesController extends AppController {
 /**
  * admin_index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function admin_index() {
 		return true;
@@ -292,8 +292,8 @@ class TestDispatchPagesController extends AppController {
 /**
  * camelCased method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function camelCased() {
 		return true;
@@ -336,8 +336,8 @@ class ArticlesTestController extends ArticlesTestAppController {
 /**
  * admin_index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function admin_index() {
 		return true;
@@ -379,8 +379,8 @@ class SomePostsController extends AppController {
 /**
  * beforeFilter method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function beforeFilter() {
 		if ($this->params['action'] == 'index') {
@@ -394,8 +394,8 @@ class SomePostsController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -404,8 +404,8 @@ class SomePostsController extends AppController {
 /**
  * change method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function change() {
 		return true;
@@ -466,8 +466,8 @@ class TestCachedPagesController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		$this->render();
@@ -476,8 +476,8 @@ class TestCachedPagesController extends AppController {
 /**
  * test_nocache_tags method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test_nocache_tags() {
 		$this->render();
@@ -486,8 +486,8 @@ class TestCachedPagesController extends AppController {
 /**
  * view method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function view($id = null) {
 		$this->render('index');
@@ -521,8 +521,8 @@ class TimesheetsController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -540,8 +540,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * setUp method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function startTest() {
 		$this->_get = $_GET;
@@ -567,8 +567,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * tearDown method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function endTest() {
 		$_GET = $this->_get;
@@ -584,8 +584,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithoutZerosAndEmptyPost method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithoutZerosAndEmptyPost() {
 		$Dispatcher =& new Dispatcher();
@@ -601,8 +601,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsReturnsPostedData method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsReturnsPostedData() {
 		$_POST['testdata'] = "My Posted Content";
@@ -615,8 +615,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithSingleZero method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithSingleZero() {
 		$Dispatcher =& new Dispatcher();
@@ -631,8 +631,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithManySingleZeros method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithManySingleZeros() {
 		$Dispatcher =& new Dispatcher();
@@ -648,8 +648,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithManyZerosInEachSectionOfUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithManyZerosInEachSectionOfUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -665,8 +665,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -682,8 +682,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testQueryStringOnRoot method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testQueryStringOnRoot() {
 		Router::reload();
@@ -712,8 +712,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testFileUploadArrayStructure method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testFileUploadArrayStructure() {
 		$_FILES = array('data' => array('name' => array(
@@ -965,8 +965,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testGetUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testGetUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -1005,8 +1005,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlAndWebrootWithModRewrite method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlAndWebrootWithModRewrite() {
 		$Dispatcher =& new Dispatcher();
@@ -1081,8 +1081,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlwithModRewriteAlias method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlwithModRewriteAlias() {
 		$_SERVER['DOCUMENT_ROOT'] = '/home/aplusnur/public_html';
@@ -1116,8 +1116,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlAndWebrootWithBaseUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlAndWebrootWithBaseUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -1186,8 +1186,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlAndWebrootWithBase method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlAndWebrootWithBase() {
 		$Dispatcher =& new Dispatcher();
@@ -1217,8 +1217,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testMissingController method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testMissingController() {
 		$Dispatcher =& new TestDispatcher();
@@ -1237,8 +1237,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testPrivate method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPrivate() {
 		$Dispatcher =& new TestDispatcher();
@@ -1260,8 +1260,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testMissingAction method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testMissingAction() {
 		$Dispatcher =& new TestDispatcher();
@@ -1298,8 +1298,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatch() {
 		$Dispatcher =& new TestDispatcher();
@@ -1353,8 +1353,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testDispatchWithArray method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatchWithArray() {
 		$Dispatcher =& new TestDispatcher();
@@ -1373,8 +1373,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAdminDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAdminDispatch() {
 		$_POST = array();
@@ -1404,8 +1404,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testPluginDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPluginDispatch() {
 		$_POST = array();
@@ -1453,8 +1453,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAutomaticPluginDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAutomaticPluginDispatch() {
 		$_POST = array();
@@ -1491,8 +1491,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAutomaticPluginControllerDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAutomaticPluginControllerDispatch() {
 		$_POST = array();
@@ -1594,7 +1594,8 @@ class DispatcherTest extends CakeTestCase {
  * plugin short form instead.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testAutomaticPluginDispatchWithShortAccess() {
 		$_POST = array();
 		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
@@ -1642,8 +1643,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAutomaticPluginControllerMissingActionDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAutomaticPluginControllerMissingActionDispatch() {
 		$_POST = array();
@@ -1685,8 +1686,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testPrefixProtection method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPrefixProtection() {
 		$_POST = array();
@@ -1715,7 +1716,8 @@ class DispatcherTest extends CakeTestCase {
  * undocumented function
  *
  * @return void
- **/
+ * @access public
+ */
 	function testTestPluginDispatch() {
 		$Dispatcher =& new TestDispatcher();
 		App::build(array(
@@ -1734,8 +1736,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testChangingParamsFromBeforeFilter method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testChangingParamsFromBeforeFilter() {
 		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
@@ -1768,8 +1770,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testStaticAssets method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testStaticAssets() {
 		Router::reload();
@@ -1845,8 +1847,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testFullPageCachingDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testFullPageCachingDispatch() {
 		Configure::write('Cache.disable', false);
@@ -1981,8 +1983,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testHttpMethodOverrides method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testHttpMethodOverrides() {
 		Router::reload();
@@ -2036,6 +2038,7 @@ class DispatcherTest extends CakeTestCase {
  * Tests that invalid characters cannot be injected into the application base path.
  *
  * @return void
+ * @access public
  */
 	function testBasePathInjection() {
 		$self = $_SERVER['PHP_SELF'];
@@ -2052,8 +2055,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testEnvironmentDetection method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testEnvironmentDetection() {
 		$dispatcher =& new Dispatcher();
@@ -2158,8 +2161,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * Tests that the Dispatcher does not return an empty action
  *
- * @access private
  * @return void
+ * @access public
  */
 	function testTrailingSlash() {
 		$_POST = array();
@@ -2184,8 +2187,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * backupEnvironment method
  *
- * @access private
  * @return void
+ * @access private
  */
 	function __backupEnvironment() {
 		return array(
@@ -2199,8 +2202,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * reloadEnvironment method
  *
- * @access private
  * @return void
+ * @access private
  */
 	function __reloadEnvironment() {
 		foreach ($_GET as $key => $val) {
@@ -2219,8 +2222,8 @@ class DispatcherTest extends CakeTestCase {
  * loadEnvironment method
  *
  * @param mixed $env
- * @access private
  * @return void
+ * @access private
  */
 	function __loadEnvironment($env) {
 		if ($env['reload']) {
@@ -2254,8 +2257,8 @@ class DispatcherTest extends CakeTestCase {
  * cachePath method
  *
  * @param mixed $her
- * @access private
  * @return string
+ * @access private
  */
 	function __cachePath($here) {
 		$path = $here;
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index b77310065..2aa63ef46 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -32,7 +32,7 @@ class CakeLogTest extends CakeTestCase {
  * Start test callback, clears all streams enabled.
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$streams = CakeLog::streams();
 		foreach ($streams as $stream) {
@@ -44,7 +44,7 @@ class CakeLogTest extends CakeTestCase {
  * test importing loggers from app/libs and plugins.
  *
  * @return void
- **/
+ */
 	function testImportingLoggers() {
 		App::build(array(
 			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
@@ -70,7 +70,7 @@ class CakeLogTest extends CakeTestCase {
  * test all the errors from failed logger imports
  *
  * @return void
- **/
+ */
 	function testImportingLoggerFailure() {
 		$this->expectError('Missing logger classname');
 		CakeLog::config('fail', array());
@@ -87,7 +87,7 @@ class CakeLogTest extends CakeTestCase {
  * When no streams are there.
  *
  * @return void
- **/
+ */
 	function testAutoConfig() {
 		@unlink(LOGS . 'error.log');
 		CakeLog::write(LOG_WARNING, 'Test warning');
@@ -102,7 +102,7 @@ class CakeLogTest extends CakeTestCase {
  * test configuring log streams
  *
  * @return void
- **/
+ */
 	function testConfig() {
 		CakeLog::config('file', array(
 			'engine' => 'FileLog',
@@ -145,7 +145,7 @@ class CakeLogTest extends CakeTestCase {
  * Test logging with the error handler.
  *
  * @return void
- **/
+ */
 	function testLoggingWithErrorHandling() {
 		@unlink(LOGS . 'debug.log');
 		Configure::write('log', E_ALL & ~E_DEPRECATED);
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index 725e95ae1..5260420a8 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -257,7 +257,7 @@ class CakeTestCaseTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testTestAction() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
@@ -389,7 +389,7 @@ class CakeTestCaseTest extends CakeTestCase {
  * testSkipIf
  *
  * @return void
- **/
+ */
 	function testSkipIf() {
 		$this->assertTrue($this->Case->skipIf(true));
 		$this->assertFalse($this->Case->skipIf(false));
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index e0b6c64a0..385b07562 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -110,7 +110,7 @@ class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
  *
  * @package       default
  * @subpackage    cake.cake.tests.cases.libs.
- **/
+ */
 class FixtureImportTestModel extends Model {
 	var $name = 'FixtureImport';
 	var $useTable = 'fixture_tests';
diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php
index abbf41d2d..f24a2c059 100644
--- a/cake/tests/cases/libs/code_coverage_manager.test.php
+++ b/cake/tests/cases/libs/code_coverage_manager.test.php
@@ -45,7 +45,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
  * Store reference of $_GET to restore later.
  *
  * @return void
- **/
+ */
 	function startCase() {
 		$this->_get = $_GET;
 	}
@@ -54,7 +54,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
  * End Case - restore GET vars.
  *
  * @return void
- **/
+ */
 	function endCase() {
 		$_GET = $this->_get;
 	}
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index 8b146b354..25eb9979c 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -136,7 +136,7 @@ class ConfigureTest extends CakeTestCase {
  * testSetErrorReporting Level
  *
  * @return void
- **/
+ */
 	function testSetErrorReportingLevel() {
 		Configure::write('log', false);
 
@@ -160,7 +160,7 @@ class ConfigureTest extends CakeTestCase {
  * test that log and debug configure values interact well.
  *
  * @return void
- **/
+ */
 	function testInteractionOfDebugAndLog() {
 		Configure::write('log', false);
 
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index 462321a57..f5a6745d1 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -477,7 +477,7 @@ class ComponentTest extends CakeTestCase {
  * Ensure that settings are not duplicated when passed into component initialize.
  *
  * @return void
- **/
+ */
 	function testComponentParamsNoDuplication() {
 		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
 			return;
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 14a912329..07bf1b8f7 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -767,7 +767,7 @@ class AuthTest extends CakeTestCase {
  * test authorize = 'actions' setting.
  *
  * @return void
- **/
+ */
 	function testAuthorizeActions() {
 		$this->AuthUser =& new AuthUser();
 		$user = $this->AuthUser->find();
@@ -827,7 +827,7 @@ class AuthTest extends CakeTestCase {
  * test the action() method
  *
  * @return void
- **/
+ */
 	function testActionMethod() {
 		$this->Controller->params['controller'] = 'auth_test';
 		$this->Controller->params['action'] = 'add';
@@ -856,7 +856,7 @@ class AuthTest extends CakeTestCase {
  * test that deny() converts camel case inputs to lowercase.
  *
  * @return void
- **/
+ */
 	function testDenyWithCamelCaseMethods() {
 		$this->Controller->Auth->initialize($this->Controller);
 		$this->Controller->Auth->allow('*');
@@ -873,7 +873,7 @@ class AuthTest extends CakeTestCase {
  * test that allow() and allowedActions work with camelCase method names.
  *
  * @return void
- **/
+ */
 	function testAllowedActionsWithCamelCaseMethods() {
 		$url = '/auth_test/camelCase';
 		$this->Controller->params = Router::parse($url);
@@ -1099,7 +1099,7 @@ class AuthTest extends CakeTestCase {
  * And the user doesn't have a session.
  *
  * @return void
- **/
+ */
 	function testNoRedirectOn404() {
 		$this->Controller->Session->delete('Auth');
 		$this->Controller->Auth->initialize($this->Controller);
@@ -1201,7 +1201,7 @@ class AuthTest extends CakeTestCase {
  * test Hashing of passwords
  *
  * @return void
- **/
+ */
 	function testHashPasswords() {
 		$this->Controller->Auth->userModel = 'AuthUser';
 
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index a72e602be..ca757321f 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -37,7 +37,7 @@ class RequestHandlerTestController extends Controller {
  *
  * @var string
  * @access public
- **/
+ */
 	var $name = 'RequestHandlerTest';
 
 /**
@@ -66,7 +66,7 @@ class RequestHandlerTestController extends Controller {
  * test method for ajax redirection
  *
  * @return void
- **/
+ */
 	function destination() {
 		$this->viewPath = 'posts';
 		$this->render('index');
@@ -245,7 +245,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  * testStartupCallback with charset.
  *
  * @return void
- **/
+ */
 	function testStartupCallbackCharset() {
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
 		$_SERVER['CONTENT_TYPE'] = 'application/xml; charset=UTF-8';
@@ -287,7 +287,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  *
  * @link #6466
  * @return void
- **/
+ */
 	function testRenderAsCalledTwice() {
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
 		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'xml');
@@ -551,7 +551,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  * test that ajax requests involving redirects trigger requestAction instead.
  *
  * @return void
- **/
+ */
 	function testAjaxRedirectAsRequestAction() {
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
 		$this->_init();
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 28eb2eab5..a704dd183 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -564,7 +564,7 @@ DIGEST;
  * test that validatePost fails if any of its required fields are missing.
  *
  * @return void
- **/
+ */
 	function testValidatePostFormHacking() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->params['_Token']['key'];
@@ -676,7 +676,7 @@ DIGEST;
  * test ValidatePost with multiple select elements.
  *
  * @return void
- **/
+ */
 	function testValidatePostMultipleSelect() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->params['_Token']['key'];
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index be3ca1738..fe35ba865 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -252,7 +252,7 @@ class ControllerPaginateModel extends CakeTestModel {
  *
  * @return void
  * @access public
- **/
+ */
 	function paginate($conditions, $fields, $order, $limit, $page, $recursive, $extra) {
 		$this->extra = $extra;
 	}
@@ -673,7 +673,7 @@ class ControllerTest extends CakeTestCase {
  * Test that special paginate types are called and that the type param doesn't leak out into defaults or options.
  *
  * @return void
- **/
+ */
 	function testPaginateSpecialType() {
 		$Controller =& new Controller();
 		$Controller->uses = array('ControllerPost', 'ControllerComment');
@@ -1029,7 +1029,7 @@ class ControllerTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testChildComponentOptionsSupercedeParents() {
 		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
 			return;
@@ -1046,7 +1046,7 @@ class ControllerTest extends CakeTestCase {
  * AppController when you make an instance of Controller
  *
  * @return void
- **/
+ */
 	function testMergeVarsNotGreedy() {
 		$Controller =& new Controller();
 		$Controller->components = array();
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
index 4b86318f0..9009f00f6 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -20,23 +20,26 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 if (!class_exists('AppController')) {
-	/**
-	 * Test case AppController requred
-	 *
-	 * @package cake.tests.cases.libs.controller
-	 **/
+
+/**
+ * Test case AppController
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.libs.controller
+ */
 	class AppController extends Controller {
-		/**
-		 * components
-		 *
-		 * @var array
-		 **/
+
+/**
+ * components
+ *
+ * @var array
+ */
 		var $components = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
-		/**
-		 * helpers
-		 *
-		 * @var array
-		 **/
+/**
+ * helpers
+ *
+ * @var array
+ */
 		var $helpers = array('MergeVar' => array('format' => 'html', 'terse'));
 	}
 } elseif (!defined('APP_CONTROLLER_EXISTS')) {
@@ -47,7 +50,7 @@ if (!class_exists('AppController')) {
  * MergeVar Component
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergeVarComponent extends Object {
 
 }
@@ -56,21 +59,21 @@ class MergeVarComponent extends Object {
  * Additional controller for testing
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergeVariablesController extends AppController {
 
 /**
  * name
  *
  * @var string
- **/
+ */
 	var $name = 'MergeVariables';
 
 /**
  * uses
  *
  * @var arrays
- **/
+ */
 	var $uses = array();
 }
 
@@ -78,21 +81,21 @@ class MergeVariablesController extends AppController {
  * MergeVarPlugin App Controller
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergeVarPluginAppController extends AppController {
 
 /**
  * components
  *
  * @var array
- **/
+ */
 	var $components = array('Auth' => array('setting' => 'val', 'otherVal'));
 
 /**
  * helpers
  *
  * @var array
- **/
+ */
 	var $helpers = array('Javascript');
 }
 
@@ -100,21 +103,21 @@ class MergeVarPluginAppController extends AppController {
  * MergePostsController
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergePostsController extends MergeVarPluginAppController {
 
 /**
  * name
  *
  * @var string
- **/
+ */
 	var $name = 'MergePosts';
 
 /**
  * uses
  *
  * @var array
- **/
+ */
 	var $uses = array();
 }
 
@@ -123,13 +126,13 @@ class MergePostsController extends MergeVarPluginAppController {
  * Test Case for Controller Merging of Vars.
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class ControllerMergeVarsTestCase extends CakeTestCase {
 /**
  * Skips the case if APP_CONTROLLER_EXISTS is defined
  *
  * @return void
- **/
+ */
 	function skip() {
 		$this->skipIf(defined('APP_CONTROLLER_EXISTS'), 'APP_CONTROLLER_EXISTS cannot run. %s');
 	}
@@ -137,7 +140,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		ClassRegistry::flush();
 	}
@@ -146,7 +149,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test that component settings are not duplicated when merging component settings
  *
  * @return void
- **/
+ */
 	function testComponentParamMergingNoDuplication() {
 		$Controller =& new MergeVariablesController();
 		$Controller->constructClasses();
@@ -159,7 +162,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test component merges with redeclared components
  *
  * @return void
- **/
+ */
 	function testComponentMergingWithRedeclarations() {
 		$Controller =& new MergeVariablesController();
 		$Controller->components['MergeVar'] = array('remote', 'redirect' => true);
@@ -173,7 +176,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test merging of helpers array, ensure no duplication occurs
  *
  * @return void
- **/
+ */
 	function testHelperSettingMergingNoDuplication() {
 		$Controller =& new MergeVariablesController();
 		$Controller->constructClasses();
@@ -186,7 +189,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test merging of vars with plugin
  *
  * @return void
- **/
+ */
 	function testMergeVarsWithPlugin() {
 		$Controller =& new MergePostsController();
 		$Controller->components = array('Email' => array('ports' => 'open'));
@@ -223,7 +226,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * AppController when you make an instance of Controller
  *
  * @return void
- **/
+ */
 	function testMergeVarsNotGreedy() {
 		$Controller =& new Controller();
 		$Controller->components = array();
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index 31cd29654..0813be0c2 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -153,7 +153,7 @@ class ScaffoldMock extends CakeTestModel {
  * hasAndBelongsToMany property
  *
  * @var string
- **/
+ */
 	var $hasAndBelongsToMany = array(
 		'ScaffoldTag' => array(
 			'className' => 'ScaffoldTag',
@@ -387,7 +387,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testIndexScaffold() {
 		$this->Controller->action = 'index';
 		$this->Controller->here = '/scaffold_mock';
@@ -426,7 +426,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testViewScaffold() {
 		$this->Controller->action = 'view';
 		$this->Controller->here = '/scaffold_mock';
@@ -468,7 +468,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testEditScaffold() {
 		$this->Controller->action = 'edit';
 		$this->Controller->here = '/scaffold_mock';
@@ -509,7 +509,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testAdminIndexScaffold() {
 		$_backAdmin = Configure::read('Routing.prefixes');
 
@@ -554,7 +554,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testAdminEditScaffold() {
 		$_backAdmin = Configure::read('Routing.prefixes');
 
@@ -597,7 +597,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testMultiplePrefixScaffold() {
 		$_backAdmin = Configure::read('Routing.prefixes');
 
@@ -718,7 +718,7 @@ class ScaffoldTest extends CakeTestCase {
  * test that the proper names and variable values are set by Scaffold
  *
  * @return void
- **/
+ */
 	function testScaffoldVariableSetting() {
 		$this->Controller->action = 'admin_edit';
 		$this->Controller->here = '/admin/scaffold_mock/edit';
@@ -757,7 +757,7 @@ class ScaffoldTest extends CakeTestCase {
  * test that scaffold outputs flash messages when sessions are unset.
  *
  * @return void
- **/
+ */
 	function testScaffoldFlashMessages() {
 		$this->Controller->action = 'edit';
 		$this->Controller->here = '/scaffold_mock';
@@ -797,7 +797,7 @@ class ScaffoldTest extends CakeTestCase {
  *
  * @see http://code.cakephp.org/tickets/view/48
  * @return void
- **/
+ */
 	function testHabtmFieldAdditionWithScaffoldForm() {
 		$this->Controller->action = 'edit';
 		$this->Controller->here = '/scaffold_mock';
@@ -830,7 +830,7 @@ class ScaffoldTest extends CakeTestCase {
  * test that the proper names and variable values are set by Scaffold
  *
  * @return void
- **/
+ */
 	function testEditScaffoldWithScaffoldFields() {
 		$this->Controller = new ScaffoldMockControllerWithFields();
 		$this->Controller->action = 'edit';
diff --git a/cake/tests/cases/libs/error.test.php b/cake/tests/cases/libs/error.test.php
index 262805eca..ac53aa6a2 100644
--- a/cake/tests/cases/libs/error.test.php
+++ b/cake/tests/cases/libs/error.test.php
@@ -218,7 +218,7 @@ class MyCustomErrorHandler extends ErrorHandler {
  * custom error message type.
  *
  * @return void
- **/
+ */
 	function missingWidgetThing() {
 		echo 'widget thing is missing';
 	}
@@ -276,7 +276,7 @@ class ErrorHandlerTest extends CakeTestCase {
  * into error404 when debug == 0
  *
  * @return void
- **/
+ */
 	function testSubclassMethodsNotBeingConvertedToError() {
 		$back = Configure::read('debug');
 		Configure::write('debug', 2);
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index c72f5fecc..84a24601b 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -222,7 +222,7 @@ class FolderTest extends CakeTestCase {
  * test Adding path elements to a path
  *
  * @return void
- **/
+ */
 	function testAddPathElement() {
 		$result = Folder::addPathElement(DS . 'some' . DS . 'dir', 'another_path');
 		$this->assertEqual($result, DS . 'some' . DS . 'dir' . DS . 'another_path');
diff --git a/cake/tests/cases/libs/log/file_log.test.php b/cake/tests/cases/libs/log/file_log.test.php
index 68e29591b..a479bc302 100644
--- a/cake/tests/cases/libs/log/file_log.test.php
+++ b/cake/tests/cases/libs/log/file_log.test.php
@@ -67,7 +67,7 @@ class FileLogTest extends CakeTestCase {
  * test using the path setting to write logs in other places.
  *
  * @return void
- **/
+ */
 	function testPathSetting() {
 		$path = TMP . 'tests' . DS;
 		@unlink($path . 'error.log');
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index d976a0758..7b57d245a 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -172,7 +172,7 @@ class MagicDbTestData extends Object {
  *
  * @param string $key
  * @access public
- **/
+ */
 	function get($key) {
 /**
  * data property
diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php
index 7b00d7b39..52ffbfb38 100644
--- a/cake/tests/cases/libs/model/cake_schema.test.php
+++ b/cake/tests/cases/libs/model/cake_schema.test.php
@@ -463,7 +463,7 @@ class CakeSchemaTest extends CakeTestCase {
  * test reading schema from plugins.
  *
  * @return void
- **/
+ */
 	function testSchemaReadWithPlugins() {
 		App::objects('model', null, false);
 		App::build(array(
@@ -489,7 +489,7 @@ class CakeSchemaTest extends CakeTestCase {
  * test that tables are generated correctly
  *
  * @return void
- **/
+ */
 	function testGenerateTable() {
 		$fields = array(
 			'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
@@ -567,7 +567,7 @@ class CakeSchemaTest extends CakeTestCase {
  * Test comparing tableParameters and indexes.
  *
  * @return void
- **/
+ */
 	function testTableParametersAndIndexComparison() {
 		$old = array(
 			'posts' => array(
@@ -670,7 +670,7 @@ class CakeSchemaTest extends CakeTestCase {
  * test loading schema files inside of plugins.
  *
  * @return void
- **/
+ */
 	function testSchemaLoadingFromPlugin() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
index 764960b7e..549bf8e66 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -196,7 +196,7 @@ class DboAdodbTest extends CakeTestCase {
  *
  * @var string
  * @access public
- **/
+ */
 	var $fixtures = array('core.article');
 
 /**
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 34ef2e682..be57aab6c 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -203,7 +203,7 @@ class DboMysqlTest extends CakeTestCase {
  * startCase
  *
  * @return void
- **/
+ */
 	function startCase() {
 		$this->_debug = Configure::read('debug');
 		Configure::write('debug', 1);
@@ -213,7 +213,7 @@ class DboMysqlTest extends CakeTestCase {
  * endCase
  *
  * @return void
- **/
+ */
 	function endCase() {
 		Configure::write('debug', $this->_debug);
 	}
@@ -418,7 +418,7 @@ class DboMysqlTest extends CakeTestCase {
  * Using a mock ensure that MySQL 4.x output is properly parsed.
  *
  * @return void
- **/
+ */
 	function testIndexOnMySQL4Output() {
 		$name = $this->db->fullTableName('simple');
 
@@ -631,7 +631,7 @@ class DboMysqlTest extends CakeTestCase {
  * test saving and retrieval of blobs
  *
  * @return void
- **/
+ */
 	function testBlobSaving() {
 		$this->db->cacheSources = false;
 		$data = "GIF87ab
@@ -650,7 +650,7 @@ class DboMysqlTest extends CakeTestCase {
  * test altering the table settings with schema.
  *
  * @return void
- **/
+ */
 	function testAlteringTableParameters() {
 		App::import('Model', 'CakeSchema');
 		$this->db->cacheSources = $this->db->testing = false;
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index 9dc6e141e..d54d6c8de 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -303,7 +303,7 @@ class DboMysqliTest extends CakeTestCase {
  * test that float values are correctly identified
  *
  * @return void
- **/
+ */
 	function testFloatParsing() {
 		$model =& new Model(array('ds' => 'test_suite', 'table' => 'datatypes', 'name' => 'Datatype'));
 		$result = $this->db->describe($model);
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index b5376163d..17704618f 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -312,7 +312,7 @@ class DboPostgresTest extends CakeTestCase {
  * test that date and time columns do not generate errors with null and nullish values.
  *
  * @return void
- **/
+ */
 	function testDateAndTimeAsNull() {
 		$this->assertEqual($this->db2->value(null, 'date'), 'NULL');
 		$this->assertEqual($this->db2->value('', 'date'), 'NULL');
@@ -523,7 +523,7 @@ class DboPostgresTest extends CakeTestCase {
  * Test index generation from table info.
  *
  * @return void
- **/
+ */
 	function testIndexGeneration() {
 		$name = $this->db->fullTableName('index_test', false);
 		$this->db->query('CREATE TABLE ' . $name . ' ("id" serial NOT NULL PRIMARY KEY, "bool" integer, "small_char" varchar(50), "description" varchar(40) )');
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index 5614b6a28..1153f0812 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -220,7 +220,7 @@ class DboSqliteTest extends CakeTestCase {
  * test building columns with SQLite
  *
  * @return void
- **/
+ */
 	function testBuildColumn() {
 		$data = array(
 			'name' => 'int_field',
@@ -292,7 +292,7 @@ class DboSqliteTest extends CakeTestCase {
  * test describe() and normal results.
  *
  * @return void
- **/
+ */
 	function testDescribe() {
 		$Model =& new Model(array('name' => 'User', 'ds' => 'test_suite', 'table' => 'users'));
 		$result = $this->db->describe($Model);
@@ -336,7 +336,7 @@ class DboSqliteTest extends CakeTestCase {
  * test that describe does not corrupt UUID primary keys
  *
  * @return void
- **/
+ */
 	function testDescribeWithUuidPrimaryKey() {
 		$tableName = 'uuid_tests';
 		$this->db->query("CREATE TABLE {$tableName} (id VARCHAR(36) PRIMARY KEY, name VARCHAR, created DATETIME, modified DATETIME)");
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 7696f929d..cb74f5687 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -3643,7 +3643,7 @@ class DboSourceTest extends CakeTestCase {
  * test hasAny()
  *
  * @return void
- **/
+ */
 	function testHasAny() {
 		$this->testDb->hasAny($this->Model, array());
 		$expected = 'SELECT COUNT(`TestModel`.`id`) AS count FROM `test_models` AS `TestModel` WHERE 1 = 1';
@@ -4000,7 +4000,7 @@ class DboSourceTest extends CakeTestCase {
  * test getting the query log as an array.
  *
  * @return void
- **/
+ */
 	function testGetLog() {
 		$this->testDb->logQuery('Query 1');
 		$this->testDb->logQuery('Query 2');
@@ -4024,7 +4024,7 @@ class DboSourceTest extends CakeTestCase {
  * test that execute runs queries.
  *
  * @return void
- **/
+ */
 	function testExecute() {
 		$query = 'SELECT * FROM ' . $this->testDb->fullTableName('articles') . ' WHERE 1 = 1';
 
@@ -4046,7 +4046,7 @@ class DboSourceTest extends CakeTestCase {
  * test that query() returns boolean values from operations like CREATE TABLE
  *
  * @return void
- **/
+ */
 	function testFetchAllBooleanReturns() {
 		$name = $this->db->fullTableName('test_query');
 		$query = "CREATE TABLE {$name} (name varchar(10));";
@@ -4062,7 +4062,7 @@ class DboSourceTest extends CakeTestCase {
  * test ShowQuery generation of regular and error messages
  *
  * @return void
- **/
+ */
 	function testShowQuery() {
 		$this->testDb->error = false;
 		ob_start();
diff --git a/cake/tests/cases/libs/model/model_behavior.test.php b/cake/tests/cases/libs/model/model_behavior.test.php
index 22d586082..3a9bc7cae 100644
--- a/cake/tests/cases/libs/model/model_behavior.test.php
+++ b/cake/tests/cases/libs/model/model_behavior.test.php
@@ -508,7 +508,7 @@ class BehaviorTest extends CakeTestCase {
  * test that attaching a non existant Behavior triggers a cake error.
  *
  * @return void
- **/
+ */
 	function testInvalidBehaviorCausingCakeError() {
 		$Apple =& new Apple();
 		$Apple->Behaviors =& new MockModelBehaviorCollection();
@@ -1103,7 +1103,7 @@ class BehaviorTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testBehaviorAttachAndDetach() {
 		$Sample =& new Sample();
 		$Sample->actsAs = array('Test3' => array('bar'), 'Test2' => array('foo', 'bar'));
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index 7a66eb7c2..6702d1752 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -572,7 +572,7 @@ class ModelDeleteTest extends BaseModelTest {
  * test that beforeDelete returning false can abort deletion.
  *
  * @return void
- **/
+ */
 	function testBeforeDeleteDeleteAbortion() {
 		$this->loadFixtures('Post');
 		$Model =& new CallbackPostTestModel();
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index 4658e6cdc..33d9e9ea6 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -536,7 +536,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * test deconstruct() with time fields.
  *
  * @return void
- **/
+ */
 	function testDeconstructFieldsTime() {
 		$this->loadFixtures('Apple');
 		$TestModel =& new Apple();
@@ -881,7 +881,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * ensure that __exists is reset on create
  *
  * @return void
- **/
+ */
 	function testResetOfExistsOnCreate() {
 		$this->loadFixtures('Article');
 		$Article =& new Article();
@@ -1179,7 +1179,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * ensure that $actsAS and $_findMethods are merged.
  *
  * @return void
- **/
+ */
 	function testConstruct() {
 		$this->loadFixtures('Post', 'Comment');
 
@@ -1200,7 +1200,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * ensure that $actsAS and $_findMethods are merged.
  *
  * @return void
- **/
+ */
 	function testConstructWithAlternateDataSource() {
 		$TestModel =& ClassRegistry::init(array(
 			'class' => 'DoesntMatter', 'ds' => 'test_suite', 'table' => false
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 420d65393..dd314ca48 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -4734,7 +4734,7 @@ class ModelReadTest extends BaseModelTest {
  * test that bindModel behaves with Custom primary Key associations
  *
  * @return void
- **/
+ */
 	function bindWithCustomPrimaryKey() {
 		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
 		$Model =& ClassRegistry::init('StoriesTag');
@@ -6400,7 +6400,7 @@ class ModelReadTest extends BaseModelTest {
  * test find with COUNT(DISTINCT field)
  *
  * @return void
- **/
+ */
 	function testFindCountDistinct() {
 		$skip = $this->skipIf(
 			$this->db->config['driver'] == 'sqlite',
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index c60aec899..a9a46b9d0 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -126,7 +126,7 @@ class ModelValidationTest extends BaseModelTest {
  * Helps to make developement easier.
  *
  * @return void
- **/
+ */
 	function testMissingValidationErrorTriggering() {
 		$restore = Configure::read('debug');
 		Configure::write('debug', 2);
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index 2abb35267..d96d33b9b 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -313,7 +313,7 @@ class ModelWriteTest extends BaseModelTest {
  * as url for controller could be either overallFavorites/index or overall_favorites/index
  *
  * @return void
- **/
+ */
 	function testCacheClearOnSave() {
 		$_back = array(
 			'check' => Configure::read('Cache.check'),
@@ -620,7 +620,7 @@ class ModelWriteTest extends BaseModelTest {
  * test that beforeValidate returning false can abort saves.
  *
  * @return void
- **/
+ */
 	function testBeforeValidateSaveAbortion() {
 		$Model =& new CallbackPostTestModel();
 		$Model->beforeValidateReturn = false;
@@ -637,7 +637,7 @@ class ModelWriteTest extends BaseModelTest {
  * test that beforeSave returning false can abort saves.
  *
  * @return void
- **/
+ */
 	function testBeforeSaveSaveAbortion() {
 		$Model =& new CallbackPostTestModel();
 		$Model->beforeSaveReturn = false;
@@ -2622,7 +2622,7 @@ class ModelWriteTest extends BaseModelTest {
  * test HABTM saving when join table has no primary key and only 2 columns.
  *
  * @return void
- **/
+ */
 	function testHabtmSavingWithNoPrimaryKeyUuidJoinTable() {
 		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
 		$Fruit =& new Fruit();
@@ -2646,7 +2646,7 @@ class ModelWriteTest extends BaseModelTest {
  * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
  *
  * @return void
- **/
+ */
 	function testHabtmSavingWithNoPrimaryKeyUuidJoinTableNoWith() {
 		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
 		$Fruit =& new FruitNoWith();
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index f043706c5..8cadcb001 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -542,7 +542,7 @@ class ModifiedComment extends CakeTestModel {
  * afterFind callback
  *
  * @return void
- **/
+ */
 	function afterFind($results) {
 		if (isset($results[0])) {
 			$results[0]['Comment']['callback'] = 'Fire';
@@ -587,7 +587,7 @@ class AgainModifiedComment extends CakeTestModel {
  * afterFind callback
  *
  * @return void
- **/
+ */
 	function afterFind($results) {
 		if (isset($results[0])) {
 			$results[0]['Comment']['querytype'] = $this->findQueryType;
@@ -2057,7 +2057,7 @@ class CallbackPostTestModel extends CakeTestModel {
  * beforeSave callback
  *
  * @return void
- **/
+ */
 	function beforeSave($options) {
 		return $this->beforeSaveReturn;
 	}
@@ -2065,7 +2065,7 @@ class CallbackPostTestModel extends CakeTestModel {
  * beforeValidate callback
  *
  * @return void
- **/
+ */
 	function beforeValidate($options) {
 		return $this->beforeValidateReturn;
 	}
@@ -2073,7 +2073,7 @@ class CallbackPostTestModel extends CakeTestModel {
  * beforeDelete callback
  *
  * @return void
- **/
+ */
 	function beforeDelete($cascade = true) {
 		return $this->beforeDeleteReturn;
 	}
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index 35c1ffca3..1fc0c8335 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -109,7 +109,7 @@ class RequestActionController extends Controller {
  * post pass, testing post passing
  *
  * @return array
- **/
+ */
 	function post_pass() {
 		return $this->data;
 	}
@@ -152,7 +152,7 @@ class RequestActionPersistentController extends Controller {
  * post pass, testing post passing
  *
  * @return array
- **/
+ */
 	function index() {
 		return 'This is a test';
 	}
@@ -295,7 +295,7 @@ class TestObject extends Object {
  * testPersist
  *
  * @return void
- **/
+ */
 	function testPersist($name, $return = null, &$object, $type = null) {
 		return $this->_persist($name, $return, $object, $type);
 	}
@@ -324,7 +324,7 @@ class ObjectTest extends CakeTestCase {
  * fixtures
  *
  * @var string
- **/
+ */
 	var $fixtures = array('core.post', 'core.comment');
 
 /**
@@ -774,7 +774,7 @@ class ObjectTest extends CakeTestCase {
  * testCakeError
  *
  * @return void
- **/
+ */
 	function testCakeError() {
 
 	}
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index c1f409f09..40a8527f6 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -50,7 +50,7 @@ class RouterTest extends CakeTestCase {
  * end the test and reset the environment
  *
  * @return void
- **/
+ */
 	function endTest() {
 		Configure::write('Routing', $this->_routing);
 	}
@@ -1031,7 +1031,7 @@ class RouterTest extends CakeTestCase {
  * or reset
  *
  * @return void
- **/
+ */
 	function testRoutingPrefixesSetting() {
 		$restore = Configure::read('Routing');
 
@@ -1120,7 +1120,7 @@ class RouterTest extends CakeTestCase {
  * Test prefix routing and plugin combinations
  *
  * @return void
- **/
+ */
 	function testPrefixRoutingAndPlugins() {
 		Configure::write('Routing.prefixes', array('admin'));
 		$paths = App::path('plugins');
@@ -1461,7 +1461,7 @@ class RouterTest extends CakeTestCase {
  * test newer style automatically generated prefix routes.
  *
  * @return void
- **/
+ */
 	function testUrlGenerationWithAutoPrefixes() {
 		Configure::write('Routing.prefixes', array('protected'));
 		Router::reload();
@@ -1518,7 +1518,7 @@ class RouterTest extends CakeTestCase {
  * test that auto-generated prefix routes persist
  *
  * @return void
- **/
+ */
 	function testAutoPrefixRoutePersistence() {
 		Configure::write('Routing.prefixes', array('protected'));
 		Router::reload();
diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php
index 0d6a39ed1..be3172684 100644
--- a/cake/tests/cases/libs/string.test.php
+++ b/cake/tests/cases/libs/string.test.php
@@ -208,7 +208,7 @@ class StringTest extends CakeTestCase {
  * test Clean Insert
  *
  * @return void
- **/
+ */
 	function testCleanInsert() {
 		$result = String::cleanInsert(':incomplete', array(
 			'clean' => true, 'before' => ':', 'after' => ''
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 768c78991..83d154731 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -1861,7 +1861,7 @@ class ValidationTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testMultiple() {
 		$this->assertTrue(Validation::multiple(array(0, 1, 2, 3)));
 		$this->assertTrue(Validation::multiple(array(50, 32, 22, 0)));
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 59b46bf8a..fbdabe951 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -341,7 +341,7 @@ class HelperTest extends CakeTestCase {
  * test getting values from Helper
  *
  * @return void
- **/
+ */
 	function testValue() {
 		$this->Helper->data = array('fullname' => 'This is me');
 		$this->Helper->setEntity('fullname');
@@ -393,7 +393,7 @@ class HelperTest extends CakeTestCase {
  * Ensure HTML escaping of url params.  So link addresses are valid and not exploited
  *
  * @return void
- **/
+ */
 	function testUrlConversion() {
 		$result = $this->Helper->url('/controller/action/1');
 		$this->assertEqual($result, '/controller/action/1');
@@ -429,7 +429,7 @@ class HelperTest extends CakeTestCase {
  * test assetTimestamp application
  *
  * @return void
- **/
+ */
 	function testAssetTimestamp() {
 		$_timestamp = Configure::read('Asset.timestamp');
 		$_debug = Configure::read('debug');
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index b52651e52..3f380b1be 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -69,7 +69,7 @@ class CacheHelperTest extends CakeTestCase {
  * Checks if TMP/views is writable, and skips the case if it is not.
  *
  * @return void
- **/
+ */
 	function skip() {
 		$this->skipUnless(is_writable(TMP . 'cache' . DS . 'views' . DS), 'TMP/views is not writable %s');
 	}
@@ -202,7 +202,7 @@ class CacheHelperTest extends CakeTestCase {
  * test that multiple <cake:nocache> tags function with multiple nocache tags in the layout.
  *
  * @return void
- **/
+ */
 	function testMultipleNoCacheTagsInViewfile() {
 		$this->Controller->cache_parsing();
 		$this->Controller->cacheAction = 21600;
@@ -282,7 +282,7 @@ class CacheHelperTest extends CakeTestCase {
  * test cacheAction set to a boolean
  *
  * @return void
- **/
+ */
 	function testCacheActionArray() {
 		$this->Controller->cache_parsing();
 		$this->Controller->cacheAction = array(
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 471573250..b693c38e6 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -1758,7 +1758,7 @@ class FormHelperTest extends CakeTestCase {
  * test form->input() with datetime, date and time types
  *
  * @return void
- **/
+ */
 	function testInputDatetime() {
 		extract($this->dateRegex);
 		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
@@ -1874,7 +1874,7 @@ class FormHelperTest extends CakeTestCase {
  * Test generating checkboxes in a loop.
  *
  * @return void
- **/
+ */
 	function testInputCheckboxesInLoop() {
 		for ($i = 1; $i < 5; $i++) {
 			$result = $this->Form->input("Contact.{$i}.email", array('type' => 'checkbox', 'value' => $i));
@@ -1894,7 +1894,7 @@ class FormHelperTest extends CakeTestCase {
  * test form->input() with select type inputs.
  *
  * @return void
- **/
+ */
 	function testInputSelectType() {
 		$result = $this->Form->input('email', array(
 			'options' => array('è' => 'Firést', 'é' => 'Secoènd'), 'empty' => true)
@@ -2040,7 +2040,7 @@ class FormHelperTest extends CakeTestCase {
  * test that overriding the magic select type widget is possible
  *
  * @return void
- **/
+ */
 	function testInputOverridingMagicSelectType() {
 		$view =& ClassRegistry::getObject('view');
 		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
@@ -2743,7 +2743,7 @@ class FormHelperTest extends CakeTestCase {
  * test disabling the hidden input for radio buttons
  *
  * @return void
- **/
+ */
 	function testRadioHiddenInputDisabling() {
 		$result = $this->Form->input('Model.1.field', array(
 				'type' => 'radio',
@@ -3043,7 +3043,7 @@ class FormHelperTest extends CakeTestCase {
  * test generation of habtm select boxes.
  *
  * @return void
- **/
+ */
 	function testHabtmSelectBox() {
 		$view =& ClassRegistry::getObject('view');
 		$view->viewVars['contactTags'] = array(
@@ -3427,7 +3427,7 @@ class FormHelperTest extends CakeTestCase {
  * Test that disabling a checkbox also disables the hidden input so no value is submitted
  *
  * @return void
- **/
+ */
 	function testCheckboxDisabling() {
 		$result = $this->Form->checkbox('Account.show_name', array('disabled' => 'disabled'));
 		$expected = array(
@@ -3441,7 +3441,7 @@ class FormHelperTest extends CakeTestCase {
  * Test that specifying false in the 'disabled' option will not disable either the hidden input or the checkbox input
  *
  * @return void
- **/
+ */
 	function testCheckboxHiddenDisabling() {
 		$result = $this->Form->checkbox('Account.show_name', array('disabled' => false));
 		$expected = array(
@@ -4685,7 +4685,7 @@ class FormHelperTest extends CakeTestCase {
  * test File upload input on a model not used in create();
  *
  * @return void
- **/
+ */
 	function testFileUploadOnOtherModel() {
 		ClassRegistry::removeObject('view');
 		$controller =& new Controller();
@@ -4816,7 +4816,7 @@ class FormHelperTest extends CakeTestCase {
  * test image submit types.
  *
  * @return void
- **/
+ */
 	function testSubmitImage() {
 		$result = $this->Form->submit('http://example.com/cake.power.gif');
 		$expected = array(
@@ -5055,7 +5055,7 @@ class FormHelperTest extends CakeTestCase {
  * test that inputDefaults are stored and used.
  *
  * @return void
- **/
+ */
 	function testCreateWithInputDefaults() {
 		$this->Form->create('User', array(
 			'inputDefaults' => array('div' => false, 'label' => false)
@@ -5080,7 +5080,7 @@ class FormHelperTest extends CakeTestCase {
  * test automatic accept-charset overriding
  *
  * @return void
- **/
+ */
 	function testCreateWithAcceptCharset() {
 		$result = $this->Form->create('UserForm', array(
 				'type' => 'post', 'action' => 'login','encoding' => 'iso-8859-1'
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 4cb252a2f..1aa1b30f0 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -302,7 +302,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test image() with Asset.timestamp
  *
  * @return void
- **/
+ */
 	function testImageTagWithTimestampping() {
 		Configure::write('Asset.timestamp', 'force');
 
@@ -438,7 +438,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test use of css() and timestamping
  *
  * @return void
- **/
+ */
 	function testCssTimestamping() {
 		Configure::write('debug', 2);
 		Configure::write('Asset.timestamp', true);
@@ -482,7 +482,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test timestamp enforcement for script tags.
  *
  * @return void
- **/
+ */
 	function testScriptTimestamping() {
 		$skip = $this->skipIf(!is_writable(JS), 'webroot/js is not Writable, timestamp testing has been skipped');
 		if ($skip) {
@@ -510,7 +510,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test script tag generation
  *
  * @return void
- **/
+ */
 	function testScript() {
 		$result = $this->Html->script('foo');
 		$expected = array(
@@ -565,7 +565,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test Script block generation
  *
  * @return void
- **/
+ */
 	function testScriptBlock() {
 		$result = $this->Html->scriptBlock('window.foo = 2;');
 		$expected = array(
@@ -615,7 +615,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test script tag output buffering when using scriptStart() and scriptEnd();
  *
  * @return void
- **/
+ */
 	function testScriptStartAndScriptEnd() {
 		$result = $this->Html->scriptStart(array('safe' => true));
 		$this->assertNull($result);
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index ab62a8a77..378459bfe 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -792,7 +792,7 @@ class JavascriptTest extends CakeTestCase {
  * test string escaping and compare to json_encode()
  *
  * @return void
- **/
+ */
 	function testStringJsonEncodeCompliance() {
 		if (!function_exists('json_encode')) {
 			return;
@@ -822,7 +822,7 @@ class JavascriptTest extends CakeTestCase {
  * test that text encoded with Javascript::object decodes properly
  *
  * @return void
- **/
+ */
 	function testObjectDecodeCompatibility() {
 		if (!function_exists('json_decode')) {
 			return;
diff --git a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
index 5bb0d2a35..527ea7ead 100644
--- a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
@@ -25,7 +25,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * startTest
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$this->Jquery =& new JqueryEngineHelper();
 	}
@@ -34,7 +34,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		unset($this->Jquery);
 	}
@@ -43,7 +43,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test selector method
  *
  * @return void
- **/
+ */
 	function testSelector() {
 		$result = $this->Jquery->get('#content');
 		$this->assertEqual($result, $this->Jquery);
@@ -66,7 +66,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test event binding
  *
  * @return void
- **/
+ */
 	function testEvent() {
 		$this->Jquery->get('#myLink');
 		$result = $this->Jquery->event('click', 'doClick', array('wrap' => false));
@@ -86,7 +86,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test dom ready event creation
  *
  * @return void
- **/
+ */
 	function testDomReady() {
 		$result = $this->Jquery->domReady('foo.name = "bar";');
 		$expected = '$(document).bind("ready", function (event) {foo.name = "bar";});';
@@ -97,7 +97,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test Each method
  *
  * @return void
- **/
+ */
 	function testEach() {
 		$this->Jquery->get('#foo');
 		$result = $this->Jquery->each('$(this).hide();');
@@ -109,7 +109,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test Effect generation
  *
  * @return void
- **/
+ */
 	function testEffect() {
 		$this->Jquery->get('#foo');
 		$result = $this->Jquery->effect('show');
@@ -153,7 +153,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * Test Request Generation
  *
  * @return void
- **/
+ */
 	function testRequest() {
 		$result = $this->Jquery->request(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = '$.ajax({url:"\\/posts\\/view\\/1"});';
@@ -213,7 +213,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test sortable list generation
  *
  * @return void
- **/
+ */
 	function testSortable() {
 		$this->Jquery->get('#myList');
 		$result = $this->Jquery->sortable(array(
@@ -242,7 +242,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test drag() method
  *
  * @return void
- **/
+ */
 	function testDrag() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->drag(array(
@@ -271,7 +271,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test drop() method
  *
  * @return void
- **/
+ */
 	function testDrop() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->drop(array(
@@ -298,7 +298,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test slider generation
  *
  * @return void
- **/
+ */
 	function testSlider() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->slider(array(
@@ -329,7 +329,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test the serializeForm method
  *
  * @return void
- **/
+ */
 	function testSerializeForm() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->serializeForm(array('isForm' => false));
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
index b36ec99c5..6a79960bd 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -38,7 +38,7 @@ class OptionEngineHelper extends JsBaseEngineHelper {
  * test method for testing option mapping
  *
  * @return array
- **/
+ */
 	function testMap($options = array()) {
 		return $this->_mapOptions('request', $options);
 	}
@@ -46,7 +46,7 @@ class OptionEngineHelper extends JsBaseEngineHelper {
  * test method for option parsing
  *
  * @return void
- **/
+ */
 	function testParseOptions($options, $safe = array()) {
 		return $this->_parseOptions($options, $safe);
 	}
@@ -109,7 +109,7 @@ class JsHelperTestCase extends CakeTestCase {
  * Switches $this->Js to a mocked engine.
  *
  * @return void
- **/
+ */
 	function _useMock() {
 		$this->Js =& new JsHelper(array('TestJs'));
 		$this->Js->TestJsEngine =& new TestJsEngineHelper($this);
@@ -122,7 +122,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test object construction
  *
  * @return void
- **/
+ */
 	function testConstruction() {
 		$js =& new JsHelper();
 		$this->assertEqual($js->helpers, array('Html', 'Form', 'JqueryEngine'));
@@ -141,7 +141,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test that methods dispatch internally and to the engine class
  *
  * @return void
- **/
+ */
 	function testMethodDispatching() {
 		$this->_useMock();
 		$this->Js->TestJsEngine->expectOnce('dispatchMethod', array(new PatternExpectation('/methodOne/i'), array()));
@@ -157,7 +157,7 @@ class JsHelperTestCase extends CakeTestCase {
  * Test that method dispatching respects buffer parameters and bufferedMethods Lists.
  *
  * @return void
- **/
+ */
 	function testMethodDispatchWithBuffering() {
 		$this->_useMock();
 
@@ -209,7 +209,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test that writeScripts generates scripts inline.
  *
  * @return void
- **/
+ */
 	function testWriteScriptsNoFile() {
 		$this->_useMock();
 		$this->Js->buffer('one = 1;');
@@ -236,7 +236,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test that writeScripts makes files, and puts the events into them.
  *
  * @return void
- **/
+ */
 	function testWriteScriptsInFile() {
 		if ($this->skipIf(!is_writable(JS), 'webroot/js is not Writable, script caching test has been skipped')) {
 			return;
@@ -261,7 +261,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test link()
  *
  * @return void
- **/
+ */
 	function testLinkWithMock() {
 		$this->_useMock();
 		$options = array('update' => '#content');
@@ -322,7 +322,7 @@ CODE;
  * test that link() and no buffering returns an <a> and <script> tags.
  *
  * @return void
- **/
+ */
 	function testLinkWithNoBuffering() {
 		$this->_useMock();
 		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax code', array('request', '*'));
@@ -359,7 +359,7 @@ CODE;
  * test submit() with a Mock to check Engine method calls
  *
  * @return void
- **/
+ */
 	function testSubmitWithMock() {
 		$this->_useMock();
 
@@ -423,7 +423,7 @@ CODE;
  * Test that Object::Object() is not breaking json output in JsHelper
  *
  * @return void
- **/
+ */
 	function testObjectPassThrough() {
 		$result = $this->Js->object(array('one' => 'first', 'two' => 'second'));
 		$expected = '{"one":"first","two":"second"}';
@@ -434,7 +434,7 @@ CODE;
  * test set()'ing variables to the Javascript buffer and controlling the output var name.
  *
  * @return void
- **/
+ */
 	function testSet() {
 		$this->Js->set('loggedIn', true);
 		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
@@ -463,7 +463,7 @@ CODE;
  * JsBaseEngine Class Test case
  *
  * @package cake.tests.view.helpers
- **/
+ */
 class JsBaseEngineTestCase extends CakeTestCase {
 /**
  * startTest method
@@ -489,7 +489,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test escape string skills
  *
  * @return void
- **/
+ */
 	function testEscaping() {
 		$result = $this->JsEngine->escape('');
 		$expected = '';
@@ -520,7 +520,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test prompt() creation
  *
  * @return void
- **/
+ */
 	function testPrompt() {
 		$result = $this->JsEngine->prompt('Hey, hey you', 'hi!');
 		$expected = 'prompt("Hey, hey you", "hi!");';
@@ -535,7 +535,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test alert generation
  *
  * @return void
- **/
+ */
 	function testAlert() {
 		$result = $this->JsEngine->alert('Hey there');
 		$expected = 'alert("Hey there");';
@@ -550,7 +550,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test confirm generation
  *
  * @return void
- **/
+ */
 	function testConfirm() {
 		$result = $this->JsEngine->confirm('Are you sure?');
 		$expected = 'confirm("Are you sure?");';
@@ -565,7 +565,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test Redirect
  *
  * @return void
- **/
+ */
 	function testRedirect() {
 		$result = $this->JsEngine->redirect(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = 'window.location = "/posts/view/1";';
@@ -576,7 +576,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * testObject encoding with non-native methods.
  *
  * @return void
- **/
+ */
 	function testObject() {
 		$this->JsEngine->useNative = false;
 
@@ -620,7 +620,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test compatibility of JsBaseEngineHelper::object() vs. json_encode()
  *
  * @return void
- **/
+ */
 	function testObjectAgainstJsonEncode() {
 		$skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s');
 		if ($skip) {
@@ -659,7 +659,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test that JSON made with JsBaseEngineHelper::object() against json_decode()
  *
  * @return void
- **/
+ */
 	function testObjectAgainstJsonDecode() {
 		$skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s');
 		if ($skip) {
@@ -684,7 +684,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test Mapping of options.
  *
  * @return void
- **/
+ */
 	function testOptionMapping() {
 		$JsEngine = new OptionEngineHelper();
 		$result = $JsEngine->testMap();
@@ -704,7 +704,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test that option parsing escapes strings and saves what is supposed to be saved.
  *
  * @return void
- **/
+ */
 	function testOptionParsing() {
 		$JsEngine = new OptionEngineHelper();
 
diff --git a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
index 38ca8dbd2..d3959ac2f 100644
--- a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
@@ -27,7 +27,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * startTest
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$this->Moo =& new MootoolsEngineHelper();
 	}
@@ -35,7 +35,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		unset($this->Moo);
 	}
@@ -43,7 +43,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test selector method
  *
  * @return void
- **/
+ */
 	function testSelector() {
 		$result = $this->Moo->get('#content');
 		$this->assertEqual($result, $this->Moo);
@@ -73,7 +73,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test event binding
  *
  * @return void
- **/
+ */
 	function testEvent() {
 		$this->Moo->get('#myLink');
 		$result = $this->Moo->event('click', 'doClick', array('wrap' => false));
@@ -92,7 +92,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test dom ready event creation
  *
  * @return void
- **/
+ */
 	function testDomReady() {
 		$result = $this->Moo->domReady('foo.name = "bar";');
 		$expected = 'window.addEvent("domready", function (event) {foo.name = "bar";});';
@@ -102,7 +102,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test Each method
  *
  * @return void
- **/
+ */
 	function testEach() {
 		$this->Moo->get('#foo');
 		$result = $this->Moo->each('item.setStyle("display", "none");');
@@ -113,7 +113,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test Effect generation
  *
  * @return void
- **/
+ */
 	function testEffect() {
 		$this->Moo->get('#foo');
 		$result = $this->Moo->effect('show');
@@ -152,7 +152,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * Test Request Generation
  *
  * @return void
- **/
+ */
 	function testRequest() {
 		$result = $this->Moo->request(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = 'var jsRequest = new Request({url:"\\/posts\\/view\\/1"}).send();';
@@ -222,7 +222,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test sortable list generation
  *
  * @return void
- **/
+ */
 	function testSortable() {
 		$this->Moo->get('#myList');
 		$result = $this->Moo->sortable(array(
@@ -240,7 +240,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test drag() method
  *
  * @return void
- **/
+ */
 	function testDrag() {
 		$this->Moo->get('#drag-me');
 		$result = $this->Moo->drag(array(
@@ -257,7 +257,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test drop() method
  *
  * @return void
- **/
+ */
 	function testDrop() {
 		$this->expectError();
 		$this->Moo->get('#drop-me');
@@ -291,7 +291,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test slider generation
  *
  * @return void
- **/
+ */
 	function testSlider() {
 		$this->Moo->get('#slider');
 		$result = $this->Moo->slider(array(
@@ -332,7 +332,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test the serializeForm implementation.
  *
  * @return void
- **/
+ */
 	function testSerializeForm() {
 		$this->Moo->get('#element');
 		$result = $this->Moo->serializeForm(array('isForm' => true));
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 35ead9350..1749f9379 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -731,7 +731,7 @@ class PaginatorHelperTest extends CakeTestCase {
  * allowing you to use shortcut syntax
  *
  * @return void
- **/
+ */
 	function testPagingLinksOptionsReplaceEmptyDisabledOptions() {
 		$this->Paginator->params['paging'] = array(
 			'Client' => array(
@@ -1735,7 +1735,7 @@ class PaginatorHelperTest extends CakeTestCase {
  * test that mock classes injected into paginatorHelper are called when using link()
  *
  * @return void
- **/
+ */
 	function testMockAjaxProviderClassInjection() {
 		$Paginator =& new PaginatorHelper(array('ajax' => 'PaginatorMockJs'));
 		$Paginator->params['paging'] = array(
diff --git a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
index e28c3800f..829968767 100644
--- a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
@@ -25,7 +25,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * startTest
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$this->Proto =& new PrototypeEngineHelper();
 	}
@@ -34,7 +34,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		unset($this->Proto);
 	}
@@ -43,7 +43,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test selector method
  *
  * @return void
- **/
+ */
 	function testSelector() {
 		$result = $this->Proto->get('#content');
 		$this->assertEqual($result, $this->Proto);
@@ -74,7 +74,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test event binding
  *
  * @return void
- **/
+ */
 	function testEvent() {
 		$this->Proto->get('#myLink');
 		$result = $this->Proto->event('click', 'doClick', array('wrap' => false));
@@ -94,7 +94,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test dom ready event creation
  *
  * @return void
- **/
+ */
 	function testDomReady() {
 		$result = $this->Proto->domReady('foo.name = "bar";');
 		$expected = 'document.observe("dom:loaded", function (event) {foo.name = "bar";});';
@@ -105,7 +105,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test Each method
  *
  * @return void
- **/
+ */
 	function testEach() {
 		$this->Proto->get('#foo li');
 		$result = $this->Proto->each('item.hide();');
@@ -117,7 +117,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test Effect generation
  *
  * @return void
- **/
+ */
 	function testEffect() {
 		$this->Proto->get('#foo');
 		$result = $this->Proto->effect('show');
@@ -173,7 +173,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * Test Request Generation
  *
  * @return void
- **/
+ */
 	function testRequest() {
 		$result = $this->Proto->request(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = 'var jsRequest = new Ajax.Request("/posts/view/1");';
@@ -253,7 +253,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test sortable list generation
  *
  * @return void
- **/
+ */
 	function testSortable() {
 		$this->Proto->get('#myList');
 		$result = $this->Proto->sortable(array(
@@ -272,7 +272,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * in new Drag() when selection is a multiple type.  Iterate over the array.
  *
  * @return void
- **/
+ */
 	function testDrag() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->drag(array(
@@ -301,7 +301,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test drop() method
  *
  * @return void
- **/
+ */
 	function testDrop() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->drop(array(
@@ -318,7 +318,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * ensure that slider() method behaves properly
  *
  * @return void
- **/
+ */
 	function testSlider() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->slider(array(
@@ -347,7 +347,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test the serializeForm implementation.
  *
  * @return void
- **/
+ */
 	function testSerializeForm() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->serializeForm(array('isForm' => true));
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index eec5805c6..b72a9dd96 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -95,7 +95,7 @@ class SessionHelperTest extends CakeTestCase {
  * test construction and initial property settings
  *
  * @return void
- **/
+ */
 	function testConstruct() {
 		$this->assertFalse(empty($this->Session->sessionTime));
 		$this->assertFalse(empty($this->Session->security));
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index 04b80c930..6f52101f2 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -293,7 +293,7 @@ class ViewTest extends CakeTestCase {
  * test that plugin/$plugin_name is only appended to the paths it should be.
  *
  * @return void
- **/
+ */
 	function testPluginPathGeneration() {
 		$this->Controller->plugin = 'test_plugin';
 		$this->Controller->name = 'TestPlugin';
@@ -319,7 +319,7 @@ class ViewTest extends CakeTestCase {
  * test that CamelCase plugins still find their view files.
  *
  * @return void
- **/
+ */
 	function testCamelCasePluginGetTemplate() {
 		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
@@ -572,7 +572,7 @@ class ViewTest extends CakeTestCase {
  * test the correct triggering of helper callbacks
  *
  * @return void
- **/
+ */
 	function testHelperCallbackTriggering() {
 		$this->PostsController->helpers = array('Html', 'CallbackMock');
 		$View =& new TestView($this->PostsController);
@@ -702,7 +702,7 @@ class ViewTest extends CakeTestCase {
  * test rendering layout with cache helper loaded
  *
  * @return void
- **/
+ */
 	function testRenderLayoutWithMockCacheHelper() {
 		$_check = Configure::read('Cache.check');
 		Configure::write('Cache.check', true);
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index 905229917..423a73c03 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -120,7 +120,7 @@ class XmlTest extends CakeTestCase {
  * test serialization of boolean and null values.  false = 0, true = 1, null = ''
  *
  * @return void
- **/
+ */
 	function testSerializationOfBooleanAndBooleanishValues() {
 		$xml =& new Xml(array('data' => array('example' => false)));
 		$result = $xml->toString(false);
@@ -732,7 +732,7 @@ class XmlTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testElementCollapsing() {
 		$xmlDataThatFails = '<resultpackage>
 		<result qid="46b1c46ed6208"><![CDATA[46b1c46ed3af9]]></result>
@@ -794,7 +794,7 @@ class XmlTest extends CakeTestCase {
  *
  * @see http://code.cakephp.org/tickets/view/8
  * @return void
- **/
+ */
 	function testCaseFoldingWithEmptyValues() {
 		$filledValue = '<method name="set_user_settings">
 			<title>update user information</title>
diff --git a/cake/tests/lib/cake_reporter.php b/cake/tests/lib/cake_reporter.php
index c4f7a10cd..234e8fc0b 100644
--- a/cake/tests/lib/cake_reporter.php
+++ b/cake/tests/lib/cake_reporter.php
@@ -56,7 +56,7 @@ class CakeHtmlReporter extends SimpleReporter {
  *
  * @param 
  * @return void
- **/
+ */
 	function paintGroupStart($test_name, $size) {
 		if (empty($this->_timeStart)) {
 			$this->_timeStart = $this->_getTime();
@@ -69,7 +69,7 @@ class CakeHtmlReporter extends SimpleReporter {
  * and timers are stopped.
  *
  * @return void
- **/
+ */
 	function paintGroupEnd($test_name) {
 		$this->_timeEnd = $this->_getTime();
 		$this->_timeDuration = $this->_timeEnd - $this->_timeStart;
@@ -81,7 +81,7 @@ class CakeHtmlReporter extends SimpleReporter {
  * but in a separate function to reduce dependancies.
  *
  * @return float Time in microseconds
- **/
+ */
 	function _getTime() {
 		list($usec, $sec) = explode(' ', microtime());
 		return ((float)$sec + (float)$usec);
diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
index 637aedd8b..c323f83cf 100644
--- a/cake/tests/lib/cake_test_fixture.php
+++ b/cake/tests/lib/cake_test_fixture.php
@@ -32,7 +32,7 @@ class CakeTestFixture extends Object {
  * Name of the object
  *
  * @var string
- **/
+ */
 	var $name = null;
 
 /**
diff --git a/cake/tests/lib/cake_text_reporter.php b/cake/tests/lib/cake_text_reporter.php
index 1d1424641..94b6e8d6f 100644
--- a/cake/tests/lib/cake_text_reporter.php
+++ b/cake/tests/lib/cake_text_reporter.php
@@ -11,7 +11,7 @@ class CakeTextReporter extends TextReporter {
  *
  * @param 
  * @return void
- **/
+ */
 	function paintGroupStart($test_name, $size) {
 		if (empty($this->_timeStart)) {
 			$this->_timeStart = $this->_getTime();
@@ -24,7 +24,7 @@ class CakeTextReporter extends TextReporter {
  * and timers are stopped.
  *
  * @return void
- **/
+ */
 	function paintGroupEnd($test_name) {
 		$this->_timeEnd = $this->_getTime();
 		$this->_timeDuration = $this->_timeEnd - $this->_timeStart;
@@ -36,7 +36,7 @@ class CakeTextReporter extends TextReporter {
  * but in a separate function to reduce dependancies.
  *
  * @return float Time in microseconds
- **/
+ */
 	function _getTime() {
 		list($usec, $sec) = explode(' ', microtime());
 		return ((float)$sec + (float)$usec);

From ac86ad05acba00ac26c6b7bf0e0d6df1efd32514 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sat, 14 Nov 2009 23:38:52 +1100
Subject: [PATCH 050/112] Moving access modifier doc tag.

---
 cake/tests/cases/console/libs/shell.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
index 707a04779..55d92aa95 100644
--- a/cake/tests/cases/console/libs/shell.test.php
+++ b/cake/tests/cases/console/libs/shell.test.php
@@ -65,8 +65,8 @@ class TestShell extends Shell {
  * stop method
  *
  * @param integer $status
- * @access protected
  * @return void
+ * @access protected
  */
 	function _stop($status = 0) {
 		$this->stopped = $status;

From 8b1a2b1f728b11b759359f334f963e6c490e6ff8 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 16:29:33 -0500
Subject: [PATCH 051/112] Applying optimization in Router::__parseExtension
 from 'robustsolution'.  Fixes #301

---
 cake/libs/router.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 0b2b3b61c..579b3ff4a 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -562,6 +562,7 @@ class Router extends Object {
 						if (strcasecmp($name, $match) === 0) {
 							$url = substr($url, 0, strpos($url, '.' . $name));
 							$ext = $match;
+							break;
 						}
 					}
 				}

From 37120725316547dd1d7d702c81d82bacff706146 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 16:32:18 -0500
Subject: [PATCH 052/112] Applying optimization to Router::connect() from
 'robustsolution' Fixes #302

---
 cake/libs/router.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 3484c11d5..14055526c 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -232,6 +232,7 @@ class Router {
 		foreach ($_this->__prefixes as $prefix) {
 			if (isset($default[$prefix])) {
 				$default['prefix'] = $prefix;
+				break;
 			}
 		}
 		if (isset($default['prefix'])) {

From 06d4e5e5531b1fcee464495fa6e83a372e3cb904 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 18:50:23 -0500
Subject: [PATCH 053/112] Reformatting code in memcache. Adding unset() to test
 case to remove unnecessary keys that can cause test failure.

---
 cake/libs/cache/memcache.php                  |  9 ++++++---
 cake/tests/cases/libs/cache/memcache.test.php | 16 +++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 2d70a6e86..831cfa2ed 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -61,7 +61,10 @@ class MemcacheEngine extends CacheEngine {
 			return false;
 		}
 		parent::init(array_merge(array(
-			'engine'=> 'Memcache', 'prefix' => Inflector::slug(APP_DIR) . '_', 'servers' => array('127.0.0.1'), 'compress'=> false
+			'engine'=> 'Memcache', 
+			'prefix' => Inflector::slug(APP_DIR) . '_', 
+			'servers' => array('127.0.0.1'),
+			'compress'=> false
 			), $settings)
 		);
 
@@ -100,7 +103,7 @@ class MemcacheEngine extends CacheEngine {
  */
 	function write($key, &$value, $duration) {
 		$expires = time() + $duration;
-		$this->__Memcache->set($key.'_expires', $expires, $this->settings['compress'], $expires);
+		$this->__Memcache->set($key . '_expires', $expires, $this->settings['compress'], $expires);
 		return $this->__Memcache->set($key, $value, $this->settings['compress'], $expires);
 	}
 /**
@@ -112,7 +115,7 @@ class MemcacheEngine extends CacheEngine {
  */
 	function read($key) {
 		$time = time();
-		$cachetime = intval($this->__Memcache->get($key.'_expires'));
+		$cachetime = intval($this->__Memcache->get($key . '_expires'));
 		if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
 			return false;
 		}
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index 8a48df86c..d26f360e8 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -82,13 +82,15 @@ class MemcacheEngineTest extends CakeTestCase {
  */
 	function testSettings() {
 		$settings = Cache::settings();
-		$expecting = array('prefix' => 'cake_',
-						'duration'=> 3600,
-						'probability' => 100,
-						'servers' => array('127.0.0.1'),
-						'compress' => false,
-						'engine' => 'Memcache'
-						);
+		unset($settings['serialize'], $settings['path']);
+		$expecting = array(
+			'prefix' => 'cake_',
+			'duration'=> 3600,
+			'probability' => 100,
+			'servers' => array('127.0.0.1'),
+			'compress' => false,
+			'engine' => 'Memcache'
+		);
 		$this->assertEqual($settings, $expecting);
 	}
 /**

From 862ff82ad48ef613df33447697e6b2f33903d464 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 15 Nov 2009 01:00:22 +0530
Subject: [PATCH 054/112] Updating Configure::store to fix escaping issues

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/configure.php                  | 15 +--------------
 cake/tests/cases/libs/configure.test.php |  7 +++++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 985890cfe..22d0e3fe6 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -459,20 +459,7 @@ class Configure extends Object {
 		$content = '';
 
 		foreach ($data as $key => $value) {
-			$content .= "\$config['$type']['$key']";
-
-			if (is_array($value)) {
-				$content .= " = array(";
-
-				foreach ($value as $key1 => $value2) {
-					$value2 = addslashes($value2);
-					$content .= "'$key1' => '$value2', ";
-				}
-				$content .= ");\n";
-			} else {
-				$value = addslashes($value);
-				$content .= " = '$value';\n";
-			}
+			$content .= "\$config['$type']['$key'] = " . var_export($value, true) . ";\n";
 		}
 		if (is_null($type)) {
 			$write = false;
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index e29f5042b..54f1aa59c 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -224,14 +224,17 @@ class ConfigureTest extends CakeTestCase {
 	function testStoreAndLoad() {
 		Configure::write('Cache.disable', false);
 
-		$expected = array('data' => 'value');
+		$expected = array('data' => 'value with backslash \, \'singlequote\' and "doublequotes"');
 		Configure::store('SomeExample', 'test', $expected);
 
 		Configure::load('test');
 		$config = Configure::read('SomeExample');
 		$this->assertEqual($config, $expected);
 
-		$expected = array('data' => array('first' => 'value', 'second' => 'value2'));
+		$expected = array(
+			'data' => array('first' => 'value with backslash \, \'singlequote\' and "doublequotes"', 'second' => 'value2'),
+			'data2' => 'value'
+		);
 		Configure::store('AnotherExample', 'test.config', $expected);
 
 		Configure::load('test.config');

From 17e377de7e3aa668a0809ecd656171a9e4de187d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 19:40:30 -0500
Subject: [PATCH 055/112] Updating doc block for MemcacheEngine

---
 cake/libs/cache/memcache.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 831cfa2ed..4c87c10c2 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -38,9 +38,11 @@ class MemcacheEngine extends CacheEngine {
  */
 	var $__Memcache = null;
 /**
- * settings
- * 		servers = string or array of memcache servers, default => 127.0.0.1
- * 		compress = boolean, default => false
+ * Settings
+ *
+ *  - servers = string or array of memcache servers, default => 127.0.0.1. If an
+ *    array MemcacheEngine will use them as a pool.
+ *  - compress = boolean, default => false
  *
  * @var array
  * @access public

From 3c349dd15cfe5bfbc56df3b8004b6f148007656e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 18:08:23 -0500
Subject: [PATCH 056/112] Removing unnecessary inheritance from Object.

---
 cake/libs/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 0be8ee7c7..7744cfd62 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -25,7 +25,7 @@
  * @package       cake
  * @subpackage    cake.cake.libs
  */
-class Cache extends Object {
+class Cache {
 
 /**
  * Cache engine to use

From b6978ab25f5b1a1db4fc544ea2c98bc4ba1b8dbd Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 02:19:11 -0500
Subject: [PATCH 057/112] Adding the ability to load cache engine classes from
 plugins and app libs. Also enabled the ability for App cache classes to
 override core ones. Test cases added. Removed unnecessary subclassing of
 Object.

---
 cake/libs/cache.php                  | 44 +++++++++++++++++-----------
 cake/tests/cases/libs/cache.test.php | 20 +++++++++++++
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 7744cfd62..99f5cfdd6 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -74,20 +74,6 @@ class Cache {
 		return $instance[0];
 	}
 
-/**
- * Tries to find and include a file for a cache engine and returns object instance
- *
- * @param $name	Name of the engine (without 'Engine')
- * @return mixed $engine object or null
- * @access private
- */
-	function __loadEngine($name) {
-		if (!class_exists($name . 'Engine')) {
-			require LIBS . DS . 'cache' . DS . strtolower($name) . '.php';
-		}
-		return true;
-	}
-
 /**
  * Set the cache configuration to use
  *
@@ -146,10 +132,15 @@ class Cache {
  * @static
  */
 	function engine($name = 'File', $settings = array()) {
-		$cacheClass = $name . 'Engine';
+		$plugin = null;
+		$class = $name;
+		if (strpos($name, '.') !== false) {
+			list($plugin, $class) = explode('.', $name);
+		}
+		$cacheClass = $class . 'Engine';
 		$_this =& Cache::getInstance();
 		if (!isset($_this->_Engine[$name])) {
-			if ($_this->__loadEngine($name) === false) {
+			if ($_this->__loadEngine($class, $plugin) === false) {
 				return false;
 			}
 			$_this->_Engine[$name] =& new $cacheClass();
@@ -165,6 +156,25 @@ class Cache {
 		return false;
 	}
 
+/**
+ * Tries to find and include a file for a cache engine and returns object instance
+ *
+ * @param $name	Name of the engine (without 'Engine')
+ * @return mixed $engine object or null
+ * @access private
+ */
+	function __loadEngine($name, $plugin = null) {
+		if ($plugin) {
+			App::import('Lib', $plugin . '.cache' . DS . $name);
+		} else {
+			if (!App::import('Lib', 'cache' . DS . $name)) {
+				App::import('Core', 'cache' . DS . $name);
+			}
+		}
+		return true;
+	}
+
+
 /**
  * Temporarily change settings to current config options. if no params are passed, resets settings if needed
  * Cache::write() will reset the configuration changes made
@@ -417,7 +427,7 @@ class Cache {
  * @package       cake
  * @subpackage    cake.cake.libs
  */
-class CacheEngine extends Object {
+class CacheEngine {
 
 /**
  * settings of current engine instance
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index c858a0f95..e80715629 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -71,6 +71,26 @@ class CacheTest extends CakeTestCase {
 		$this->assertEqual($results, Cache::config('new'));
 	}
 
+/**
+ * test configuring CacheEngines in App/libs
+ *
+ * @return void
+ **/
+	function testConfigWithLibAndPluginEngines() {
+		App::build(array(
+			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+
+		$settings = array('engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_');
+		$result = Cache::config('libEngine', $settings);
+		$this->assertEqual($result, Cache::config('libEngine'));
+
+		$settings = array('engine' => 'TestPlugin.TestPluginCache', 'path' => TMP, 'prefix' => 'cake_test_');
+		$result = Cache::config('pluginLibEngine', $settings);
+		$this->assertEqual($result, Cache::config('pluginLibEngine'));
+	}
+
 /**
  * testInvalidConfig method
  *

From 040f94cb81a88a1f40057e4a95af3aeee0eb0b0b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 02:25:49 -0500
Subject: [PATCH 058/112] Adding test case files used for previous commit.

---
 cake/tests/test_app/libs/cache/test_app_cache.php            | 5 +++++
 .../plugins/test_plugin/libs/cache/test_plugin_cache.php     | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 cake/tests/test_app/libs/cache/test_app_cache.php
 create mode 100644 cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php

diff --git a/cake/tests/test_app/libs/cache/test_app_cache.php b/cake/tests/test_app/libs/cache/test_app_cache.php
new file mode 100644
index 000000000..61fe7e4e7
--- /dev/null
+++ b/cake/tests/test_app/libs/cache/test_app_cache.php
@@ -0,0 +1,5 @@
+<?php
+
+class TestAppCacheEngine extends CacheEngine {
+	
+}
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
new file mode 100644
index 000000000..24dc126e3
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
@@ -0,0 +1,5 @@
+<?php
+
+class TestPluginCacheEngine extends CacheEngine {
+	
+}
\ No newline at end of file

From 59a7cee89d19fde2aa9dc9e676123b2c53c46981 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 02:26:29 -0500
Subject: [PATCH 059/112] Removing deprecated $config parameter handling. 
 $config must be a string that is the name of an existing cache config.

---
 cake/libs/cache.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 99f5cfdd6..320cca446 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -240,12 +240,6 @@ class Cache {
 	function write($key, $value, $config = null) {
 		$_this =& Cache::getInstance();
 
-		if (is_array($config)) {
-			extract($config);
-		} else if ($config && (is_numeric($config) || is_numeric($config[0]) || (isset($config[1]) && is_numeric($config[1])))) {
-			$config = null;
-		}
-
 		if ($config && isset($_this->__config[$config])) {
 			$settings = $_this->set($_this->__config[$config]);
 		} else {

From caedbdf98acb374578267edccdafbfe6204a2aa2 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 13:09:43 -0500
Subject: [PATCH 060/112] Adding Cache::configured() and Cache::unconfig(). 
 configured() allows introspection on the currently configured settings. 
 unconfig() allows for the removal of cache configs. Tests added.

---
 cake/libs/cache.php                  | 47 ++++++++++++++++++++++++---
 cake/tests/cases/libs/cache.test.php | 48 ++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 320cca446..46d6af7fc 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -122,6 +122,44 @@ class Cache {
 		return compact('engine', 'settings');
 	}
 
+/**
+ * Returns an array containing the currently configured Cache settings.
+ *
+ * @return array
+ **/
+	function configured() {
+		$_this = Cache::getInstance();
+		return array_keys($_this->__config);
+	}
+
+/**
+ * Unconfigures a cache engine.  Deletes the cache configuration information
+ * If the deleted configuration is the last configuration using an certain engine,
+ * the Engine instance is also unset.
+ *
+ * @param string $name A currently configured cache config you wish to remove.
+ * @return boolen success of the removal, returns false when the config does not exist.
+ **/
+	function unconfig($name) {
+		$_this = Cache::getInstance();
+		if (!isset($_this->__config[$name])) {
+			return false;
+		}
+		$last = true;
+		$engine = $_this->__config[$name]['engine'];
+		unset($_this->__config[$name]);
+		foreach ($_this->__config as $name => $settings) {
+			if ($settings['engine'] == $engine) {
+				$last = false;
+				break;
+			}
+		}
+		if ($last) {
+			unset($_this->_Engine[$engine]);
+		}
+		return true;
+	}
+
 /**
  * Set the cache engine to use or modify settings for one instance
  *
@@ -165,13 +203,14 @@ class Cache {
  */
 	function __loadEngine($name, $plugin = null) {
 		if ($plugin) {
-			App::import('Lib', $plugin . '.cache' . DS . $name);
+			return App::import('Lib', $plugin . '.cache' . DS . $name);
 		} else {
-			if (!App::import('Lib', 'cache' . DS . $name)) {
-				App::import('Core', 'cache' . DS . $name);
+			$app = App::import('Lib', 'cache' . DS . $name);
+			if (!$app) {
+				return App::import('Core', 'cache' . DS . $name);
 			}
+			return true;
 		}
-		return true;
 	}
 
 
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index e80715629..732dac8aa 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -89,6 +89,11 @@ class CacheTest extends CakeTestCase {
 		$settings = array('engine' => 'TestPlugin.TestPluginCache', 'path' => TMP, 'prefix' => 'cake_test_');
 		$result = Cache::config('pluginLibEngine', $settings);
 		$this->assertEqual($result, Cache::config('pluginLibEngine'));
+
+		Cache::unconfig('libEngine');
+		Cache::unconfig('pluginLibEngine');
+
+		App::build();
 	}
 
 /**
@@ -157,6 +162,18 @@ class CacheTest extends CakeTestCase {
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
 	}
 
+/**
+ * test that configured returns an array of the currently configured cache 
+ * settings
+ *
+ * @return void
+ **/
+	function testConfigured() {
+		$result = Cache::configured();
+		$this->assertTrue(in_array('_cake_core_', $result));
+		$this->assertTrue(in_array('default', $result));
+	}
+
 /**
  * testInitSettings method
  *
@@ -182,6 +199,37 @@ class CacheTest extends CakeTestCase {
 		Cache::engine('File');
 	}
 
+/**
+ * test that unconfig removes cache configs, and that further attempts to use that config 
+ * do not work.
+ *
+ * @return void
+ **/
+	function testUnconfig() {
+		App::build(array(
+			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+
+		$result = Cache::unconfig('some_config_that_does_not_exist');
+		$this->assertFalse($result);
+
+		$_testsConfig = Cache::config('tests');
+		$result = Cache::unconfig('tests');
+		$this->assertTrue($result);
+		
+		Cache::config('unconfigTest', array(
+			'engine' => 'TestAppCache'
+		));
+		$this->assertTrue(Cache::isInitialized('TestAppCache'));
+
+		$this->assertTrue(Cache::unconfig('unconfigTest'));
+		$this->assertFalse(Cache::isInitialized('TestAppCache'));
+
+		Cache::config('tests', $_testsConfig);
+		App::build();
+	}
+
 /**
  * testWriteEmptyValues method
  *

From 70820e2e968523aebd30fb67bf091555b4e33a1a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 20:18:58 -0500
Subject: [PATCH 061/112] Renaming unconfig to drop.

---
 cake/libs/cache.php                  |  4 ++--
 cake/tests/cases/libs/cache.test.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 46d6af7fc..956832962 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -133,14 +133,14 @@ class Cache {
 	}
 
 /**
- * Unconfigures a cache engine.  Deletes the cache configuration information
+ * Drops a cache engine.  Deletes the cache configuration information
  * If the deleted configuration is the last configuration using an certain engine,
  * the Engine instance is also unset.
  *
  * @param string $name A currently configured cache config you wish to remove.
  * @return boolen success of the removal, returns false when the config does not exist.
  **/
-	function unconfig($name) {
+	function drop($name) {
 		$_this = Cache::getInstance();
 		if (!isset($_this->__config[$name])) {
 			return false;
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index 732dac8aa..c440b0e58 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -90,8 +90,8 @@ class CacheTest extends CakeTestCase {
 		$result = Cache::config('pluginLibEngine', $settings);
 		$this->assertEqual($result, Cache::config('pluginLibEngine'));
 
-		Cache::unconfig('libEngine');
-		Cache::unconfig('pluginLibEngine');
+		Cache::drop('libEngine');
+		Cache::drop('pluginLibEngine');
 
 		App::build();
 	}
@@ -211,11 +211,11 @@ class CacheTest extends CakeTestCase {
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 
-		$result = Cache::unconfig('some_config_that_does_not_exist');
+		$result = Cache::drop('some_config_that_does_not_exist');
 		$this->assertFalse($result);
 
 		$_testsConfig = Cache::config('tests');
-		$result = Cache::unconfig('tests');
+		$result = Cache::drop('tests');
 		$this->assertTrue($result);
 		
 		Cache::config('unconfigTest', array(
@@ -223,7 +223,7 @@ class CacheTest extends CakeTestCase {
 		));
 		$this->assertTrue(Cache::isInitialized('TestAppCache'));
 
-		$this->assertTrue(Cache::unconfig('unconfigTest'));
+		$this->assertTrue(Cache::drop('unconfigTest'));
 		$this->assertFalse(Cache::isInitialized('TestAppCache'));
 
 		Cache::config('tests', $_testsConfig);

From b7e7eff7382d5366ee5edb497361938b52baf54f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 20:24:18 -0500
Subject: [PATCH 062/112] Fixing doc blocks.

---
 cake/libs/cache.php                  | 4 ++--
 cake/tests/cases/libs/cache.test.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 956832962..af4abec38 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -126,7 +126,7 @@ class Cache {
  * Returns an array containing the currently configured Cache settings.
  *
  * @return array
- **/
+ */
 	function configured() {
 		$_this = Cache::getInstance();
 		return array_keys($_this->__config);
@@ -139,7 +139,7 @@ class Cache {
  *
  * @param string $name A currently configured cache config you wish to remove.
  * @return boolen success of the removal, returns false when the config does not exist.
- **/
+ */
 	function drop($name) {
 		$_this = Cache::getInstance();
 		if (!isset($_this->__config[$name])) {
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index c440b0e58..8d0e7e996 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -75,7 +75,7 @@ class CacheTest extends CakeTestCase {
  * test configuring CacheEngines in App/libs
  *
  * @return void
- **/
+ */
 	function testConfigWithLibAndPluginEngines() {
 		App::build(array(
 			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
@@ -167,7 +167,7 @@ class CacheTest extends CakeTestCase {
  * settings
  *
  * @return void
- **/
+ */
 	function testConfigured() {
 		$result = Cache::configured();
 		$this->assertTrue(in_array('_cake_core_', $result));
@@ -204,7 +204,7 @@ class CacheTest extends CakeTestCase {
  * do not work.
  *
  * @return void
- **/
+ */
 	function testUnconfig() {
 		App::build(array(
 			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),

From fb483e9bffd3ecaca3f9bc739feee807294fef95 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 20:25:45 -0500
Subject: [PATCH 063/112] Adding file headers.

---
 .../test_app/libs/cache/test_app_cache.php    | 19 ++++++++++++++++++-
 .../libs/cache/test_plugin_cache.php          | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/cake/tests/test_app/libs/cache/test_app_cache.php b/cake/tests/test_app/libs/cache/test_app_cache.php
index 61fe7e4e7..1cc9b7c52 100644
--- a/cake/tests/test_app/libs/cache/test_app_cache.php
+++ b/cake/tests/test_app/libs/cache/test_app_cache.php
@@ -1,5 +1,22 @@
 <?php
-
+/**
+ * Test Suite Test App Cache Engine class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
 class TestAppCacheEngine extends CacheEngine {
 	
 }
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
index 24dc126e3..9b63de842 100644
--- a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
+++ b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
@@ -1,5 +1,22 @@
 <?php
-
+/**
+ * Test Suite Test Plugin Cache Engine class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
 class TestPluginCacheEngine extends CacheEngine {
 	
 }
\ No newline at end of file

From be9f0ec4c7156c92e1454b99667c82753a97c1ec Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 20:42:57 -0500
Subject: [PATCH 064/112] Renaming method so they match those in Cache.
 Removing method that was missed during previous refactor. Updating tests.

---
 cake/libs/cake_log.php                  | 32 ++++---------------------
 cake/tests/cases/libs/cake_log.test.php | 12 +++++-----
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index a2300abb2..802034643 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -19,15 +19,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
-/**
- * Included libraries.
- *
- */
-	if (!class_exists('File')) {
-		require LIBS . 'file.php';
-	}
-
 /**
  * Set up error level constants to be used within the framework if they are not defined within the
  * system.
@@ -140,39 +131,24 @@ class CakeLog {
  * @return array
  * @static
  */
-	function streams() {
+	function configured() {
 		$self = CakeLog::getInstance();
 		return array_keys($self->_streams);
 	}
 
 /**
- * Remove a stream from the active streams.  Once a stream has been removed
- * it will no longer be called.
+ * Removes a stream from the active streams.  Once a stream has been removed
+ * it will no longer have messages sent to it.
  *
  * @param string $keyname Key name of callable to remove.
  * @return void
  * @static
  */
-	function remove($streamName) {
+	function drop($streamName) {
 		$self = CakeLog::getInstance();
 		unset($self->_streams[$streamName]);
 	}
 
-/**
- * Add a stream the logger.
- * Streams represent destinations for log messages.  Each stream can connect to
- * a different resource /interface and capture/write output to that source.
- *
- * @param string $key Keyname of config.
- * @param array $config Array of config information for the LogStream
- * @return boolean success
- * @static
- */
-	function addStream($key, $config) {
-		$self = CakeLog::getInstance();
-		$self->_streams[$key] = $config;
-	}
-
 /**
  * Configures the automatic/default stream a FileLog.
  *
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index 2aa63ef46..d7b3d6f2d 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -34,9 +34,9 @@ class CakeLogTest extends CakeTestCase {
  * @return void
  */
 	function startTest() {
-		$streams = CakeLog::streams();
+		$streams = CakeLog::configured();
 		foreach ($streams as $stream) {
-			CakeLog::remove($stream);
+			CakeLog::drop($stream);
 		}
 	}
 
@@ -55,13 +55,13 @@ class CakeLogTest extends CakeTestCase {
 			'engine' => 'TestAppLog'
 		));
 		$this->assertTrue($result);
-		$this->assertEqual(CakeLog::streams(), array('libtest'));
+		$this->assertEqual(CakeLog::configured(), array('libtest'));
 
 		$result = CakeLog::config('plugintest', array(
 			'engine' => 'TestPlugin.TestPluginLog'
 		));
 		$this->assertTrue($result);
-		$this->assertEqual(CakeLog::streams(), array('libtest', 'plugintest'));
+		$this->assertEqual(CakeLog::configured(), array('libtest', 'plugintest'));
 
 		App::build();
 	}
@@ -93,7 +93,7 @@ class CakeLogTest extends CakeTestCase {
 		CakeLog::write(LOG_WARNING, 'Test warning');
 		$this->assertTrue(file_exists(LOGS . 'error.log'));
 
-		$result = CakeLog::streams();
+		$result = CakeLog::configured();
 		$this->assertEqual($result, array('default'));
 		unlink(LOGS . 'error.log');
 	}
@@ -108,7 +108,7 @@ class CakeLogTest extends CakeTestCase {
 			'engine' => 'FileLog',
 			'path' => LOGS
 		));
-		$result = CakeLog::streams();
+		$result = CakeLog::configured();
 		$this->assertEqual($result, array('file'));
 
 		@unlink(LOGS . 'error.log');

From b452e8367f37eca55771a8bc53b15124d380de9d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 20:44:42 -0500
Subject: [PATCH 065/112] Adding tests for CakeLog::drop()

---
 cake/tests/cases/libs/cake_log.test.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index d7b3d6f2d..55909c70e 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -120,6 +120,24 @@ class CakeLogTest extends CakeTestCase {
 		unlink(LOGS . 'error.log');
 	}
 
+/**
+ * explict tests for drop()
+ *
+ * @return void
+ **/
+	function testDrop() {
+		CakeLog::config('file', array(
+			'engine' => 'FileLog',
+			'path' => LOGS
+		));
+		$result = CakeLog::configured();
+		$this->assertEqual($result, array('file'));
+
+		CakeLog::drop('file');
+		$result = CakeLog::configured();
+		$this->assertEqual($result, array());
+	}
+
 /**
  * testLogFileWriting method
  *

From 0b2fc5b35f3e848288ad5b6070d1aaf30c4a7c95 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 20:52:11 -0500
Subject: [PATCH 066/112] Adding tests for phone() pass through to localized
 class.

---
 cake/tests/cases/libs/validation.test.php | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 2e94e3313..5e76b9b76 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -60,6 +60,25 @@ class TestNlValidation {
 	}
 }
 
+/**
+ * TestNlValidation class
+ *
+ * Used to test pass through of Validation
+ *
+ * @package cake.tests.cases.libs
+ */
+class TestDeValidation {
+/**
+ * phone function, for testing phone pass through.
+ *
+ * @param string $check
+ * @return void
+ */
+	function phone($check) {
+		return true;
+	}
+}
+
 /**
  * Test Case for Validation Class
  *
@@ -2017,6 +2036,16 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::postal('13089-3333'));
 	}
 
+/**
+ * test that phone and postal pass to other classes.
+ *
+ * @return void
+ */
+	function testPhoneAndPostalPass() {
+		$this->assertTrue(Validation::postal('text', null, 'testNl'));
+		$this->assertTrue(Validation::phone('text', null, 'testDe'));
+	}
+
 /**
  * test the pass through calling of an alternate locale with postal()
  *

From 0049c9ad81bf4f1fced47ce6fe603f6264452b19 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sun, 15 Nov 2009 21:18:46 +1100
Subject: [PATCH 067/112] Renaming Helper::__name to Helper::_name for proper
 access level for extension overloading and callback.

---
 cake/libs/view/helper.php       | 5 +++--
 cake/libs/view/helpers/form.php | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 030b17fe1..64a6440a0 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -578,8 +578,9 @@ class Helper extends Overloadable {
  * @param array $options
  * @param string $key
  * @return array
+ * @access protected
  */
-	function __name($options = array(), $field = null, $key = 'name') {
+	function _name($options = array(), $field = null, $key = 'name') {
 		$view =& ClassRegistry::getObject('view');
 		if ($options === null) {
 			$options = array();
@@ -689,7 +690,7 @@ class Helper extends Overloadable {
 			$this->setEntity($field);
 		}
 		$options = (array)$options;
-		$options = $this->__name($options);
+		$options = $this->_name($options);
 		$options = $this->value($options);
 		$options = $this->domId($options);
 		if ($this->tagIsInvalid()) {
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 002f86622..3557c1092 100755
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -1751,8 +1751,9 @@ class FormHelper extends AppHelper {
  * @param array $options
  * @param string $key
  * @return array
+ * @access protected
  */
-	function __name($options = array(), $field = null, $key = 'name') {
+	function _name($options = array(), $field = null, $key = 'name') {
 		if ($this->requestType == 'get') {
 			if ($options === null) {
 				$options = array();
@@ -1777,7 +1778,7 @@ class FormHelper extends AppHelper {
 				return $name;
 			}
 		}
-		return parent::__name($options, $field, $key);
+		return parent::_name($options, $field, $key);
 	}
 
 /**
@@ -1846,7 +1847,7 @@ class FormHelper extends AppHelper {
 							$label['class'] = 'selected';
 						}
 
-						list($name) = array_values($this->__name());
+						list($name) = array_values($this->_name());
 
 						if (empty($attributes['class'])) {
 							$attributes['class'] = 'checkbox';

From 6039d6ebe495533107711b7c1117081476d0718c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 15:32:58 -0500
Subject: [PATCH 068/112] Applying optimization in Dispatcher::parseParams()
 from 'robustsolution'.  Fixes #309

---
 cake/dispatcher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index b2b1d81d4..c6be13c7d 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -271,7 +271,7 @@ class Dispatcher extends Object {
 				$params['form']['_method'] = env('HTTP_X_HTTP_METHOD_OVERRIDE');
 			}
 			if (isset($params['form']['_method'])) {
-				if (isset($_SERVER) && !empty($_SERVER)) {
+				if (!empty($_SERVER)) {
 					$_SERVER['REQUEST_METHOD'] = $params['form']['_method'];
 				} else {
 					$_ENV['REQUEST_METHOD'] = $params['form']['_method'];

From 31102ad412283a0d5e7fd5aae765a30755150c0c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 16:38:02 -0500
Subject: [PATCH 069/112] Adding tests for App::pluginPath that were omitted
 before.

---
 cake/tests/cases/libs/configure.test.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index 25eb9979c..a50e71d49 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -391,6 +391,29 @@ class AppImportTest extends UnitTestCase {
 		$this->assertFalse($result);
 	}
 
+/**
+ * test that pluginPath can find paths for plugins.
+ *
+ * @return void
+ */
+	function testPluginPath() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$path = App::pluginPath('test_plugin');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::pluginPath('TestPlugin');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::pluginPath('TestPluginTwo');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS;
+		$this->assertEqual($path, $expected);
+		App::build();
+	}
+
 /**
  * testClassLoading method
  *

From e1d60368f681cb2923415da0629cc3a01318397f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 16:38:15 -0500
Subject: [PATCH 070/112] Adding missing reference operator.

---
 cake/console/libs/tasks/view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index 5a1b0a0b3..df425fa71 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -460,7 +460,7 @@ class ViewTask extends Shell {
  * @return  array $associations
  * @access private
  */
-	function __associations($model) {
+	function __associations(&$model) {
 		$keys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
 		$associations = array();
 

From ea6e3dd0763f4d4b310df79190918dd4fedd9f30 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 16:47:58 -0500
Subject: [PATCH 071/112] Fixing issue with bake model <name>

---
 cake/console/libs/tasks/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index b962a13df..0292f74ae 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -65,6 +65,7 @@ class ModelTask extends Shell {
 
 		if (!empty($this->args[0])) {
 			$model = Inflector::camelize($this->args[0]);
+			$this->useDbConfig = 'default';
 			if ($this->bake($model)) {
 				if ($this->_checkUnitTest()) {
 					$this->bakeTest($model);

From 63ab96d751a7308fdb65c13d43a1a237bbc09eee Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 17:48:41 -0500
Subject: [PATCH 072/112] Setting $primary = false inside
 DboSource::queryAssociation.  Fixed #208

---
 cake/libs/model/datasources/dbo_source.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 013a5baee..ec154f25e 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -798,12 +798,12 @@ class DboSource extends DataSource {
 					if (count($ins) > 1) {
 						$query = str_replace('{$__cakeID__$}', '(' .join(', ', $ins) .')', $query);
 						$query = str_replace('= (', 'IN (', $query);
-						$query = str_replace('=	 (', 'IN (', $query);
+						$query = str_replace('= (', 'IN (', $query);
 					} else {
 						$query = str_replace('{$__cakeID__$}',$ins[0], $query);
 					}
 
-					$query = str_replace('	WHERE 1 = 1', '', $query);
+					$query = str_replace(' WHERE 1 = 1', '', $query);
 				}
 
 				$foreignKey = $model->hasAndBelongsToMany[$association]['foreignKey'];
@@ -877,7 +877,7 @@ class DboSource extends DataSource {
 						$this->__mergeAssociation($resultSet[$i], $fetch, $association, $type, $selfJoin);
 					}
 					if (isset($resultSet[$i][$association])) {
-						$resultSet[$i][$association] = $linkModel->afterFind($resultSet[$i][$association]);
+						$resultSet[$i][$association] = $linkModel->afterFind($resultSet[$i][$association], false);
 					}
 				} else {
 					$tempArray[0][$association] = false;
@@ -898,7 +898,7 @@ class DboSource extends DataSource {
 		$query = str_replace('{$__cakeID__$}', join(', ', $ids), $query);
 		if (count($ids) > 1) {
 			$query = str_replace('= (', 'IN (', $query);
-			$query = str_replace('=	 (', 'IN (', $query);
+			$query = str_replace('= (', 'IN (', $query);
 		}
 		return $this->fetchAll($query, $model->cacheQueries, $model->alias);
 	}

From 7a4793a20c213159368e24cdbbebca94e9a871a0 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Sun, 15 Nov 2009 22:59:19 +0100
Subject: [PATCH 073/112] refactoring Configure::load() to load config files
 from plugins, tests and config files added

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/configure.php                       | 10 ++++++++-
 cake/tests/cases/libs/configure.test.php      | 21 +++++++++++++++++++
 .../plugins/test_plugin/config/load.php       |  3 +++
 .../plugins/test_plugin/config/more.load.php  |  3 +++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 cake/tests/test_app/plugins/test_plugin/config/load.php
 create mode 100644 cake/tests/test_app/plugins/test_plugin/config/more.load.php

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index fb86ed3b3..a8f4cd7f6 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -201,8 +201,16 @@ class Configure extends Object {
  */
 	function load($fileName) {
 		$found = false;
+		$pluginPath = false;
+		if(strpos($fileName, '.') !== false) {
+			$plugin = explode('.', $fileName, 2);
+			$pluginPath = App::pluginPath($plugin[0]);
+		}
 
-		if (file_exists(CONFIGS . $fileName . '.php')) {
+		if ($pluginPath && file_exists($pluginPath . 'config' . DS . $plugin[1] . '.php')) {
+		include($pluginPath . 'config' . DS . $plugin[1] . '.php');
+			$found = true;
+		} elseif (file_exists(CONFIGS . $fileName . '.php')) {
 			include(CONFIGS . $fileName . '.php');
 			$found = true;
 		} elseif (file_exists(CACHE . 'persistent' . DS . $fileName . '.php')) {
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index a50e71d49..6cb18032c 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -224,6 +224,27 @@ class ConfigureTest extends CakeTestCase {
 		$this->assertTrue($result === null);
 	}
 
+/**
+ * testLoad method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadPlugin() {
+		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true);
+		$result = Configure::load('test_plugin.load');
+		$this->assertTrue($result === null);
+		$expected = '/test_app/plugins/test_plugin/config/load.php';
+		$config = Configure::read('plugin_load');
+		$this->assertEqual($config, $expected);
+
+		$result = Configure::load('test_plugin.more.load');
+		$this->assertTrue($result === null);
+		$expected = '/test_app/plugins/test_plugin/config/more.load.php';
+		$config = Configure::read('plugin_more_load');
+		$this->assertEqual($config, $expected);
+	}
+
 /**
  * testStore method
  *
diff --git a/cake/tests/test_app/plugins/test_plugin/config/load.php b/cake/tests/test_app/plugins/test_plugin/config/load.php
new file mode 100644
index 000000000..4074ddf0c
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/config/load.php
@@ -0,0 +1,3 @@
+<?php
+$config['plugin_load'] = '/test_app/plugins/test_plugin/config/load.php';
+?>
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/cake/tests/test_app/plugins/test_plugin/config/more.load.php
new file mode 100644
index 000000000..de3f167de
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/config/more.load.php
@@ -0,0 +1,3 @@
+<?php
+$config['plugin_more_load'] = '/test_app/plugins/test_plugin/config/more.load.php';
+?>
\ No newline at end of file

From 28d3488cb2c47ea8c908a37178abbc9ac68d5af5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 18:09:04 -0500
Subject: [PATCH 074/112] Adding file headers to config files in test app.
 Updating doc blocks. Updating formatting.

---
 cake/libs/configure.php                       | 41 +++++++++++--------
 .../plugins/test_plugin/config/load.php       | 20 +++++++++
 .../plugins/test_plugin/config/more.load.php  | 20 +++++++++
 3 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index a8f4cd7f6..7c919de01 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -130,12 +130,14 @@ class Configure extends Object {
 /**
  * Used to read information stored in the Configure instance.
  *
- * Usage
+ * Usage:
+ * {{{
  * Configure::read('Name'); will return all values for Name
  * Configure::read('Name.key'); will return only the value of Configure::Name[key]
+ * }}}
  *
- * @link          http://book.cakephp.org/view/413/read
- * @param string $var Variable to obtain
+ * @link http://book.cakephp.org/view/413/read
+ * @param string $var Variable to obtain.  Use '.' to access array elements.
  * @return string value of Configure::$var
  * @access public
  */
@@ -165,10 +167,12 @@ class Configure extends Object {
  * Used to delete a variable from the Configure instance.
  *
  * Usage:
+ * {{{
  * Configure::delete('Name'); will delete the entire Configure::Name
  * Configure::delete('Name.key'); will delete only the Configure::Name[key]
+ * }}}
  *
- * @link          http://book.cakephp.org/view/414/delete
+ * @link http://book.cakephp.org/view/414/delete
  * @param string $var the var to be deleted
  * @return void
  * @access public
@@ -188,27 +192,28 @@ class Configure extends Object {
 /**
  * Loads a file from app/config/configure_file.php.
  * Config file variables should be formated like:
- *  $config['name'] = 'value';
- * These will be used to create dynamic Configure vars.
+ *  `$config['name'] = 'value';`
+ * These will be used to create dynamic Configure vars. load() is also used to 
+ * load stored config files created with Configure::store()
  *
- * Usage Configure::load('configure_file');
+ * - To load config files from app/config use `Configure::load('configure_file');`.
+ * - To load config files from a plugin `Configure::load('plugin.configure_file');`.
  *
- * @link          http://book.cakephp.org/view/415/load
+ * @link http://book.cakephp.org/view/415/load
  * @param string $fileName name of file to load, extension must be .php and only the name
- *                         should be used, not the extenstion
+ *     should be used, not the extenstion
  * @return mixed false if file not found, void if load successful
  * @access public
  */
 	function load($fileName) {
-		$found = false;
-		$pluginPath = false;
-		if(strpos($fileName, '.') !== false) {
+		$found = $pluginPath = false;
+		if (strpos($fileName, '.') !== false) {
 			$plugin = explode('.', $fileName, 2);
 			$pluginPath = App::pluginPath($plugin[0]);
 		}
 
 		if ($pluginPath && file_exists($pluginPath . 'config' . DS . $plugin[1] . '.php')) {
-		include($pluginPath . 'config' . DS . $plugin[1] . '.php');
+			include($pluginPath . 'config' . DS . $plugin[1] . '.php');
 			$found = true;
 		} elseif (file_exists(CONFIGS . $fileName . '.php')) {
 			include(CONFIGS . $fileName . '.php');
@@ -241,9 +246,9 @@ class Configure extends Object {
 /**
  * Used to determine the current version of CakePHP.
  *
- * Usage Configure::version();
+ * Usage `Configure::version();`
  *
- * @link          http://book.cakephp.org/view/416/version
+ * @link http://book.cakephp.org/view/416/version
  * @return string Current version of CakePHP
  * @access public
  */
@@ -260,9 +265,11 @@ class Configure extends Object {
 /**
  * Used to write a config file to disk.
  *
+ * {{{
  * Configure::store('Model', 'class.paths', array('Users' => array(
  *      'path' => 'users', 'plugin' => true
  * )));
+ * }}}
  *
  * @param string $type Type of config file to write, ex: Models, Controllers, Helpers, Components
  * @param string $name file name.
@@ -1231,8 +1238,8 @@ class App extends Object {
 /**
  * Returns an array of filenames of PHP files in the given directory.
  *
- * @param  string $path Path to scan for files
- * @param  string $suffix if false, return only directories. if string, match and return files
+ * @param string $path Path to scan for files
+ * @param string $suffix if false, return only directories. if string, match and return files
  * @return array  List of directories or files in directory
  */
 	function __list($path, $suffix = false, $extension = false) {
diff --git a/cake/tests/test_app/plugins/test_plugin/config/load.php b/cake/tests/test_app/plugins/test_plugin/config/load.php
index 4074ddf0c..75c7e0bb2 100644
--- a/cake/tests/test_app/plugins/test_plugin/config/load.php
+++ b/cake/tests/test_app/plugins/test_plugin/config/load.php
@@ -1,3 +1,23 @@
 <?php
+/**
+ * Test Suite TestPlugin config file.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
 $config['plugin_load'] = '/test_app/plugins/test_plugin/config/load.php';
 ?>
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/cake/tests/test_app/plugins/test_plugin/config/more.load.php
index de3f167de..fe20ef087 100644
--- a/cake/tests/test_app/plugins/test_plugin/config/more.load.php
+++ b/cake/tests/test_app/plugins/test_plugin/config/more.load.php
@@ -1,3 +1,23 @@
 <?php
+/**
+ * Test Suite TestPlugin config file.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
 $config['plugin_more_load'] = '/test_app/plugins/test_plugin/config/more.load.php';
 ?>
\ No newline at end of file

From db0c030557218d8693750f7499c2647a8aa02ad5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 18:16:12 -0500
Subject: [PATCH 075/112] Adding pluginSplit and test case.  pluginSplit
 consolidates a number of repeated code blocks.

---
 cake/basics.php                  | 16 ++++++++++++++++
 cake/tests/cases/basics.test.php | 13 +++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/cake/basics.php b/cake/basics.php
index bf4df7afa..b18e415a7 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -212,6 +212,22 @@ if (!function_exists('array_combine')) {
 		return htmlspecialchars($text, ENT_QUOTES, $charset);
 	}
 
+/**
+ * Splits a dot syntax plugin name into its plugin and classname.
+ * If $name does not have a dot, then index 0 will be null.
+ *
+ * Commonly used like `list($plugin, $name) = pluginSplit($name);
+ *
+ * @param string $name The name you want to plugin split.
+ * @return array Array with 2 indexes.  0 => plugin name, 1 => classname
+ */
+	function pluginSplit($name) {
+		if (strpos($name, '.') !== false) {
+			return explode('.', $name, 2);
+		}
+		return array(null, $name);
+	}
+
 /**
  * Returns an array of all the given parameters.
  *
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index eb87b7b00..01860d2dc 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -764,5 +764,18 @@ class BasicsTest extends CakeTestCase {
 		$this->assertEqual(ife(0, 'a', 'b'), 'b');
 		$this->assertEqual(ife(array(), 'a', 'b'), 'b');
 	}
+
+/**
+ * test pluginSplit
+ *
+ * @return void
+ */
+	function testPluginSplit() {
+		$result = pluginSplit('Something.else');
+		$this->assertEqual($result, array('Something', 'else'));
+
+		$result = pluginSplit('Somethingelse');
+		$this->assertEqual($result, array(null, 'Somethingelse'));
+	}
 }
 ?>
\ No newline at end of file

From 20a114a1cd922b2027beb258215a258af3af0ea5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 19:12:00 -0500
Subject: [PATCH 076/112] Adding $dotAppend to pluginSplit()

---
 cake/basics.php                  | 11 ++++++++---
 cake/tests/cases/basics.test.php |  9 +++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cake/basics.php b/cake/basics.php
index b18e415a7..039d1c42e 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -216,14 +216,19 @@ if (!function_exists('array_combine')) {
  * Splits a dot syntax plugin name into its plugin and classname.
  * If $name does not have a dot, then index 0 will be null.
  *
- * Commonly used like `list($plugin, $name) = pluginSplit($name);
+ * Commonly used like `list($plugin, $name) = pluginSplit($name);`
  *
  * @param string $name The name you want to plugin split.
+ * @param boolean $dotAppend Set to true if you want the plugin to have a '.' appended to it.
  * @return array Array with 2 indexes.  0 => plugin name, 1 => classname
  */
-	function pluginSplit($name) {
+	function pluginSplit($name, $dotAppend = false) {
 		if (strpos($name, '.') !== false) {
-			return explode('.', $name, 2);
+			$parts = explode('.', $name, 2);
+			if ($dotAppend) {
+				$parts[0] .= '.';
+			}
+			return $parts;
 		}
 		return array(null, $name);
 	}
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 01860d2dc..ff39e9fa1 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -773,9 +773,18 @@ class BasicsTest extends CakeTestCase {
 	function testPluginSplit() {
 		$result = pluginSplit('Something.else');
 		$this->assertEqual($result, array('Something', 'else'));
+		
+		$result = pluginSplit('Something.else.more.dots');
+		$this->assertEqual($result, array('Something', 'else.more.dots'));
 
 		$result = pluginSplit('Somethingelse');
 		$this->assertEqual($result, array(null, 'Somethingelse'));
+		
+		$result = pluginSplit('Something.else', true);
+		$this->assertEqual($result, array('Something.', 'else'));
+		
+		$result = pluginSplit('Something.else.more.dots', true);
+		$this->assertEqual($result, array('Something.', 'else.more.dots'));
 	}
 }
 ?>
\ No newline at end of file

From a292ef0f167b3f14ec413c170d26991e224cf5c4 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 19:54:33 -0500
Subject: [PATCH 077/112] Adding ability to provide default plugin value to
 pluginSplit().

---
 cake/basics.php                  |  5 +++--
 cake/tests/cases/basics.test.php | 12 +++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cake/basics.php b/cake/basics.php
index 039d1c42e..516fe746b 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -220,9 +220,10 @@ if (!function_exists('array_combine')) {
  *
  * @param string $name The name you want to plugin split.
  * @param boolean $dotAppend Set to true if you want the plugin to have a '.' appended to it.
+ * @param string $plugin Optional default plugin to use if no plugin is found. Defaults to null.
  * @return array Array with 2 indexes.  0 => plugin name, 1 => classname
  */
-	function pluginSplit($name, $dotAppend = false) {
+	function pluginSplit($name, $dotAppend = false, $plugin = null) {
 		if (strpos($name, '.') !== false) {
 			$parts = explode('.', $name, 2);
 			if ($dotAppend) {
@@ -230,7 +231,7 @@ if (!function_exists('array_combine')) {
 			}
 			return $parts;
 		}
-		return array(null, $name);
+		return array($plugin, $name);
 	}
 
 /**
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index ff39e9fa1..bb24c70f9 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -773,18 +773,24 @@ class BasicsTest extends CakeTestCase {
 	function testPluginSplit() {
 		$result = pluginSplit('Something.else');
 		$this->assertEqual($result, array('Something', 'else'));
-		
+
 		$result = pluginSplit('Something.else.more.dots');
 		$this->assertEqual($result, array('Something', 'else.more.dots'));
 
 		$result = pluginSplit('Somethingelse');
 		$this->assertEqual($result, array(null, 'Somethingelse'));
-		
+
 		$result = pluginSplit('Something.else', true);
 		$this->assertEqual($result, array('Something.', 'else'));
-		
+
 		$result = pluginSplit('Something.else.more.dots', true);
 		$this->assertEqual($result, array('Something.', 'else.more.dots'));
+
+		$result = pluginSplit('Post', false, 'Blog');
+		$this->assertEqual($result, array('Blog', 'Post'));
+
+		$result = pluginSplit('Blog.Post', false, 'Ultimate');
+		$this->assertEqual($result, array('Blog', 'Post'));
 	}
 }
 ?>
\ No newline at end of file

From 078317623851ed341988fa3ffeb17e23ab103ec1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 19:55:20 -0500
Subject: [PATCH 078/112] Replacing duplicated code with pluginSplit().
 Updating test case.

---
 cake/console/cake.php                     |  9 ++-------
 cake/console/libs/bake.php                |  2 +-
 cake/console/libs/schema.php              |  5 +++--
 cake/console/libs/shell.php               |  6 +-----
 cake/libs/cache.php                       |  5 +----
 cake/libs/cake_log.php                    |  6 ++----
 cake/libs/class_registry.php              |  8 ++++----
 cake/libs/configure.php                   | 14 +++++++-------
 cake/libs/controller/component.php        | 12 ++----------
 cake/libs/controller/components/acl.php   |  4 +---
 cake/libs/controller/components/email.php |  4 +---
 cake/libs/controller/controller.php       | 15 ++++-----------
 cake/libs/model/model.php                 | 22 ++++++----------------
 cake/libs/model/model_behavior.php        |  5 +----
 cake/libs/view/helpers/js.php             |  5 ++---
 cake/libs/view/view.php                   |  8 ++------
 cake/tests/cases/libs/configure.test.php  |  4 ++--
 17 files changed, 42 insertions(+), 92 deletions(-)

diff --git a/cake/console/cake.php b/cake/console/cake.php
index 27309fbd4..7ec5c19be 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -317,13 +317,8 @@ class ShellDispatcher {
 			$this->help();
 			return true;
 		}
-
-		if (strpos($arg, '.') !== false)  {
-			list($plugin, $shell) = explode('.', $arg);
-		} else {
-			$plugin = null;
-			$shell = $arg;
-		}
+		
+		list($plugin, $shell) = pluginSplit($arg);
 		$this->shell = $shell;
 		$this->shellName = Inflector::camelize($shell);
 		$this->shellClass = $this->shellName . 'Shell';
diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php
index ff270f086..5be3482d1 100644
--- a/cake/console/libs/bake.php
+++ b/cake/console/libs/bake.php
@@ -57,7 +57,7 @@ class BakeShell extends Shell {
 			}
 			foreach($this->args as $i => $arg) {
 				if (strpos($arg, '.')) {
-					list($this->params['plugin'], $this->args[$i]) = explode('.', $arg);
+					list($this->params['plugin'], $this->args[$i]) = pluginSplit($arg);
 					break;
 				}
 			}
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index b6c69708a..0ab9acd14 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -63,9 +63,10 @@ class SchemaShell extends Shell {
 		} elseif (!empty($this->args[0])) {
 			$name = $this->params['name'] = $this->args[0];
 		}
+
 		if (strpos($name, '.')) {
-			list($this->params['plugin'], $this->params['name']) = explode('.', $name);
-			$name = $this->params['name'];
+			list($this->params['plugin'], $splitName) = pluginSplit($name);
+			$name = $this->params['name'] = $splitName;
 		}
 
 		if ($name) {
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index 0a481db60..41b24200e 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -254,11 +254,7 @@ class Shell extends Object {
 			$this->modelClass = $modelClassName;
 
 			foreach ($uses as $modelClass) {
-				$plugin = null;
-				if (strpos($modelClass, '.') !== false) {
-					list($plugin, $modelClass) = explode('.', $modelClass);
-					$plugin = $plugin . '.';
-				}
+				list($plugin, $modelClass) = pluginSplit($modelClass, true);
 				if (PHP5) {
 					$this->{$modelClass} = ClassRegistry::init($plugin . $modelClass);
 				} else {
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index af4abec38..fca1c2607 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -170,11 +170,8 @@ class Cache {
  * @static
  */
 	function engine($name = 'File', $settings = array()) {
-		$plugin = null;
 		$class = $name;
-		if (strpos($name, '.') !== false) {
-			list($plugin, $class) = explode('.', $name);
-		}
+		list($plugin, $class) = pluginSplit($name);
 		$cacheClass = $class . 'Engine';
 		$_this =& Cache::getInstance();
 		if (!isset($_this->_Engine[$name])) {
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index 802034643..d0d586775 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -100,10 +100,8 @@ class CakeLog {
  * @access protected
  */
 	function _getLogger($loggerName) {
-		$plugin = null;
-		if (strpos($loggerName, '.') !== false) {
-			list($plugin, $loggerName) = explode('.', $loggerName);
-		}
+		list($plugin, $loggerName) = pluginSplit($loggerName);
+
 		if ($plugin) {
 			App::import('Lib', $plugin . '.log/' . $loggerName);
 		} else {
diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index b6ebccf65..4d9e98f16 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -118,12 +118,12 @@ class ClassRegistry {
 
 		foreach ($objects as $key => $settings) {
 			if (is_array($settings)) {
-				$plugin = $pluginPath = null;
+				$pluginPath = null;
 				$settings = array_merge($defaults, $settings);
 				$class = $settings['class'];
-
-				if (strpos($class, '.') !== false) {
-					list($plugin, $class) = explode('.', $class);
+				
+				list($plugin, $class) = pluginSplit($class);
+				if ($plugin) {
 					$pluginPath = $plugin . '.';
 				}
 
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 7c919de01..bcf748e94 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -206,14 +206,14 @@ class Configure extends Object {
  * @access public
  */
 	function load($fileName) {
-		$found = $pluginPath = false;
-		if (strpos($fileName, '.') !== false) {
-			$plugin = explode('.', $fileName, 2);
-			$pluginPath = App::pluginPath($plugin[0]);
+		$found = $plugin = $pluginPath = false;
+		list($plugin, $fileName) = pluginSplit($fileName);
+		if ($plugin) {
+			$pluginPath = App::pluginPath($plugin);
 		}
 
-		if ($pluginPath && file_exists($pluginPath . 'config' . DS . $plugin[1] . '.php')) {
-			include($pluginPath . 'config' . DS . $plugin[1] . '.php');
+		if ($pluginPath && file_exists($pluginPath . 'config' . DS . $fileName . '.php')) {
+			include($pluginPath . 'config' . DS . $fileName . '.php');
 			$found = true;
 		} elseif (file_exists(CONFIGS . $fileName . '.php')) {
 			include(CONFIGS . $fileName . '.php');
@@ -266,7 +266,7 @@ class Configure extends Object {
  * Used to write a config file to disk.
  *
  * {{{
- * Configure::store('Model', 'class.paths', array('Users' => array(
+ * Configure::store('Model', 'class_paths', array('Users' => array(
  *      'path' => 'users', 'plugin' => true
  * )));
  * }}}
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index 081c81a5e..6c26a9ddd 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -189,16 +189,8 @@ class Component extends Object {
 			$normal = Set::merge(array('Session' => null), $normal);
 		}
 		foreach ((array)$normal as $component => $config) {
-			$plugin = null;
-
-			if (isset($this->__controllerVars['plugin'])) {
-				$plugin = $this->__controllerVars['plugin'] . '.';
-			}
-
-			if (strpos($component, '.') !== false) {
-				list($plugin, $component) = explode('.', $component);
-				$plugin = $plugin . '.';
-			}
+			$plugin = isset($this->__controllerVars['plugin']) ? $this->__controllerVars['plugin'] . '.' : null;
+			list($plugin, $component) = pluginSplit($component, true, $plugin);
 			$componentCn = $component . 'Component';
 
 			if (!class_exists($componentCn)) {
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index a50ba1a1d..900ddf879 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -46,9 +46,7 @@ class AclComponent extends Object {
 		$name = Inflector::camelize(strtolower(Configure::read('Acl.classname')));
 		if (!class_exists($name)) {
 			if (App::import('Component', $name)) {
-				if (strpos($name, '.') !== false) {
-					list($plugin, $name) = explode('.', $name);
-				}
+				list($plugin, $name) = pluginSplit($name);
 				$name .= 'Component';
 			} else {
 				trigger_error(sprintf(__('Could not find %s.', true), $name), E_USER_WARNING);
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 10f2ef41f..21473e63c 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -391,9 +391,7 @@ class EmailComponent extends Object{
 		$viewClass = $this->Controller->view;
 
 		if ($viewClass != 'View') {
-			if (strpos($viewClass, '.') !== false) {
-				list($plugin, $viewClass) = explode('.', $viewClass);
-			}
+			list($plugin, $viewClass) = pluginSplit($viewClass);
 			$viewClass = $viewClass . 'View';
 			App::import('View', $this->Controller->view);
 		}
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 33688efe0..26e84e562 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -528,11 +528,7 @@ class Controller extends Object {
 				$plugin = $this->plugin . '.';
 			}
 		}
-
-		if (strpos($modelClass, '.') !== false) {
-			list($plugin, $modelClass) = explode('.', $modelClass);
-			$plugin = $plugin . '.';
-		}
+		list($plugin, $modelClass) = pluginSplit($modelClass, true, $plugin);
 
 		if ($this->persistModel === true) {
 			$cached = $this->_persist($modelClass, null, $object);
@@ -808,9 +804,7 @@ class Controller extends Object {
 
 		$viewClass = $this->view;
 		if ($this->view != 'View') {
-			if (strpos($viewClass, '.') !== false) {
-				list($plugin, $viewClass) = explode('.', $viewClass);
-			}
+			list($plugin, $viewClass) = pluginSplit($viewClass);
 			$viewClass = $viewClass . 'View';
 			App::import('View', $this->view);
 		}
@@ -1003,9 +997,8 @@ class Controller extends Object {
 
 		if (is_string($object)) {
 			$assoc = null;
-
-			if (strpos($object, '.') !== false) {
-				list($object, $assoc) = explode('.', $object);
+			if (strpos($object, '.')  !== false) {
+				list($object, $assoc) = pluginSplit($object);
 			}
 
 			if ($assoc && isset($this->{$object}->{$assoc})) {
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index e20db4810..953480478 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -641,20 +641,15 @@ class Model extends Overloadable {
 						if (strpos($assoc, '.') !== false) {
 							$value = $this->{$type}[$assoc];
 							unset($this->{$type}[$assoc]);
-							list($plugin, $assoc) = explode('.', $assoc);
+							list($plugin, $assoc) = pluginSplit($assoc, true);
 							$this->{$type}[$assoc] = $value;
-							$plugin = $plugin . '.';
 						}
 					}
 					$className =  $assoc;
 
-					if (isset($value['className']) && !empty($value['className'])) {
-						$className = $value['className'];
-						if (strpos($className, '.') !== false) {
-							list($plugin, $className) = explode('.', $className);
-							$plugin = $plugin . '.';
-							$this->{$type}[$assoc]['className'] = $className;
-						}
+					if (!empty($value['className'])) {
+						list($plugin, $className) = pluginSplit($value['className'], true);
+						$this->{$type}[$assoc]['className'] = $className;
 					}
 					$this->__constructLinkedModel($assoc, $plugin . $className);
 				}
@@ -753,13 +748,8 @@ class Model extends Overloadable {
 				if (is_array($joinClass)) {
 					$joinClass = key($joinClass);
 				}
-				$plugin = null;
-
-				if (strpos($joinClass, '.') !== false) {
-					list($plugin, $joinClass) = explode('.', $joinClass);
-					$plugin = $plugin . '.';
-					$this->{$type}[$assocKey]['with'] = $joinClass;
-				}
+				list($plugin, $joinClass) = pluginSplit($joinClass, true);
+				$this->{$type}[$assocKey]['with'] = $joinClass;
 
 				if (!ClassRegistry::isKeySet($joinClass) && $dynamicWith === true) {
 					$this->{$joinClass} = new AppModel(array(
diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
index e1bfb3666..e5fd759de 100644
--- a/cake/libs/model/model_behavior.php
+++ b/cake/libs/model/model_behavior.php
@@ -279,10 +279,7 @@ class BehaviorCollection extends Object {
  * @access public
  */
 	function attach($behavior, $config = array()) {
-		$name = $behavior;
-		if (strpos($behavior, '.')) {
-			list($plugin, $name) = explode('.', $behavior, 2);
-		}
+		list($plugin, $name) = pluginSplit($behavior);
 		$class = $name . 'Behavior';
 
 		if (!App::import('Behavior', $behavior)) {
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index 1352074c8..ccd955fc1 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -87,9 +87,8 @@ class JsHelper extends AppHelper {
 			$className = $settings;
 		}
 		$engineName = $className;
-		if (strpos($className, '.') !== false) {
-			list($plugin, $className) = explode('.', $className);
-		}
+		list($plugin, $className) = pluginSplit($className);
+
 		$this->__engineName = $className . 'Engine';
 		$engineClass = $engineName . 'Engine';
 		$this->helpers[] = $engineClass;
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index af8d49127..3cafd8bb9 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -750,18 +750,14 @@ class View extends Object {
 				$options = $helper;
 				$helper = $i;
 			}
-			$plugin = $this->plugin;
-
-			if (strpos($helper, '.') !== false) {
-				list($plugin, $helper) = explode('.', $helper);
-			}
+			list($plugin, $helper) = pluginSplit($helper, true, $this->plugin);
 			$helperCn = $helper . 'Helper';
 
 			if (!isset($loaded[$helper])) {
 				if (!class_exists($helperCn)) {
 					$isLoaded = false;
 					if (!is_null($plugin)) {
-						$isLoaded = App::import('Helper', $plugin . '.' . $helper);
+						$isLoaded = App::import('Helper', $plugin . $helper);
 					}
 					if (!$isLoaded) {
 						if (!App::import('Helper', $helper)) {
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index 6cb18032c..eb73981a2 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -262,9 +262,9 @@ class ConfigureTest extends CakeTestCase {
 		$this->assertEqual($config, $expected);
 
 		$expected = array('data' => array('first' => 'value', 'second' => 'value2'));
-		Configure::store('AnotherExample', 'test.config', $expected);
+		Configure::store('AnotherExample', 'test_config', $expected);
 
-		Configure::load('test.config');
+		Configure::load('test_config');
 		$config = Configure::read('AnotherExample');
 		$this->assertEqual($config, $expected);
 	}

From e2c7cda5d576f11c4ebf3239c973223863894b66 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 20:07:02 -0500
Subject: [PATCH 079/112] Adding deleted empty file back in.

---
 app/tmp/cache/views/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 app/tmp/cache/views/empty

diff --git a/app/tmp/cache/views/empty b/app/tmp/cache/views/empty
new file mode 100755
index 000000000..e69de29bb

From aa97daeea9d54aa1b7a6f1a6bb86a6660e752412 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 20:09:35 -0500
Subject: [PATCH 080/112] Updating test due to merge conflicts.

---
 cake/tests/cases/libs/configure.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index b7f0cc973..739197224 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -265,7 +265,7 @@ class ConfigureTest extends CakeTestCase {
 			'data' => array('first' => 'value with backslash \, \'singlequote\' and "doublequotes"', 'second' => 'value2'),
 			'data2' => 'value'
 		);
-		Configure::store('AnotherExample', 'test.config', $expected);
+		Configure::store('AnotherExample', 'test_config', $expected);
 
 		Configure::load('test_config');
 		$config = Configure::read('AnotherExample');

From a91108a81af2a613b53f63eaa6120e36d8bf81b2 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Mon, 16 Nov 2009 13:49:52 +1100
Subject: [PATCH 081/112] Adding version check to getCharsetName() for MySQL
 Datasource.

---
 cake/libs/model/datasources/dbo/dbo_mysql.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index f4b77f0a3..d2ad87118 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -456,13 +456,14 @@ class DboMysqlBase extends DboSource {
  * @return string Character set name
  */
 	function getCharsetName($name) {
-		$cols = $this->query('SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME= ' . $this->value($name) . ';');
-		if (isset($cols[0]['COLLATIONS']['CHARACTER_SET_NAME'])) {
-			return $cols[0]['COLLATIONS']['CHARACTER_SET_NAME'];
+		if ((bool)version_compare(mysql_get_server_info($this->connection), "5", ">=")) {
+			$cols = $this->query('SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME= ' . $this->value($name) . ';');
+			if (isset($cols[0]['COLLATIONS']['CHARACTER_SET_NAME'])) {
+				return $cols[0]['COLLATIONS']['CHARACTER_SET_NAME'];
+			}
 		}
 		return false;
 	}
-
 }
 
 /**

From ddb9f8924c2762514cb8e19d7a267163b5cfa165 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 16 Nov 2009 09:12:41 -0500
Subject: [PATCH 082/112] Updating i18n shell to use updated schema shell api.

---
 cake/console/libs/i18n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php
index 5ab6eb597..08aab9afb 100644
--- a/cake/console/libs/i18n.php
+++ b/cake/console/libs/i18n.php
@@ -103,7 +103,7 @@ class I18nShell extends Shell {
  * @access public
  */
 	function initdb() {
-		$this->Dispatch->args = array('schema', 'run', 'create', 'i18n');
+		$this->Dispatch->args = array('schema', 'create', 'i18n');
 		$this->Dispatch->dispatch();
 	}
 

From 89558dc4af33d9b1d7668d05adedc182f524ad60 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 16 Nov 2009 09:24:52 -0500
Subject: [PATCH 083/112] Fixing issues with models using default inflected
 tables instead of their actual tables when detecting associations. Fixes #315

---
 cake/console/libs/tasks/model.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 30cce0e0d..78cb2f6e3 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -130,8 +130,11 @@ class ModelTask extends Shell {
  * @param string $className Name of class you want model to be.
  * @return object Model instance
  */
-	function &_getModelObject($className) {
-		$object = new Model(array('name' => $className, 'ds' => $this->connection));
+	function &_getModelObject($className, $table = null) {
+		if (!$table) {
+			$table = Inflector::tableize($className);
+		}
+		$object =& new Model(array('name' => $className, 'table' => $table, 'ds' => $this->connection));
 		return $object;
 	}
 
@@ -517,7 +520,7 @@ class ModelTask extends Shell {
 	function findHasOneAndMany(&$model, $associations) {
 		$foreignKey = $this->_modelKey($model->name);
 		foreach ($this->__tables as $otherTable) {
-			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable));
+			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
 			$modelFieldsTemp = $tempOtherModel->schema();
 
 			$pattern = '/_' . preg_quote($model->table, '/') . '|' . preg_quote($model->table, '/') . '_/';
@@ -560,7 +563,7 @@ class ModelTask extends Shell {
 	function findHasAndBelongsToMany(&$model, $associations) {
 		$foreignKey = $this->_modelKey($model->name);
 		foreach ($this->__tables as $otherTable) {
-			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable));
+			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
 			$modelFieldsTemp = $tempOtherModel->schema();
 
 			$offset = strpos($otherTable, $model->table . '_');

From 7211541821ae6a2cfee6934f77792e02adf1a81e Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Mon, 16 Nov 2009 10:14:03 -0600
Subject: [PATCH 084/112] Removing 1024 char limit when using fgets()

---
 cake/libs/i18n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 63fa8c116..1a4a5d41e 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -392,7 +392,7 @@ class I18n extends Object {
 		$header = "";
 
 		do {
-			$line = trim(fgets($file, 1024));
+			$line = trim(fgets($file));
 			if ($line == "" || $line[0] == "#") {
 				continue;
 			}

From 2cb0c3acb3563863ad85dac4ee565b838724b0d7 Mon Sep 17 00:00:00 2001
From: Jippi <root@dev.enovo.dk>
Date: Mon, 16 Nov 2009 23:15:24 +0000
Subject: [PATCH 085/112] Changed SessionHelper::flash to return message
 instead of echoing it

---
 cake/libs/view/helpers/session.php            |  8 +++----
 .../cases/libs/view/helpers/session.test.php  | 22 ++++---------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index fc30e676e..82c7184b4 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -125,10 +125,12 @@ class SessionHelper extends CakeSession {
  * 					Will default to flash if no param is passed
  *
  * @param string $key The [Message.]key you are rendering in the view.
- * @return string Will echo the value if $key is set, or false if not set.
+ * @return boolean|string Will return the value if $key is set, or false if not set.
  * @access public
  */
 	function flash($key = 'flash') {
+		$out = false;
+
 		if ($this->__active === true && $this->__start()) {
 			if (parent::check('Message.' . $key)) {
 				$flash = parent::read('Message.' . $key);
@@ -148,12 +150,10 @@ class SessionHelper extends CakeSession {
 					$tmpVars['message'] = $flash['message'];
 					$out = $view->element($flash['element'], $tmpVars);
 				}
-				echo($out);
 				parent::delete('Message.' . $key);
-				return true;
 			}
 		}
-		return false;
+		return $out;
 	}
 
 /**
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index eec5805c6..9e5f0498e 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -148,19 +148,13 @@ class SessionHelperTest extends CakeTestCase {
  * @return void
  */
 	function testFlash() {
-		ob_start();
-		$this->Session->flash();
-		$result = ob_get_contents();
-		ob_clean();
-
+		$result = $this->Session->flash('flash', true);
 		$expected = '<div id="flashMessage" class="message">This is a calling</div>';
 		$this->assertEqual($result, $expected);
 		$this->assertFalse($this->Session->check('Message.flash'));
 
 		$expected = '<div id="classyMessage" class="positive">Recorded</div>';
-		ob_start();
-		$this->Session->flash('classy');
-		$result = ob_get_clean();
+		$result = $this->Session->flash('classy', true);
 		$this->assertEqual($result, $expected);
 
 		App::build(array(
@@ -169,21 +163,13 @@ class SessionHelperTest extends CakeTestCase {
 		$controller = new Controller();
 		$this->Session->view = new View($controller);
 
-		ob_start();
-		$this->Session->flash('notification');
-		$result = ob_get_contents();
-		ob_clean();
-
+		$result = $this->Session->flash('notification', true);
 		$result = str_replace("\r\n", "\n", $result);
 		$expected = "<div id=\"notificationLayout\">\n\t<h1>Alert!</h1>\n\t<h3>Notice!</h3>\n\t<p>This is a test of the emergency broadcasting system</p>\n</div>";
 		$this->assertEqual($result, $expected);
 		$this->assertFalse($this->Session->check('Message.notification'));
 
-		ob_start();
-		$this->Session->flash('bare');
-		$result = ob_get_contents();
-		ob_clean();
-
+		$result = $this->Session->flash('bare');
 		$expected = 'Bare message';
 		$this->assertEqual($result, $expected);
 		$this->assertFalse($this->Session->check('Message.bare'));

From f078b0aedad48a21730c600b00f12336266b5d41 Mon Sep 17 00:00:00 2001
From: Jippi <root@dev.enovo.dk>
Date: Mon, 16 Nov 2009 23:16:49 +0000
Subject: [PATCH 086/112] Fixed Router::url() not being able to leave an URL
 with persist parameters

---
 cake/libs/router.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 3484c11d5..9a112592b 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -859,6 +859,7 @@ class Router {
 				$plugin = $url['plugin'];
 			}
 
+			$_url = $url;
 			$url = array_merge(array('controller' => $params['controller'], 'plugin' => $params['plugin']), Set::filter($url, true));
 
 			if ($plugin !== false) {
@@ -878,7 +879,13 @@ class Router {
 				$originalUrl = $url;
 
 				if (isset($route[4]['persist'], $_this->__params[0])) {
-					$url = array_merge(array_intersect_key($params, Set::combine($route[4]['persist'], '/')), $url);
+					foreach($route[4]['persist'] as $_key) {
+						if (array_key_exists($_key, $_url)) {
+							$url[$_key] = $_url[$_key];
+						} elseif (array_key_exists($_key, $params)) {
+							$url[$_key] = $params[$_key];
+						}
+					}
 				}
 				if ($match = $_this->mapRouteElements($route, $url)) {
 					$output = trim($match, '/');
@@ -890,7 +897,7 @@ class Router {
 
 			$named = $args = array();
 			$skip = array_merge(
-				array('bare', 'action', 'controller', 'plugin', 'ext', '?', '#', 'prefix'), 
+				array('bare', 'action', 'controller', 'plugin', 'ext', '?', '#', 'prefix'),
 				$_this->__prefixes
 			);
 

From 925fda7ba6830608d302e3dc6c0454a4084bf2a4 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 16 Nov 2009 20:01:55 -0500
Subject: [PATCH 087/112] Updating core layout, and skel layout to reflect
 changes in session->flash(). Updating skel layout to use $this->Helper.

---
 .../templates/skel/views/layouts/default.ctp       | 14 +++++++-------
 cake/libs/view/layouts/default.ctp                 |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cake/console/templates/skel/views/layouts/default.ctp b/cake/console/templates/skel/views/layouts/default.ctp
index 0c0cca0fb..e390b17e7 100644
--- a/cake/console/templates/skel/views/layouts/default.ctp
+++ b/cake/console/templates/skel/views/layouts/default.ctp
@@ -20,15 +20,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<?php echo $html->charset(); ?>
+	<?php echo $this->Html->charset(); ?>
 	<title>
 		<?php __('CakePHP: the rapid development php framework:'); ?>
 		<?php echo $title_for_layout; ?>
 	</title>
 	<?php
-		echo $html->meta('icon');
+		echo $this->Html->meta('icon');
 
-		echo $html->css('cake.generic');
+		echo $this->Html->css('cake.generic');
 
 		echo $scripts_for_layout;
 	?>
@@ -36,18 +36,18 @@
 <body>
 	<div id="container">
 		<div id="header">
-			<h1><?php echo $html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1>
+			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1>
 		</div>
 		<div id="content">
 
-			<?php $session->flash(); ?>
+			<?php echo $this->Session->flash(); ?>
 
 			<?php echo $content_for_layout; ?>
 
 		</div>
 		<div id="footer">
-			<?php echo $html->link(
-					$html->image('cake.power.gif', array('alt'=>__("CakePHP: the rapid development php framework", true), 'border'=>"0")),
+			<?php echo $this->Html->link(
+					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework', true), 'border' => '0')),
 					'http://www.cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index c1d938884..101de97f8 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -40,7 +40,7 @@
 		</div>
 		<div id="content">
 
-			<?php $this->Session->flash(); ?>
+			<?php echo $this->Session->flash(); ?>
 
 			<?php echo $content_for_layout; ?>
 

From 67cea6d21ce595a53355e2260122ccc7d04cb273 Mon Sep 17 00:00:00 2001
From: burzum <florian.kraemer@cakedc.com>
Date: Tue, 17 Nov 2009 02:11:23 +0100
Subject: [PATCH 088/112] Fixing a problem with setting Paginator::sort()
 defaults directon to desc

---
 cake/libs/view/helpers/paginator.php          |  4 +---
 .../libs/view/helpers/paginator.test.php      | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 45ffb488d..c4d34acc6 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -302,9 +302,7 @@ class PaginatorHelper extends AppHelper {
 		$isSorted = ($sortKey === $key || $sortKey === $this->defaultModel() . '.' . $key);
 
 		if ($isSorted) {
-			if ($this->sortDir($options['model']) === 'asc') {
-				$dir = 'desc';
-			}
+			$dir = $this->sortDir($options['model']) === 'asc' ? 'desc' : 'asc';
 			$class = $dir === 'asc' ? 'desc' : 'asc';
 			if (!empty($options['class'])) {
 				$options['class'] .= $class;
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 1749f9379..e41f65530 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -195,6 +195,29 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
 		$result = $this->Paginator->sort('title');
 		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result);
+		
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result);
+
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'asc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result);
+
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'asc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result);
+
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result);
 	}
 
 

From 94c0ec16997df82644b21439f775481bf1c59812 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 17 Nov 2009 10:27:09 -0500
Subject: [PATCH 089/112] Adding libs to templates/skel so baked projects
 contain an app/libs dir.

---
 cake/console/templates/skel/libs/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 cake/console/templates/skel/libs/empty

diff --git a/cake/console/templates/skel/libs/empty b/cake/console/templates/skel/libs/empty
new file mode 100644
index 000000000..e69de29bb

From 97239f025963d91c58d0f3fac20f1355c45e0333 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Wed, 18 Nov 2009 22:28:03 +1100
Subject: [PATCH 090/112] Adding newline.

---
 cake/libs/router.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 50154d51b..9c540bbc1 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -183,6 +183,7 @@ class Router {
 			$this->__prefixes = array_merge($this->__prefixes, (array)$routing['prefixes']);
 		}
 	}
+
 /**
  * Gets a reference to the Router object instance
  *

From a33bd1d144ca99f79f187c42a4f22f45c91aa9b6 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Thu, 19 Nov 2009 16:28:11 -0200
Subject: [PATCH 091/112] Removing the argument passed to
 mssql_get_last_message(), it does not accept any argument.

---
 cake/libs/model/datasources/dbo/dbo_mssql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 1424332f4..ebbe33fcf 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -426,7 +426,7 @@ class DboMssql extends DboSource {
  * @return string Error message with error number
  */
 	function lastError() {
-		$error = mssql_get_last_message($this->connection);
+		$error = mssql_get_last_message();
 
 		if ($error) {
 			if (!preg_match('/contexto de la base de datos a|contesto di database|changed database|datenbankkontext/i', $error)) {

From b1c89496c523061fae6685b0d8edb3efc3c90a55 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 15:19:11 -0500
Subject: [PATCH 092/112] Fixing typo in Cache doc block. Updating formatting
 in Xcache doc block. Fixing Xcache test case so it passes when username and
 password are not user & password.

---
 cake/libs/cache.php                         |  2 +-
 cake/libs/cache/xcache.php                  |  7 ++++---
 cake/tests/cases/libs/cache/xcache.test.php | 17 ++++++++++-------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index fca1c2607..fb221baab 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -468,7 +468,7 @@ class CacheEngine {
 	var $settings = array();
 
 /**
- * Iitialize the cache engine
+ * Initialize the cache engine
  *
  * Called automatically by the cache frontend
  *
diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index 42dc477f0..91fd9dad0 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -29,9 +29,10 @@
 class XcacheEngine extends CacheEngine {
 
 /**
- * settings
- * 		PHP_AUTH_USER = xcache.admin.user, default cake
- * 		PHP_AUTH_PW = xcache.admin.password, default cake
+ * Settings
+ *
+ *  - PHP_AUTH_USER = xcache.admin.user, default cake
+ *  - PHP_AUTH_PW = xcache.admin.password, default cake
  *
  * @var array
  * @access public
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index 5bc291e93..942504192 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -76,13 +76,16 @@ class XcacheEngineTest extends UnitTestCase {
  */
 	function testSettings() {
 		$settings = Cache::settings();
-		$expecting = array('prefix' => 'cake_',
-						'duration'=> 3600,
-						'probability' => 100,
-						'engine' => 'Xcache',
-						'PHP_AUTH_USER' => 'user',
-						'PHP_AUTH_PW' => 'password',
-						);
+		$expecting = array(
+			'prefix' => 'cake_',
+			'duration'=> 3600,
+			'probability' => 100,
+			'engine' => 'Xcache',
+		);
+		$this->assertTrue(isset($settings['PHP_AUTH_USER']));
+		$this->assertTrue(isset($settings['PHP_AUTH_PW']));
+
+		unset($settings['PHP_AUTH_USER'], $settings['PHP_AUTH_PW']);
 		$this->assertEqual($settings, $expecting);
 	}
 

From d1066bfeaf58970e606c3e521bab0a666b7a477c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 15:21:19 -0500
Subject: [PATCH 093/112] Updating FileLog to include File if it does not
 already exist, fixes possible fatal errors if log was written to during the
 bootstrap process.

---
 cake/libs/log/file_log.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php
index e726bf231..3702d882a 100644
--- a/cake/libs/log/file_log.php
+++ b/cake/libs/log/file_log.php
@@ -2,7 +2,6 @@
 /**
  * File Storage stream for Logging
  *
- *
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
@@ -18,7 +17,9 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
+if (!class_exists('File')) {
+	require LIBS . 'file.php';
+}
 /**
  * File Storage stream for Logging
  *

From 3404f1ed39984cc0be3ae4b4e7b81876cf5d5728 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 16 Nov 2009 21:58:27 -0500
Subject: [PATCH 094/112] Adding documentation to Cache::config(). Adding tests
 for default configuration manipulation of config().

---
 cake/libs/cache.php                  | 13 +++++++++-
 cake/tests/cases/libs/cache.test.php | 39 +++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index fb221baab..e18abe934 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -75,7 +75,18 @@ class Cache {
 	}
 
 /**
- * Set the cache configuration to use
+ * Set the cache configuration to use.  config() can
+ * both create new configurations, return the settings for already configured
+ * configurations.  It also sets the 'default' configuration to use for subsequent 
+ * operations.
+ *
+ * To create a new configuration:
+ *
+ * `Cache::config('my_config', array('engine' => 'File', 'path' => TMP));`
+ *
+ * To get the settings for a configuration, and set it as the currently selected configuration
+ *
+ * `Cache::config('default');`
  *
  * @see app/config/core.php for configuration settings
  * @param string $name Name of the configuration
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index 8d0e7e996..277cc69e6 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -22,7 +22,7 @@
 if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
-
+Configure::write('debug', 0);
 /**
  * CacheTest class
  *
@@ -136,6 +136,37 @@ class CacheTest extends CakeTestCase {
 		Cache::config('tests', $_cacheConfigTests['settings']);
 	}
 
+/**
+ * test that calling config() sets the 'default' configuration up.
+ *
+ * @return void
+ */
+	function testConfigSettingDefaultConfigKey() {
+		Configure::write('debug', 2);
+		Cache::config('test_name', array('engine' => 'File', 'prefix' => 'test_name_'));
+
+		Cache::config('test_name');
+		Cache::write('value_one', 'I am cached');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, 'I am cached');
+
+		Cache::config('default');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, null);
+
+		Cache::write('value_one', 'I am in another cache config!');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, 'I am in another cache config!');
+
+		Cache::config('test_name');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, 'I am cached');
+		
+		Cache::delete('value_one');
+		Cache::config('default');
+		Cache::delete('value_one');
+	}
+
 /**
  * testWritingWithConfig method
  *
@@ -200,12 +231,12 @@ class CacheTest extends CakeTestCase {
 	}
 
 /**
- * test that unconfig removes cache configs, and that further attempts to use that config 
+ * test that drop removes cache configs, and that further attempts to use that config 
  * do not work.
  *
  * @return void
  */
-	function testUnconfig() {
+	function testDrop() {
 		App::build(array(
 			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
@@ -324,5 +355,7 @@ class CacheTest extends CakeTestCase {
 
 		Cache::set($_cacheSet);
 	}
+
+
 }
 ?>
\ No newline at end of file

From 0ba622bb0e7da365cab52be3d19313429f0fa76d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 17 Nov 2009 00:05:14 -0500
Subject: [PATCH 095/112] Removing debug changes. Updating isInitialized() to
 its new use. Refactoring Cache engines to no longer be singletons with heavy
 settings manipulation. Instead each config() is a separate instance.

---
 cake/libs/cache.php                  | 264 ++++++++++++++-------------
 cake/tests/cases/libs/cache.test.php |  12 +-
 2 files changed, 141 insertions(+), 135 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index e18abe934..b3bc49d32 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -27,16 +27,10 @@
  */
 class Cache {
 
-/**
- * Cache engine to use
- *
- * @var CacheEngine
- * @access protected
- */
-	var $_Engine = null;
-
 /**
  * Cache configuration stack
+ * Keeps the permanent/default settings for each cache engine.
+ * These settings are used to reset the engines after temporary modification.
  *
  * @var array
  * @access private
@@ -44,7 +38,7 @@ class Cache {
 	var $__config = array();
 
 /**
- * Holds name of the current configuration being used
+ * Holds name of the current configuration name being used.
  *
  * @var array
  * @access private
@@ -52,13 +46,20 @@ class Cache {
 	var $__name = 'default';
 
 /**
- * whether to reset the settings with the next call to self::set();
+ * Whether to reset the settings with the next call to Cache::set();
  *
  * @var array
  * @access private
  */
 	var $__reset = false;
 
+/**
+ * Engine instances keyed by configuration name.
+ *
+ * @var array
+ */
+	var $_engines = array();
+
 /**
  * Returns a singleton instance
  *
@@ -77,7 +78,7 @@ class Cache {
 /**
  * Set the cache configuration to use.  config() can
  * both create new configurations, return the settings for already configured
- * configurations.  It also sets the 'default' configuration to use for subsequent 
+ * configurations.  It also sets the 'default' configuration to use for subsequent
  * operations.
  *
  * To create a new configuration:
@@ -96,51 +97,74 @@ class Cache {
  * @static
  */
 	function config($name = null, $settings = array()) {
-		$_this =& Cache::getInstance();
+		$self =& Cache::getInstance();
 		if (is_array($name)) {
 			$settings = $name;
 		}
 
 		if ($name === null || !is_string($name)) {
-			$name = $_this->__name;
+			$name = $self->__name;
 		}
 
 		$current = array();
-		if (isset($_this->__config[$name])) {
-			$current = $_this->__config[$name];
+		if (isset($self->__config[$name])) {
+			$current = $self->__config[$name];
 		}
 
 		if (!empty($settings)) {
-			$_this->__name = null;
-			$_this->__config[$name] = array_merge($current, $settings);
+			$self->__config[$name] = array_merge($current, $settings);
 		}
 
-		if (empty($_this->__config[$name]['engine'])) {
+		if (empty($self->__config[$name]['engine'])) {
 			return false;
 		}
 
-		$_this->__name = $name;
-		$engine = $_this->__config[$name]['engine'];
+		$self->__name = $name;
+		$engine = $self->__config[$name]['engine'];
 
-		if (!$_this->isInitialized($engine)) {
-			if ($_this->engine($engine, $_this->__config[$name]) === false) {
-				return false;
-			}
-			$settings = $_this->__config[$name] = $_this->settings($engine);
-		} else if ($settings = $_this->set($_this->__config[$name])) {
-			$_this->__config[$name] = $settings;
+		if (!isset($this->_engines[$name])) {
+			$self->_buildEngine($name);
+			$settings = $self->__config[$name] = $self->settings($name);
+		} elseif ($settings = $self->set($self->__config[$name])) {
+			var_dump($settings);
+			$self->__config[$name] = $settings;
 		}
 		return compact('engine', 'settings');
 	}
 
+/**
+ * Finds and builds the instance of the required engine class.
+ *
+ * @param string $name Name of the config array that needs an engine instance built
+ * @return void
+ * @access protected
+ */
+	function _buildEngine($name) {
+		$config = $this->__config[$name];
+
+		list($plugin, $class) = pluginSplit($config['engine']);
+		if ($this->__loadEngine($class, $plugin) === false) {
+			return false;
+		}
+		$cacheClass = $class . 'Engine';
+		$this->_engines[$name] =& new $cacheClass();
+		if ($this->_engines[$name]->init($config)) {
+			if (time() % $this->_engines[$name]->settings['probability'] === 0) {
+				$this->_engines[$name]->gc();
+			}
+			return true;
+		}
+		return false;
+	}
+
 /**
  * Returns an array containing the currently configured Cache settings.
  *
  * @return array
  */
 	function configured() {
-		$_this = Cache::getInstance();
-		return array_keys($_this->__config);
+		$self = Cache::getInstance();
+		return array_keys($self->__config);
 	}
 
 /**
@@ -152,21 +176,21 @@ class Cache {
  * @return boolen success of the removal, returns false when the config does not exist.
  */
 	function drop($name) {
-		$_this = Cache::getInstance();
-		if (!isset($_this->__config[$name])) {
+		$self = Cache::getInstance();
+		if (!isset($self->__config[$name])) {
 			return false;
 		}
 		$last = true;
-		$engine = $_this->__config[$name]['engine'];
-		unset($_this->__config[$name]);
-		foreach ($_this->__config as $name => $settings) {
+		$engine = $self->__config[$name]['engine'];
+		unset($self->__config[$name]);
+		foreach ($self->__config as $name => $settings) {
 			if ($settings['engine'] == $engine) {
 				$last = false;
 				break;
 			}
 		}
 		if ($last) {
-			unset($_this->_Engine[$engine]);
+			unset($self->_Engine[$engine]);
 		}
 		return true;
 	}
@@ -184,21 +208,21 @@ class Cache {
 		$class = $name;
 		list($plugin, $class) = pluginSplit($name);
 		$cacheClass = $class . 'Engine';
-		$_this =& Cache::getInstance();
-		if (!isset($_this->_Engine[$name])) {
-			if ($_this->__loadEngine($class, $plugin) === false) {
+		$self =& Cache::getInstance();
+		if (!isset($self->_Engine[$name])) {
+			if ($self->__loadEngine($class, $plugin) === false) {
 				return false;
 			}
-			$_this->_Engine[$name] =& new $cacheClass();
+			$self->_Engine[$name] =& new $cacheClass();
 		}
 
-		if ($_this->_Engine[$name]->init($settings)) {
-			if (time() % $_this->_Engine[$name]->settings['probability'] === 0) {
-				$_this->_Engine[$name]->gc();
+		if ($self->_Engine[$name]->init($settings)) {
+			if (time() % $self->_Engine[$name]->settings['probability'] === 0) {
+				$self->_Engine[$name]->gc();
 			}
 			return true;
 		}
-		$_this->_Engine[$name] = null;
+		$self->_Engine[$name] = null;
 		return false;
 	}
 
@@ -233,30 +257,29 @@ class Cache {
  * @static
  */
 	function set($settings = array(), $value = null) {
-		$_this =& Cache::getInstance();
-		if (!isset($_this->__config[$_this->__name])) {
+		$self =& Cache::getInstance();
+		if (!isset($self->__config[$self->__name])) {
 			return false;
 		}
 
-		$engine = $_this->__config[$_this->__name]['engine'];
+		$name = $self->__name;
 		if (!empty($settings)) {
-			$_this->__reset = true;
+			$self->__reset = true;
 		}
 
-		if ($_this->__reset === true) {
+		if ($self->__reset === true) {
 			if (empty($settings)) {
-				$_this->__reset = false;
-				$settings = $_this->__config[$_this->__name];
+				$self->__reset = false;
+				$settings = $self->__config[$name];
 			} else {
 				if (is_string($settings) && $value !== null) {
 					$settings = array($settings => $value);
 				}
-				$settings = array_merge($_this->__config[$_this->__name], $settings);
+				$settings = array_merge($self->__config[$self->__name], $settings);
 			}
-			$_this->engine($engine, $settings);
+			$self->_engines[$name]->settings = $settings;
 		}
-
-		return $_this->settings($engine);
+		return $self->settings($name);
 	}
 
 /**
@@ -269,9 +292,9 @@ class Cache {
  * @static
  */
 	function gc() {
-		$_this =& Cache::getInstance();
-		$config = $_this->config();
-		$_this->_Engine[$config['engine']]->gc();
+		$self =& Cache::getInstance();
+		$config = $self->config();
+		$self->_Engine[$config['engine']]->gc();
 	}
 
 /**
@@ -285,37 +308,27 @@ class Cache {
  * @static
  */
 	function write($key, $value, $config = null) {
-		$_this =& Cache::getInstance();
+		$self =& Cache::getInstance();
 
-		if ($config && isset($_this->__config[$config])) {
-			$settings = $_this->set($_this->__config[$config]);
-		} else {
-			$settings = $_this->settings();
+		if (!$config) {
+			$config = $self->__name;
 		}
+		$settings = $self->settings($config);
 
 		if (empty($settings)) {
 			return null;
 		}
-		extract($settings);
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$key = $self->_engines[$config]->key($key);
 
-		if (!$_this->isInitialized($engine)) {
+		if (!$key || is_resource($value) || $settings['duration'] < 1) {
 			return false;
 		}
 
-		if (!$key = $_this->_Engine[$engine]->key($key)) {
-			return false;
-		}
-
-		if (is_resource($value)) {
-			return false;
-		}
-
-		if ($duration < 1) {
-			return false;
-		}
-
-		$success = $_this->_Engine[$engine]->write($settings['prefix'] . $key, $value, $duration);
-		$settings = $_this->set();
+		$success = $self->_engines[$config]->write($settings['prefix'] . $key, $value, $settings['duration']);
+		$self->set();
 		return $success;
 	}
 
@@ -329,29 +342,27 @@ class Cache {
  * @static
  */
 	function read($key, $config = null) {
-		$_this =& Cache::getInstance();
+		$self =& Cache::getInstance();
 
-		if (isset($_this->__config[$config])) {
-			$settings = $_this->set($_this->__config[$config]);
-		} else {
-			$settings = $_this->settings();
+		if (!$config) {
+			$config = $self->__name;
 		}
+		$settings = $self->settings($config);
 
 		if (empty($settings)) {
 			return null;
 		}
-		extract($settings);
-
-		if (!$_this->isInitialized($engine)) {
+		if (!$self->isInitialized($config)) {
 			return false;
 		}
-		if (!$key = $_this->_Engine[$engine]->key($key)) {
+		$key = $self->_engines[$config]->key($key);
+		if (!$key) {
 			return false;
 		}
-		$success = $_this->_Engine[$engine]->read($settings['prefix'] . $key);
+		$success = $self->_engines[$config]->read($settings['prefix'] . $key);
 
-		if ($config !== null && $config !== $_this->__name) {
-			$settings = $_this->set();
+		if ($config !== null && $config !== $self->__name) {
+			$self->set();
 		}
 		return $success;
 	}
@@ -366,28 +377,25 @@ class Cache {
  * @static
  */
 	function delete($key, $config = null) {
-		$_this =& Cache::getInstance();
-		if (isset($_this->__config[$config])) {
-			$settings = $_this->set($_this->__config[$config]);
-		} else {
-			$settings = $_this->settings();
+		$self =& Cache::getInstance();
+		if (!$config) {
+			$config = $self->__name;
 		}
+		$settings = $self->settings($config);
 
 		if (empty($settings)) {
 			return null;
 		}
-		extract($settings);
-
-		if (!$_this->isInitialized($engine)) {
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$key = $self->_engines[$config]->key($key);
+		if (!$key) {
 			return false;
 		}
 
-		if (!$key = $_this->_Engine[$engine]->key($key)) {
-			return false;
-		}
-
-		$success = $_this->_Engine[$engine]->delete($settings['prefix'] . $key);
-		$settings = $_this->set();
+		$success = $self->_engines[$config]->delete($settings['prefix'] . $key);
+		$self->set();
 		return $success;
 	}
 
@@ -401,28 +409,26 @@ class Cache {
  * @static
  */
 	function clear($check = false, $config = null) {
-		$_this =& Cache::getInstance();
-		if (isset($_this->__config[$config])) {
-			$settings = $_this->set($_this->__config[$config]);
-		} else {
-			$settings = $_this->settings();
+		$self =& Cache::getInstance();
+		if (!$config) {
+			$config = $self->__name;
 		}
+		$settings = $self->settings($config);
 
 		if (empty($settings)) {
 			return null;
 		}
-		extract($settings);
 
-		if (isset($engine) && !$_this->isInitialized($engine)) {
+		if (!$self->isInitialized($config)) {
 			return false;
 		}
-		$success = $_this->_Engine[$engine]->clear($check);
-		$settings = $_this->set();
+		$success = $self->_engines[$config]->clear($check);
+		$self->set();
 		return $success;
 	}
 
 /**
- * Check if Cache has initialized a working storage engine
+ * Check if Cache has initialized a working config for the given name.
  *
  * @param string $engine Name of the engine
  * @param string $config Name of the configuration setting
@@ -430,33 +436,35 @@ class Cache {
  * @access public
  * @static
  */
-	function isInitialized($engine = null) {
+	function isInitialized($name = null) {
 		if (Configure::read('Cache.disable')) {
 			return false;
 		}
-		$_this =& Cache::getInstance();
-		if (!$engine && isset($_this->__config[$_this->__name]['engine'])) {
-			$engine = $_this->__config[$_this->__name]['engine'];
+		$self =& Cache::getInstance();
+		if (!$name && isset($self->__config[$self->__name])) {
+			$name = $self->__name;
 		}
-		return isset($_this->_Engine[$engine]);
+		return isset($self->_engines[$name]);
 	}
 
 /**
- * Return the settings for current cache engine
+ * Return the settings for current cache engine. If no name is supplied the settings
+ * for the 'active default' configuration will be returned.  To set the 'active default'
+ * configuration use `Cache::config()`
  *
- * @param string $engine Name of the engine
+ * @param string $engine Name of the configuration to get settings for.
  * @return array list of settings for this engine
+ * @see Cache::config()
  * @access public
  * @static
  */
-	function settings($engine = null) {
-		$_this =& Cache::getInstance();
-		if (!$engine && isset($_this->__config[$_this->__name]['engine'])) {
-			$engine = $_this->__config[$_this->__name]['engine'];
+	function settings($name = null) {
+		$self =& Cache::getInstance();
+		if (!$name && isset($self->__config[$self->__name])) {
+			$name = $self->__name;
 		}
-
-		if (isset($_this->_Engine[$engine]) && !is_null($_this->_Engine[$engine])) {
-			return $_this->_Engine[$engine]->settings();
+		if (!empty($self->_engines[$name])) {
+			return $self->_engines[$name]->settings();
 		}
 		return array();
 	}
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index 277cc69e6..a63e9e666 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -22,7 +22,7 @@
 if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
-Configure::write('debug', 0);
+
 /**
  * CacheTest class
  *
@@ -127,10 +127,10 @@ class CacheTest extends CakeTestCase {
 		$_cacheConfigTests = Cache::config('tests');
 
 		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
-		$this->assertEqual($result['settings'], Cache::settings('File'));
+		$this->assertEqual($result['settings'], Cache::settings('sessions'));
 
 		$result = Cache::config('tests', array('engine'=> 'File', 'path' => TMP . 'tests'));
-		$this->assertEqual($result['settings'], Cache::settings('File'));
+		$this->assertEqual($result['settings'], Cache::settings('tests'));
 
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
 		Cache::config('tests', $_cacheConfigTests['settings']);
@@ -142,7 +142,6 @@ class CacheTest extends CakeTestCase {
  * @return void
  */
 	function testConfigSettingDefaultConfigKey() {
-		Configure::write('debug', 2);
 		Cache::config('test_name', array('engine' => 'File', 'prefix' => 'test_name_'));
 
 		Cache::config('test_name');
@@ -188,7 +187,7 @@ class CacheTest extends CakeTestCase {
 			'engine' => 'File',
 			'isWindows' => DIRECTORY_SEPARATOR == '\\'
 		);
-		$this->assertEqual($expected, Cache::settings('File'));
+		$this->assertEqual($expected, Cache::settings('sessions'));
 
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
 	}
@@ -252,7 +251,7 @@ class CacheTest extends CakeTestCase {
 		Cache::config('unconfigTest', array(
 			'engine' => 'TestAppCache'
 		));
-		$this->assertTrue(Cache::isInitialized('TestAppCache'));
+		$this->assertTrue(Cache::isInitialized('unconfigTest'));
 
 		$this->assertTrue(Cache::drop('unconfigTest'));
 		$this->assertFalse(Cache::isInitialized('TestAppCache'));
@@ -356,6 +355,5 @@ class CacheTest extends CakeTestCase {
 		Cache::set($_cacheSet);
 	}
 
-
 }
 ?>
\ No newline at end of file

From 95f8ed5b5594118ee9249f1c04c360d45a95a92c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 17 Nov 2009 00:09:22 -0500
Subject: [PATCH 096/112] Additional refactoring and code removal.

---
 cake/libs/cache.php                  | 35 +---------------------------
 cake/tests/cases/libs/cache.test.php |  7 +-----
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index b3bc49d32..b96e4d296 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -195,37 +195,6 @@ class Cache {
 		return true;
 	}
 
-/**
- * Set the cache engine to use or modify settings for one instance
- *
- * @param string $name Name of the engine (without 'Engine')
- * @param array $settings Optional associative array of settings passed to the engine
- * @return boolean True on success, false on failure
- * @access public
- * @static
- */
-	function engine($name = 'File', $settings = array()) {
-		$class = $name;
-		list($plugin, $class) = pluginSplit($name);
-		$cacheClass = $class . 'Engine';
-		$self =& Cache::getInstance();
-		if (!isset($self->_Engine[$name])) {
-			if ($self->__loadEngine($class, $plugin) === false) {
-				return false;
-			}
-			$self->_Engine[$name] =& new $cacheClass();
-		}
-
-		if ($self->_Engine[$name]->init($settings)) {
-			if (time() % $self->_Engine[$name]->settings['probability'] === 0) {
-				$self->_Engine[$name]->gc();
-			}
-			return true;
-		}
-		$self->_Engine[$name] = null;
-		return false;
-	}
-
 /**
  * Tries to find and include a file for a cache engine and returns object instance
  *
@@ -245,7 +214,6 @@ class Cache {
 		}
 	}
 
-
 /**
  * Temporarily change settings to current config options. if no params are passed, resets settings if needed
  * Cache::write() will reset the configuration changes made
@@ -293,8 +261,7 @@ class Cache {
  */
 	function gc() {
 		$self =& Cache::getInstance();
-		$config = $self->config();
-		$self->_Engine[$config['engine']]->gc();
+		$self->_engines[$self->__name]->gc();
 	}
 
 /**
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index a63e9e666..4e575bc8c 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -43,8 +43,6 @@ class CacheTest extends CakeTestCase {
 
 		$this->_defaultCacheConfig = Cache::config('default');
 		Cache::config('default', array('engine' => 'File', 'path' => TMP . 'tests'));
-
-		Cache::engine('File', array('path' => TMP . 'tests'));
 	}
 
 /**
@@ -56,7 +54,6 @@ class CacheTest extends CakeTestCase {
 	function tearDown() {
 		Configure::write('Cache.disable', $this->_cacheDisable);
 		Cache::config('default', $this->_defaultCacheConfig['settings']);
-		Cache::engine('File');
 	}
 
 /**
@@ -211,7 +208,7 @@ class CacheTest extends CakeTestCase {
  * @return void
  */
 	function testInitSettings() {
-		Cache::engine('File', array('path' => TMP . 'tests'));
+		Cache::config('default', array('engine' => 'File', 'path' => TMP . 'tests'));
 
 		$settings = Cache::settings();
 		$expecting = array(
@@ -225,8 +222,6 @@ class CacheTest extends CakeTestCase {
 			'isWindows' => DIRECTORY_SEPARATOR == '\\'
 		);
 		$this->assertEqual($settings, $expecting);
-
-		Cache::engine('File');
 	}
 
 /**

From 14d643ff99635379fecad0c1de46e8ab97674eb9 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 17 Nov 2009 09:27:27 -0500
Subject: [PATCH 097/112] Fixing File cache test to run with modified Cache
 API.

---
 cake/tests/cases/libs/cache/file.test.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 208309026..21f2b506e 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -169,12 +169,12 @@ class FileEngineTest extends CakeTestCase {
  * @return void
  */
 	function testSerialize() {
-		Cache::engine('File', array('serialize' => true));
+		Cache::config('default', array('engine' => 'File', 'serialize' => true));
 		$data = 'this is a test of the emergency broadcasting system';
-		$write = Cache::write('serialize_test', $data, 1);
+		$write = Cache::write('serialize_test', $data);
 		$this->assertTrue($write);
 
-		Cache::engine('File', array('serialize' => false));
+		Cache::config('default', array('serialize' => false));
 		$read = Cache::read('serialize_test');
 
 		$newread = Cache::read('serialize_test');
@@ -194,7 +194,7 @@ class FileEngineTest extends CakeTestCase {
  * @return void
  */
 	function testClear() {
-		Cache::engine('File', array('duration' => 1));
+		Cache::config('default', array('engine' => 'File', 'duration' => 1));
 		$data = 'this is a test of the emergency broadcasting system';
 		$write = Cache::write('serialize_test1', $data);
 		$write = Cache::write('serialize_test2', $data);
@@ -223,7 +223,7 @@ class FileEngineTest extends CakeTestCase {
 		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test2'));
 		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test3'));
 
-		$result = Cache::engine('File', array('path' => CACHE . 'views'));
+		Cache::config('default', array('engine' => 'File', 'path' => CACHE . 'views'));
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$write = Cache::write('controller_view_1', $data);
@@ -278,7 +278,7 @@ class FileEngineTest extends CakeTestCase {
 
 		clearCache('controller_view');
 
-		Cache::engine('File', array('path' => CACHE));
+		Cache::config('default', array('engine' => 'File', 'path' => CACHE));
 	}
 
 /**
@@ -306,7 +306,7 @@ class FileEngineTest extends CakeTestCase {
  * @return void
  */
 	function testRemoveWindowsSlashesFromCache() {
-		Cache::engine('File', array('isWindows' => true, 'prefix' => null, 'path' => TMP));
+		Cache::config('default', array('engine' => 'File', 'isWindows' => true, 'prefix' => null, 'path' => TMP));
 
 		$expected = array (
 				'C:\dev\prj2\sites\cake\libs' => array(
@@ -349,13 +349,13 @@ class FileEngineTest extends CakeTestCase {
  * @return void
  */
 	function testWriteQuotedString() {
-		Cache::engine('File', array('path' => TMP . 'tests'));
+		Cache::config('default', array('engine' => 'File', 'path' => TMP . 'tests'));
 		Cache::write('App.doubleQuoteTest', '"this is a quoted string"');
 		$this->assertIdentical(Cache::read('App.doubleQuoteTest'), '"this is a quoted string"');
 		Cache::write('App.singleQuoteTest', "'this is a quoted string'");
 		$this->assertIdentical(Cache::read('App.singleQuoteTest'), "'this is a quoted string'");
 
-		Cache::engine('File', array('isWindows' => true, 'path' => TMP . 'tests'));
+		Cache::config('default', array('isWindows' => true, 'path' => TMP . 'tests'));
 		$this->assertIdentical(Cache::read('App.doubleQuoteTest'), '"this is a quoted string"');
 		Cache::write('App.singleQuoteTest', "'this is a quoted string'");
 		$this->assertIdentical(Cache::read('App.singleQuoteTest'), "'this is a quoted string'");

From e3e02bfcee26737ffd63a4025dbf47ba1c464416 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 18 Nov 2009 17:54:24 -0500
Subject: [PATCH 098/112] Fixing drop()

---
 cake/libs/cache.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index b96e4d296..e65c73d5d 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -180,18 +180,8 @@ class Cache {
 		if (!isset($self->__config[$name])) {
 			return false;
 		}
-		$last = true;
-		$engine = $self->__config[$name]['engine'];
 		unset($self->__config[$name]);
-		foreach ($self->__config as $name => $settings) {
-			if ($settings['engine'] == $engine) {
-				$last = false;
-				break;
-			}
-		}
-		if ($last) {
-			unset($self->_Engine[$engine]);
-		}
+		unset($self->_engines[$name]);
 		return true;
 	}
 

From 4b184ceccbeeb15c616ebb037d6166da7edcef97 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 18 Nov 2009 18:07:48 -0500
Subject: [PATCH 099/112] Updating FileEngine test to use new Cache api
 methods.

---
 cake/tests/cases/libs/cache/file.test.php | 77 +++++++++++------------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 21f2b506e..0a0bc0875 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -2,8 +2,6 @@
 /**
  * FileEngineTest file
  *
- * Long description for file
- *
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
@@ -22,9 +20,6 @@
 if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
-if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
-	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
-}
 
 /**
  * FileEngineTest class
@@ -74,12 +69,11 @@ class FileEngineTest extends CakeTestCase {
  */
 	function testCacheDirChange() {
 		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
-		$this->assertEqual($result['settings'], Cache::settings('File'));
-		$this->assertNotEqual($result, Cache::settings('File'));
+		$this->assertEqual($result['settings'], Cache::settings('sessions'));
 
-		$result = Cache::config('tests', array('engine'=> 'File', 'path' => TMP . 'tests'));
-		$this->assertEqual($result['settings'], Cache::settings('File'));
-		$this->assertNotEqual($result, Cache::settings('File'));
+		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'tests'));
+		$this->assertEqual($result['settings'], Cache::settings('sessions'));
+		$this->assertNotEqual($result['settings'], Cache::settings('default'));
 	}
 
 /**
@@ -306,40 +300,43 @@ class FileEngineTest extends CakeTestCase {
  * @return void
  */
 	function testRemoveWindowsSlashesFromCache() {
-		Cache::config('default', array('engine' => 'File', 'isWindows' => true, 'prefix' => null, 'path' => TMP));
+		Cache::config('windows_test', array('engine' => 'File', 'isWindows' => true, 'prefix' => null, 'path' => TMP));
 
 		$expected = array (
-				'C:\dev\prj2\sites\cake\libs' => array(
-					0 => 'C:\dev\prj2\sites\cake\libs', 1 => 'C:\dev\prj2\sites\cake\libs\view',
-					2 => 'C:\dev\prj2\sites\cake\libs\view\scaffolds', 3 => 'C:\dev\prj2\sites\cake\libs\view\pages',
-					4 => 'C:\dev\prj2\sites\cake\libs\view\layouts', 5 => 'C:\dev\prj2\sites\cake\libs\view\layouts\xml',
-					6 => 'C:\dev\prj2\sites\cake\libs\view\layouts\rss', 7 => 'C:\dev\prj2\sites\cake\libs\view\layouts\js',
-					8 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email', 9 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email\text',
-					10 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email\html', 11 => 'C:\dev\prj2\sites\cake\libs\view\helpers',
-					12 => 'C:\dev\prj2\sites\cake\libs\view\errors', 13 => 'C:\dev\prj2\sites\cake\libs\view\elements',
-					14 => 'C:\dev\prj2\sites\cake\libs\view\elements\email', 15 => 'C:\dev\prj2\sites\cake\libs\view\elements\email\text',
-					16 => 'C:\dev\prj2\sites\cake\libs\view\elements\email\html', 17 => 'C:\dev\prj2\sites\cake\libs\model',
-					18 => 'C:\dev\prj2\sites\cake\libs\model\datasources', 19 => 'C:\dev\prj2\sites\cake\libs\model\datasources\dbo',
-					20 => 'C:\dev\prj2\sites\cake\libs\model\behaviors', 21 => 'C:\dev\prj2\sites\cake\libs\controller',
-					22 => 'C:\dev\prj2\sites\cake\libs\controller\components', 23 => 'C:\dev\prj2\sites\cake\libs\cache'),
-				'C:\dev\prj2\sites\main_site\vendors' => array(
-					0 => 'C:\dev\prj2\sites\main_site\vendors', 1 => 'C:\dev\prj2\sites\main_site\vendors\shells',
-					2 => 'C:\dev\prj2\sites\main_site\vendors\shells\templates', 3 => 'C:\dev\prj2\sites\main_site\vendors\shells\templates\cdc_project',
-					4 => 'C:\dev\prj2\sites\main_site\vendors\shells\tasks', 5 => 'C:\dev\prj2\sites\main_site\vendors\js',
-					6 => 'C:\dev\prj2\sites\main_site\vendors\css'),
-				'C:\dev\prj2\sites\vendors' => array(
-					0 => 'C:\dev\prj2\sites\vendors', 1 => 'C:\dev\prj2\sites\vendors\simpletest',
-					2 => 'C:\dev\prj2\sites\vendors\simpletest\test', 3 => 'C:\dev\prj2\sites\vendors\simpletest\test\support',
-					4 => 'C:\dev\prj2\sites\vendors\simpletest\test\support\collector', 5 => 'C:\dev\prj2\sites\vendors\simpletest\extensions',
-					6 => 'C:\dev\prj2\sites\vendors\simpletest\extensions\testdox', 7 => 'C:\dev\prj2\sites\vendors\simpletest\docs',
-					8 => 'C:\dev\prj2\sites\vendors\simpletest\docs\fr', 9 => 'C:\dev\prj2\sites\vendors\simpletest\docs\en'),
-				'C:\dev\prj2\sites\main_site\views\helpers' => array(
-					0 => 'C:\dev\prj2\sites\main_site\views\helpers'));
+			'C:\dev\prj2\sites\cake\libs' => array(
+				0 => 'C:\dev\prj2\sites\cake\libs', 1 => 'C:\dev\prj2\sites\cake\libs\view',
+				2 => 'C:\dev\prj2\sites\cake\libs\view\scaffolds', 3 => 'C:\dev\prj2\sites\cake\libs\view\pages',
+				4 => 'C:\dev\prj2\sites\cake\libs\view\layouts', 5 => 'C:\dev\prj2\sites\cake\libs\view\layouts\xml',
+				6 => 'C:\dev\prj2\sites\cake\libs\view\layouts\rss', 7 => 'C:\dev\prj2\sites\cake\libs\view\layouts\js',
+				8 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email', 9 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email\text',
+				10 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email\html', 11 => 'C:\dev\prj2\sites\cake\libs\view\helpers',
+				12 => 'C:\dev\prj2\sites\cake\libs\view\errors', 13 => 'C:\dev\prj2\sites\cake\libs\view\elements',
+				14 => 'C:\dev\prj2\sites\cake\libs\view\elements\email', 15 => 'C:\dev\prj2\sites\cake\libs\view\elements\email\text',
+				16 => 'C:\dev\prj2\sites\cake\libs\view\elements\email\html', 17 => 'C:\dev\prj2\sites\cake\libs\model',
+				18 => 'C:\dev\prj2\sites\cake\libs\model\datasources', 19 => 'C:\dev\prj2\sites\cake\libs\model\datasources\dbo',
+				20 => 'C:\dev\prj2\sites\cake\libs\model\behaviors', 21 => 'C:\dev\prj2\sites\cake\libs\controller',
+				22 => 'C:\dev\prj2\sites\cake\libs\controller\components', 23 => 'C:\dev\prj2\sites\cake\libs\cache'),
+			'C:\dev\prj2\sites\main_site\vendors' => array(
+				0 => 'C:\dev\prj2\sites\main_site\vendors', 1 => 'C:\dev\prj2\sites\main_site\vendors\shells',
+				2 => 'C:\dev\prj2\sites\main_site\vendors\shells\templates', 3 => 'C:\dev\prj2\sites\main_site\vendors\shells\templates\cdc_project',
+				4 => 'C:\dev\prj2\sites\main_site\vendors\shells\tasks', 5 => 'C:\dev\prj2\sites\main_site\vendors\js',
+				6 => 'C:\dev\prj2\sites\main_site\vendors\css'),
+			'C:\dev\prj2\sites\vendors' => array(
+				0 => 'C:\dev\prj2\sites\vendors', 1 => 'C:\dev\prj2\sites\vendors\simpletest',
+				2 => 'C:\dev\prj2\sites\vendors\simpletest\test', 3 => 'C:\dev\prj2\sites\vendors\simpletest\test\support',
+				4 => 'C:\dev\prj2\sites\vendors\simpletest\test\support\collector', 5 => 'C:\dev\prj2\sites\vendors\simpletest\extensions',
+				6 => 'C:\dev\prj2\sites\vendors\simpletest\extensions\testdox', 7 => 'C:\dev\prj2\sites\vendors\simpletest\docs',
+				8 => 'C:\dev\prj2\sites\vendors\simpletest\docs\fr', 9 => 'C:\dev\prj2\sites\vendors\simpletest\docs\en'),
+			'C:\dev\prj2\sites\main_site\views\helpers' => array(
+				0 => 'C:\dev\prj2\sites\main_site\views\helpers')
+		);
 
-		$data = Cache::write('test_dir_map', $expected);
-		$data = Cache::read('test_dir_map');
-		Cache::delete('test_dir_map');
+		Cache::write('test_dir_map', $expected, 'windows_test');
+		$data = Cache::read('test_dir_map', 'windows_test');
+		Cache::delete('test_dir_map', 'windows_test');
 		$this->assertEqual($expected, $data);
+
+		Cache::drop('windows_test');
 	}
 
 /**

From 266cddb4dbcf3a3b9c2f166833d41c6753be835b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 18 Nov 2009 18:08:30 -0500
Subject: [PATCH 100/112] Removing whitespace.

---
 cake/tests/cases/libs/cache/file.test.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 0a0bc0875..22c84ebbd 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -153,7 +153,6 @@ class FileEngineTest extends CakeTestCase {
 
 		$result = Cache::delete('delete_test');
 		$this->assertFalse($result);
-
 	}
 
 /**
@@ -178,7 +177,6 @@ class FileEngineTest extends CakeTestCase {
 		$this->assertIdentical($read, serialize($data));
 
 		$this->assertIdentical(unserialize($newread), $data);
-
 	}
 
 /**

From 5ff2e66f75ed90cd28b86319a5c4f21133996c98 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 18 Nov 2009 19:47:40 -0500
Subject: [PATCH 101/112] Updating memcache test to use new Cache api. Removing
 most private access in the test case.

---
 cake/tests/cases/libs/cache/memcache.test.php | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index 9caddd5f6..a857d52b9 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -2,8 +2,6 @@
 /**
  * MemcacheEngineTest file
  *
- * Long description for file
- *
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
@@ -23,13 +21,6 @@ if (!class_exists('Cache')) {
 	require LIBS . 'cache.php';
 }
 
-/**
- * MemcacheEngineTest class
- *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
- */
-
 /**
  * MemcacheEngineTest class
  *
@@ -46,7 +37,7 @@ class MemcacheEngineTest extends CakeTestCase {
  */
 	function skip() {
 		$skip = true;
-		if (Cache::engine('Memcache')) {
+		if (class_exists('Memcache')) {
 			$skip = false;
 		}
 		$this->skipIf($skip, '%s Memcache is not installed or configured properly');
@@ -72,6 +63,7 @@ class MemcacheEngineTest extends CakeTestCase {
  */
 	function tearDown() {
 		Configure::write('Cache.disable', $this->_cacheDisable);
+		Cache::drop('memcache');
 		Cache::config('default');
 	}
 
@@ -103,14 +95,12 @@ class MemcacheEngineTest extends CakeTestCase {
  */
 	function testMultipleServers() {
 		$servers = array('127.0.0.1:11211', '127.0.0.1:11222');
-
-		$Cache =& Cache::getInstance();
-		$MemCache =& $Cache->_Engine['Memcache'];
-
 		$available = true;
+		$Memcache =& new Memcache();
+
 		foreach($servers as $server) {
 			list($host, $port) = explode(':', $server);
-			if (!@$MemCache->__Memcache->connect($host, $port)) {
+			if (!$Memcache->addServer($host, $port)) {
 				$available = false;
 			}
 		}
@@ -118,13 +108,13 @@ class MemcacheEngineTest extends CakeTestCase {
 		if ($this->skipIf(!$available, '%s Need memcache servers at ' . implode(', ', $servers) . ' to run this test')) {
 			return;
 		}
+		$Memcache =& new MemcacheEngine();
+		$Memcache->init(array('engine' => 'Memcache', 'servers' => $servers));
 
-		unset($MemCache->__Memcache);
-		$MemCache->init(array('engine' => 'Memcache', 'servers' => $servers));
-
-		$servers = array_keys($MemCache->__Memcache->getExtendedStats());
-		$settings = Cache::settings();
+		$servers = array_keys($Memcache->__Memcache->getExtendedStats());
+		$settings = $Memcache->settings();
 		$this->assertEqual($servers, $settings['servers']);
+		Cache::drop('dual_server');
 	}
 
 /**
@@ -134,8 +124,9 @@ class MemcacheEngineTest extends CakeTestCase {
  * @return void
  */
 	function testConnect() {
-		$Cache =& Cache::getInstance();
-		$result = $Cache->_Engine['Memcache']->connect('127.0.0.1');
+		$Memcache =& new MemcacheEngine();
+		$Memcache->init(Cache::settings('memcache'));
+		$result = $Memcache->connect('127.0.0.1');
 		$this->assertTrue($result);
 	}
 
@@ -193,13 +184,13 @@ class MemcacheEngineTest extends CakeTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 
-		Cache::engine('Memcache', array('duration' => '+1 second'));
+		Cache::config('memcache', array('duration' => '+1 second'));
 		sleep(2);
 
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 
-		Cache::engine('Memcache', array('duration' => '+31 day'));
+		Cache::config('memcache', array('duration' => '+31 day'));
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('long_expiry_test', $data);
 		$this->assertTrue($result);
@@ -212,7 +203,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		$result = Cache::read('long_expiry_test');
 		$this->assertTrue($result);
 
-		Cache::engine('Memcache', array('duration' => 3600));
+		Cache::config('memcache', array('duration' => 3600));
 	}
 
 /**

From 3f067ed16677530fd6e24106aa5b5fcb676f5ef4 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 18 Nov 2009 22:32:24 -0500
Subject: [PATCH 102/112] Updating ApcEngine test to use the new Cache engine
 api.

---
 cake/tests/cases/libs/cache/apc.test.php      | 5 +++--
 cake/tests/cases/libs/cache/memcache.test.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php
index 164a6199b..1377cfe41 100644
--- a/cake/tests/cases/libs/cache/apc.test.php
+++ b/cake/tests/cases/libs/cache/apc.test.php
@@ -39,7 +39,7 @@ class ApcEngineTest extends UnitTestCase {
  */
 	function skip() {
 		$skip = true;
-		if (Cache::engine('Apc')) {
+		if (function_exists('apc_store')) {
 			$skip = false;
 		}
 		$this->skipIf($skip, '%s Apc is not installed or configured properly');
@@ -65,6 +65,7 @@ class ApcEngineTest extends UnitTestCase {
  */
 	function tearDown() {
 		Configure::write('Cache.disable', $this->_cacheDisable);
+		Cache::drop('apc');
 		Cache::config('default');
 	}
 
@@ -112,7 +113,7 @@ class ApcEngineTest extends UnitTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 
-		Cache::set(array('duration' =>  "+1 second"));
+		Cache::set(array('duration' =>  1));
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('other_test', $data);
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index a857d52b9..99cc68ca1 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -40,7 +40,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		if (class_exists('Memcache')) {
 			$skip = false;
 		}
-		$this->skipIf($skip, '%s Memcache is not installed or configured properly');
+		$this->skipIf($skip, '%s Memcache is not installed or configured properly.');
 	}
 
 /**

From fb7d99e6b3fd2276cb1f358f7498fbe3cc781a0d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 15:44:03 -0500
Subject: [PATCH 103/112] Making XcacheTest use refactored Cache API.

---
 cake/libs/cache/xcache.php                  | 5 ++---
 cake/tests/cases/libs/cache/xcache.test.php | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index 91fd9dad0..ecdc08260 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -2,7 +2,6 @@
 /**
  * Xcache storage engine for cache.
  *
- *
  * PHP versions 4 and 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@@ -68,7 +67,7 @@ class XcacheEngine extends CacheEngine {
  */
 	function write($key, &$value, $duration) {
 		$expires = time() + $duration;
-		xcache_set($key.'_expires', $expires, $duration);
+		xcache_set($key . '_expires', $expires, $duration);
 		return xcache_set($key, $value, $duration);
 	}
 
@@ -82,7 +81,7 @@ class XcacheEngine extends CacheEngine {
 	function read($key) {
 		if (xcache_isset($key)) {
 			$time = time();
-			$cachetime = intval(xcache_get($key.'_expires'));
+			$cachetime = intval(xcache_get($key . '_expires'));
 			if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
 				return false;
 			}
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index 942504192..87d360c11 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -39,7 +39,7 @@ class XcacheEngineTest extends UnitTestCase {
  */
 	function skip() {
 		$skip = true;
-		if ($result = Cache::engine('Xcache')) {
+		if (function_exists('xcache_set')) {
 			$skip = false;
 		}
 		$this->skipIf($skip, '%s Xcache is not installed or configured properly');
@@ -132,7 +132,7 @@ class XcacheEngineTest extends UnitTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 
-		Cache::set(array('duration' =>  "+1 second"));
+		Cache::set(array('duration' =>  1));
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('other_test', $data);

From d37dd4c49fef551539d9a6b4579341751fefbdc7 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 16:09:06 -0500
Subject: [PATCH 104/112] Updating doc block for FileEngine. Fixing
 Cache::set() so strtotime compatible durations are handled properly.
 Restoring previous change in Xcache test case.

---
 cake/libs/cache.php                         |  3 +++
 cake/libs/cache/file.php                    | 11 ++++++-----
 cake/tests/cases/libs/cache/xcache.test.php |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index e65c73d5d..5e01cb020 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -234,6 +234,9 @@ class Cache {
 					$settings = array($settings => $value);
 				}
 				$settings = array_merge($self->__config[$self->__name], $settings);
+				if (isset($settings['duration']) && !is_numeric($settings['duration'])) {
+					$settings['duration'] = strtotime($settings['duration']) - time();
+				}
 			}
 			$self->_engines[$name]->settings = $settings;
 		}
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index d1c2249e0..957b10e7b 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -37,11 +37,12 @@ class FileEngine extends CacheEngine {
 	var $__File = null;
 
 /**
- * settings
- * 		path = absolute path to cache directory, default => CACHE
- * 		prefix = string prefix for filename, default => cake_
- * 		lock = enable file locking on write, default => false
- * 		serialize = serialize the data, default => true
+ * Settings
+ * 
+ * - path = absolute path to cache directory, default => CACHE
+ * - prefix = string prefix for filename, default => cake_
+ * - lock = enable file locking on write, default => false
+ * - serialize = serialize the data, default => true
  *
  * @var array
  * @see CacheEngine::__defaults
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index 87d360c11..50ed9c280 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -132,7 +132,7 @@ class XcacheEngineTest extends UnitTestCase {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 
-		Cache::set(array('duration' =>  1));
+		Cache::set(array('duration' =>  "+1 second"));
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('other_test', $data);

From c11509483ce837e276584bd8f73a5598191bd847 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 16:43:54 -0500
Subject: [PATCH 105/112] Removing use of Helper::output from core helpers.
 Removing duplicated test caused by merge in form helper test.

---
 cake/libs/view/helpers/ajax.php               |  4 +-
 cake/libs/view/helpers/form.php               | 50 +++++++++----------
 cake/libs/view/helpers/html.php               | 26 +++++-----
 cake/libs/view/helpers/javascript.php         |  2 +-
 cake/libs/view/helpers/paginator.php          |  4 +-
 cake/libs/view/helpers/rss.php                |  2 +-
 cake/libs/view/helpers/time.php               | 25 ++++------
 cake/libs/view/helpers/xml.php                |  6 +--
 .../cases/libs/view/helpers/form.test.php     | 15 ------
 9 files changed, 55 insertions(+), 79 deletions(-)

diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index 494e6fc40..0a69b5f21 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -528,7 +528,7 @@ class AjaxHelper extends AppHelper {
 			}
 		}
 		$attr = $this->_parseAttributes(array_merge($options, array('id' => $id)));
-		return $this->output(sprintf($this->Html->tags['blockstart'], $attr));
+		return sprintf($this->Html->tags['blockstart'], $attr);
 	}
 
 /**
@@ -547,7 +547,7 @@ class AjaxHelper extends AppHelper {
 				return '';
 			}
 		}
-		return $this->output($this->Html->tags['blockend']);
+		return $this->Html->tags['blockend'];
 	}
 
 /**
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 9cb39b5b2..c88337f22 100755
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -294,7 +294,7 @@ class FormHelper extends AppHelper {
 
 		$this->setEntity($model . '.', true);
 		$attributes = $this->_parseAttributes($htmlAttributes, null, '');
-		return $this->output(sprintf($this->Html->tags['form'], $attributes)) . $append;
+		return sprintf($this->Html->tags['form'], $attributes) . $append;
 	}
 
 /**
@@ -349,7 +349,7 @@ class FormHelper extends AppHelper {
 
 		$view =& ClassRegistry::getObject('view');
 		$view->modelScope = false;
-		return $this->output($out);
+		return $out;
 	}
 
 /**
@@ -528,11 +528,11 @@ class FormHelper extends AppHelper {
 			$labelFor = $this->domId($fieldName);
 		}
 
-		return $this->output(sprintf(
+		return sprintf(
 			$this->Html->tags['label'],
 			$labelFor,
 			$this->_parseAttributes($options), $text
-		));
+		);
 	}
 
 /**
@@ -940,11 +940,11 @@ class FormHelper extends AppHelper {
 		}
 		unset($options['hiddenField']);
 
-		return $this->output($output . sprintf(
+		return $output . sprintf(
 			$this->Html->tags['checkbox'],
 			$options['name'],
 			$this->_parseAttributes($options, array('name'), null, ' ')
-		));
+		);
 	}
 
 /**
@@ -1036,7 +1036,7 @@ class FormHelper extends AppHelper {
 				sprintf($this->Html->tags['legend'], $legend) . $out
 			);
 		}
-		return $this->output($out);
+		return $out;
 	}
 
 /**
@@ -1050,11 +1050,11 @@ class FormHelper extends AppHelper {
 		$options = $this->_initInputField($fieldName, array_merge(
 			array('type' => 'text'), $options
 		));
-		return $this->output(sprintf(
+		return sprintf(
 			$this->Html->tags['input'],
 			$options['name'],
 			$this->_parseAttributes($options, array('name'), null, ' ')
-		));
+		);
 	}
 
 /**
@@ -1066,11 +1066,11 @@ class FormHelper extends AppHelper {
  */
 	function password($fieldName, $options = array()) {
 		$options = $this->_initInputField($fieldName, $options);
-		return $this->output(sprintf(
+		return sprintf(
 			$this->Html->tags['password'],
 			$options['name'],
 			$this->_parseAttributes($options, array('name'), null, ' ')
-		));
+		);
 	}
 
 /**
@@ -1091,12 +1091,12 @@ class FormHelper extends AppHelper {
 			}
 			unset($options['value']);
 		}
-		return $this->output(sprintf(
+		return sprintf(
 			$this->Html->tags['textarea'],
 			$options['name'],
 			$this->_parseAttributes($options, array('type', 'name'), null, ' '),
 			$value
-		));
+		);
 	}
 
 /**
@@ -1123,11 +1123,11 @@ class FormHelper extends AppHelper {
 			$this->__secure(null, '' . $options['value']);
 		}
 
-		return $this->output(sprintf(
+		return sprintf(
 			$this->Html->tags['hidden'],
 			$options['name'],
 			$this->_parseAttributes($options, array('name', 'class'), '', ' ')
-		));
+		);
 	}
 
 /**
@@ -1149,7 +1149,7 @@ class FormHelper extends AppHelper {
 		}
 
 		$attributes = $this->_parseAttributes($options, array('name'), '', ' ');
-		return $this->output(sprintf($this->Html->tags['file'], $options['name'], $attributes));
+		return sprintf($this->Html->tags['file'], $options['name'], $attributes);
 	}
 
 /**
@@ -1169,12 +1169,12 @@ class FormHelper extends AppHelper {
 		if ($options['escape']) {
 			$title = h($title);
 		}
-		return $this->output(sprintf(
+		return sprintf(
 			$this->Html->tags['button'],
 			$options['type'],
 			$this->_parseAttributes($options, array('type'), '', ' '),
 			$title
-		));
+		);
 	}
 
 /**
@@ -1217,11 +1217,11 @@ class FormHelper extends AppHelper {
 
 		if (strpos($caption, '://') !== false) {
 			unset($options['type']);
-			$out .=  $this->output($before . sprintf(
+			$out .=  $before . sprintf(
 				$this->Html->tags['submitimage'],
 				$caption,
 				$this->_parseAttributes($options, null, '', ' ')
-			) . $after);
+			) . $after;
 		} elseif (preg_match('/\.(jpg|jpe|jpeg|gif|png|ico)$/', $caption)) {
 			unset($options['type']);
 			if ($caption{0} !== '/') {
@@ -1230,17 +1230,17 @@ class FormHelper extends AppHelper {
 				$caption = trim($caption, '/');
 				$url = $this->webroot($caption);
 			}
-			$out .= $this->output($before . sprintf(
+			$out .= $before . sprintf(
 				$this->Html->tags['submitimage'],
 				$url,
 				$this->_parseAttributes($options, null, '', ' ')
-			) . $after);
+			) . $after;
 		} else {
 			$options['value'] = $caption;
-			$out .= $this->output($before . sprintf(
+			$out .= $before . sprintf(
 				$this->Html->tags['submit'],
 				$this->_parseAttributes($options, null, '', ' ')
-			). $after);
+			). $after;
 		}
 
 		if (isset($divOptions)) {
@@ -1347,7 +1347,7 @@ class FormHelper extends AppHelper {
 
 		$template = ($style == 'checkbox') ? 'checkboxmultipleend' : 'selectend';
 		$select[] = $this->Html->tags[$template];
-		return $this->output(implode("\n", $select));
+		return implode("\n", $select);
 	}
 
 /**
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index f86c84087..b4039e0e5 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -201,7 +201,7 @@ class HtmlHelper extends AppHelper {
  */
 	function docType($type = 'xhtml-strict') {
 		if (isset($this->__docTypes[$type])) {
-			return $this->output($this->__docTypes[$type]);
+			return $this->__docTypes[$type];
 		}
 		return null;
 	}
@@ -270,7 +270,7 @@ class HtmlHelper extends AppHelper {
 		}
 
 		if ($inline) {
-			return $this->output($out);
+			return $out;
 		} else {
 			$view =& ClassRegistry::getObject('view');
 			$view->addScript($out);
@@ -288,7 +288,7 @@ class HtmlHelper extends AppHelper {
 		if (empty($charset)) {
 			$charset = strtolower(Configure::read('App.encoding'));
 		}
-		return $this->output(sprintf($this->tags['charset'], (!empty($charset) ? $charset : 'utf-8')));
+		return sprintf($this->tags['charset'], (!empty($charset) ? $charset : 'utf-8'));
 	}
 
 /**
@@ -347,7 +347,7 @@ class HtmlHelper extends AppHelper {
 			}
 			unset($options['default']);
 		}
-		return $this->output(sprintf($this->tags['link'], $url, $this->_parseAttributes($options), $title));
+		return sprintf($this->tags['link'], $url, $this->_parseAttributes($options), $title);
 	}
 
 /**
@@ -408,7 +408,6 @@ class HtmlHelper extends AppHelper {
 			}
 			$out = sprintf($this->tags['css'], $rel, $url, $this->_parseAttributes($options, array('inline'), '', ' '));
 		}
-		$out = $this->output($out);
 
 		if ($options['inline']) {
 			return $out;
@@ -472,7 +471,7 @@ class HtmlHelper extends AppHelper {
 			}
 		}
 		$attributes = $this->_parseAttributes($options, array('inline', 'once'), ' ');
-		$out = $this->output(sprintf($this->tags['javascriptlink'], $url, $attributes));
+		$out = sprintf($this->tags['javascriptlink'], $url, $attributes);
 
 		if ($options['inline']) {
 			return $out;
@@ -585,7 +584,7 @@ class HtmlHelper extends AppHelper {
 					$out[] = $crumb[0];
 				}
 			}
-			return $this->output(join($separator, $out));
+			return join($separator, $out);
 		} else {
 			return null;
 		}
@@ -624,9 +623,9 @@ class HtmlHelper extends AppHelper {
 		$image = sprintf($this->tags['image'], $path, $this->_parseAttributes($options, null, '', ' '));
 
 		if ($url) {
-			return $this->output(sprintf($this->tags['link'], $this->url($url), null, $image));
+			return sprintf($this->tags['link'], $this->url($url), null, $image);
 		}
-		return $this->output($image);
+		return $image;
 	}
 
 /**
@@ -643,8 +642,7 @@ class HtmlHelper extends AppHelper {
 		foreach ($names as $arg) {
 			$out[] = sprintf($this->tags['tableheader'], $this->_parseAttributes($thOptions), $arg);
 		}
-		$data = sprintf($this->tags['tablerow'], $this->_parseAttributes($trOptions), join(' ', $out));
-		return $this->output($data);
+		return sprintf($this->tags['tablerow'], $this->_parseAttributes($trOptions), join(' ', $out));
 	}
 
 /**
@@ -698,7 +696,7 @@ class HtmlHelper extends AppHelper {
 			$options = $this->_parseAttributes($count % 2 ? $oddTrOptions : $evenTrOptions);
 			$out[] = sprintf($this->tags['tablerow'], $options, join(' ', $cellsOut));
 		}
-		return $this->output(join("\n", $out));
+		return implode("\n", $out);
 	}
 
 /**
@@ -729,7 +727,7 @@ class HtmlHelper extends AppHelper {
 		} else {
 			$tag = 'tag';
 		}
-		return $this->output(sprintf($this->tags[$tag], $name, $this->_parseAttributes($options, null, ' ', ''), $text, $name));
+		return sprintf($this->tags[$tag], $name, $this->_parseAttributes($options, null, ' ', ''), $text, $name);
 	}
 
 /**
@@ -778,7 +776,7 @@ class HtmlHelper extends AppHelper {
 		} else {
 			$tag = 'para';
 		}
-		return $this->output(sprintf($this->tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $text));
+		return sprintf($this->tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $text);
 	}
 
 /**
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index c4732a5ca..c7c44c898 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -273,7 +273,7 @@ class JavascriptHelper extends AppHelper {
 				}
 			}
 		}
-		$out = $this->output(sprintf($this->tags['javascriptlink'], $url));
+		$out = sprintf($this->tags['javascriptlink'], $url);
 
 		if ($inline) {
 			return $out;
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 45ffb488d..38625b57a 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -557,7 +557,7 @@ class PaginatorHelper extends AppHelper {
 				$out = str_replace($newKeys, array_values($map), $out);
 			break;
 		}
-		return $this->output($out);
+		return $out;
 	}
 
 /**
@@ -678,7 +678,7 @@ class PaginatorHelper extends AppHelper {
 			$out .= $after;
 		}
 
-		return $this->output($out);
+		return $out;
 	}
 
 /**
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index c0bc776c2..a05b85b6a 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -269,7 +269,7 @@ class RssHelper extends XmlHelper {
 		if (!empty($elements)) {
 			$content = join('', $elements);
 		}
-		return $this->output($this->elem('item', $att, $content, !($content === null)));
+		return $this->elem('item', $att, $content, !($content === null));
 	}
 
 /**
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index ac14484b0..54eefe05e 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -87,8 +87,7 @@ class TimeHelper extends AppHelper {
 			$date = time();
 		}
 
-		$ret = date("D, M jS Y, H:i", $date);
-		return $this->output($ret);
+		return date("D, M jS Y, H:i", $date);
 	}
 
 /**
@@ -115,8 +114,7 @@ class TimeHelper extends AppHelper {
 		} else {
 			$ret = date("M jS{$y}, H:i", $date);
 		}
-
-		return $this->output($ret);
+		return $ret;
 	}
 
 /**
@@ -134,8 +132,7 @@ class TimeHelper extends AppHelper {
 		$begin = date('Y-m-d', $begin) . ' 00:00:00';
 		$end = date('Y-m-d', $end) . ' 23:59:59';
 
-		$ret  ="($fieldName >= '$begin') AND ($fieldName <= '$end')";
-		return $this->output($ret);
+		return "($fieldName >= '$begin') AND ($fieldName <= '$end')";
 	}
 
 /**
@@ -149,8 +146,7 @@ class TimeHelper extends AppHelper {
  */
 	function dayAsSql($dateString, $fieldName, $userOffset = null) {
 		$date = $this->fromString($dateString, $userOffset);
-		$ret = $this->daysAsSql($dateString, $dateString, $fieldName);
-		return $this->output($ret);
+		return $this->daysAsSql($dateString, $dateString, $fieldName);
 	}
 
 /**
@@ -254,7 +250,7 @@ class TimeHelper extends AppHelper {
 					break;
 			}
 		}
-		return $this->output($date);
+		return $date;
 	}
 
 /**
@@ -265,8 +261,7 @@ class TimeHelper extends AppHelper {
  * @return integer Unix timestamp
  */
 	function toUnix($dateString, $userOffset = null) {
-		$ret = $this->fromString($dateString, $userOffset);
-		return $this->output($ret);
+		return $this->fromString($dateString, $userOffset);
 	}
 
 /**
@@ -278,8 +273,7 @@ class TimeHelper extends AppHelper {
  */
 	function toAtom($dateString, $userOffset = null) {
 		$date = $this->fromString($dateString, $userOffset);
-		$ret = date('Y-m-d\TH:i:s\Z', $date);
-		return $this->output($ret);
+		return date('Y-m-d\TH:i:s\Z', $date);
 	}
 
 /**
@@ -291,8 +285,7 @@ class TimeHelper extends AppHelper {
  */
 	function toRSS($dateString, $userOffset = null) {
 		$date = $this->fromString($dateString, $userOffset);
-		$ret = date("r", $date);
-		return $this->output($ret);
+		return date("r", $date);
 	}
 
 /**
@@ -472,7 +465,7 @@ class TimeHelper extends AppHelper {
 				$relativeDate = sprintf(__('%s ago', true), $relativeDate);
 			}
 		}
-		return $this->output($relativeDate);
+		return $relativeDate;
 	}
 
 /**
diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php
index f6a03321b..ac7b9775b 100644
--- a/cake/libs/view/helpers/xml.php
+++ b/cake/libs/view/helpers/xml.php
@@ -65,7 +65,7 @@ class XmlHelper extends AppHelper {
 			$attrib = 'xml ' . $attrib;
 		}
 
-		return $this->output($this->Xml->header($attrib));
+		return $this->Xml->header($attrib);
 	}
 
 /**
@@ -131,7 +131,7 @@ class XmlHelper extends AppHelper {
 		if (!$endTag) {
 			$this->Xml =& $elem;
 		}
-		return $this->output($out);
+		return $out;
 	}
 
 /**
@@ -144,7 +144,7 @@ class XmlHelper extends AppHelper {
 		if ($parent =& $this->Xml->parent()) {
 			$this->Xml =& $parent;
 		}
-		return $this->output('</' . $name . '>');
+		return '</' . $name . '>';
 	}
 
 /**
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 316cd8a0c..f19c16f85 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -5064,21 +5064,6 @@ class FormHelperTest extends CakeTestCase {
 			'/fieldset'
 		);
 		$this->assertTags($result, $expected);
-
-		$this->Form->data = array();
-		$this->Form->params['controller'] = 'contacts';
-		$this->Form->params['models'] = array('Contact');
-		$result = $this->Form->create(array('url' => array('action' => 'index', 'param')));
-		$expected = array(
-			'form' => array(
-				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param'
-			),
-			'fieldset' => array('style' => 'preg:/display\s*\:\s*none;\s*/'),
-			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
-			'/fieldset'
-		);
-		$this->assertTags($result, $expected);
-		
 	}
 
 /**

From 46b965edba6f0238b08baeb69b0f512171bc8e5b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 19:57:04 -0500
Subject: [PATCH 106/112] Refactoring Configure::read/Configure::write so keys
 with <= 2 keys read/write faster.

---
 cake/libs/configure.php | 44 +++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index b6feb080a..7cc3988cc 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -91,11 +91,21 @@ class Configure extends Object {
 			if (strpos($name, '.') === false) {
 				$_this->{$name} = $value;
 			} else {
-				$names = explode('.', $name, 2);
-				if (!isset($_this->{$names[0]})) {
-					$_this->{$names[0]} = array();
+				$names = explode('.', $name, 4);
+				switch (count($names)) {
+					case 2:
+						$_this->{$names[0]}[$names[1]] = $value;
+					break;
+					case 3:
+						$_this->{$names[0]}[$names[1]][$names[2]] = $value;
+					case 4:
+						$names = explode('.', $name, 2);
+						if (!isset($_this->{$names[0]})) {
+							$_this->{$names[0]} = array();
+						}
+						$_this->{$names[0]} = Set::insert($_this->{$names[0]}, $names[1], $value);
+					break;
 				}
-				$_this->{$names[0]} = Set::insert($_this->{$names[0]}, $names[1], $value);
 			}
 		}
 
@@ -149,18 +159,32 @@ class Configure extends Object {
 		}
 
 		if (strpos($var, '.') !== false) {
-			$names = explode('.', $var, 2);
+			$names = explode('.', $var, 3);
 			$var = $names[0];
 		}
 		if (!isset($_this->{$var})) {
 			return null;
 		}
-
-		if (!empty($names[1])) {
-			return Set::extract($_this->{$var}, $names[1]);
+		if (!isset($names[1])) {
+			return $_this->{$var};
 		}
-
-		return $_this->{$var};
+		switch (count($names)) {
+			case 2:
+				if (isset($_this->{$var}[$names[1]])) {
+					return $_this->{$var}[$names[1]];
+				}
+			break;
+			case 3:
+				if (isset($_this->{$var}[$names[1]][$names[2]])) {
+					return $_this->{$var}[$names[1]][$names[2]];
+				}
+				if (!isset($_this->{$var}[$names[1]])) {
+					return null;
+				}
+				return Set::classicExtract($_this->{$var}[$names[1]], $names[2]);
+			break;
+		}
+		return null;
 	}
 
 /**

From fa0d0addf8fc4c62856b5ebc0420b8250cb3ee44 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 20:01:33 -0500
Subject: [PATCH 107/112] Making it so Cache::__loadEngine is only called once
 per classname.

---
 cake/libs/cache.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 5e01cb020..7e5ece965 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -143,7 +143,8 @@ class Cache {
 		$config = $this->__config[$name];
 
 		list($plugin, $class) = pluginSplit($config['engine']);
-		if ($this->__loadEngine($class, $plugin) === false) {
+		$cacheClass = $class . 'Engine';
+		if (!class_exists($cacheClass) && $this->__loadEngine($class, $plugin) === false) {
 			return false;
 		}
 		$cacheClass = $class . 'Engine';

From 4ea2a3f37d801e3d4a1d3891038b8e13b694eebf Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 20:05:19 -0500
Subject: [PATCH 108/112] Minor optimization on importing of Cache engines.

---
 cake/libs/cache.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 7e5ece965..093a391f0 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -195,11 +195,11 @@ class Cache {
  */
 	function __loadEngine($name, $plugin = null) {
 		if ($plugin) {
-			return App::import('Lib', $plugin . '.cache' . DS . $name);
+			return App::import('Lib', $plugin . '.cache' . DS . $name, false);
 		} else {
-			$app = App::import('Lib', 'cache' . DS . $name);
+			$app = App::import('Lib', 'cache' . DS . $name, false);
 			if (!$app) {
-				return App::import('Core', 'cache' . DS . $name);
+				require LIBS . 'cache' . DS . strtolower($name) . '.php';
 			}
 			return true;
 		}

From 63b047eb5751f2c711ecfd22dc19e4450b41e277 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 20:25:45 -0500
Subject: [PATCH 109/112] Replacing extract with classicExtract.

---
 cake/libs/cake_session.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index 957af54ff..1ef0a8397 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -216,7 +216,7 @@ class CakeSession extends Object {
 		if (empty($var)) {
 			return false;
 		}
-		$result = Set::extract($_SESSION, $var);
+		$result = Set::classicExtract($_SESSION, $var);
 		return isset($result);
 	}
 
@@ -354,7 +354,7 @@ class CakeSession extends Object {
 		if (empty($name)) {
 			return false;
 		}
-		$result = Set::extract($_SESSION, $name);
+		$result = Set::classicExtract($_SESSION, $name);
 
 		if (!is_null($result)) {
 			return $result;
@@ -433,7 +433,7 @@ class CakeSession extends Object {
 			trigger_error('Writing session key {' . $var . '}: ' . Debugger::exportVar($value), E_USER_NOTICE);
 		}
 		$this->__overwrite($_SESSION, Set::insert($_SESSION, $var, $value));
-		return (Set::extract($_SESSION, $var) === $value);
+		return (Set::classicExtract($_SESSION, $var) === $value);
 	}
 
 /**

From 6b3b2a629b9d8d137a4e0a102c9d099f8a7e83ca Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 20:44:35 -0500
Subject: [PATCH 110/112] Removing CakeSession::__validateKeys() its no longer
 needed due to CakeSession using Set to manipulate the session values. Adding
 test case for exploit shown in https://trac.cakephp.org/ticket/2041

---
 cake/libs/cake_session.php                  | 45 +++++----------------
 cake/tests/cases/libs/cake_session.test.php | 14 +++++++
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index 1ef0a8397..6b844989d 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -212,11 +212,10 @@ class CakeSession extends Object {
  * @access public
  */
 	function check($name) {
-		$var = $this->__validateKeys($name);
-		if (empty($var)) {
+		if (empty($name)) {
 			return false;
 		}
-		$result = Set::classicExtract($_SESSION, $var);
+		$result = Set::classicExtract($_SESSION, $name);
 		return isset($result);
 	}
 
@@ -259,13 +258,11 @@ class CakeSession extends Object {
  */
 	function delete($name) {
 		if ($this->check($name)) {
-			if ($var = $this->__validateKeys($name)) {
-				if (in_array($var, $this->watchKeys)) {
-					trigger_error('Deleting session key {' . $var . '}', E_USER_NOTICE);
-				}
-				$this->__overwrite($_SESSION, Set::remove($_SESSION, $var));
-				return ($this->check($var) == false);
+			if (in_array($name, $this->watchKeys)) {
+				trigger_error('Deleting session key {' . $name . '}', E_USER_NOTICE);
 			}
+			$this->__overwrite($_SESSION, Set::remove($_SESSION, $name));
+			return ($this->check($name) == false);
 		}
 		$this->__setError(2, "$name doesn't exist");
 		return false;
@@ -385,7 +382,6 @@ class CakeSession extends Object {
  * @access public
  */
 	function watch($var) {
-		$var = $this->__validateKeys($var);
 		if (empty($var)) {
 			return false;
 		}
@@ -402,7 +398,6 @@ class CakeSession extends Object {
  * @access public
  */
 	function ignore($var) {
-		$var = $this->__validateKeys($var);
 		if (!in_array($var, $this->watchKeys)) {
 			return;
 		}
@@ -424,16 +419,14 @@ class CakeSession extends Object {
  * @access public
  */
 	function write($name, $value) {
-		$var = $this->__validateKeys($name);
-
-		if (empty($var)) {
+		if (empty($name)) {
 			return false;
 		}
-		if (in_array($var, $this->watchKeys)) {
-			trigger_error('Writing session key {' . $var . '}: ' . Debugger::exportVar($value), E_USER_NOTICE);
+		if (in_array($name, $this->watchKeys)) {
+			trigger_error('Writing session key {' . $name . '}: ' . Debugger::exportVar($value), E_USER_NOTICE);
 		}
-		$this->__overwrite($_SESSION, Set::insert($_SESSION, $var, $value));
-		return (Set::classicExtract($_SESSION, $var) === $value);
+		$this->__overwrite($_SESSION, Set::insert($_SESSION, $name, $value));
+		return (Set::classicExtract($_SESSION, $name) === $value);
 	}
 
 /**
@@ -676,22 +669,6 @@ class CakeSession extends Object {
 		$this->__regenerateId();
 	}
 
-/**
- * Validate that the $name is in correct dot notation
- * example: $name = 'ControllerName.key';
- *
- * @param string $name Session key names as string.
- * @return mixed false is $name is not correct format, or $name if it is correct
- * @access private
- */
-	function __validateKeys($name) {
-		if (is_string($name) && preg_match("/^[ 0-9a-zA-Z._-]*$/", $name)) {
-			return $name;
-		}
-		$this->__setError(3, "$name is not a string");
-		return false;
-	}
-
 /**
  * Helper method to set an internal error message.
  *
diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php
index 09b744b1f..99d030cfd 100644
--- a/cake/tests/cases/libs/cake_session.test.php
+++ b/cake/tests/cases/libs/cake_session.test.php
@@ -289,6 +289,20 @@ class SessionTest extends CakeTestCase {
 		$this->assertTrue($this->Session->check('Session Test.Test Case'));
 	}
 
+/**
+ * test key exploitation
+ *
+ * @return void
+ */
+	function testKeyExploit() {
+		$key = "a'] = 1; phpinfo(); \$_SESSION['a";
+		$result = $this->Session->write($key, 'haxored');
+		$this->assertTrue($result);
+
+		$result = $this->Session->read($key);
+		$this->assertEqual($result, 'haxored');
+	}
+
 /**
  * testReadingSavedEmpty method
  *

From 4f3852618f0d08be27704bf8bda5e22e39be5aa2 Mon Sep 17 00:00:00 2001
From: AD7six <andydawson76@yahoo.co.uk>
Date: Sun, 22 Nov 2009 19:58:10 +0100
Subject: [PATCH 111/112] correcting $this -> $self removing debug code

---
 cake/libs/cache.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 093a391f0..8c54bbf66 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -122,11 +122,10 @@ class Cache {
 		$self->__name = $name;
 		$engine = $self->__config[$name]['engine'];
 
-		if (!isset($this->_engines[$name])) {
+		if (!isset($self->_engines[$name])) {
 			$self->_buildEngine($name);
 			$settings = $self->__config[$name] = $self->settings($name);
 		} elseif ($settings = $self->set($self->__config[$name])) {
-			var_dump($settings);
 			$self->__config[$name] = $settings;
 		}
 		return compact('engine', 'settings');

From cd6fd74caf02c3702f4b00034cea1339f28a3323 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Tue, 17 Nov 2009 00:04:33 +0100
Subject: [PATCH 112/112] Added -empty flag for ProjectTask to bake with empty
 dir files, tests included

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/console/libs/tasks/project.php           |  3 ++
 .../cases/console/libs/tasks/project.test.php | 47 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index 70f254bc3..03cc23d65 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -149,6 +149,9 @@ class ProjectTask extends Shell {
 			$verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n');
 
 			$Folder = new Folder($skel);
+			if (!empty($this->params['empty'])) {
+				$skip = array();
+			}
 			if ($Folder->copy(array('to' => $path, 'skip' => $skip))) {
 				$this->hr();
 				$this->out(sprintf(__("Created: %s in %s", true), $app, $path));
diff --git a/cake/tests/cases/console/libs/tasks/project.test.php b/cake/tests/cases/console/libs/tasks/project.test.php
index 08f33778b..ce91e262b 100644
--- a/cake/tests/cases/console/libs/tasks/project.test.php
+++ b/cake/tests/cases/console/libs/tasks/project.test.php
@@ -115,6 +115,51 @@ class ProjectTaskTest extends CakeTestCase {
 		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
 	}
 
+/**
+ * test bake() method with -empty flag,  directory creation and empty files.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeEmptyFlag() {
+		$this->Task->params['empty'] = true;
+		$this->_setupTestProject();
+		$path = $this->Task->path . 'bake_test_app';
+		$this->assertTrue(is_dir($path), 'No project dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+
+		$this->assertTrue(is_file($path . DS . 'controllers' . DS .'components' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'locale' . DS . 'eng' . DS . 'LC_MESSAGES' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'models' . DS . 'behaviors' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'models' . DS . 'datasources' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'plugins' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'behaviors' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'components' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'controllers' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'datasources' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'shells' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'fixtures' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'groups' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'vendors' . DS . 'css' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'vendors' . DS . 'img' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'vendors' . DS . 'js' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'vendors' . DS . 'shells' . DS . 'tasks' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'views' . DS . 'errors' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'views' . DS . 'helpers' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'views' . DS . 'scaffolds' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'webroot' . DS . 'js' . DS . 'empty'), 'No empty file in dir %s');
+	}
+
 /**
  * test generation of Security.salt
  *
@@ -141,7 +186,7 @@ class ProjectTaskTest extends CakeTestCase {
  */
 	function testIndexPhpGeneration() {
 		$this->_setupTestProject();
-		
+
 		$path = $this->Task->path . 'bake_test_app' . DS;
 		$this->Task->corePath($path);