From c5bab541251b1ae8a846907d4ac4fa9b30ba1925 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 00:15:09 -0500
Subject: [PATCH 01/90] Starting to try and re-factor named params to perform
 better and be more explicit with how they are used.

---
 cake/libs/route/cake_route.php                  | 11 ++++++++++-
 cake/libs/router.php                            |  4 ++--
 cake/tests/cases/libs/route/cake_route.test.php |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 979f90dcf..0dbe085f8 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -263,6 +263,15 @@ class CakeRoute {
 		if (array_intersect_key($keyNames, $url) != $keyNames) {
 			return false;
 		}
+		
+		//pull out named params so comparisons later on are faster.
+		$named = array();
+		foreach ($url as $key => $value) {
+			if ($key[0] === ':') {
+				$named[$key] = $value;
+				unset($url[$key]);
+			}
+		}
 
 		$diffUnfiltered = Set::diff($url, $defaults);
 		$diff = array();
@@ -289,7 +298,7 @@ class CakeRoute {
 			return false;
 		}
 
-		$passedArgsAndParams = array_diff_key($diff, $filteredDefaults, $keyNames);
+		$passedArgsAndParams = array_diff_key($diff, $filteredDefaults, $keyNames) + $named;
 		list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
 
 		//remove any pass params, they have numeric indexes, skip any params that are in the defaults
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 611301867..85491ebc0 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -89,7 +89,7 @@ class Router {
  * @access public
  */
 	public static $named = array(
-		'default' => array('page', 'fields', 'order', 'limit', 'recursive', 'sort', 'direction', 'step'),
+		'default' => array(':page', ':fields', ':order', ':limit', ':recursive', ':sort', ':direction', ':step'),
 		'greedy' => true,
 		'separator' => ':',
 		'rules' => false,
@@ -972,7 +972,7 @@ class Router {
 			if (isset(self::$named['rules'][$param])) {
 				$rule = self::$named['rules'][$param];
 				if (Router::matchNamed($param, $val, $rule, compact('controller', 'action'))) {
-					$named[$param] = $val;
+					$named[substr($param, 1)] = $val;
 					unset($params[$param]);
 				}
 			}
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index dae305b23..a5c13c62b 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -298,13 +298,13 @@ class CakeRouteTestCase extends CakeTestCase {
 		Router::connectNamed(true);
 
 		$route = new CakeRoute('/:controller/:action/*', array('plugin' => null));
-		$result = $route->match(array('controller' => 'posts', 'action' => 'index', 'plugin' => null, 'page' => 1));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'index', 'plugin' => null, ':page' => 1));
 		$this->assertEqual($result, '/posts/index/page:1');
 
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5));
 		$this->assertEqual($result, '/posts/view/5');
 
-		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, 'page' => 1, 'limit' => 20, 'order' => 'title'));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, ':page' => 1, ':limit' => 20, ':order' => 'title'));
 		$this->assertEqual($result, '/posts/view/5/page:1/limit:20/order:title');
 
 

From 456a14cf37e4b03680aabb8cd346124fbe0c8f35 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 12:34:48 -0500
Subject: [PATCH 02/90] Refactored CakeRoute::match() to not use Set::diff(). 
 This was the slowest part of reverse routing and this change should make
 things faster. Added additional tests for the 0 edge case.

---
 cake/libs/route/cake_route.php                | 55 +++++++++----------
 .../cases/libs/route/cake_route.test.php      |  6 ++
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 0dbe085f8..8803a3201 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -263,27 +263,40 @@ class CakeRoute {
 		if (array_intersect_key($keyNames, $url) != $keyNames) {
 			return false;
 		}
-		
-		//pull out named params so comparisons later on are faster.
-		$named = array();
+
+		$named = $pass = $diff = array();
 		foreach ($url as $key => $value) {
+			// pull out named params so comparisons later on are faster.
 			if ($key[0] === ':') {
-				$named[$key] = $value;
+				$named[substr($key, 1)] = $value;
 				unset($url[$key]);
+				continue;
 			}
-		}
 
-		$diffUnfiltered = Set::diff($url, $defaults);
-		$diff = array();
-
-		foreach ($diffUnfiltered as $key => $var) {
-			if ($var === 0 || $var === '0' || !empty($var)) {
-				$diff[$key] = $var;
+			// keys that exist in the defaults and have different values cause match failures.
+			$keyExists = array_key_exists($key, $defaults);
+			if ($keyExists && $defaults[$key] != $value) {
+				$diff[$key] = $value;
+				continue;
+			}
+			// keys that don't exist are different.
+			if (!$keyExists) {
+				$diff[$key] = $value;
+			}
+			
+			// pull out passed args
+			$numeric = is_numeric($key);
+			if ($numeric && isset($defaults[$key]) && $defaults[$key] == $value) {
+				continue;
+			} elseif ($numeric) {
+				$pass[] = $value;
+				unset($url[$key]);
+				continue;
 			}
 		}
 
 		//if a not a greedy route, no extra params are allowed.
-		if (!$this->_greedy && array_diff_key($diff, $keyNames) != array()) {
+		if (!$this->_greedy && (!empty($pass) || array_diff_key($diff, $keyNames) != array())) {
 			return false;
 		}
 
@@ -294,26 +307,10 @@ class CakeRoute {
 		$filteredDefaults = array_filter($defaults);
 
 		//if the difference between the url diff and defaults contains keys from defaults its not a match
-		if (array_intersect_key($filteredDefaults, $diffUnfiltered) !== array()) {
+		if (array_intersect_key($filteredDefaults, $diff) !== array()) {
 			return false;
 		}
 
-		$passedArgsAndParams = array_diff_key($diff, $filteredDefaults, $keyNames) + $named;
-		list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
-
-		//remove any pass params, they have numeric indexes, skip any params that are in the defaults
-		$pass = array();
-		$i = 0;
-		while (isset($url[$i])) {
-			if (!isset($diff[$i])) {
-				$i++;
-				continue;
-			}
-			$pass[] = $url[$i];
-			unset($url[$i], $params[$i]);
-			$i++;
-		}
-
 		//still some left over parameters that weren't named or passed args, bail.
 		if (!empty($params)) {
 			return false;
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index a5c13c62b..37fd17d1c 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -304,6 +304,12 @@ class CakeRouteTestCase extends CakeTestCase {
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5));
 		$this->assertEqual($result, '/posts/view/5');
 
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 0));
+		$this->assertEqual($result, '/posts/view/0');
+
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, '0'));
+		$this->assertEqual($result, '/posts/view/0');
+
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, ':page' => 1, ':limit' => 20, ':order' => 'title'));
 		$this->assertEqual($result, '/posts/view/5/page:1/limit:20/order:title');
 

From 6ef8203d54199bcb438e6e402af911b18c6b1522 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 13:32:05 -0500
Subject: [PATCH 03/90] Adding another case that makes false/null to not cause
 match failure.

---
 cake/libs/route/cake_route.php                  |  2 +-
 cake/tests/cases/libs/route/cake_route.test.php | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 8803a3201..5fa934347 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -280,7 +280,7 @@ class CakeRoute {
 				continue;
 			}
 			// keys that don't exist are different.
-			if (!$keyExists) {
+			if (!$keyExists && !empty($value)) {
 				$diff[$key] = $value;
 			}
 			
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index 37fd17d1c..a8c5404fa 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -289,6 +289,19 @@ class CakeRouteTestCase extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * test that falsey values do not interrupt a match.
+ *
+ * @return void
+ */
+	function testMatchWithFalseyValues() {
+		$route = new CakeRoute('/:controller/:action/*', array('plugin' => null));
+		$result = $route->match(array(
+			'controller' => 'posts', 'action' => 'index', 'plugin' => null, 'admin' => false
+		));
+		$this->assertEqual($result, '/posts/index/');
+	}
+
 /**
  * test match() with greedy routes, named parameters and passed args.
  *

From 8d404332a279ebe9cfe59de8a0a9ef571c6c1ffa Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 13:40:07 -0500
Subject: [PATCH 04/90] Fixing issue where named params equal to null/false
 would be part of the generated url.

---
 cake/libs/route/cake_route.php                  |  2 +-
 cake/tests/cases/libs/route/cake_route.test.php | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 5fa934347..93c48897b 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -267,7 +267,7 @@ class CakeRoute {
 		$named = $pass = $diff = array();
 		foreach ($url as $key => $value) {
 			// pull out named params so comparisons later on are faster.
-			if ($key[0] === ':') {
+			if ($key[0] === ':' && ($value !== false && $value !== null)) {
 				$named[substr($key, 1)] = $value;
 				unset($url[$key]);
 				continue;
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index a8c5404fa..bf58d8295 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -338,6 +338,17 @@ class CakeRouteTestCase extends CakeTestCase {
 		$this->assertFalse($result);
 	}
 
+/**
+ * test that named params with null/false are excluded
+ *
+ * @return void
+ */
+	function testNamedParamsWithNullFalse() {
+		$route = new CakeRoute('/:controller/:action/*', array('plugin' => null));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'index', ':page' => null, 'sort' => false));
+		$this->assertEquals('/posts/index/', $result);
+	}
+
 /**
  * test that match with patterns works.
  *

From 328db0c36b12ca8ceb59dd374ac82fba1c17e9e5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 14:16:00 -0500
Subject: [PATCH 05/90] Fixed a number of tests, there are still a few issues
 with prefix routes. Moved removing defaults that are also keys to the compile
 step.  This removes quite a few repetitive loops.

---
 cake/libs/route/cake_route.php                | 36 ++++++++++---------
 cake/libs/router.php                          |  3 +-
 .../cases/libs/route/cake_route.test.php      | 33 ++++++++++++++---
 cake/tests/cases/libs/router.test.php         | 30 ++++++++--------
 4 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 93c48897b..9d1fb97c7 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -165,6 +165,11 @@ class CakeRoute {
 		$parsed = str_replace(array_keys($routeParams), array_values($routeParams), $parsed);
 		$this->_compiledRoute = '#^' . $parsed . '[/]*$#';
 		$this->keys = $names;
+
+		//remove defaults that are also keys. They can cause match failures
+		foreach ($this->keys as $key) {
+			unset($this->defaults[$key]);
+		}
 	}
 
 /**
@@ -265,6 +270,7 @@ class CakeRoute {
 		}
 
 		$named = $pass = $diff = array();
+
 		foreach ($url as $key => $value) {
 			// pull out named params so comparisons later on are faster.
 			if ($key[0] === ':' && ($value !== false && $value !== null)) {
@@ -279,11 +285,12 @@ class CakeRoute {
 				$diff[$key] = $value;
 				continue;
 			}
-			// keys that don't exist are different.
-			if (!$keyExists && !empty($value)) {
-				$diff[$key] = $value;
-			}
 			
+			// If the key is a routed key, its not different yet.
+			if (array_key_exists($key, $keyNames)) {
+				continue;
+			}
+
 			// pull out passed args
 			$numeric = is_numeric($key);
 			if ($numeric && isset($defaults[$key]) && $defaults[$key] == $value) {
@@ -293,26 +300,21 @@ class CakeRoute {
 				unset($url[$key]);
 				continue;
 			}
+
+			// keys that don't exist are different.
+			if (!$keyExists && !empty($value)) {
+				$diff[$key] = $value;
+			}
 		}
 
+
 		//if a not a greedy route, no extra params are allowed.
-		if (!$this->_greedy && (!empty($pass) || array_diff_key($diff, $keyNames) != array())) {
-			return false;
-		}
-
-		//remove defaults that are also keys. They can cause match failures
-		foreach ($this->keys as $key) {
-			unset($defaults[$key]);
-		}
-		$filteredDefaults = array_filter($defaults);
-
-		//if the difference between the url diff and defaults contains keys from defaults its not a match
-		if (array_intersect_key($filteredDefaults, $diff) !== array()) {
+		if (!$this->_greedy && ( (!empty($pass) || !empty($named)) || array_diff_key($diff, $keyNames) != array()) ) {
 			return false;
 		}
 
 		//still some left over parameters that weren't named or passed args, bail.
-		if (!empty($params)) {
+		if (!empty($diff)) {
 			return false;
 		}
 
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 85491ebc0..43c9590bf 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -943,7 +943,8 @@ class Router {
 		}
 
 		if (!empty($named)) {
-			foreach ($named as $name => $value) {				
+			foreach ($named as $name => $value) {
+				$name = trim($name, ':');
 				if (is_array($value)) {
 					$flattend = Set::flatten($value, '][');
 					foreach ($flattend as $namedKey => $namedValue) {
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index bf58d8295..aa6a7246b 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -191,8 +191,7 @@ class CakeRouteTestCase extends CakeTestCase {
 		$this->assertEqual($route->options, array('extra' => '[a-z1-9_]*', 'slug' => '[a-z1-9_]+', 'action' => 'view'));
 		$expected = array(
 			'controller' => 'pages',
-			'action' => 'view',
-			'extra' => null,
+			'action' => 'view'
 		);
 		$this->assertEqual($route->defaults, $expected);
 
@@ -220,7 +219,7 @@ class CakeRouteTestCase extends CakeTestCase {
  * @return void
  **/
 	function testMatchBasic() {
-		$route = new CakeRoute('/:controller/:action/:id', array('plugin' => null));
+/*		$route = new CakeRoute('/:controller/:action/:id', array('plugin' => null));
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null));
 		$this->assertFalse($result);
 
@@ -236,7 +235,7 @@ class CakeRouteTestCase extends CakeTestCase {
 
 		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'about'));
 		$this->assertFalse($result);
-
+*/
 
 		$route = new CakeRoute('/pages/*', array('controller' => 'pages', 'action' => 'display'));
 		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'home'));
@@ -289,6 +288,32 @@ class CakeRouteTestCase extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * test that non-greedy routes fail with extra passed args
+ *
+ * @return void
+ */
+	function testGreedyRouteFailurePassedArg() {
+		$route = new CakeRoute('/:controller/:action', array('plugin' => null));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', '0'));
+		$this->assertFalse($result);
+
+		$route = new CakeRoute('/:controller/:action', array('plugin' => null));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'test'));
+		$this->assertFalse($result);
+	}
+
+/**
+ * test that non-greedy routes fail with extra passed args
+ *
+ * @return void
+ */
+	function testGreedyRouteFailureNamedParam() {
+		$route = new CakeRoute('/:controller/:action', array('plugin' => null));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', ':page' => 1));
+		$this->assertFalse($result);
+	}
+
 /**
  * test that falsey values do not interrupt a match.
  *
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index e0def56f9..31539a185 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -328,7 +328,7 @@ class RouterTest extends CakeTestCase {
 		Router::connect('short_controller_name/:action/*', array('controller' => 'real_controller_name'));
 		Router::parse('/');
 
-		$result = Router::url(array('controller' => 'real_controller_name', 'page' => '1'));
+		$result = Router::url(array('controller' => 'real_controller_name', ':page' => '1'));
 		$expected = '/short_controller_name/index/page:1';
 		$this->assertEqual($result, $expected);
 
@@ -389,14 +389,14 @@ class RouterTest extends CakeTestCase {
  * @return void
  */
 	function testArrayNamedParameters() {
-		$result = Router::url(array('controller' => 'tests', 'pages' => array(
+		$result = Router::url(array('controller' => 'tests', ':pages' => array(
 			1, 2, 3
 		)));
 		$expected = '/tests/index/pages[0]:1/pages[1]:2/pages[2]:3';
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'tests',
-			'pages' => array(
+			':pages' => array(
 				'param1' => array(
 					'one',
 					'two'
@@ -408,7 +408,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'tests',
-			'pages' => array(
+			':pages' => array(
 				'param1' => array(
 					'one' => 1,
 					'two' => 2
@@ -420,7 +420,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'tests',
-			'super' => array(
+			':super' => array(
 				'nested' => array(
 					'array' => 'awesome',
 					'something' => 'else'
@@ -431,7 +431,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/tests/index/super[nested][array]:awesome/super[nested][something]:else/super[0]:cool';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'tests', 'namedParam' => array(
+		$result = Router::url(array('controller' => 'tests', ':namedParam' => array(
 			'keyed' => 'is an array',
 			'test'
 		)));
@@ -648,9 +648,9 @@ class RouterTest extends CakeTestCase {
 
 		Router::parse('/');
 
-		$result = Router::url(array('page' => 3));
+		$result = Router::url(array(':page' => 3));
 		$expected = '/magazine/admin/subscriptions/index/page:3';
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($expected, $result);
 
 		Router::reload();
 		Router::connect('/admin/subscriptions/:action/*', array('controller' => 'subscribe', 'admin' => true, 'prefix' => 'admin'));
@@ -860,7 +860,7 @@ class RouterTest extends CakeTestCase {
 
 		$result = Router::url(array(
 			'lang' => 'en',
-			'controller' => 'shows', 'action' => 'index', 'page' => '1',
+			'controller' => 'shows', 'action' => 'index', ':page' => '1',
 		));
 		$expected = '/en/shows/shows/page:1';
 		$this->assertEqual($result, $expected);
@@ -1361,11 +1361,11 @@ class RouterTest extends CakeTestCase {
  * @return void
  */
 	function testNamedArgsUrlGeneration() {
-		$result = Router::url(array('controller' => 'posts', 'action' => 'index', 'published' => 1, 'deleted' => 1));
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', ':published' => 1, ':deleted' => 1));
 		$expected = '/posts/index/published:1/deleted:1';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'posts', 'action' => 'index', 'published' => 0, 'deleted' => 0));
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', ':published' => 0, ':deleted' => 0));
 		$expected = '/posts/index/published:0/deleted:0';
 		$this->assertEqual($result, $expected);
 
@@ -1375,11 +1375,11 @@ class RouterTest extends CakeTestCase {
 		Router::connect('/', array('controller' => 'graphs', 'action' => 'index'));
 		Router::connect('/:id/*', array('controller' => 'graphs', 'action' => 'view'), array('id' => $ID));
 
-		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 'id' => 12, 'file' => 'asdf.png'));
+		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 'id' => 12, ':file' => 'asdf.png'));
 		$expected = '/12/file:asdf.png';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 12, 'file' => 'asdf.foo'));
+		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 12, ':file' => 'asdf.foo'));
 		$expected = '/graphs/view/12/file:asdf.foo';
 		$this->assertEqual($result, $expected);
 
@@ -1398,7 +1398,7 @@ class RouterTest extends CakeTestCase {
 		);
 		Router::parse('/');
 
-		$result = Router::url(array('page' => 1, 0 => null, 'sort' => 'controller', 'direction' => 'asc', 'order' => null));
+		$result = Router::url(array(':page' => 1, 0 => null, ':sort' => 'controller', ':direction' => 'asc', ':order' => null));
 		$expected = "/admin/controller/index/page:1/sort:controller/direction:asc";
 		$this->assertEqual($result, $expected);
 
@@ -1411,7 +1411,7 @@ class RouterTest extends CakeTestCase {
 		Router::setRequestInfo($request);
 
 		$result = Router::parse('/admin/controller/index/type:whatever');
-		$result = Router::url(array('type'=> 'new'));
+		$result = Router::url(array(':type'=> 'new'));
 		$expected = "/admin/controller/index/type:new";
 		$this->assertEqual($result, $expected);
 	}

From 756b09849fd9febd9c202260b1f3063ae6a76da0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 14:26:45 -0500
Subject: [PATCH 06/90] Router tests all pass now.

---
 cake/libs/route/cake_route.php        | 6 +++++-
 cake/tests/cases/libs/router.test.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 9d1fb97c7..27e453ea9 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -269,6 +269,11 @@ class CakeRoute {
 			return false;
 		}
 
+		// Missing defaults is a fail.
+		if (array_diff_key($defaults, $url) !== array()) {
+			return false;
+		}
+
 		$named = $pass = $diff = array();
 
 		foreach ($url as $key => $value) {
@@ -307,7 +312,6 @@ class CakeRoute {
 			}
 		}
 
-
 		//if a not a greedy route, no extra params are allowed.
 		if (!$this->_greedy && ( (!empty($pass) || !empty($named)) || array_diff_key($diff, $keyNames) != array()) ) {
 			return false;
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index 31539a185..6d2f700f6 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -1516,7 +1516,7 @@ class RouterTest extends CakeTestCase {
 
 		$result = Router::url(array('controller' => 'images', 'action' => 'add'));
 		$expected = '/images/add';
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($expected, $result);
 
 		$result = Router::url(array('controller' => 'images', 'action' => 'add', 'protected' => true));
 		$expected = '/protected/images/add';

From 3b0a3d4109dc8550603fc4412dd2ec8d7cae0d93 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 14:36:11 -0500
Subject: [PATCH 07/90] Making route matching fail even faster.  This gives
 significant performance boosts to routes not matching.

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

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 27e453ea9..bbe70bc63 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -265,7 +265,7 @@ class CakeRoute {
 
 		//check that all the key names are in the url
 		$keyNames = array_flip($this->keys);
-		if (array_intersect_key($keyNames, $url) != $keyNames) {
+		if (array_intersect_key($keyNames, $url) !== $keyNames) {
 			return false;
 		}
 
@@ -287,6 +287,7 @@ class CakeRoute {
 			// keys that exist in the defaults and have different values cause match failures.
 			$keyExists = array_key_exists($key, $defaults);
 			if ($keyExists && $defaults[$key] != $value) {
+				return false;
 				$diff[$key] = $value;
 				continue;
 			}
@@ -308,6 +309,7 @@ class CakeRoute {
 
 			// keys that don't exist are different.
 			if (!$keyExists && !empty($value)) {
+				return false;
 				$diff[$key] = $value;
 			}
 		}
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index aa6a7246b..279e305f1 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -219,7 +219,7 @@ class CakeRouteTestCase extends CakeTestCase {
  * @return void
  **/
 	function testMatchBasic() {
-/*		$route = new CakeRoute('/:controller/:action/:id', array('plugin' => null));
+		$route = new CakeRoute('/:controller/:action/:id', array('plugin' => null));
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null));
 		$this->assertFalse($result);
 
@@ -235,7 +235,7 @@ class CakeRouteTestCase extends CakeTestCase {
 
 		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'about'));
 		$this->assertFalse($result);
-*/
+
 
 		$route = new CakeRoute('/pages/*', array('controller' => 'pages', 'action' => 'display'));
 		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'home'));
@@ -369,7 +369,7 @@ class CakeRouteTestCase extends CakeTestCase {
  * @return void
  */
 	function testNamedParamsWithNullFalse() {
-		$route = new CakeRoute('/:controller/:action/*', array('plugin' => null));
+		$route = new CakeRoute('/:controller/:action/*');
 		$result = $route->match(array('controller' => 'posts', 'action' => 'index', ':page' => null, 'sort' => false));
 		$this->assertEquals('/posts/index/', $result);
 	}

From 5255b8fc9e9dabb490d758d4073cbd2d9d16fb66 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 15:36:22 -0500
Subject: [PATCH 08/90] Updating doc block for Router::redirect() Updating
 RedirectRoute to not use defaults for where the route will redirect.

---
 cake/libs/route/redirect_route.php | 31 +++++++++++++++++++++++++-----
 cake/libs/router.php               |  7 +++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/cake/libs/route/redirect_route.php b/cake/libs/route/redirect_route.php
index 148ce358f..e385dec0d 100644
--- a/cake/libs/route/redirect_route.php
+++ b/cake/libs/route/redirect_route.php
@@ -2,7 +2,9 @@
 App::import('Core', 'CakeResponse');
 App::import('Core', 'route/CakeRoute');
 /**
- * Redirect route will perform an immediate redirect
+ * Redirect route will perform an immediate redirect.  Redirect routes
+ * are useful when you want to have Routing layer redirects occur in your 
+ * application, for when URLs move.
  *
  * PHP5
  *
@@ -28,6 +30,25 @@ class RedirectRoute extends CakeRoute {
  */
 	public $response = null;
 
+/**
+ * The location to redirect to.  Either a string or a cake array url.
+ *
+ * @var mixed
+ */
+	public $redirect;
+
+/**
+ * Constructor
+ *
+ * @param string $template Template string with parameter placeholders
+ * @param array $defaults Array of defaults for the route.
+ * @param string $params Array of parameters and additional options for the Route
+ */
+	public function __construct($template, $defaults = array(), $options = array()) {
+		parent::__construct($template, $defaults, $options);
+		$this->redirect = (array)$defaults;
+	}
+
 /**
  * Parses a string url into an array. Parsed urls will result in an automatic
  * redirection
@@ -43,16 +64,16 @@ class RedirectRoute extends CakeRoute {
 		if (!$this->response) {
 			$this->response = new CakeResponse();
 		}
-		$redirect = $this->defaults;
-		if (count($this->defaults) == 1 && !isset($this->defaults['controller'])) {
-			$redirect = $this->defaults[0];
+		$redirect = $this->redirect;
+		if (count($this->redirect) == 1 && !isset($this->redirect['controller'])) {
+			$redirect = $this->redirect[0];
 		}
 		if (isset($this->options['persist']) && is_array($redirect)) {
 			$argOptions['context'] = array('action' => $redirect['action'], 'controller' => $redirect['controller']);
 			$args = Router::getArgs($params['_args_'], $argOptions);
 			$redirect += $args['pass'];
 			$redirect += $args['named'];
-		}		
+		}
 		$status = 301;
 		if (isset($this->options['status']) && ($this->options['status'] >= 300 && $this->options['status'] < 400)) {
 			$status = $this->options['status'];
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 43c9590bf..506bdb2b0 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -269,15 +269,18 @@ class Router {
  *
  * `Router::redirect('/home/*', array('controller' => 'posts', 'action' => 'view', array('persist' => true));`
  *
- * Redirects /home/* to /posts/view and passes the parameters to /posts/view
+ * Redirects /home/* to /posts/view and passes the parameters to /posts/view.  Using an array as the 
+ * redirect destination allows you to use other routes to define where a url string should be redirected ot.
  *
  * `Router::redirect('/posts/*', 'http://google.com', array('status' => 302));`
  *
  * Redirects /posts/* to http://google.com with a HTTP status of 302
  *
  * ### Options:
+ *
  * - `status` Sets the HTTP status (default 301)
- * - `persist` Passes the params to the redirected route, if it can
+ * - `persist` Passes the params to the redirected route, if it can.  This is useful with greedy routes,
+ *   routes that end in `*` are greedy.  As you can remap urls and not loose any passed/named args.
  *
  * @param string $route A string describing the template of the route
  * @param array $url A url to redirect to. Can be a string or a Cake array-based url

From b1630d4f07b6cbb3cb27c57d5752eb4e998b9406 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 15:48:14 -0500
Subject: [PATCH 09/90] Removing garbage from Paginator test cases.

---
 .../libs/view/helpers/paginator.test.php      | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 2d0bda4a9..2e60552c5 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -139,8 +139,8 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::reload();
 		Router::parse('/');
 		Router::setRequestInfo(array(
-			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/'), 'bare' => 0),
-			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'url' => array('url' => 'accounts/')),
+			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/')
 		));
 		$this->Paginator->options(array('url' => array('param')));
 		$result = $this->Paginator->sort('title');
@@ -279,9 +279,8 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::parse('/');
 		Router::setRequestInfo(array(
 			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(),
-				'form' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true'), 'bare' => 0),
-			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/', 'here' => '/accounts/',
-				'webroot' => '/', 'passedArgs' => array())
+				'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true')),
+			array('base' => '/', 'here' => '/accounts/', 'webroot' => '/',)
 		));
 		$this->Paginator->options(array('url' => array('param')));
 
@@ -313,7 +312,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::parse('/');
 		Router::setRequestInfo(array(
 			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(),  'form' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true'), 'bare' => 0),
-			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
+			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/')
 		));
 
 		$this->Paginator->request->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
@@ -444,7 +443,7 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		Router::reload();
 		Router::setRequestInfo(array(
-			array('pass' => array(), 'named' => array(), 'controller' => 'users', 'plugin' => null, 'action' => 'admin_index', 'prefix' => 'admin', 'admin' => true, 'url' => array('ext' => 'html', 'url' => 'admin/users'), 'form' => array()),
+			array('pass' => array(), 'named' => array(), 'controller' => 'users', 'plugin' => null, 'action' => 'admin_index', 'prefix' => 'admin', 'admin' => true, 'url' => array('ext' => 'html', 'url' => 'admin/users')),
 			array('base' => '', 'here' => '/admin/users', 'webroot' => '/')
 		));
 		Router::parse('/admin/users');
@@ -461,8 +460,8 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		Router::reload();
 		Router::setRequestInfo(array(
-			array('plugin' => null, 'controller' => 'test', 'action' => 'admin_index', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/test')),
-			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/admin/test', 'webroot' => '/')
+			array('plugin' => null, 'controller' => 'test', 'action' => 'admin_index', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'url' => array('url' => 'admin/test')),
+			array('base' => '', 'here' => '/admin/test', 'webroot' => '/')
 		));
 		Router::parse('/');
 		$this->Paginator->options(array('url' => array('param')));
@@ -532,7 +531,7 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		Router::setRequestInfo( array(
 			array('controller' => 'posts', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
-			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => 'posts/index', 'webroot' => '/')
+			array('base' => '', 'here' => 'posts/index', 'webroot' => '/')
 		));
 
 		$this->Paginator->request->params['paging']['Article']['options']['page'] = 2;
@@ -643,8 +642,8 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::reload();
 		Router::parse('/');
 		Router::setRequestInfo(array(
-			array('plugin' => null, 'controller' => 'articles', 'action' => 'index', 'pass' => array('2'), 'named' => array('foo' => 'bar'), 'form' => array(), 'url' => array('url' => 'articles/index/2/foo:bar'), 'bare' => 0),
-			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/', 'here' => '/articles/', 'webroot' => '/', 'passedArgs' => array(0 => '2', 'foo' => 'bar'))
+			array('plugin' => null, 'controller' => 'articles', 'action' => 'index', 'pass' => array('2'), 'named' => array('foo' => 'bar'), 'url' => array('url' => 'articles/index/2/foo:bar')),
+			array('base' => '/', 'here' => '/articles/', 'webroot' => '/', 'passedArgs' => array(0 => '2', 'foo' => 'bar'))
 		));
 		$this->Paginator->request->params['paging'] = array(
 			'Article' => array(
@@ -1932,8 +1931,8 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::reload();
 		Router::parse('/');
 		Router::setRequestInfo(array(
-			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true'), 'bare' => 0),
-			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true')),
+			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
 		));
 
 		$this->Paginator->request->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');

From 9c1516e6a80589124b8111f74176e89edbea8b62 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 15:52:23 -0500
Subject: [PATCH 10/90] Fixing calltime pass by reference deprecation warnings.

---
 cake/libs/http_socket.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index b1df3f25d..ba56034bd 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -539,7 +539,7 @@ class HttpSocket extends CakeSocket {
 		if (!method_exists($authClass, 'authentication')) {
 			throw new SocketException(sprintf(__('The %s do not support authentication.'), $authClass));
 		}
-		call_user_func("$authClass::authentication", $this, &$this->_auth[$method]);
+		call_user_func("$authClass::authentication", $this, $this->_auth[$method]);
 	}
 
 /**
@@ -565,7 +565,7 @@ class HttpSocket extends CakeSocket {
 		if (!method_exists($authClass, 'proxyAuthentication')) {
 			throw new SocketException(sprintf(__('The %s do not support proxy authentication.'), $authClass));
 		}
-		call_user_func("$authClass::proxyAuthentication", $this, &$this->_proxy);
+		call_user_func("$authClass::proxyAuthentication", $this, $this->_proxy);
 	}
 
 /**

From eb9fe07472bb35c98b0186e94776a9d9e7330387 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 16:44:21 -0500
Subject: [PATCH 11/90] Adding query string generation into CakeRoute.  This
 removes one more task from Router.  Tests added Adding constants for the
 named param and querystring param sigils.

---
 cake/libs/route/cake_route.php                | 53 ++++++++++++++-----
 .../cases/libs/route/cake_route.test.php      | 24 +++++++++
 2 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index bbe70bc63..7e4af3384 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -73,6 +73,16 @@ class CakeRoute {
  */
 	protected $_compiledRoute = null;
 
+/**
+ * Constant for the sigil that indicates a route param is a named parameter.
+ */
+	const SIGIL_NAMED = ':';
+
+/**
+ * Constant for the sigil that indicates a route param is a query string parameter.
+ */
+	const SIGIL_QUERYSTRING = '?';
+
 /**
  * HTTP header shortcut map.  Used for evaluating header-based route expressions.
  *
@@ -274,22 +284,27 @@ class CakeRoute {
 			return false;
 		}
 
-		$named = $pass = $diff = array();
+		$named = $pass = $_query = array();
 
 		foreach ($url as $key => $value) {
 			// pull out named params so comparisons later on are faster.
-			if ($key[0] === ':' && ($value !== false && $value !== null)) {
+			if ($key[0] === CakeRoute::SIGIL_NAMED && ($value !== false && $value !== null)) {
 				$named[substr($key, 1)] = $value;
 				unset($url[$key]);
 				continue;
 			}
+			
+			// pull out querystring params
+			if ($key[0] === CakeRoute::SIGIL_QUERYSTRING && ($value !== false && $value !== null)) {
+				$_query[substr($key, 1)] = $value;
+				unset($url[$key]);
+				continue;
+			}
 
 			// keys that exist in the defaults and have different values cause match failures.
 			$keyExists = array_key_exists($key, $defaults);
 			if ($keyExists && $defaults[$key] != $value) {
 				return false;
-				$diff[$key] = $value;
-				continue;
 			}
 			
 			// If the key is a routed key, its not different yet.
@@ -310,17 +325,11 @@ class CakeRoute {
 			// keys that don't exist are different.
 			if (!$keyExists && !empty($value)) {
 				return false;
-				$diff[$key] = $value;
 			}
 		}
 
 		//if a not a greedy route, no extra params are allowed.
-		if (!$this->_greedy && ( (!empty($pass) || !empty($named)) || array_diff_key($diff, $keyNames) != array()) ) {
-			return false;
-		}
-
-		//still some left over parameters that weren't named or passed args, bail.
-		if (!empty($diff)) {
+		if (!$this->_greedy && (!empty($pass) || !empty($named))) {
 			return false;
 		}
 
@@ -332,7 +341,7 @@ class CakeRoute {
 				}
 			}
 		}
-		return $this->_writeUrl(array_merge($url, compact('pass', 'named')));
+		return $this->_writeUrl(array_merge($url, compact('pass', 'named', '_query')));
 	}
 
 /**
@@ -385,7 +394,27 @@ class CakeRoute {
 		if (strpos($this->template, '*')) {
 			$out = str_replace('*', $params['pass'], $out);
 		}
+		if (!empty($params['_query'])) {
+			$out .= $this->queryString($params['_query']);
+		}
 		$out = str_replace('//', '/', $out);
 		return $out;
 	}
+
+/**
+ * Generates a well-formed querystring from $q
+ * 
+ * Will compose an array or nested array into a proper querystring.
+ *
+ * @param mixed $q An array of parameters to compose into a query string.
+ * @param bool $escape Whether or not to use escaped &
+ * @return string
+ */
+	public function queryString($q, $escape = false) {
+		$join = '&';
+		if ($escape === true) {
+			$join = '&amp;';
+		}
+		return '?' . http_build_query($q, null, $join);
+	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index 279e305f1..5e6860fba 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -472,4 +472,28 @@ class CakeRouteTestCase extends CakeTestCase {
 		$result = $route->parse('/blog/foobar');
 		$this->assertFalse($result);
 	}
+
+/**
+ * test sigil based query string params
+ *
+ * @return void
+ */
+	function testQueryStringParams() {
+		$route = new CakeRoute('/:controller/:action/*');
+		$result = $route->match(array('controller' => 'posts', 'action' => 'index', '?test' => 'value'));
+		$expected = '/posts/index/?test=value';
+		$this->assertEquals($expected, $result);
+
+		$result = $route->match(array(
+			'controller' => 'posts', 'action' => 'index', '?test' => array(1, 2, 3)
+		));
+		$expected = '/posts/index/?test%5B0%5D=1&test%5B1%5D=2&test%5B2%5D=3';
+		$this->assertEquals($expected, $result);
+		
+		$result = $route->match(array(
+			'controller' => 'posts', 'action' => 'index', '?test' => 'value', '?other' => 'value'
+		));
+		$expected = '/posts/index/?test=value&other=value';
+		$this->assertEquals($expected, $result);
+	}
 }
\ No newline at end of file

From 319e622151669ad2bfe0f6ec27629bd21073229c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 16:51:54 -0500
Subject: [PATCH 12/90] Added another test for querystring params.  Querystring
 params should not be affected by greedy routes, as they are not really
 controlled by internal routing.

---
 cake/tests/cases/libs/route/cake_route.test.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index 5e6860fba..3107e0084 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -496,4 +496,16 @@ class CakeRouteTestCase extends CakeTestCase {
 		$expected = '/posts/index/?test=value&other=value';
 		$this->assertEquals($expected, $result);
 	}
+
+/**
+ * test that querystring params work with non greedy routes.
+ *
+ * @return void
+ */
+	function testQueryStringNonGreedy() {
+		$route = new CakeRoute('/:controller/:action');
+		$result = $route->match(array('controller' => 'posts', 'action' => 'index', '?test' => 'value'));
+		$expected = '/posts/index?test=value';
+		$this->assertEquals($expected, $result);
+	}
 }
\ No newline at end of file

From 7c6af5bfec02caa636f5722890f22ff501dac64b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 17:01:26 -0500
Subject: [PATCH 13/90] Making a test actually test what its supposed to.

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

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index 6d2f700f6..e05e50149 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -1350,7 +1350,7 @@ class RouterTest extends CakeTestCase {
 		Router::reload();
 		Router::connect('/:controller/:action/*');
 		Router::connectNamed(array('page'), array('default' => false, 'greedy' => false));
-		$result = Router::parse('/categories/index?limit=5');
+		$result = Router::parse('/categories/index/limit=5');
 		$this->assertTrue(empty($result['named']));
 	}
 

From a6cca7c03613dd007ccf8f21c36af1b63f7cd2df Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 17:09:30 -0500
Subject: [PATCH 14/90] Extracting a method from paginator component.

---
 cake/libs/controller/components/paginator.php | 83 +++++++++++--------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 9bf89f991..4a0bd2ffc 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -64,42 +64,7 @@ class PaginatorComponent extends Component {
 		}
 		$assoc = null;
 
-		if (is_string($object)) {
-			$assoc = null;
-			if (strpos($object, '.')  !== false) {
-				list($object, $assoc) = pluginSplit($object);
-			}
-
-			if ($assoc && isset($this->Controller->{$object}->{$assoc})) {
-				$object = $this->Controller->{$object}->{$assoc};
-			} elseif (
-				$assoc && isset($this->Controller->{$this->Controller->modelClass}) &&
-				isset($this->Controller->{$this->Controller->modelClass}->{$assoc}
-			)) {
-				$object = $this->Controller->{$this->Controller->modelClass}->{$assoc};
-			} elseif (isset($this->Controller->{$object})) {
-				$object = $this->Controller->{$object};
-			} elseif (
-				isset($this->Controller->{$this->Controller->modelClass}) && isset($this->Controller->{$this->Controller->modelClass}->{$object}
-			)) {
-				$object = $this->Controller->{$this->Controller->modelClass}->{$object};
-			}
-		} elseif (empty($object) || $object === null) {
-			if (isset($this->Controller->{$this->Controller->modelClass})) {
-				$object = $this->Controller->{$this->Controller->modelClass};
-			} else {
-				$className = null;
-				$name = $this->Controller->uses[0];
-				if (strpos($this->Controller->uses[0], '.') !== false) {
-					list($name, $className) = explode('.', $this->Controller->uses[0]);
-				}
-				if ($className) {
-					$object = $this->Controller->{$className};
-				} else {
-					$object = $this->Controller->{$name};
-				}
-			}
-		}
+		$object = $this->_getObject($object);
 
 		if (!is_object($object)) {
 			throw new MissingModelException($object);
@@ -252,4 +217,50 @@ class PaginatorComponent extends Component {
 		}
 		return $results;
 	}
+
+/**
+ * Get the object pagination will occur on.
+ *
+ * @param mixed $object The object you are looking for.
+ * @return mixed The model object to paginate on.
+ */
+	protected function _getObject($object) {
+		if (is_string($object)) {
+			$assoc = null;
+			if (strpos($object, '.')  !== false) {
+				list($object, $assoc) = pluginSplit($object);
+			}
+
+			if ($assoc && isset($this->Controller->{$object}->{$assoc})) {
+				$object = $this->Controller->{$object}->{$assoc};
+			} elseif (
+				$assoc && isset($this->Controller->{$this->Controller->modelClass}) &&
+				isset($this->Controller->{$this->Controller->modelClass}->{$assoc}
+			)) {
+				$object = $this->Controller->{$this->Controller->modelClass}->{$assoc};
+			} elseif (isset($this->Controller->{$object})) {
+				$object = $this->Controller->{$object};
+			} elseif (
+				isset($this->Controller->{$this->Controller->modelClass}) && isset($this->Controller->{$this->Controller->modelClass}->{$object}
+			)) {
+				$object = $this->Controller->{$this->Controller->modelClass}->{$object};
+			}
+		} elseif (empty($object) || $object === null) {
+			if (isset($this->Controller->{$this->Controller->modelClass})) {
+				$object = $this->Controller->{$this->Controller->modelClass};
+			} else {
+				$className = null;
+				$name = $this->Controller->uses[0];
+				if (strpos($this->Controller->uses[0], '.') !== false) {
+					list($name, $className) = explode('.', $this->Controller->uses[0]);
+				}
+				if ($className) {
+					$object = $this->Controller->{$className};
+				} else {
+					$object = $this->Controller->{$name};
+				}
+			}
+		}
+		return $object;
+	}
 }
\ No newline at end of file

From 6b9d9f4aea1f542eda766ea6bb68520739bfdaaf Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 17:17:43 -0500
Subject: [PATCH 15/90] Reapplying changes in
 [33d2f9a6ed7adfee0aedd0fd20d9f31368ef1836] as they got lost when the
 paginator component was extracted.

---
 cake/libs/controller/components/paginator.php |  5 ++-
 .../controller/components/paginator.test.php  | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 4a0bd2ffc..26e36b367 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -43,7 +43,7 @@ class PaginatorComponent extends Component {
  * @param array $settings Array of configuration settings.
  */
 	public function __construct(ComponentCollection $collection, $settings = array()) {
-		$settings = array_merge(array('page' => 1, 'limit' => 20), (array)$settings);
+		$settings = array_merge(array('page' => 1, 'limit' => 20, 'maxLimit' => 100), (array)$settings);
 		$this->Controller = $collection->getController();
 		parent::__construct($collection, $settings);
 	}
@@ -146,6 +146,7 @@ class PaginatorComponent extends Component {
 		if (empty($options['limit']) || $options['limit'] < 1) {
 			$options['limit'] = 1;
 		}
+		$options['limit'] = min((int)$options['limit'], $options['maxLimit']);
 
 		extract($options);
 
@@ -181,7 +182,7 @@ class PaginatorComponent extends Component {
 		} elseif (intval($page) < 1) {
 			$options['page'] = $page = 1;
 		}
-		$page = $options['page'] = (integer)$page;
+		$page = $options['page'] = (int)$page;
 
 		if (method_exists($object, 'paginate')) {
 			$results = $object->paginate(
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 20abfd8da..82efa4b02 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -486,4 +486,43 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->constructClasses();
 		$Controller->Paginator->paginate('MissingModel');		
 	}
+
+/**
+ * testPaginateMaxLimit
+ *
+ * @return void
+ * @access public
+ */
+	function testPaginateMaxLimit() {
+		$request = new CakeRequest('controller_posts/index');
+		$request->params['pass'] = $request->params['named'] = array();
+        
+		$Controller = new Controller($request);
+        
+		$Controller->uses = array('ControllerPost', 'ControllerComment');
+		$Controller->passedArgs[] = '1';
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+        
+		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000');
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 100);
+        
+		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000', 'maxLimit' => 1000);
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 100);
+        
+		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '10');
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 10);
+        
+		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000');
+		$Controller->paginate = array('maxLimit' => 2000);
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 1000);
+        
+		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '5000');
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 2000);
+	}
 }
\ No newline at end of file

From 54c52d85fb559fb25dfa25c6864b0f4eb0d4e0cf Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 17:28:28 -0500
Subject: [PATCH 16/90] Fixing failing tests in PaginatorComponent.

---
 cake/libs/controller/components/paginator.php |  2 +-
 .../controller/components/paginator.test.php  | 92 ++++++++++++-------
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 26e36b367..1dcd23bb5 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -141,7 +141,7 @@ class PaginatorComponent extends Component {
 			unset($defaults[0]);
 		}
 
-		$options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options);
+		$options = array_merge(array('page' => 1, 'limit' => 20, 'maxLimit' => 100), $defaults, $options);
 		$options['limit'] = (int) $options['limit'];
 		if (empty($options['limit']) || $options['limit'] < 1) {
 			$options['limit'] = 1;
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 82efa4b02..4efa5e785 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -269,13 +269,13 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEqual($results, array(1, 3, 2));
 
 		$Controller->passedArgs = array('page' => '1 " onclick="alert(\'xss\');">');
-		$Controller->Paginator->settings = array('limit' => 1);
+		$Controller->Paginator->settings = array('limit' => 1, 'maxLimit' => 10);
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
 
 		$Controller->passedArgs = array();
-		$Controller->Paginator->settings = array('limit' => 0);
+		$Controller->Paginator->settings = array('limit' => 0, 'maxLimit' => 10);
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
@@ -283,7 +283,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
 		$Controller->passedArgs = array();
-		$Controller->Paginator->settings = array('limit' => 'garbage!');
+		$Controller->Paginator->settings = array('limit' => 'garbage!', 'maxLimit' => 10);
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
@@ -291,7 +291,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
 		$Controller->passedArgs = array();
-		$Controller->Paginator->settings = array('limit' => '-1');
+		$Controller->Paginator->settings = array('limit' => '-1', 'maxLimit' => 10);
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
@@ -323,19 +323,23 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQuery['contain']));
 
 		$Controller->passedArgs = array('page' => '-1');
-		$Controller->Paginator->settings = array('PaginatorControllerPost' => array('contain' => array('PaginatorControllerComment')));
+		$Controller->Paginator->settings = array(
+			'PaginatorControllerPost' => array('contain' => array('PaginatorControllerComment'), 'maxLimit' => 10),
+		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(1, 2, 3));
 		$this->assertTrue(isset($Controller->PaginatorControllerPost->lastQuery['contain']));
 
-		$Controller->Paginator->settings = array('PaginatorControllerPost' => array('popular', 'fields' => array('id', 'title')));
+		$Controller->Paginator->settings = array(
+			'PaginatorControllerPost' => array('popular', 'fields' => array('id', 'title'), 'maxLimit' => 10),
+		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
 		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['conditions'], array('PaginatorControllerPost.id > ' => '1'));
 
 		$Controller->passedArgs = array('limit' => 12);
-		$Controller->Paginator->settings = array('limit' => 30);
+		$Controller->Paginator->settings = array('limit' => 30, 'maxLimit' => 100);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$paging = $Controller->params['paging']['PaginatorControllerPost'];
 
@@ -347,18 +351,31 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 		$Controller->Paginator->settings = array(
-			'ControllerPaginateModel' => array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id')
+			'ControllerPaginateModel' => array(
+				'contain' => array('ControllerPaginateModel'),
+				'group' => 'Comment.author_id',
+				'maxLimit' => 10
+			)
 		);
 		$result = $Controller->Paginator->paginate('ControllerPaginateModel');
-		$expected = array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id');
+		$expected = array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id', 'maxLimit' => 10);
 		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
 		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
 
 		$Controller->Paginator->settings = array(
-			'ControllerPaginateModel' => array('foo', 'contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id')
+			'ControllerPaginateModel' => array(
+				'foo', 'contain' => array('ControllerPaginateModel'),
+				'group' => 'Comment.author_id',
+				'maxLimit' => 10
+			)
 		);
 		$Controller->Paginator->paginate('ControllerPaginateModel');
-		$expected = array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id', 'type' => 'foo');
+		$expected = array(
+			'contain' => array('ControllerPaginateModel'),
+			'group' => 'Comment.author_id',
+			'type' => 'foo',
+			'maxLimit' => 10
+		);
 		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
 		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
 	}
@@ -383,15 +400,17 @@ class PaginatorTest extends CakeTestCase {
 			'order' => '',
 			'limit' => 5,
 			'page' => 1,
-			'recursive' => -1
+			'recursive' => -1,
+			'maxLimit' => 10
 		);
 		$conditions = array();
-		$Controller->Paginator->paginate('PaginatorControllerPost',$conditions);
+		$Controller->Paginator->paginate('PaginatorControllerPost', $conditions);
 
 		$expected = array(
 			'fields' => array(),
 			'order' => '',
 			'limit' => 5,
+			'maxLimit' => 10,
 			'page' => 1,
 			'recursive' => -1,
 			'conditions' => array()
@@ -414,7 +433,9 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 
-		$Controller->Paginator->settings = array('PaginatorControllerPost' => array('popular', 'fields' => array('id', 'title')));
+		$Controller->Paginator->settings = array(
+			'PaginatorControllerPost' => array('popular', 'fields' => array('id', 'title'), 'maxLimit' => 10)
+		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
@@ -437,7 +458,7 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->modelClass = 'PaginatorControllerPost';
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
-		$Controller->Paginator->settings = array('order' => 'PaginatorControllerPost.id DESC');
+		$Controller->Paginator->settings = array('order' => 'PaginatorControllerPost.id DESC', 'maxLimit' => 10);
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['defaults']['order'], 'PaginatorControllerPost.id DESC');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['order'], 'PaginatorControllerPost.id DESC');
@@ -463,7 +484,8 @@ class PaginatorTest extends CakeTestCase {
 
 		$Controller->Paginator->settings = array(
 			'fields' => array('id', 'title', 'offset_test'),
-			'order' => array('offset_test' => 'DESC')
+			'order' => array('offset_test' => 'DESC'),
+			'maxLimit' => 10
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(4, 3, 2));
@@ -484,7 +506,7 @@ class PaginatorTest extends CakeTestCase {
 
 		$Controller = new PaginatorTestController($request);
 		$Controller->constructClasses();
-		$Controller->Paginator->paginate('MissingModel');		
+		$Controller->Paginator->paginate('MissingModel');
 	}
 
 /**
@@ -496,33 +518,33 @@ class PaginatorTest extends CakeTestCase {
 	function testPaginateMaxLimit() {
 		$request = new CakeRequest('controller_posts/index');
 		$request->params['pass'] = $request->params['named'] = array();
-        
+
 		$Controller = new Controller($request);
-        
-		$Controller->uses = array('ControllerPost', 'ControllerComment');
+
+		$Controller->uses = array('PaginatorControllerPost', 'ControllerComment');
 		$Controller->passedArgs[] = '1';
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
-        
+
 		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000');
-		$result = $Controller->paginate('ControllerPost');
-		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 100);
-        
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
+
 		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000', 'maxLimit' => 1000);
-		$result = $Controller->paginate('ControllerPost');
-		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 100);
-        
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
+
 		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '10');
-		$result = $Controller->paginate('ControllerPost');
-		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 10);
-        
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 10);
+
 		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000');
 		$Controller->paginate = array('maxLimit' => 2000);
-		$result = $Controller->paginate('ControllerPost');
-		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 1000);
-        
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 1000);
+
 		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '5000');
-		$result = $Controller->paginate('ControllerPost');
-		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['limit'], 2000);
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
 	}
 }
\ No newline at end of file

From 7585b2941efb44b2dc47333b46ab9ede18ec7755 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 00:38:20 -0500
Subject: [PATCH 17/90] Adding paramType to the test cases.

---
 cake/libs/controller/components/paginator.php | 23 ++++++--
 .../controller/components/paginator.test.php  | 55 +++++++++++++------
 2 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 1dcd23bb5..554e58d99 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -30,11 +30,25 @@
 class PaginatorComponent extends Component {
 
 /**
- * Pagination settings
+ * Pagination settings.  These settings control pagination at a general level.
+ * You can also define sub arrays for pagination settings for specific models.
+ *
+ * - `maxLimit` The maximum limit users can choose to view. Defaults to 100
+ * - `limit` The initial number of items per page.  Defaults to 20.
+ * - `page` The starting page, defaults to 1.
+ * - `paramType` What type of parameters you want pagination to use?
+ *      - `named` Use named parameters.
+ *      - `querystring` Use query string parameters.
+ *      - `route` Use routed parameters, these require you to setup routes that include the pagination params
  *
  * @var array
  */
-	public $settings = array();
+	public $settings = array(
+		'page' => 1,
+		'limit' => 20,
+		'maxLimit' => 100,
+		'paramType' => 'named'
+	);
 
 /**
  * Constructor
@@ -43,7 +57,7 @@ class PaginatorComponent extends Component {
  * @param array $settings Array of configuration settings.
  */
 	public function __construct(ComponentCollection $collection, $settings = array()) {
-		$settings = array_merge(array('page' => 1, 'limit' => 20, 'maxLimit' => 100), (array)$settings);
+		$settings = array_merge($this->settings, (array)$settings);
 		$this->Controller = $collection->getController();
 		parent::__construct($collection, $settings);
 	}
@@ -203,7 +217,8 @@ class PaginatorComponent extends Component {
 			'nextPage'	=> ($count > ($page * $limit)),
 			'pageCount'	=> $pageCount,
 			'defaults'	=> array_merge(array('limit' => 20, 'step' => 1), $defaults),
-			'options'	=> $options
+			'options'	=> $options,
+			'paramType' => $options['paramType']
 		);
 		if (!isset($this->Controller->request['paging'])) {
 			$this->Controller->request['paging'] = array();
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 4efa5e785..096c523c5 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -269,13 +269,13 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEqual($results, array(1, 3, 2));
 
 		$Controller->passedArgs = array('page' => '1 " onclick="alert(\'xss\');">');
-		$Controller->Paginator->settings = array('limit' => 1, 'maxLimit' => 10);
+		$Controller->Paginator->settings = array('limit' => 1, 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
 
 		$Controller->passedArgs = array();
-		$Controller->Paginator->settings = array('limit' => 0, 'maxLimit' => 10);
+		$Controller->Paginator->settings = array('limit' => 0, 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
@@ -283,7 +283,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
 		$Controller->passedArgs = array();
-		$Controller->Paginator->settings = array('limit' => 'garbage!', 'maxLimit' => 10);
+		$Controller->Paginator->settings = array('limit' => 'garbage!', 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
@@ -291,7 +291,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
 		$Controller->passedArgs = array();
-		$Controller->Paginator->settings = array('limit' => '-1', 'maxLimit' => 10);
+		$Controller->Paginator->settings = array('limit' => '-1', 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
@@ -324,7 +324,11 @@ class PaginatorTest extends CakeTestCase {
 
 		$Controller->passedArgs = array('page' => '-1');
 		$Controller->Paginator->settings = array(
-			'PaginatorControllerPost' => array('contain' => array('PaginatorControllerComment'), 'maxLimit' => 10),
+			'PaginatorControllerPost' => array(
+				'contain' => array('PaginatorControllerComment'),
+				'maxLimit' => 10,
+				'paramType' => 'named'
+			),
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
@@ -332,14 +336,16 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertTrue(isset($Controller->PaginatorControllerPost->lastQuery['contain']));
 
 		$Controller->Paginator->settings = array(
-			'PaginatorControllerPost' => array('popular', 'fields' => array('id', 'title'), 'maxLimit' => 10),
+			'PaginatorControllerPost' => array(
+				'popular', 'fields' => array('id', 'title'), 'maxLimit' => 10, 'paramType' => 'named'
+			),
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
 		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['conditions'], array('PaginatorControllerPost.id > ' => '1'));
 
 		$Controller->passedArgs = array('limit' => 12);
-		$Controller->Paginator->settings = array('limit' => 30, 'maxLimit' => 100);
+		$Controller->Paginator->settings = array('limit' => 30, 'maxLimit' => 100, 'paramType' => 'named');
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$paging = $Controller->params['paging']['PaginatorControllerPost'];
 
@@ -354,11 +360,17 @@ class PaginatorTest extends CakeTestCase {
 			'ControllerPaginateModel' => array(
 				'contain' => array('ControllerPaginateModel'),
 				'group' => 'Comment.author_id',
-				'maxLimit' => 10
+				'maxLimit' => 10,
+				'paramType' => 'named'
 			)
 		);
 		$result = $Controller->Paginator->paginate('ControllerPaginateModel');
-		$expected = array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id', 'maxLimit' => 10);
+		$expected = array(
+			'contain' => array('ControllerPaginateModel'),
+			'group' => 'Comment.author_id',
+			'maxLimit' => 10,
+			'paramType' => 'named'
+		);
 		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
 		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
 
@@ -366,7 +378,8 @@ class PaginatorTest extends CakeTestCase {
 			'ControllerPaginateModel' => array(
 				'foo', 'contain' => array('ControllerPaginateModel'),
 				'group' => 'Comment.author_id',
-				'maxLimit' => 10
+				'maxLimit' => 10,
+				'paramType' => 'named'
 			)
 		);
 		$Controller->Paginator->paginate('ControllerPaginateModel');
@@ -374,7 +387,8 @@ class PaginatorTest extends CakeTestCase {
 			'contain' => array('ControllerPaginateModel'),
 			'group' => 'Comment.author_id',
 			'type' => 'foo',
-			'maxLimit' => 10
+			'maxLimit' => 10,
+			'paramType' => 'named'
 		);
 		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
 		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
@@ -401,7 +415,8 @@ class PaginatorTest extends CakeTestCase {
 			'limit' => 5,
 			'page' => 1,
 			'recursive' => -1,
-			'maxLimit' => 10
+			'maxLimit' => 10,
+			'paramType' => 'named'
 		);
 		$conditions = array();
 		$Controller->Paginator->paginate('PaginatorControllerPost', $conditions);
@@ -413,7 +428,8 @@ class PaginatorTest extends CakeTestCase {
 			'maxLimit' => 10,
 			'page' => 1,
 			'recursive' => -1,
-			'conditions' => array()
+			'conditions' => array(),
+			'paramType' => 'named'
 		);
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options'],$expected);
 	}
@@ -434,7 +450,9 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$Controller->Paginator->settings = array(
-			'PaginatorControllerPost' => array('popular', 'fields' => array('id', 'title'), 'maxLimit' => 10)
+			'PaginatorControllerPost' => array(
+				'popular', 'fields' => array('id', 'title'), 'maxLimit' => 10, 'paramType' => 'named'
+			)
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 
@@ -458,7 +476,9 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->modelClass = 'PaginatorControllerPost';
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
-		$Controller->Paginator->settings = array('order' => 'PaginatorControllerPost.id DESC', 'maxLimit' => 10);
+		$Controller->Paginator->settings = array(
+			'order' => 'PaginatorControllerPost.id DESC', 'maxLimit' => 10, 'paramType' => 'named'
+		);
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['defaults']['order'], 'PaginatorControllerPost.id DESC');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['order'], 'PaginatorControllerPost.id DESC');
@@ -485,7 +505,8 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->Paginator->settings = array(
 			'fields' => array('id', 'title', 'offset_test'),
 			'order' => array('offset_test' => 'DESC'),
-			'maxLimit' => 10
+			'maxLimit' => 10,
+			'paramType' => 'named'
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(4, 3, 2));
@@ -539,7 +560,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 10);
 
 		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000');
-		$Controller->paginate = array('maxLimit' => 2000);
+		$Controller->paginate = array('maxLimit' => 2000, 'paramType' => 'named');
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 1000);
 

From 6b3db0a3eb0ce3437b015b5ce07fc7afffc0602f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 01:42:23 -0500
Subject: [PATCH 18/90] Pulling out parameter merging logic into a method, this
 allows specific typing of parameter merging (named, querystring, route). 
 Also simplifies whitelisting of request parameters. Tests added for merging
 and whitelisting.

---
 cake/libs/controller/components/paginator.php |  59 ++++++
 .../controller/components/paginator.test.php  | 190 +++++++++++++++---
 2 files changed, 216 insertions(+), 33 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 554e58d99..c0e237297 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -50,6 +50,17 @@ class PaginatorComponent extends Component {
 		'paramType' => 'named'
 	);
 
+/**
+ * A list of request parameters users are allowed to set.  Modifying
+ * this list will allow users to have more influence over pagination,
+ * be careful with what you permit.
+ *
+ * @var array
+ */
+	public $whitelist = array(
+		'limit', 'sort', 'page', 'direction'
+	);
+
 /**
  * Constructor
  *
@@ -83,6 +94,9 @@ class PaginatorComponent extends Component {
 		if (!is_object($object)) {
 			throw new MissingModelException($object);
 		}
+		
+		$options = $this->mergeOptions($object->alias, $scope, $whitelist);
+
 		$options = array_merge(
 			$this->Controller->request->params,
 			$this->Controller->request->query,
@@ -279,4 +293,49 @@ class PaginatorComponent extends Component {
 		}
 		return $object;
 	}
+
+/**
+ * Merges the various options that Pagination uses.
+ * Pulls settings together from the following places:
+ *
+ * - General pagination settings
+ * - Model specific settings.
+ * - Request parameters
+ * - $options argument.
+ *
+ * The result of this method is the aggregate of all the option sets combined together.
+ *
+ * @param string $alias Model alias being paginated, if the general settings has a key with this value
+ *   that key's settings will be used for pagination instead of the general ones.
+ * @param string $options Per call options.
+ * @param string $whitelist A whitelist of options that are allowed from the request parameters.  Modifying
+ *   this array will allow you to permit more or less input from the user.
+ * @return array Array of merged options.
+ */
+	public function mergeOptions($alias, $options, $whitelist = array()) {
+		if (isset($this->settings[$alias])) {
+			$defaults = $this->settings[$alias];
+		} else {
+			$defaults = $this->settings;
+		}
+		if (empty($defaults['paramType'])) {
+			$defaults['paramType'] = 'named';
+		}
+		switch ($defaults['paramType']) {
+			case 'named':
+				$request = $this->Controller->request->params['named'];
+				break;
+			case 'querystring':
+				$request = $this->Controller->request->query;
+				break;
+			case 'route':
+				$request = $this->Controller->request->params;
+				unset($request['pass'], $request['named']);
+		}
+
+		$whitelist = array_flip(array_merge($this->whitelist, $whitelist));
+		$request = array_intersect_key($request, $whitelist);
+
+		return array_merge($defaults, $request, $options);
+	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 096c523c5..25bf12a99 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -20,6 +20,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Controller', 'Controller', false);
+App::import('Component', 'Paginator');
 App::import('Core', array('CakeRequest', 'CakeResponse'));
 
 /**
@@ -210,6 +211,20 @@ class PaginatorTest extends CakeTestCase {
  */
 	public $fixtures = array('core.post', 'core.comment');
 
+/**
+ * setup
+ *
+ * @return void
+ */
+	function setUp() {
+		parent::setUp();
+		$this->request = new CakeRequest('controller_posts/index');
+		$this->request->params['pass'] = $this->request->params['named'] = array();
+		$this->Controller = new Controller($this->request);
+		$this->Paginator = new PaginatorComponent($this->getMock('ComponentCollection'), array());
+		$this->Paginator->Controller = $this->Controller;
+	}
+
 /**
  * testPaginate method
  *
@@ -217,10 +232,7 @@ class PaginatorTest extends CakeTestCase {
  * @return void
  */
 	function testPaginate() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->passedArgs[] = '1';
 		$Controller->params['url'] = array();
@@ -306,10 +318,7 @@ class PaginatorTest extends CakeTestCase {
  * @return void
  */
 	function testPaginateExtraParams() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->passedArgs[] = '1';
@@ -352,7 +361,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['limit'], 12);
 		$this->assertEqual($paging['options']['limit'], 12);
 
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('ControllerPaginateModel');
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
@@ -400,10 +409,7 @@ class PaginatorTest extends CakeTestCase {
  * @return void
  */
 	public function testPaginatePassedArgs() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost');
 		$Controller->passedArgs[] = array('1', '2', '3');
 		$Controller->params['url'] = array();
@@ -440,10 +446,7 @@ class PaginatorTest extends CakeTestCase {
  * @return void
  */
 	function testPaginateSpecialType() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->passedArgs[] = '1';
 		$Controller->params['url'] = array();
@@ -469,10 +472,7 @@ class PaginatorTest extends CakeTestCase {
  * @return void
  */
 	function testDefaultPaginateParams() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 		$Controller->modelClass = 'PaginatorControllerPost';
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
@@ -491,10 +491,7 @@ class PaginatorTest extends CakeTestCase {
  * @return void
  */
 	function testPaginateOrderVirtualField() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
@@ -522,10 +519,7 @@ class PaginatorTest extends CakeTestCase {
  * @expectedException MissingModelException
  */
 	function testPaginateMissingModel() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new PaginatorTestController($request);
+		$Controller = new PaginatorTestController($this->request);
 		$Controller->constructClasses();
 		$Controller->Paginator->paginate('MissingModel');
 	}
@@ -537,10 +531,7 @@ class PaginatorTest extends CakeTestCase {
  * @access public
  */
 	function testPaginateMaxLimit() {
-		$request = new CakeRequest('controller_posts/index');
-		$request->params['pass'] = $request->params['named'] = array();
-
-		$Controller = new Controller($request);
+		$Controller = new Controller($this->request);
 
 		$Controller->uses = array('PaginatorControllerPost', 'ControllerComment');
 		$Controller->passedArgs[] = '1';
@@ -568,4 +559,137 @@ class PaginatorTest extends CakeTestCase {
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
 	}
+
+/**
+ * test that option merging prefers specific models 
+ *
+ * @return void
+ */
+	function testMergeOptionsModelSpecific() {
+		$this->Paginator->settings = array(
+			'page' => 1,
+			'limit' => 20,
+			'maxLimit' => 100,
+			'paramType' => 'named',
+			'Post' => array(
+				'page' => 1,
+				'limit' => 10,
+				'maxLimit' => 50,
+				'paramType' => 'named',
+			)
+		);
+		$result = $this->Paginator->mergeOptions('Silly', array());
+		$this->assertEquals($this->Paginator->settings, $result);
+
+		$result = $this->Paginator->mergeOptions('Silly', array('limit' => 10));
+		$this->assertEquals(10, $result['limit']);
+
+		$result = $this->Paginator->mergeOptions('Post', array('sort' => 'title'));
+		$expected = array('page' => 1, 'limit' => 10, 'paramType' => 'named', 'sort' => 'title', 'maxLimit' => 50);
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * test mergeOptions with named params.
+ *
+ * @return void
+ */
+	function testMergeOptionsNamedParams() {
+		$this->request->params['named'] = array(
+			'page' => 10,
+			'limit' => 10
+		);
+		$this->Paginator->settings = array(
+			'page' => 1,
+			'limit' => 20,
+			'maxLimit' => 100,
+			'paramType' => 'named',
+		);
+		$result = $this->Paginator->mergeOptions('Post', array());
+		$expected = array('page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named');
+		$this->assertEquals($expected, $result);
+
+		$result = $this->Paginator->mergeOptions('Post', array('page' => 100));
+		$this->assertEquals(100, $result['page'], 'Passed options should replace request params');
+	}
+
+/**
+ * test merging options from the querystring.
+ *
+ * @return void
+ */
+	function testMergeOptionsQueryString() {
+		$this->request->params['named'] = array(
+			'page' => 10,
+			'limit' => 10
+		);
+		$this->request->query = array(
+			'page' => 99,
+			'limit' => 75
+		);
+		$this->Paginator->settings = array(
+			'page' => 1,
+			'limit' => 20,
+			'maxLimit' => 100,
+			'paramType' => 'querystring',
+		);
+		$result = $this->Paginator->mergeOptions('Post', array());
+		$expected = array('page' => 99, 'limit' => 75, 'maxLimit' => 100, 'paramType' => 'querystring');
+		$this->assertEquals($expected, $result);
+
+		$result = $this->Paginator->mergeOptions('Post', array('page' => 100));
+		$this->assertEquals(100, $result['page'], 'Passed options should replace request params');
+	}
+
+/**
+ * test that the default whitelist doesn't let people screw with things they should not be allowed to.
+ *
+ * @return void
+ */
+	function testMergeOptionsDefaultWhiteList() {
+		$this->request->params['named'] = array(
+			'page' => 10,
+			'limit' => 10,
+			'fields' => array('bad.stuff'),
+			'recursive' => 1000,
+			'conditions' => array('bad.stuff'),
+			'contain' => array('bad')
+		);
+		$this->Paginator->settings = array(
+			'page' => 1,
+			'limit' => 20,
+			'maxLimit' => 100,
+			'paramType' => 'named',
+		);
+		$result = $this->Paginator->mergeOptions('Post', array());
+		$expected = array('page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named');
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * test that modifying the whitelist works.
+ *
+ * @return void
+ */
+	function testMergeOptionsExtraWhitelist() {
+		$this->request->params['named'] = array(
+			'page' => 10,
+			'limit' => 10,
+			'fields' => array('bad.stuff'),
+			'recursive' => 1000,
+			'conditions' => array('bad.stuff'),
+			'contain' => array('bad')
+		);
+		$this->Paginator->settings = array(
+			'page' => 1,
+			'limit' => 20,
+			'maxLimit' => 100,
+			'paramType' => 'named',
+		);
+		$result = $this->Paginator->mergeOptions('Post', array(), array('fields'));
+		$expected = array(
+			'page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named', 'fields' => array('bad.stuff')
+		);
+		$this->assertEquals($expected, $result);
+	}
 }
\ No newline at end of file

From 7b11eeb6e001a9dfaa3d41b36cf350e2cd977ccd Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 01:57:51 -0500
Subject: [PATCH 19/90] Updating tests to not use the deprecated
 Controller::$passedArgs. Removing messy and hard to understand defaults +
 whitelisting from paginate() now that it has a separate method.

---
 cake/libs/controller/components/paginator.php | 42 +++-----------
 .../controller/components/paginator.test.php  | 56 ++++++++++---------
 2 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index c0e237297..bb33177e1 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -94,21 +94,9 @@ class PaginatorComponent extends Component {
 		if (!is_object($object)) {
 			throw new MissingModelException($object);
 		}
-		
+
 		$options = $this->mergeOptions($object->alias, $scope, $whitelist);
 
-		$options = array_merge(
-			$this->Controller->request->params,
-			$this->Controller->request->query,
-			$this->Controller->passedArgs
-		);
-
-		if (isset($this->settings[$object->alias])) {
-			$defaults = $this->settings[$object->alias];
-		} else {
-			$defaults = $this->settings;
-		}
-		
 		if (isset($options['show'])) {
 			$options['limit'] = $options['show'];
 		}
@@ -142,34 +130,21 @@ class PaginatorComponent extends Component {
 				$options['order'][$alias . '.' . $field] = $value;
 			}
 		}
-		$vars = array('fields', 'order', 'limit', 'page', 'recursive');
-		$keys = array_keys($options);
-		$count = count($keys);
 
-		for ($i = 0; $i < $count; $i++) {
-			if (!in_array($keys[$i], $vars, true)) {
-				unset($options[$keys[$i]]);
-			}
-			if (empty($whitelist) && ($keys[$i] === 'fields' || $keys[$i] === 'recursive')) {
-				unset($options[$keys[$i]]);
-			} elseif (!empty($whitelist) && !in_array($keys[$i], $whitelist)) {
-				unset($options[$keys[$i]]);
-			}
-		}
 		$conditions = $fields = $order = $limit = $page = $recursive = null;
 
-		if (!isset($defaults['conditions'])) {
-			$defaults['conditions'] = array();
+		if (!isset($options['conditions'])) {
+			$options['conditions'] = array();
 		}
 
 		$type = 'all';
 
-		if (isset($defaults[0])) {
-			$type = $defaults[0];
-			unset($defaults[0]);
+		if (isset($options[0])) {
+			$type = $options[0];
+			unset($options[0]);
 		}
 
-		$options = array_merge(array('page' => 1, 'limit' => 20, 'maxLimit' => 100), $defaults, $options);
+		$options = array_merge(array('page' => 1, 'limit' => 20, 'maxLimit' => 100), $options);
 		$options['limit'] = (int) $options['limit'];
 		if (empty($options['limit']) || $options['limit'] < 1) {
 			$options['limit'] = 1;
@@ -187,7 +162,7 @@ class PaginatorComponent extends Component {
 			$recursive = $object->recursive;
 		}
 
-		$extra = array_diff_key($defaults, compact(
+		$extra = array_diff_key($options, compact(
 			'conditions', 'fields', 'order', 'limit', 'page', 'recursive'
 		));
 		if ($type !== 'all') {
@@ -230,7 +205,6 @@ class PaginatorComponent extends Component {
 			'prevPage'	=> ($page > 1),
 			'nextPage'	=> ($count > ($page * $limit)),
 			'pageCount'	=> $pageCount,
-			'defaults'	=> array_merge(array('limit' => 20, 'step' => 1), $defaults),
 			'options'	=> $options,
 			'paramType' => $options['paramType']
 		);
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 25bf12a99..063dfaf02 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -234,8 +234,8 @@ class PaginatorTest extends CakeTestCase {
 	function testPaginate() {
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
-		$Controller->passedArgs[] = '1';
-		$Controller->params['url'] = array();
+		$Controller->request->params['pass'] = array('1');
+		$Controller->request->query = array();
 		$Controller->constructClasses();
 
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
@@ -250,43 +250,45 @@ class PaginatorTest extends CakeTestCase {
 		$results = Set::extract($Controller->Paginator->paginate(), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($results, array(1, 2, 3));
 
-		$Controller->passedArgs = array('page' => '-1');
+		$Controller->request->params['named'] = array('page' => '-1');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertEqual($results, array(1, 2, 3));
 
-		$Controller->passedArgs = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'asc');
+		$Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'asc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertEqual($results, array(1, 2, 3));
 
-		$Controller->passedArgs = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'desc');
+		$Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'desc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertEqual($results, array(3, 2, 1));
 
-		$Controller->passedArgs = array('sort' => 'id', 'direction' => 'desc');
+		$Controller->request->params['named'] = array('sort' => 'id', 'direction' => 'desc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertEqual($results, array(3, 2, 1));
 
-		$Controller->passedArgs = array('sort' => 'NotExisting.field', 'direction' => 'desc');
+		$Controller->request->params['named'] = array('sort' => 'NotExisting.field', 'direction' => 'desc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'Invalid field in query %s');
 		$this->assertEqual($results, array(1, 2, 3));
 
-		$Controller->passedArgs = array('sort' => 'PaginatorControllerPost.author_id', 'direction' => 'allYourBase');
+		$Controller->request->params['named'] = array(
+			'sort' => 'PaginatorControllerPost.author_id', 'direction' => 'allYourBase'
+		);
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
 		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['order'][0], array('PaginatorControllerPost.author_id' => 'asc'));
 		$this->assertEqual($results, array(1, 3, 2));
 
-		$Controller->passedArgs = array('page' => '1 " onclick="alert(\'xss\');">');
+		$Controller->request->params['named'] = array('page' => '1 " onclick="alert(\'xss\');">');
 		$Controller->Paginator->settings = array('limit' => 1, 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
 
-		$Controller->passedArgs = array();
+		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => 0, 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
@@ -294,7 +296,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
-		$Controller->passedArgs = array();
+		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => 'garbage!', 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
@@ -302,7 +304,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
-		$Controller->passedArgs = array();
+		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => '-1', 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
@@ -321,17 +323,17 @@ class PaginatorTest extends CakeTestCase {
 		$Controller = new PaginatorTestController($this->request);
 
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
-		$Controller->passedArgs[] = '1';
+		$Controller->request->params['pass'] = array('1');
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 
-		$Controller->passedArgs = array('page' => '-1', 'contain' => array('PaginatorControllerComment'));
+		$Controller->request->params['named'] = array('page' => '-1', 'contain' => array('PaginatorControllerComment'));
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(1, 2, 3));
 		$this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQuery['contain']));
 
-		$Controller->passedArgs = array('page' => '-1');
+		$Controller->request->params['named'] = array('page' => '-1');
 		$Controller->Paginator->settings = array(
 			'PaginatorControllerPost' => array(
 				'contain' => array('PaginatorControllerComment'),
@@ -353,7 +355,7 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
 		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['conditions'], array('PaginatorControllerPost.id > ' => '1'));
 
-		$Controller->passedArgs = array('limit' => 12);
+		$Controller->request->params['named'] = array('limit' => 12);
 		$Controller->Paginator->settings = array('limit' => 30, 'maxLimit' => 100, 'paramType' => 'named');
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$paging = $Controller->params['paging']['PaginatorControllerPost'];
@@ -363,7 +365,7 @@ class PaginatorTest extends CakeTestCase {
 
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('ControllerPaginateModel');
-		$Controller->params['url'] = array();
+		$Controller->request->query = array();
 		$Controller->constructClasses();
 		$Controller->Paginator->settings = array(
 			'ControllerPaginateModel' => array(
@@ -411,7 +413,7 @@ class PaginatorTest extends CakeTestCase {
 	public function testPaginatePassedArgs() {
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost');
-		$Controller->passedArgs[] = array('1', '2', '3');
+		$Controller->request->params['pass'] = array('1', '2', '3');
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 
@@ -461,7 +463,6 @@ class PaginatorTest extends CakeTestCase {
 
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
 		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['conditions'], array('PaginatorControllerPost.id > ' => '1'));
-		$this->assertFalse(isset($Controller->params['paging']['PaginatorControllerPost']['defaults'][0]));
 		$this->assertFalse(isset($Controller->params['paging']['PaginatorControllerPost']['options'][0]));
 	}
 
@@ -480,7 +481,6 @@ class PaginatorTest extends CakeTestCase {
 			'order' => 'PaginatorControllerPost.id DESC', 'maxLimit' => 10, 'paramType' => 'named'
 		);
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['defaults']['order'], 'PaginatorControllerPost.id DESC');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['order'], 'PaginatorControllerPost.id DESC');
 		$this->assertEqual($results, array(3, 2, 1));
 	}
@@ -508,7 +508,7 @@ class PaginatorTest extends CakeTestCase {
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(4, 3, 2));
 
-		$Controller->passedArgs = array('sort' => 'offset_test', 'direction' => 'asc');
+		$Controller->request->params['named'] = array('sort' => 'offset_test', 'direction' => 'asc');
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(2, 3, 4));
 	}
@@ -538,24 +538,28 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 
-		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000');
+		$Controller->request->params['named'] = array(
+			'contain' => array('ControllerComment'), 'limit' => '1000'
+		);
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
 
-		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000', 'maxLimit' => 1000);
+		$Controller->request->params['named'] = array(
+			'contain' => array('ControllerComment'), 'limit' => '1000', 'maxLimit' => 1000
+		);
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
 
-		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '10');
+		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '10');
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 10);
 
-		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '1000');
+		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '1000');
 		$Controller->paginate = array('maxLimit' => 2000, 'paramType' => 'named');
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 1000);
 
-		$Controller->passedArgs = array('contain' => array('ControllerComment'), 'limit' => '5000');
+		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '5000');
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
 	}

From 108a6611a8f7945f491952060e9c1c9152ee066d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 02:11:39 -0500
Subject: [PATCH 20/90] Moving validation of sorting to a separate method. 
 This makes it easier to test, extends and read. Tests added.

---
 cake/libs/controller/components/paginator.php | 76 +++++++++++--------
 .../controller/components/paginator.test.php  | 41 ++++++++++
 2 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index bb33177e1..9755d47f2 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -95,41 +95,12 @@ class PaginatorComponent extends Component {
 			throw new MissingModelException($object);
 		}
 
-		$options = $this->mergeOptions($object->alias, $scope, $whitelist);
-
 		if (isset($options['show'])) {
 			$options['limit'] = $options['show'];
 		}
 
-		if (isset($options['sort'])) {
-			$direction = null;
-			if (isset($options['direction'])) {
-				$direction = strtolower($options['direction']);
-			}
-			if ($direction != 'asc' && $direction != 'desc') {
-				$direction = 'asc';
-			}
-			$options['order'] = array($options['sort'] => $direction);
-		}
-
-		if (!empty($options['order']) && is_array($options['order'])) {
-			$alias = $object->alias ;
-			$key = $field = key($options['order']);
-
-			if (strpos($key, '.') !== false) {
-				list($alias, $field) = explode('.', $key);
-			}
-			$value = $options['order'][$key];
-			unset($options['order'][$key]);
-
-			if ($object->hasField($field)) {
-				$options['order'][$alias . '.' . $field] = $value;
-			} elseif ($object->hasField($field, true)) {
-				$options['order'][$field] = $value;
-			} elseif (isset($object->{$alias}) && $object->{$alias}->hasField($field)) {
-				$options['order'][$alias . '.' . $field] = $value;
-			}
-		}
+		$options = $this->mergeOptions($object->alias, $scope, $whitelist);
+		$options = $this->validateSort($object, $options);
 
 		$conditions = $fields = $order = $limit = $page = $recursive = null;
 
@@ -312,4 +283,47 @@ class PaginatorComponent extends Component {
 
 		return array_merge($defaults, $request, $options);
 	}
+
+/**
+ * Validate that the desired sorting can be performed on the $object.  Only fields or 
+ * virtualFields can be sorted on.  The direction param will also be sanitized.  Lastly
+ * sort + direction keys will be converted into the model friendly order key.
+ *
+ * @param Model $object The model being paginated.
+ * @param array $options The pagination options being used for this request.
+ * @return array An array of options with sort + direction removed and replaced with order if possible.
+ */
+	public function validateSort($object, $options) {
+		if (isset($options['sort'])) {
+			$direction = null;
+			if (isset($options['direction'])) {
+				$direction = strtolower($options['direction']);
+			}
+			if ($direction != 'asc' && $direction != 'desc') {
+				$direction = 'asc';
+			}
+			$options['order'] = array($options['sort'] => $direction);
+		}
+	
+		if (!empty($options['order']) && is_array($options['order'])) {
+			$alias = $object->alias ;
+			$key = $field = key($options['order']);
+
+			if (strpos($key, '.') !== false) {
+				list($alias, $field) = explode('.', $key);
+			}
+			$value = $options['order'][$key];
+			unset($options['order'][$key]);
+
+			if ($object->hasField($field)) {
+				$options['order'][$alias . '.' . $field] = $value;
+			} elseif ($object->hasField($field, true)) {
+				$options['order'][$field] = $value;
+			} elseif (isset($object->{$alias}) && $object->{$alias}->hasField($field)) {
+				$options['order'][$alias . '.' . $field] = $value;
+			}
+		}
+	
+		return $options;
+	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 063dfaf02..9fb22993e 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -696,4 +696,45 @@ class PaginatorTest extends CakeTestCase {
 		);
 		$this->assertEquals($expected, $result);
 	}
+
+/**
+ * test that invalid directions are ignored.
+ *
+ * @return void
+ */
+	function testValidateSortInvalidDirection() {
+		$model = $this->getMock('Model');
+		$model->alias = 'model';
+		$model->expects($this->any())->method('hasField')->will($this->returnValue(true));
+
+		$options = array('sort' => 'something', 'direction' => 'boogers');
+		$result = $this->Paginator->validateSort($model, $options);
+
+		$this->assertEquals('asc', $result['order']['model.something']);
+	}
+
+/**
+ * test that virtual fields work.
+ *
+ * @return void
+ */
+	function testValidateSortVirtualField() {
+		$model = $this->getMock('Model');
+		$model->alias = 'model';
+
+		$model->expects($this->at(0))
+			->method('hasField')
+			->with('something')
+			->will($this->returnValue(false));
+			
+		$model->expects($this->at(1))
+			->method('hasField')
+			->with('something', true)
+			->will($this->returnValue(true));
+
+		$options = array('sort' => 'something', 'direction' => 'desc');
+		$result = $this->Paginator->validateSort($model, $options);
+
+		$this->assertEquals('desc', $result['order']['something']);
+	}
 }
\ No newline at end of file

From 1e741de84bbb822bd131f459c5cbe5651987b967 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 02:14:37 -0500
Subject: [PATCH 21/90] Removing show alias, it was undocumented and untested.

---
 cake/libs/controller/components/paginator.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 9755d47f2..847ea3ead 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -95,10 +95,6 @@ class PaginatorComponent extends Component {
 			throw new MissingModelException($object);
 		}
 
-		if (isset($options['show'])) {
-			$options['limit'] = $options['show'];
-		}
-
 		$options = $this->mergeOptions($object->alias, $scope, $whitelist);
 		$options = $this->validateSort($object, $options);
 

From e9d3fcf5cfe6fc1b3e40c5041e92e4ca8c2f7516 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 02:28:38 -0500
Subject: [PATCH 22/90] Moving limit checking into a separate method, and
 adding tests. Removing $scope from being passed down to the options, it
 previously only allowed additional conditions to be set. Updated tests.

---
 cake/libs/controller/components/paginator.php | 40 ++++++++++-------
 .../controller/components/paginator.test.php  | 45 ++++++++++++-------
 2 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 847ea3ead..5d05a1a9e 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -77,7 +77,7 @@ class PaginatorComponent extends Component {
  * Handles automatic pagination of model records.
  *
  * @param mixed $object Model to paginate (e.g: model instance, or 'Model', or 'Model.InnerModel')
- * @param mixed $scope Conditions to use while paginating
+ * @param mixed $scope Additional find conditions to use while paginating
  * @param array $whitelist List of allowed options for paging
  * @return array Model query results
  */
@@ -87,7 +87,6 @@ class PaginatorComponent extends Component {
 			$scope = $object;
 			$object = null;
 		}
-		$assoc = null;
 
 		$object = $this->_getObject($object);
 
@@ -95,8 +94,9 @@ class PaginatorComponent extends Component {
 			throw new MissingModelException($object);
 		}
 
-		$options = $this->mergeOptions($object->alias, $scope, $whitelist);
+		$options = $this->mergeOptions($object->alias, $whitelist);
 		$options = $this->validateSort($object, $options);
+		$options = $this->checkLimit($options);
 
 		$conditions = $fields = $order = $limit = $page = $recursive = null;
 
@@ -111,13 +111,6 @@ class PaginatorComponent extends Component {
 			unset($options[0]);
 		}
 
-		$options = array_merge(array('page' => 1, 'limit' => 20, 'maxLimit' => 100), $options);
-		$options['limit'] = (int) $options['limit'];
-		if (empty($options['limit']) || $options['limit'] < 1) {
-			$options['limit'] = 1;
-		}
-		$options['limit'] = min((int)$options['limit'], $options['maxLimit']);
-
 		extract($options);
 
 		if (is_array($scope) && !empty($scope)) {
@@ -248,20 +241,20 @@ class PaginatorComponent extends Component {
  *
  * @param string $alias Model alias being paginated, if the general settings has a key with this value
  *   that key's settings will be used for pagination instead of the general ones.
- * @param string $options Per call options.
  * @param string $whitelist A whitelist of options that are allowed from the request parameters.  Modifying
  *   this array will allow you to permit more or less input from the user.
  * @return array Array of merged options.
  */
-	public function mergeOptions($alias, $options, $whitelist = array()) {
+	public function mergeOptions($alias, $whitelist = array()) {
 		if (isset($this->settings[$alias])) {
 			$defaults = $this->settings[$alias];
 		} else {
 			$defaults = $this->settings;
 		}
-		if (empty($defaults['paramType'])) {
-			$defaults['paramType'] = 'named';
-		}
+		$defaults = array_merge(
+			array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named'),
+			$defaults
+		);
 		switch ($defaults['paramType']) {
 			case 'named':
 				$request = $this->Controller->request->params['named'];
@@ -277,7 +270,7 @@ class PaginatorComponent extends Component {
 		$whitelist = array_flip(array_merge($this->whitelist, $whitelist));
 		$request = array_intersect_key($request, $whitelist);
 
-		return array_merge($defaults, $request, $options);
+		return array_merge($defaults, $request);
 	}
 
 /**
@@ -322,4 +315,19 @@ class PaginatorComponent extends Component {
 	
 		return $options;
 	}
+
+/**
+ * Check the limit parameter and ensure its within the maxLimit bounds.
+ *
+ * @param array $options An array of options with a limit key to be checked.
+ * @return array An array of options for pagination
+ */
+	public function checkLimit($options) {
+		$options['limit'] = (int) $options['limit'];
+		if (empty($options['limit']) || $options['limit'] < 1) {
+			$options['limit'] = 1;
+		}
+		$options['limit'] = min((int)$options['limit'], $options['maxLimit']);
+		return $options;
+	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 9fb22993e..ecb9f812f 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -582,14 +582,11 @@ class PaginatorTest extends CakeTestCase {
 				'paramType' => 'named',
 			)
 		);
-		$result = $this->Paginator->mergeOptions('Silly', array());
+		$result = $this->Paginator->mergeOptions('Silly');
 		$this->assertEquals($this->Paginator->settings, $result);
 
-		$result = $this->Paginator->mergeOptions('Silly', array('limit' => 10));
-		$this->assertEquals(10, $result['limit']);
-
-		$result = $this->Paginator->mergeOptions('Post', array('sort' => 'title'));
-		$expected = array('page' => 1, 'limit' => 10, 'paramType' => 'named', 'sort' => 'title', 'maxLimit' => 50);
+		$result = $this->Paginator->mergeOptions('Post');
+		$expected = array('page' => 1, 'limit' => 10, 'paramType' => 'named', 'maxLimit' => 50);
 		$this->assertEquals($expected, $result);
 	}
 
@@ -609,12 +606,9 @@ class PaginatorTest extends CakeTestCase {
 			'maxLimit' => 100,
 			'paramType' => 'named',
 		);
-		$result = $this->Paginator->mergeOptions('Post', array());
+		$result = $this->Paginator->mergeOptions('Post');
 		$expected = array('page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named');
 		$this->assertEquals($expected, $result);
-
-		$result = $this->Paginator->mergeOptions('Post', array('page' => 100));
-		$this->assertEquals(100, $result['page'], 'Passed options should replace request params');
 	}
 
 /**
@@ -637,12 +631,9 @@ class PaginatorTest extends CakeTestCase {
 			'maxLimit' => 100,
 			'paramType' => 'querystring',
 		);
-		$result = $this->Paginator->mergeOptions('Post', array());
+		$result = $this->Paginator->mergeOptions('Post');
 		$expected = array('page' => 99, 'limit' => 75, 'maxLimit' => 100, 'paramType' => 'querystring');
 		$this->assertEquals($expected, $result);
-
-		$result = $this->Paginator->mergeOptions('Post', array('page' => 100));
-		$this->assertEquals(100, $result['page'], 'Passed options should replace request params');
 	}
 
 /**
@@ -665,7 +656,7 @@ class PaginatorTest extends CakeTestCase {
 			'maxLimit' => 100,
 			'paramType' => 'named',
 		);
-		$result = $this->Paginator->mergeOptions('Post', array());
+		$result = $this->Paginator->mergeOptions('Post');
 		$expected = array('page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named');
 		$this->assertEquals($expected, $result);
 	}
@@ -690,7 +681,7 @@ class PaginatorTest extends CakeTestCase {
 			'maxLimit' => 100,
 			'paramType' => 'named',
 		);
-		$result = $this->Paginator->mergeOptions('Post', array(), array('fields'));
+		$result = $this->Paginator->mergeOptions('Post', array('fields'));
 		$expected = array(
 			'page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named', 'fields' => array('bad.stuff')
 		);
@@ -737,4 +728,26 @@ class PaginatorTest extends CakeTestCase {
 
 		$this->assertEquals('desc', $result['order']['something']);
 	}
+
+/**
+ * test that maxLimit is respected
+ *
+ * @return void
+ */
+	function testCheckLimit() {
+		$result = $this->Paginator->checkLimit(array('limit' => 1000000, 'maxLimit' => 100));
+		$this->assertEquals(100, $result['limit']);
+
+		$result = $this->Paginator->checkLimit(array('limit' => 'sheep!', 'maxLimit' => 100));
+		$this->assertEquals(1, $result['limit']);
+
+		$result = $this->Paginator->checkLimit(array('limit' => '-1', 'maxLimit' => 100));
+		$this->assertEquals(1, $result['limit']);
+
+		$result = $this->Paginator->checkLimit(array('limit' => null, 'maxLimit' => 100));
+		$this->assertEquals(1, $result['limit']);
+
+		$result = $this->Paginator->checkLimit(array('limit' => 0, 'maxLimit' => 100));
+		$this->assertEquals(1, $result['limit']);
+	}
 }
\ No newline at end of file

From f54479e5665fbc01eb23262b6c6a75a3babbd061 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 12:20:12 -0500
Subject: [PATCH 23/90] Adding some docblock info about pagination.

---
 cake/libs/controller/components/paginator.php | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 5d05a1a9e..c2fefef55 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -19,13 +19,39 @@
  */
 
 /**
- * PaginatorComponent
+ * This component is used to handle automatic model data pagination.  The primary way to use this
+ * component is to call the paginate() method. There is a convience wrapper on Controller as well.
  *
- * This component is used to handle automatic model data pagination
+ * ### Configuring pagination
+ *
+ * You configure pagination using the PaginatorComponent::$settings.  This allows you to configure
+ * the default pagination behavior in general or for a specific model. General settings are used when there
+ * are no specific model configuration, or the model you are paginating does not have specific settings.
+ *
+ * {{{
+ *	$this->Paginator->settings = array(
+ *		'limit' => 20,
+ *		'maxLimit' => 100
+ *	);
+ * }}}
+ *
+ * The above settings will be used to paginate any model.  You can configure model specific settings by
+ * keying the settings with the model name.
+ *
+ * {{{
+ *	$this->Paginator->settings = array(
+ *		'Post' => array(
+ *			'limit' => 20,
+ *			'maxLimit' => 100
+ *		),
+ *		'Comment' => array( ... )
+ *	);
+ * }}}
+ *
+ * This would allow you to have different pagination settings for `Comment` and `Post` models.
  *
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
- *
  */
 class PaginatorComponent extends Component {
 

From ef84d86cf537afec5000982f892f2c60432e0146 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 12:26:28 -0500
Subject: [PATCH 24/90] Reformatting code, and removing merging of defaults key
 in the helper.  It no longer exists.

---
 cake/libs/controller/components/paginator.php | 5 ++++-
 cake/libs/view/helpers/paginator.php          | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index c2fefef55..a774e934e 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -202,7 +202,10 @@ class PaginatorComponent extends Component {
 			array($object->alias => $paging)
 		);
 
-		if (!in_array('Paginator', $this->Controller->helpers) && !array_key_exists('Paginator', $this->Controller->helpers)) {
+		if (
+			!in_array('Paginator', $this->Controller->helpers) &&
+			!array_key_exists('Paginator', $this->Controller->helpers)
+		) {
 			$this->Controller->helpers[] = 'Paginator';
 		}
 		return $results;
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 11b897226..6fde140e6 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -112,7 +112,6 @@ class PaginatorHelper extends AppHelper {
  */
 	public function beforeRender($viewFile) {
 		$this->options['url'] = array_merge($this->request->params['pass'], $this->request->params['named']);
-
 		parent::beforeRender($viewFile);
 	}
 
@@ -191,7 +190,7 @@ class PaginatorHelper extends AppHelper {
 	public function sortKey($model = null, $options = array()) {
 		if (empty($options)) {
 			$params = $this->params($model);
-			$options = array_merge($params['defaults'], $params['options']);
+			$options = $params['options'];
 		}
 
 		if (isset($options['sort']) && !empty($options['sort'])) {
@@ -217,7 +216,7 @@ class PaginatorHelper extends AppHelper {
 
 		if (empty($options)) {
 			$params = $this->params($model);
-			$options = array_merge($params['defaults'], $params['options']);
+			$options = $params['options'];
 		}
 
 		if (isset($options['direction'])) {

From 833bdbcc0b0ffa050605034d20b1f4ef2b87b665 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 12:43:29 -0500
Subject: [PATCH 25/90] Reformatting paging params. Removing defaults from the
 paging params as they are no longer being used.

---
 cake/libs/view/helpers/paginator.php          |   4 +-
 .../libs/view/helpers/paginator.test.php      | 392 ++++++++++++++----
 2 files changed, 301 insertions(+), 95 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 6fde140e6..5708b9afe 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -367,9 +367,7 @@ class PaginatorHelper extends AppHelper {
  */
 	public function url($options = array(), $asArray = false, $model = null) {
 		$paging = $this->params($model);
-		$url = array_merge(array_filter(Set::diff(array_merge(
-			$paging['defaults'], $paging['options']), $paging['defaults'])), $options
-		);
+		$url = array_merge(array_filter($paging['options']), $options);
 
 		if (isset($url['order'])) {
 			$sort = $direction = null;
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 2e60552c5..fa6718d55 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -52,11 +52,6 @@ class PaginatorHelperTest extends CakeTestCase {
 					'prevPage' => false,
 					'nextPage' => true,
 					'pageCount' => 7,
-					'defaults' => array(
-						'order' => array('Article.date' => 'asc'),
-						'limit' => 9,
-						'conditions' => array()
-					),
 					'options' => array(
 						'order' => array('Article.date' => 'asc'),
 						'limit' => 9,
@@ -649,9 +644,6 @@ class PaginatorHelperTest extends CakeTestCase {
 			'Article' => array(
 				'page' => 1, 'current' => 3, 'count' => 13,
 				'prevPage' => false, 'nextPage' => true, 'pageCount' => 8,
-				'defaults' => array(
-					'limit' => 3, 'step' => 1, 'order' => array(), 'conditions' => array()
-				),
 				'options' => array(
 					'page' => 1, 'limit' => 3, 'order' => array(), 'conditions' => array()
 				)
@@ -706,10 +698,21 @@ class PaginatorHelperTest extends CakeTestCase {
  * @return void
  */
 	function testPagingLinks() {
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 1,
+				'current' => 3,
+				'count' => 13,
+				'prevPage' => false,
+				'nextPage' => true,
+				'pageCount' => 5,
+				'options' => array(
+					'page' => 1,
+					'limit' => 3,
+					'order' => array('Client.name' => 'DESC'),
+					'conditions' => array()
+				)
+			)
 		);
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
 		$expected = array(
@@ -779,10 +782,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 1, 'current' => 1, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
-			'defaults' => array(),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 1,
+				'current' => 1,
+				'count' => 13, 
+				'prevPage' => false, 
+				'nextPage' => true, 
+				'pageCount' => 5,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>');
@@ -809,10 +823,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
-			'defaults' => array(),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 1, 
+				'current' => 3, 
+				'count' => 13, 
+				'prevPage' => false, 
+				'nextPage' => true, 
+				'pageCount' => 5,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$this->Paginator->request->params['paging']['Client']['page'] = 2;
@@ -837,11 +862,22 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 2, 'current' => 1, 'count' => 13, 'prevPage' => true, 'nextPage' => false, 'pageCount' => 2,
-			'defaults' => array(),
-			'options' => array('page' => 2, 'limit' => 10, 'order' => array(), 'conditions' => array())
-		));
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 2, 
+				'current' => 1, 
+				'count' => 13, 
+				'prevPage' => true, 
+				'nextPage' => false, 
+				'pageCount' => 2,
+				'options' => array(
+					'page' => 2, 
+					'limit' => 10, 
+					'order' => array(), 
+					'conditions' => array()
+				)
+			)
+		);
 		$result = $this->Paginator->prev('Prev');
 		$expected = array(
 			'<span',
@@ -883,11 +919,12 @@ class PaginatorHelperTest extends CakeTestCase {
 	function testPagingLinksOptionsReplaceEmptyDisabledOptions() {
 		$this->Paginator->request->params['paging'] = array(
 			'Client' => array(
-				'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false,
-				'nextPage' => true, 'pageCount' => 5,
-				'defaults' => array(
-					'limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()
-				),
+				'page' => 1, 
+				'current' => 3, 
+				'count' => 13, 
+				'prevPage' => false,
+				'nextPage' => true, 
+				'pageCount' => 5,
 				'options' => array(
 					'page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()
 				)
@@ -924,14 +961,32 @@ class PaginatorHelperTest extends CakeTestCase {
 		// Multiple Model Paginate
 		$this->Paginator->request->params['paging'] = array(
 			'Client' => array(
-				'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
-				'defaults' => array( 'limit'=>3, 'order' => array('Client.name' => 'DESC')),
-				'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array())
+				'page' => 1, 
+				'current' => 3,
+				'count' => 13, 
+				'prevPage' => false, 
+				'nextPage' => true, 
+				'pageCount' => 5,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
 			),
 			'Server' => array(
-				'page' => 1, 'current' => 1, 'count' => 5, 'prevPage' => false, 'nextPage' => false, 'pageCount' => 5,
-				'defaults' => array(),
-				'options' => array('page' => 1, 'limit' => 5, 'order' => array('Server.name' => 'ASC'), 'conditions' => array())
+				'page' => 1, 
+				'current' => 1, 
+				'count' => 5, 
+				'prevPage' => false, 
+				'nextPage' => false, 
+				'pageCount' => 5,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 5, 
+					'order' => array('Server.name' => 'ASC'), 
+					'conditions' => array()
+				)
 			)
 		);
 		$result = $this->Paginator->next('Next', array('model' => 'Client'));
@@ -1030,10 +1085,21 @@ class PaginatorHelperTest extends CakeTestCase {
  * @return void
  */
 	function testNumbers() {
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 8, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 8, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 		$result = $this->Paginator->numbers();
 		$expected = array(
@@ -1119,10 +1185,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 1, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 1, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 		$result = $this->Paginator->numbers();
 		$expected = array(
@@ -1147,10 +1224,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 14, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 14, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 		$result = $this->Paginator->numbers();
 		$expected = array(
@@ -1174,10 +1262,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 2, 'current' => 3, 'count' => 27, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 9,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 2, 
+				'current' => 3, 
+				'count' => 27, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 9,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1));
@@ -1224,10 +1323,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 15, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 15, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1));
@@ -1255,10 +1365,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 10, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 10, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
@@ -1287,10 +1408,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 6, 'current' => 15, 'count' => 623, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 42,
-			'defaults' => array('limit' => 15, 'step' => 1, 'page' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 6, 'limit' => 15, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 6, 
+				'current' => 15, 
+				'count' => 623, 
+				'prevPage' => 1, 
+				'nextPage' => 1, 
+				'pageCount' => 42,
+				'options' => array(
+					'page' => 6, 
+					'limit' => 15, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
@@ -1319,10 +1451,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 37, 'current' => 15, 'count' => 623, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 42,
-			'defaults' => array('limit' => 15, 'step' => 1, 'page' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 37, 'limit' => 15, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 37, 
+				'current' => 15, 
+				'count' => 623, 
+				'prevPage' => 1, 
+				'nextPage' => 1, 
+				'pageCount' => 42,
+				'options' => array(
+					'page' => 37, 
+					'limit' => 15, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
@@ -1384,10 +1527,20 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 2, 'current' => 10, 'count' => 31, 'prevPage' => true, 'nextPage' => true, 'pageCount' => 4,
-			'defaults' => array('limit' => 10),
-			'options' => array('page' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 2, 
+				'current' => 10, 
+				'count' => 31, 
+				'prevPage' => true, 
+				'nextPage' => true, 
+				'pageCount' => 4,
+				'options' => array(
+					'page' => 1, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 		$result = $this->Paginator->numbers();
 		$expected = array(
@@ -1402,10 +1555,21 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 4895, 'current' => 10, 'count' => 48962, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 4897,
-			'defaults' => array('limit' => 10),
-			'options' => array('page' => 4894, 'limit' => 10, 'order' => 'Client.name DESC', 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 4895, 
+				'current' => 10, 
+				'count' => 48962, 
+				'prevPage' => 1, 
+				'nextPage' => 1, 
+				'pageCount' => 4897,
+				'options' => array(
+					'page' => 4894, 
+					'limit' => 10, 
+					'order' => 'Client.name DESC', 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2));
@@ -1619,20 +1783,42 @@ class PaginatorHelperTest extends CakeTestCase {
  * @return void
  */
 	function testFirstAndLast() {
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 1, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 1, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->first();
 		$expected = '';
 		$this->assertEqual($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 4, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 4,
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->first();
@@ -1702,19 +1888,41 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 15, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 15, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 		$result = $this->Paginator->last();
 		$expected = '';
 		$this->assertEqual($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array('Client' => array(
-			'page' => 4, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
-			'defaults' => array('limit' => 3),
-			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 4, 
+				'current' => 3, 
+				'count' => 30, 
+				'prevPage' => false, 
+				'nextPage' => 2, 
+				'pageCount' => 15,
+				'options' => array(
+					'page' => 1, 
+					'limit' => 3, 
+					'order' => array('Client.name' => 'DESC'), 
+					'conditions' => array()
+				)
+			)
 		);
 
 		$result = $this->Paginator->first();

From 8c3ceff50d0bf8b7042954156300cec2b4382095 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 12:58:07 -0500
Subject: [PATCH 26/90] Making paging.options only contain options that are not
 in the defaults.  This replaces the many diffs that were calculated on each
 url generation between paging.options and paging.defaults.

---
 cake/libs/controller/components/paginator.php | 47 ++++++++++------
 .../controller/components/paginator.test.php  | 56 +++++--------------
 2 files changed, 44 insertions(+), 59 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index a774e934e..e660276e3 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -184,14 +184,18 @@ class PaginatorComponent extends Component {
 			}
 			$results = $object->find($type, array_merge($parameters, $extra));
 		}
+		$defaults = $this->getDefaults($object->alias);
+		unset($defaults[0]);
+
 		$paging = array(
-			'page'		=> $page,
-			'current'	=> count($results),
-			'count'		=> $count,
-			'prevPage'	=> ($page > 1),
-			'nextPage'	=> ($count > ($page * $limit)),
-			'pageCount'	=> $pageCount,
-			'options'	=> $options,
+			'page' => $page,
+			'current' => count($results),
+			'count' => $count,
+			'prevPage' => ($page > 1),
+			'nextPage' => ($count > ($page * $limit)),
+			'pageCount' => $pageCount,
+			'order' => $order,
+			'options' => Set::diff($options, $defaults),
 			'paramType' => $options['paramType']
 		);
 		if (!isset($this->Controller->request['paging'])) {
@@ -275,15 +279,7 @@ class PaginatorComponent extends Component {
  * @return array Array of merged options.
  */
 	public function mergeOptions($alias, $whitelist = array()) {
-		if (isset($this->settings[$alias])) {
-			$defaults = $this->settings[$alias];
-		} else {
-			$defaults = $this->settings;
-		}
-		$defaults = array_merge(
-			array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named'),
-			$defaults
-		);
+		$defaults = $this->getDefaults($alias);
 		switch ($defaults['paramType']) {
 			case 'named':
 				$request = $this->Controller->request->params['named'];
@@ -302,6 +298,25 @@ class PaginatorComponent extends Component {
 		return array_merge($defaults, $request);
 	}
 
+/**
+ * Get the default settings for a $model.  If there are no settings for a specific model, the general settings
+ * will be used.
+ *
+ * @param string $alias Model name to get default settings for.
+ * @return array
+ */
+	public function getDefaults($alias) {
+		if (isset($this->settings[$alias])) {
+			$defaults = $this->settings[$alias];
+		} else {
+			$defaults = $this->settings;
+		}
+		return array_merge(
+			array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named'),
+			$defaults
+		);
+	}
+
 /**
  * Validate that the desired sorting can be performed on the $object.  Only fields or 
  * virtualFields can be sorted on.  The direction param will also be sanitized.  Lastly
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index ecb9f812f..9268d9615 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -285,8 +285,7 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->request->params['named'] = array('page' => '1 " onclick="alert(\'xss\');">');
 		$Controller->Paginator->settings = array('limit' => 1, 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'XSS exploit opened %s');
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
+		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'XSS exploit opened');
 
 		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => 0, 'maxLimit' => 10, 'paramType' => 'named');
@@ -405,43 +404,6 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
 	}
 
-/**
- * testPaginatePassedArgs method
- *
- * @return void
- */
-	public function testPaginatePassedArgs() {
-		$Controller = new PaginatorTestController($this->request);
-		$Controller->uses = array('PaginatorControllerPost');
-		$Controller->request->params['pass'] = array('1', '2', '3');
-		$Controller->params['url'] = array();
-		$Controller->constructClasses();
-
-		$Controller->Paginator->settings = array(
-			'fields' => array(),
-			'order' => '',
-			'limit' => 5,
-			'page' => 1,
-			'recursive' => -1,
-			'maxLimit' => 10,
-			'paramType' => 'named'
-		);
-		$conditions = array();
-		$Controller->Paginator->paginate('PaginatorControllerPost', $conditions);
-
-		$expected = array(
-			'fields' => array(),
-			'order' => '',
-			'limit' => 5,
-			'maxLimit' => 10,
-			'page' => 1,
-			'recursive' => -1,
-			'conditions' => array(),
-			'paramType' => 'named'
-		);
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options'],$expected);
-	}
-
 /**
  * Test that special paginate types are called and that the type param doesn't leak out into defaults or options.
  *
@@ -456,13 +418,19 @@ class PaginatorTest extends CakeTestCase {
 
 		$Controller->Paginator->settings = array(
 			'PaginatorControllerPost' => array(
-				'popular', 'fields' => array('id', 'title'), 'maxLimit' => 10, 'paramType' => 'named'
+				'popular',
+				'fields' => array('id', 'title'),
+				'maxLimit' => 10,
+				'paramType' => 'named'
 			)
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 
 		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
-		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['conditions'], array('PaginatorControllerPost.id > ' => '1'));
+		$this->assertEqual(
+			$Controller->PaginatorControllerPost->lastQuery['conditions'], 
+			array('PaginatorControllerPost.id > ' => '1')
+		);
 		$this->assertFalse(isset($Controller->params['paging']['PaginatorControllerPost']['options'][0]));
 	}
 
@@ -478,10 +446,12 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 		$Controller->Paginator->settings = array(
-			'order' => 'PaginatorControllerPost.id DESC', 'maxLimit' => 10, 'paramType' => 'named'
+			'order' => 'PaginatorControllerPost.id DESC', 
+			'maxLimit' => 10,
+			'paramType' => 'named'
 		);
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['order'], 'PaginatorControllerPost.id DESC');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['order'], 'PaginatorControllerPost.id DESC');
 		$this->assertEqual($results, array(3, 2, 1));
 	}
 

From 176d5520f624f821de8bb7ce1ddd95b63eacba99 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 13:09:52 -0500
Subject: [PATCH 27/90] Making paging params match those that would be
 generated by PaginatorComponent.

---
 .../libs/view/helpers/paginator.test.php      | 112 +++++-------------
 1 file changed, 32 insertions(+), 80 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index fa6718d55..c8ca15a05 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -53,8 +53,6 @@ class PaginatorHelperTest extends CakeTestCase {
 					'nextPage' => true,
 					'pageCount' => 7,
 					'options' => array(
-						'order' => array('Article.date' => 'asc'),
-						'limit' => 9,
 						'page' => 1,
 						'conditions' => array()
 					)
@@ -138,6 +136,21 @@ class PaginatorHelperTest extends CakeTestCase {
 			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/')
 		));
 		$this->Paginator->options(array('url' => array('param')));
+		$this->Paginator->request['paging'] = array(
+			'Article' => array(
+				'current' => 9,
+				'count' => 62,
+				'prevPage' => false,
+				'nextPage' => true,
+				'pageCount' => 7,
+				'options' => array(
+					'page' => 1,
+					'order' => array('date' => 'asc'),
+					'conditions' => array()
+				)
+			)
+		);
+		
 		$result = $this->Paginator->sort('title');
 		$expected = array(
 			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
@@ -645,7 +658,9 @@ class PaginatorHelperTest extends CakeTestCase {
 				'page' => 1, 'current' => 3, 'count' => 13,
 				'prevPage' => false, 'nextPage' => true, 'pageCount' => 8,
 				'options' => array(
-					'page' => 1, 'limit' => 3, 'order' => array(), 'conditions' => array()
+					'page' => 1, 
+					'order' => array(), 
+					'conditions' => array()
 				)
 			)
 		);
@@ -708,9 +723,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1,
-					'limit' => 3,
-					'order' => array('Client.name' => 'DESC'),
-					'conditions' => array()
 				)
 			)
 		);
@@ -792,9 +804,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
 				)
 			)
 		);
@@ -834,8 +843,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'options' => array(
 					'page' => 1, 
 					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'order' => array('Client.name' => 'DESC'),
 				)
 			)
 		);
@@ -873,7 +881,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'options' => array(
 					'page' => 2, 
 					'limit' => 10, 
-					'order' => array(), 
+					'order' => array(),
 					'conditions' => array()
 				)
 			)
@@ -926,7 +934,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => true, 
 				'pageCount' => 5,
 				'options' => array(
-					'page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()
+					'page' => 1,
 				)
 			)
 		);
@@ -969,9 +977,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
 				)
 			),
 			'Server' => array(
@@ -983,9 +988,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1, 
-					'limit' => 5, 
-					'order' => array('Server.name' => 'ASC'), 
-					'conditions' => array()
 				)
 			)
 		);
@@ -1094,10 +1096,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => 2, 
 				'pageCount' => 15,
 				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'page' => 1,
 				)
 			)
 		);
@@ -1194,10 +1193,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => 2, 
 				'pageCount' => 15,
 				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'page' => 1,
 				)
 			)
 		);
@@ -1233,10 +1229,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => 2, 
 				'pageCount' => 15,
 				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'page' => 1,
 				)
 			)
 		);
@@ -1271,10 +1264,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => 2, 
 				'pageCount' => 9,
 				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'page' => 1,
 				)
 			)
 		);
@@ -1332,10 +1322,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => 2, 
 				'pageCount' => 15,
 				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'page' => 1,
 				)
 			)
 		);
@@ -1374,10 +1361,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => 2, 
 				'pageCount' => 15,
 				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'page' => 1,
 				)
 			)
 		);
@@ -1418,9 +1402,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 42,
 				'options' => array(
 					'page' => 6, 
-					'limit' => 15, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
 				)
 			)
 		);
@@ -1460,10 +1441,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => 1, 
 				'pageCount' => 42,
 				'options' => array(
-					'page' => 37, 
-					'limit' => 15, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
+					'page' => 37,
 				)
 			)
 		);
@@ -1502,17 +1480,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'prevPage' => false,
 				'nextPage' => 2,
 				'pageCount' => 3,
-				'defaults' => array(
-					'limit' => 3,
-					'step' => 1,
-					'order' => array('Client.name' => 'DESC'),
-					'conditions' => array()
-				),
 				'options' => array(
 					'page' => 1,
-					'limit' => 3,
-					'order' => array('Client.name' => 'DESC'),
-					'conditions' => array()
 				)
 			)
 		);
@@ -1538,7 +1507,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'options' => array(
 					'page' => 1, 
 					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
 				)
 			)
 		);
@@ -1565,9 +1533,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 4897,
 				'options' => array(
 					'page' => 4894, 
-					'limit' => 10, 
-					'order' => 'Client.name DESC', 
-					'conditions' => array()
 				)
 			)
 		);
@@ -1791,12 +1756,7 @@ class PaginatorHelperTest extends CakeTestCase {
 				'prevPage' => false, 
 				'nextPage' => 2, 
 				'pageCount' => 15,
-				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
-				)
+				'options' => array()
 			)
 		);
 
@@ -1814,9 +1774,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
 				)
 			)
 		);
@@ -1898,9 +1855,6 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1, 
-					'limit' => 3, 
-					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
 				)
 			)
 		);
@@ -1913,14 +1867,12 @@ class PaginatorHelperTest extends CakeTestCase {
 				'page' => 4, 
 				'current' => 3, 
 				'count' => 30, 
-				'prevPage' => false, 
+				'prevPage' => false,
 				'nextPage' => 2, 
 				'pageCount' => 15,
 				'options' => array(
-					'page' => 1, 
-					'limit' => 3, 
+					'page' => 1,
 					'order' => array('Client.name' => 'DESC'), 
-					'conditions' => array()
 				)
 			)
 		);
@@ -2139,7 +2091,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::reload();
 		Router::parse('/');
 		Router::setRequestInfo(array(
-			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true')),
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'url' => array('url' => 'accounts/')),
 			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
 		));
 

From cc2d8e2fece90d9024ea54a249081293f67ee249 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 13:15:04 -0500
Subject: [PATCH 28/90] Moving limit from the options to the normal paging
 params.  This fixes a few notice errors.

---
 cake/libs/controller/components/paginator.php          |  1 +
 cake/libs/view/helpers/paginator.php                   |  4 ++--
 .../libs/controller/components/paginator.test.php      |  2 ++
 cake/tests/cases/libs/view/helpers/paginator.test.php  | 10 +---------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index e660276e3..caa911c06 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -195,6 +195,7 @@ class PaginatorComponent extends Component {
 			'nextPage' => ($count > ($page * $limit)),
 			'pageCount' => $pageCount,
 			'order' => $order,
+			'limit' => $limit,
 			'options' => Set::diff($options, $defaults),
 			'paramType' => $options['paramType']
 		);
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 5708b9afe..2651579f5 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -525,9 +525,9 @@ class PaginatorHelper extends AppHelper {
 		}
 		$start = 0;
 		if ($paging['count'] >= 1) {
-			$start = (($paging['page'] - 1) * $paging['options']['limit']) + 1;
+			$start = (($paging['page'] - 1) * $paging['limit']) + 1;
 		}
-		$end = $start + $paging['options']['limit'] - 1;
+		$end = $start + $paging['limit'] - 1;
 		if ($paging['count'] < $end) {
 			$end = $paging['count'];
 		}
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 9268d9615..1f6168b66 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -306,6 +306,8 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => '-1', 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
+
+		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['limit'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index c8ca15a05..27e9f94a9 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -1966,18 +1966,10 @@ class PaginatorHelperTest extends CakeTestCase {
 				'prevPage' => false,
 				'nextPage' => true,
 				'pageCount' => 5,
-				'defaults' => array(
-					'limit' => 3,
-					'step' => 1,
-					'order' => array('Client.name' => 'DESC'),
-					'conditions' => array()
-				),
+				'limit' => 3,
 				'options' => array(
 					'page' => 1,
-					'limit' => 3,
 					'order' => array('Client.name' => 'DESC'),
-					'conditions' => array(),
-					'separator' => 'of'
 				),
 			)
 		);

From da46ad494b4a3c3ce171de39c68e586e22a77e3f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 13:53:11 -0500
Subject: [PATCH 29/90] Deleting duplicate tests. Moving a test out into a
 separate method.

---
 .../controller/components/paginator.test.php  | 107 ++++++++++--------
 1 file changed, 62 insertions(+), 45 deletions(-)

diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 1f6168b66..df3779f1e 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -223,6 +223,8 @@ class PaginatorTest extends CakeTestCase {
 		$this->Controller = new Controller($this->request);
 		$this->Paginator = new PaginatorComponent($this->getMock('ComponentCollection'), array());
 		$this->Paginator->Controller = $this->Controller;
+		$this->Controller->Post = $this->getMock('Model');
+		$this->Controller->Post->alias = 'Post';
 	}
 
 /**
@@ -282,11 +284,6 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEqual($Controller->PaginatorControllerPost->lastQuery['order'][0], array('PaginatorControllerPost.author_id' => 'asc'));
 		$this->assertEqual($results, array(1, 3, 2));
 
-		$Controller->request->params['named'] = array('page' => '1 " onclick="alert(\'xss\');">');
-		$Controller->Paginator->settings = array('limit' => 1, 'maxLimit' => 10, 'paramType' => 'named');
-		$Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'XSS exploit opened');
-
 		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => 0, 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
@@ -314,6 +311,26 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 	}
 
+/**
+ * Test that non-numeric values are rejected for page, and limit
+ *
+ * @return void
+ */
+	function testPageParamCasting() {
+		$this->Controller->Post->expects($this->at(0))
+			->method('find')
+			->will($this->returnValue(2));
+		
+		$this->Controller->Post->expects($this->at(1))
+			->method('find')
+			->will($this->returnValue(array('stuff')));
+	
+		$this->request->params['named'] = array('page' => '1 " onclick="alert(\'xss\');">');
+		$this->Paginator->settings = array('limit' => 1, 'maxLimit' => 10, 'paramType' => 'named');
+		$this->Paginator->paginate('Post');
+		$this->assertSame(1, $this->request->params['paging']['Post']['page'], 'XSS exploit opened');
+	}
+
 /**
  * testPaginateExtraParams method
  *
@@ -496,46 +513,6 @@ class PaginatorTest extends CakeTestCase {
 		$Controller->Paginator->paginate('MissingModel');
 	}
 
-/**
- * testPaginateMaxLimit
- *
- * @return void
- * @access public
- */
-	function testPaginateMaxLimit() {
-		$Controller = new Controller($this->request);
-
-		$Controller->uses = array('PaginatorControllerPost', 'ControllerComment');
-		$Controller->passedArgs[] = '1';
-		$Controller->params['url'] = array();
-		$Controller->constructClasses();
-
-		$Controller->request->params['named'] = array(
-			'contain' => array('ControllerComment'), 'limit' => '1000'
-		);
-		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
-
-		$Controller->request->params['named'] = array(
-			'contain' => array('ControllerComment'), 'limit' => '1000', 'maxLimit' => 1000
-		);
-		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
-
-		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '10');
-		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 10);
-
-		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '1000');
-		$Controller->paginate = array('maxLimit' => 2000, 'paramType' => 'named');
-		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 1000);
-
-		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '5000');
-		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
-	}
-
 /**
  * test that option merging prefers specific models 
  *
@@ -722,4 +699,44 @@ class PaginatorTest extends CakeTestCase {
 		$result = $this->Paginator->checkLimit(array('limit' => 0, 'maxLimit' => 100));
 		$this->assertEquals(1, $result['limit']);
 	}
+
+/**
+ * testPaginateMaxLimit
+ *
+ * @return void
+ * @access public
+ */
+	function testPaginateMaxLimit() {
+		$Controller = new Controller($this->request);
+
+		$Controller->uses = array('PaginatorControllerPost', 'ControllerComment');
+		$Controller->passedArgs[] = '1';
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+
+		$Controller->request->params['named'] = array(
+			'contain' => array('ControllerComment'), 'limit' => '1000'
+		);
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
+
+		$Controller->request->params['named'] = array(
+			'contain' => array('ControllerComment'), 'limit' => '1000', 'maxLimit' => 1000
+		);
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
+
+		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '10');
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 10);
+
+		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '1000');
+		$Controller->paginate = array('maxLimit' => 2000, 'paramType' => 'named');
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 1000);
+
+		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '5000');
+		$result = $Controller->paginate('PaginatorControllerPost');
+		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
+	}
 }
\ No newline at end of file

From c83a4703a3779db9446a93fe15938a64a8ca18fb Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 16:47:22 -0500
Subject: [PATCH 30/90] Implementing ability to change pagination params to use
 querystring variables. Tests added.

---
 cake/libs/view/helpers/paginator.php          |  45 ++++++-
 .../libs/view/helpers/paginator.test.php      | 117 ++++++++++++------
 2 files changed, 121 insertions(+), 41 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 2651579f5..5caaf7ed9 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -68,14 +68,22 @@ class PaginatorHelper extends AppHelper {
  *  - `$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. **Only supported by
- *     AjaxHelper**
+ *  - `$options['paramType']` The type of parameters to use when creating links.  Valid options are 
+ *     'querystring', 'named', and 'route'.  See PaginatorComponent::$settings for more information.
  *
  * @var array
  * @access public
  */
 	public $options = array();
 
+/**
+ * A list of keys that will be turned into `$this->options['paramType']` url parameters when links
+ * are generated
+ *
+ * @var array
+ */
+	public $convertKeys = array('page', 'limit', 'sort', 'direction');
+
 /**
  * Constructor for the helper. Sets up the helper that is used for creating 'AJAX' links.
  *
@@ -111,7 +119,12 @@ class PaginatorHelper extends AppHelper {
  * @return void
  */
 	public function beforeRender($viewFile) {
-		$this->options['url'] = array_merge($this->request->params['pass'], $this->request->params['named']);
+		$named = $this->request->params['named'];
+		foreach ($named as $key => $val) {
+			$named[CakeRoute::SIGIL_NAMED . $key] = $val;
+			unset($named[$key]);
+		}
+		$this->options['url'] = array_merge($this->request->params['pass'], $named);
 		parent::beforeRender($viewFile);
 	}
 
@@ -377,6 +390,7 @@ class PaginatorHelper extends AppHelper {
 			unset($url['order']);
 			$url = array_merge($url, compact('sort', 'direction'));
 		}
+		$url = $this->_convertUrlKeys($url, $paging['paramType']);
 
 		if ($asArray) {
 			return $url;
@@ -384,6 +398,31 @@ class PaginatorHelper extends AppHelper {
 		return parent::url($url);
 	}
 
+/**
+ * Converts the keys being used into the format set by options.paramType
+ *
+ * @param array $url Array of url params to convert
+ * @return converted url params.
+ */
+	protected function _convertUrlKeys($url, $type) {
+		$prefix = '';
+		switch ($type) {
+			case 'named':
+				$prefix = CakeRoute::SIGIL_NAMED;
+				break;
+			case 'querystring':
+				$prefix = CakeRoute::SIGIL_QUERYSTRING;
+				break;
+		}
+		foreach ($this->convertKeys as $key) {
+			if (isset($url[$key])) {
+				$url[$prefix . $key] = $url[$key];
+				unset($url[$key]);
+			}
+		}
+		return $url;
+	}
+
 /**
  * Protected method for generating prev/next links
  *
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 27e9f94a9..ab400702b 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -55,7 +55,8 @@ class PaginatorHelperTest extends CakeTestCase {
 					'options' => array(
 						'page' => 1,
 						'conditions' => array()
-					)
+					),
+					'paramType' => 'named'
 				)
 			)
 		));
@@ -147,7 +148,8 @@ class PaginatorHelperTest extends CakeTestCase {
 					'page' => 1,
 					'order' => array('date' => 'asc'),
 					'conditions' => array()
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		
@@ -651,7 +653,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		Router::parse('/');
 		Router::setRequestInfo(array(
 			array('plugin' => null, 'controller' => 'articles', 'action' => 'index', 'pass' => array('2'), 'named' => array('foo' => 'bar'), 'url' => array('url' => 'articles/index/2/foo:bar')),
-			array('base' => '/', 'here' => '/articles/', 'webroot' => '/', 'passedArgs' => array(0 => '2', 'foo' => 'bar'))
+			array('base' => '/', 'here' => '/articles/', 'webroot' => '/')
 		));
 		$this->Paginator->request->params['paging'] = array(
 			'Article' => array(
@@ -661,7 +663,8 @@ class PaginatorHelperTest extends CakeTestCase {
 					'page' => 1, 
 					'order' => array(), 
 					'conditions' => array()
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -671,7 +674,7 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		$result = $this->Paginator->sort('title');
 		$expected = array(
-			'a' => array('href' => '/articles/index/2/page:1/foo:bar/sort:title/direction:asc'),
+			'a' => array('href' => '/articles/index/2/foo:bar/page:1/sort:title/direction:asc'),
 			'Title',
 			'/a'
 		);
@@ -681,24 +684,24 @@ class PaginatorHelperTest extends CakeTestCase {
 		$expected = array(
 			array('span' => array('class' => 'current')), '1', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:2/foo:bar')), '2', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:2')), '2', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:3/foo:bar')), '3', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:3')), '3', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:4/foo:bar')), '4', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:4')), '4', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:5/foo:bar')), '5', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:5')), '5', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:6/foo:bar')), '6', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:6')), '6', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:7/foo:bar')), '7', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:7')), '7', '/a', '/span',
 		);
 		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/articles/index/2/page:2/foo:bar', 'class' => 'next'),
+			'a' => array('href' => '/articles/index/2/foo:bar/page:2', 'class' => 'next'),
 			'Next',
 			'/a',
 			'/span'
@@ -723,7 +726,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
@@ -804,7 +808,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1, 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -844,7 +849,8 @@ class PaginatorHelperTest extends CakeTestCase {
 					'page' => 1, 
 					'limit' => 3, 
 					'order' => array('Client.name' => 'DESC'),
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -883,7 +889,8 @@ class PaginatorHelperTest extends CakeTestCase {
 					'limit' => 10, 
 					'order' => array(),
 					'conditions' => array()
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->prev('Prev');
@@ -903,14 +910,15 @@ class PaginatorHelperTest extends CakeTestCase {
 				'defaults' => array(),
 				'options' => array(
 					'page' => 2, 'limit' => 10, 'order' => array(), 'conditions' => array()
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$this->Paginator->options(array('url' => array(12, 'page' => 3)));
-		$result = $this->Paginator->prev('Prev', array('url' => array('foo' => 'bar')));
+		$result = $this->Paginator->prev('Prev', array('url' => array(':foo' => 'bar')));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/12/page:1/limit:10/foo:bar', 'class' => 'prev'),
+			'a' => array('href' => '/index/12/foo:bar/page:1/limit:10', 'class' => 'prev'),
 			'Prev',
 			'/a',
 			'/span'
@@ -935,7 +943,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->prev('<< Previous', array('escape' => false));
@@ -977,7 +986,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1, 
-				)
+				),
+				'paramType' => 'named'
 			),
 			'Server' => array(
 				'page' => 1, 
@@ -988,7 +998,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 5,
 				'options' => array(
 					'page' => 1, 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->next('Next', array('model' => 'Client'));
@@ -1097,7 +1108,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->numbers();
@@ -1194,7 +1206,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->numbers();
@@ -1230,7 +1243,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->numbers();
@@ -1265,7 +1279,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 9,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1323,7 +1338,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1362,7 +1378,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1402,7 +1419,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 42,
 				'options' => array(
 					'page' => 6, 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1442,7 +1460,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 42,
 				'options' => array(
 					'page' => 37,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1482,7 +1501,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 3,
 				'options' => array(
 					'page' => 1,
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$options = array('modulus' => 10);
@@ -1507,7 +1527,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'options' => array(
 					'page' => 1, 
 					'order' => array('Client.name' => 'DESC'), 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->numbers();
@@ -1533,7 +1554,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 4897,
 				'options' => array(
 					'page' => 4894, 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1756,7 +1778,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'prevPage' => false, 
 				'nextPage' => 2, 
 				'pageCount' => 15,
-				'options' => array()
+				'options' => array(),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1774,7 +1797,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1, 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1855,7 +1879,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'pageCount' => 15,
 				'options' => array(
 					'page' => 1, 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 		$result = $this->Paginator->last();
@@ -1873,7 +1898,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'options' => array(
 					'page' => 1,
 					'order' => array('Client.name' => 'DESC'), 
-				)
+				),
+				'paramType' => 'named'
 			)
 		);
 
@@ -1971,6 +1997,7 @@ class PaginatorHelperTest extends CakeTestCase {
 					'page' => 1,
 					'order' => array('Client.name' => 'DESC'),
 				),
+				'paramType' => 'named'
 			)
 		);
 		$input = 'Page %page% of %pages%, showing %current% records out of %count% total, ';
@@ -2152,7 +2179,8 @@ class PaginatorHelperTest extends CakeTestCase {
 				'nextPage' => true,
 				'pageCount' => 7,
 				'defaults' => array(),
-				'options' => array()
+				'options' => array(),
+				'paramType' => 'named'
 			)
 		);
 		$Paginator->PaginatorMockJs = $mock;
@@ -2162,4 +2190,17 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->expectException();
 		$Paginator = new PaginatorHelper($this->View, array('ajax' => 'Form'));
 	}
+
+/**
+ * test that querystring links can be generated.
+ *
+ * @return void
+ */
+	function testQuerystringLinkGeneration() {
+		$this->Paginator->request->params['paging']['Article']['paramType'] = 'querystring';
+		$result = $this->Paginator->url(array('page' => '4'));
+		$expected = '/index?page=4';
+		$this->assertEquals($expected, $result);
+	}
+
 }

From 5df2678ba9fce1728d5f6a885a166fb25cd724a2 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 17:09:34 -0500
Subject: [PATCH 31/90] Fixing named params that were missing the : and fixing
 Router::reverse() so it adds in the :

---
 cake/libs/router.php                  | 21 +++++++++++++++------
 cake/tests/cases/libs/router.test.php | 16 ++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 506bdb2b0..f4cfa32fd 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -897,7 +897,7 @@ class Router {
  * @see Router::url()
  */
 	protected static function _handleNoRoute($url) {
-		$named = $args = array();
+		$named = $args = $query = array();
 		$skip = array_merge(
 			array('bare', 'action', 'controller', 'plugin', 'prefix'),
 			self::$_prefixes
@@ -908,10 +908,13 @@ class Router {
 
 		// Remove this once parsed URL parameters can be inserted into 'pass'
 		for ($i = 0; $i < $count; $i++) {
+			$key = $keys[$i];
 			if (is_numeric($keys[$i])) {
-				$args[] = $url[$keys[$i]];
-			} else {
-				$named[$keys[$i]] = $url[$keys[$i]];
+				$args[] = $url[$key];
+			} elseif ($key[0] === CakeRoute::SIGIL_NAMED) {
+				$named[substr($key, 1)] = $url[$key];
+			} elseif ($key[0] === CakeRoute::SIGIL_QUERYSTRING) {
+				$query[substr($key, 1)] = $url[$key];
 			}
 		}
 
@@ -923,7 +926,7 @@ class Router {
 			}
 		}
 
-		if (empty($named) && empty($args) && (!isset($url['action']) || $url['action'] === 'index')) {
+		if (empty($named) && empty($args) && empty($query) && (!isset($url['action']) || $url['action'] === 'index')) {
 			$url['action'] = null;
 		}
 
@@ -947,7 +950,6 @@ class Router {
 
 		if (!empty($named)) {
 			foreach ($named as $name => $value) {
-				$name = trim($name, ':');
 				if (is_array($value)) {
 					$flattend = Set::flatten($value, '][');
 					foreach ($flattend as $namedKey => $namedValue) {
@@ -958,6 +960,9 @@ class Router {
 				}
 			}
 		}
+		if (!empty($query)) {
+			$output .= Router::queryString($query);
+		}
 		return $output;
 	}
 
@@ -1070,6 +1075,10 @@ class Router {
 			$params['pass'], $params['named'], $params['paging'], $params['models'], $params['url'], $url['url'],
 			$params['autoRender'], $params['bare'], $params['requested'], $params['return']
 		);
+		foreach ($named as $key => $value) {
+			$named[CakeRoute::SIGIL_NAMED . $key] = $value;
+			unset($named[$key]);
+		}
 		$params = array_merge($params, $pass, $named);
 		if (!empty($url)) {
 			$params['?'] = $url;
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index e05e50149..d9a57afc8 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -630,7 +630,7 @@ class RouterTest extends CakeTestCase {
 		$request->webroot = '/';
 		Router::setRequestInfo($request);
 
-		$result = Router::url(array('page' => 2));
+		$result = Router::url(array(':page' => 2));
 		$expected = '/admin/registrations/index/page:2';
 		$this->assertEqual($result, $expected);
 
@@ -1546,12 +1546,12 @@ class RouterTest extends CakeTestCase {
 		$expected = '/protected/others/edit/1';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'page' => 1));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':page' => 1));
 		$expected = '/protected/others/edit/1/page:1';
 		$this->assertEqual($result, $expected);
 
 		Router::connectNamed(array('random'));
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'random' => 'my-value'));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':random' => 'my-value'));
 		$expected = '/protected/others/edit/1/random:my-value';
 		$this->assertEqual($result, $expected);
 	}
@@ -1610,12 +1610,12 @@ class RouterTest extends CakeTestCase {
 		$expected = '/protected/others/edit/1';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'page' => 1));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':page' => 1));
 		$expected = '/protected/others/edit/1/page:1';
 		$this->assertEqual($result, $expected);
 
 		Router::connectNamed(array('random'));
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'random' => 'my-value'));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':random' => 'my-value'));
 		$expected = '/protected/others/edit/1/random:my-value';
 		$this->assertEqual($result, $expected);
 	}
@@ -1721,7 +1721,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'my_controller', 'action' => 'my_action', 'base' => true));
-		$expected = '/base/my_controller/my_action/base:1';
+		$expected = '/base/my_controller/my_action';
 		$this->assertEqual($result, $expected);
 	}
 
@@ -1908,7 +1908,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('pass' => array(), 'named' => array(), 'prefix' => 'members', 'plugin' => null, 'controller' => 'posts', 'action' => 'index', 'members' => true);
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('members' => true, 'controller' => 'posts', 'action' =>'index', 'page' => 2));
+		$result = Router::url(array('members' => true, 'controller' => 'posts', 'action' =>'index', ':page' => 2));
 		$expected = '/base/members/posts/index/page:2';
 		$this->assertEqual($result, $expected);
 
@@ -2083,7 +2083,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('action' => 'test_another_action', 'locale' => 'badness'));
-		$expected = '/test/test_another_action/locale:badness';
+		$expected = '/test/test_another_action';
 		$this->assertEqual($result, $expected);
 	}
 

From 51e2b16d46d96023d5ec4e11fcb32e9c52d91ce5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 17:24:38 -0500
Subject: [PATCH 32/90] Removing pagination test from Containable test case, it
 doesn't make sense there.

---
 .../libs/model/behaviors/containable.test.php | 106 ------------------
 1 file changed, 106 deletions(-)

diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index d2ccdc5aa..b5dbabe52 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3191,112 +3191,6 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 	}
 
-/**
- * testPaginate method
- *
- * @access public
- * @return void
- */
-	function testPaginate() {
-		App::import('Core', 'Controller');
-		$Controller = new Controller($this->getMock('CakeRequest'));
-		$Controller->uses = array('Article');
-		$Controller->passedArgs[] = '1';
-		$Controller->request->params['url'] = array();
-		$Controller->constructClasses();
-
-		$Controller->paginate = array('Article' => array('fields' => array('title'), 'contain' => array('User(user)')));
-		$result = $Controller->paginate('Article');
-		$expected = array(
-			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
-			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
-			array('Article' => array('title' => 'Third Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
-		);
-		$this->assertEqual($result, $expected);
-
-		$r = $Controller->Article->find('all');
-		$this->assertTrue(Set::matches('/Article[id=1]', $r));
-		$this->assertTrue(Set::matches('/User[id=1]', $r));
-		$this->assertTrue(Set::matches('/Tag[id=1]', $r));
-
-		$Controller->paginate = array('Article' => array('contain' => array('Comment(comment)' => 'User(user)'), 'fields' => array('title')));
-		$result = $Controller->paginate('Article');
-		$expected = array(
-			array(
-				'Article' => array('title' => 'First Article', 'id' => 1),
-				'Comment' => array(
-					array(
-						'comment' => 'First Comment for First Article',
-						'user_id' => 2,
-						'article_id' => 1,
-						'User' => array('user' => 'nate')
-					),
-					array(
-						'comment' => 'Second Comment for First Article',
-						'user_id' => 4,
-						'article_id' => 1,
-						'User' => array('user' => 'garrett')
-					),
-					array(
-						'comment' => 'Third Comment for First Article',
-						'user_id' => 1,
-						'article_id' => 1,
-						'User' => array('user' => 'mariano')
-					),
-					array(
-						'comment' => 'Fourth Comment for First Article',
-						'user_id' => 1,
-						'article_id' => 1,
-						'User' => array('user' => 'mariano')
-					)
-				)
-			),
-			array(
-				'Article' => array('title' => 'Second Article', 'id' => 2),
-				'Comment' => array(
-					array(
-						'comment' => 'First Comment for Second Article',
-						'user_id' => 1,
-						'article_id' => 2,
-						'User' => array('user' => 'mariano')
-					),
-					array(
-						'comment' => 'Second Comment for Second Article',
-						'user_id' => 2,
-						'article_id' => 2,
-						'User' => array('user' => 'nate')
-					)
-				)
-			),
-			array(
-				'Article' => array('title' => 'Third Article', 'id' => 3),
-				'Comment' => array()
-			),
-		);
-		$this->assertEqual($result, $expected);
-
-		$r = $Controller->Article->find('all');
-		$this->assertTrue(Set::matches('/Article[id=1]', $r));
-		$this->assertTrue(Set::matches('/User[id=1]', $r));
-		$this->assertTrue(Set::matches('/Tag[id=1]', $r));
-
-		$Controller->Article->unbindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User'), 'hasAndBelongsToMany' => array('Tag')), false);
-		$Controller->Article->bindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User')), false);
-
-		$Controller->paginate = array('Article' => array('contain' => array('Comment(comment)', 'User(user)'), 'fields' => array('title')));
-		$r = $Controller->paginate('Article');
-		$this->assertTrue(Set::matches('/Article[id=1]', $r));
-		$this->assertTrue(Set::matches('/User[id=1]', $r));
-		$this->assertTrue(Set::matches('/Comment[article_id=1]', $r));
-		$this->assertFalse(Set::matches('/Comment[id=1]', $r));
-
-		$r = $this->Article->find('all');
-		$this->assertTrue(Set::matches('/Article[id=1]', $r));
-		$this->assertTrue(Set::matches('/User[id=1]', $r));
-		$this->assertTrue(Set::matches('/Comment[article_id=1]', $r));
-		$this->assertTrue(Set::matches('/Comment[id=1]', $r));
-	}
-
 /**
  * testOriginalAssociations method
  *

From 4c3736a68aa16c7c6d815c86b9ed2dec12433fa2 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 17:38:21 -0500
Subject: [PATCH 33/90] Making more tests pass with the named parameter
 changes.

---
 cake/libs/http_socket.php                            | 4 ++--
 cake/libs/route/redirect_route.php                   | 7 +++----
 cake/tests/cases/libs/controller/controller.test.php | 3 ++-
 cake/tests/cases/libs/view/helper.test.php           | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index ba56034bd..1a486742c 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -539,7 +539,7 @@ class HttpSocket extends CakeSocket {
 		if (!method_exists($authClass, 'authentication')) {
 			throw new SocketException(sprintf(__('The %s do not support authentication.'), $authClass));
 		}
-		call_user_func("$authClass::authentication", $this, $this->_auth[$method]);
+		call_user_func_array("$authClass::authentication", array($this, &$this->_auth[$method]));
 	}
 
 /**
@@ -565,7 +565,7 @@ class HttpSocket extends CakeSocket {
 		if (!method_exists($authClass, 'proxyAuthentication')) {
 			throw new SocketException(sprintf(__('The %s do not support proxy authentication.'), $authClass));
 		}
-		call_user_func("$authClass::proxyAuthentication", $this, $this->_proxy);
+		call_user_func_array("$authClass::proxyAuthentication", array($this, &$this->_proxy));
 	}
 
 /**
diff --git a/cake/libs/route/redirect_route.php b/cake/libs/route/redirect_route.php
index e385dec0d..d9beaa42d 100644
--- a/cake/libs/route/redirect_route.php
+++ b/cake/libs/route/redirect_route.php
@@ -70,16 +70,15 @@ class RedirectRoute extends CakeRoute {
 		}
 		if (isset($this->options['persist']) && is_array($redirect)) {
 			$argOptions['context'] = array('action' => $redirect['action'], 'controller' => $redirect['controller']);
-			$args = Router::getArgs($params['_args_'], $argOptions);
-			$redirect += $args['pass'];
-			$redirect += $args['named'];
+			$redirect += Router::getArgs($params['_args_'], $argOptions) + array('url' => array());
+			$redirect = Router::reverse($redirect);
 		}
 		$status = 301;
 		if (isset($this->options['status']) && ($this->options['status'] >= 300 && $this->options['status'] < 400)) {
 			$status = $this->options['status'];
 		}
 		$this->response->header(array('Location' => Router::url($redirect, true)));
-		$this->response->statusCode($status);		
+		$this->response->statusCode($status);
 		$this->response->send();
 	}
 
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 39563931b..91165cd22 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -1266,7 +1266,8 @@ class ControllerTest extends CakeTestCase {
 		$Controller->passedArgs[] = '1';
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
-		$this->assertEqual($Controller->paginate, array('page' => 1, 'limit' => 20));
+		$expected = array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named');
+		$this->assertEqual($Controller->paginate, $expected);
 
 		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
 		$this->assertEqual($results, array(1, 2, 3));
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 4ef761091..9e57e3028 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -477,7 +477,7 @@ class HelperTest extends CakeTestCase {
 		$result = $this->Helper->url('/controller/action/1?one=1&two=2');
 		$this->assertEqual($result, '/controller/action/1?one=1&amp;two=2');
 
-		$result = $this->Helper->url(array('controller' => 'posts', 'action' => 'index', 'page' => '1" onclick="alert(\'XSS\');"'));
+		$result = $this->Helper->url(array('controller' => 'posts', 'action' => 'index', ':page' => '1" onclick="alert(\'XSS\');"'));
 		$this->assertEqual($result, "/posts/index/page:1&quot; onclick=&quot;alert(&#039;XSS&#039;);&quot;");
 
 		$result = $this->Helper->url('/controller/action/1/param:this+one+more');
@@ -490,12 +490,12 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($result, '/controller/action/1/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24');
 
 		$result = $this->Helper->url(array(
-			'controller' => 'posts', 'action' => 'index', 'param' => '%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24'
+			'controller' => 'posts', 'action' => 'index', ':param' => '%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24'
 		));
 		$this->assertEqual($result, "/posts/index/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24");
 
 		$result = $this->Helper->url(array(
-			'controller' => 'posts', 'action' => 'index', 'page' => '1',
+			'controller' => 'posts', 'action' => 'index', ':page' => '1',
 			'?' => array('one' => 'value', 'two' => 'value', 'three' => 'purple')
 		));
 		$this->assertEqual($result, "/posts/index/page:1?one=value&amp;two=value&amp;three=purple");

From 025ba238863cb52c51ce916491f3da11c6010a03 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 20:05:57 -0500
Subject: [PATCH 34/90] Removing whitespace and adding some more documentation.

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

diff --git a/cake/libs/router.php b/cake/libs/router.php
index f4cfa32fd..8d76a7ba5 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -300,7 +300,9 @@ class Router {
 	}
 
 /**
- * Specifies what named parameters CakePHP should be parsing. The most common setups are:
+ * Specifies what named parameters CakePHP should be parsing out of incoming urls. By default
+ * CakePHP will parse every named parameter out of incoming URLs.  However, if you want to take more
+ * control over how named parameters are parsed you can use one of the following setups:
  *
  * Do not parse any named parameters:
  *
@@ -342,8 +344,6 @@ class Router {
  * @return array
  */
 	public static function connectNamed($named, $options = array()) {
-		
-
 		if (isset($options['argSeparator'])) {
 			self::$named['separator'] = $options['argSeparator'];
 			unset($options['argSeparator']);
@@ -385,7 +385,6 @@ class Router {
  * @return void
  */
 	public static function defaults($connect = true) {
-		
 		self::$_connectDefaults = $connect;
 	}
 
@@ -403,7 +402,6 @@ class Router {
  * @return array Array of mapped resources
  */
 	public static function mapResources($controller, $options = array()) {
-		
 		$options = array_merge(array('prefix' => '/', 'id' => self::$__named['ID'] . '|' . self::$__named['UUID']), $options);
 		$prefix = $options['prefix'];
 
@@ -430,7 +428,6 @@ class Router {
  * @return array A list of prefixes used in connected routes
  */
 	public static function prefixes() {
-		
 		return self::$_prefixes;
 	}
 
@@ -441,8 +438,6 @@ class Router {
  * @return array Parsed elements from URL
  */
 	public static function parse($url) {
-
-		
 		if (!self::$_defaultsMapped && self::$_connectDefaults) {
 			self::__connectDefaultRoutes();
 		}

From d3fc29c8e83642a20fe9f96d0d782e903d524180 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 21:49:17 -0500
Subject: [PATCH 35/90] Adding more documentation to connectNamed(). Changing
 argSeparator -> separator, as it is less typing and easier to remember.

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

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 8d76a7ba5..29e38dc3a 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -89,7 +89,7 @@ class Router {
  * @access public
  */
 	public static $named = array(
-		'default' => array(':page', ':fields', ':order', ':limit', ':recursive', ':sort', ':direction', ':step'),
+		'default' => array('page', 'fields', 'order', 'limit', 'recursive', 'sort', 'direction', 'step'),
 		'greedy' => true,
 		'separator' => ':',
 		'rules' => false,
@@ -316,7 +316,7 @@ class Router {
  *
  * {{{ Router::connectNamed(array('page' => '[\d]+'), array('default' => false, 'greedy' => false)); }}}
  *
- * Parse only the page parameter no mater what.
+ * Parse only the page parameter no matter what.
  *
  * {{{ Router::connectNamed(array('page'), array('default' => false, 'greedy' => false)); }}}
  *
@@ -338,15 +338,23 @@ class Router {
  * ); 
  * }}}
  *
+ * ### Options
+ *
+ * - `greedy` Setting this to true will make Router parse all named params.  Setting it to false will 
+ *    parse only the connected named params.
+ * - `default` Set this to true to merge in the default set of named parameters.
+ * - `reset` Set to true to clear existing rules and start fresh.
+ * - `separator` Change the string used to separate the key & value in a named parameter.  Defaults to `:`
+ *
  * @param array $named A list of named parameters. Key value pairs are accepted where values are 
  *    either regex strings to match, or arrays as seen above.
  * @param array $options Allows to control all settings: separator, greedy, reset, default
  * @return array
  */
 	public static function connectNamed($named, $options = array()) {
-		if (isset($options['argSeparator'])) {
-			self::$named['separator'] = $options['argSeparator'];
-			unset($options['argSeparator']);
+		if (isset($options['separator'])) {
+			self::$named['separator'] = $options['separator'];
+			unset($options['separator']);
 		}
 
 		if ($named === true || $named === false) {
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index d9a57afc8..c44f27619 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -1335,14 +1335,14 @@ class RouterTest extends CakeTestCase {
 
 		Router::reload();
 		Router::connect('/foo/*', array('controller' => 'bar', 'action' => 'fubar'));
-		Router::connectNamed(array(), array('argSeparator' => '='));
+		Router::connectNamed(array(), array('separator' => '='));
 		$result = Router::parse('/foo/param1=value1/param2=value2');
 		$expected = array('pass' => array(), 'named' => array('param1' => 'value1', 'param2' => 'value2'), 'controller' => 'bar', 'action' => 'fubar', 'plugin' => null);
 		$this->assertEqual($result, $expected);
 
 		Router::reload();
 		Router::connect('/controller/action/*', array('controller' => 'controller', 'action' => 'action'), array('named' => array('param1' => 'value[\d]')));
-		Router::connectNamed(array(), array('greedy' => false, 'argSeparator' => '='));
+		Router::connectNamed(array(), array('greedy' => false, 'separator' => '='));
 		$result = Router::parse('/controller/action/param1=value1/param2=value2');
 		$expected = array('pass' => array('param2=value2'), 'named' => array('param1' => 'value1'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
 		$this->assertEqual($result, $expected);

From b49b49a5ef4656f23d51bcfcf8553338a50df9bb Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 22:17:57 -0500
Subject: [PATCH 36/90] Removing named parameter sigils.

---
 cake/libs/route/cake_route.php                | 42 +++++++++++--------
 cake/libs/router.php                          |  4 +-
 .../cases/libs/route/cake_route.test.php      | 12 +++---
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 7e4af3384..364b18641 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -284,27 +284,19 @@ class CakeRoute {
 			return false;
 		}
 
+		$greedyNamed = Router::$named['greedy'];
+		$allowedNamedParams = Router::$named['rules'];
+
 		$named = $pass = $_query = array();
 
 		foreach ($url as $key => $value) {
-			// pull out named params so comparisons later on are faster.
-			if ($key[0] === CakeRoute::SIGIL_NAMED && ($value !== false && $value !== null)) {
-				$named[substr($key, 1)] = $value;
-				unset($url[$key]);
-				continue;
-			}
-			
-			// pull out querystring params
-			if ($key[0] === CakeRoute::SIGIL_QUERYSTRING && ($value !== false && $value !== null)) {
-				$_query[substr($key, 1)] = $value;
-				unset($url[$key]);
-				continue;
-			}
 
-			// keys that exist in the defaults and have different values cause match failures.
-			$keyExists = array_key_exists($key, $defaults);
-			if ($keyExists && $defaults[$key] != $value) {
+			// keys that exist in the defaults and have different values is a match failure.
+			$defaultExists = array_key_exists($key, $defaults);
+			if ($defaultExists && $defaults[$key] != $value) {
 				return false;
+			} elseif ($defaultExists) {
+				continue;
 			}
 			
 			// If the key is a routed key, its not different yet.
@@ -322,8 +314,24 @@ class CakeRoute {
 				continue;
 			}
 
+			// pull out querystring params
+			if ($key[0] === CakeRoute::SIGIL_QUERYSTRING && ($value !== false && $value !== null)) {
+				$_query[substr($key, 1)] = $value;
+				unset($url[$key]);
+				continue;
+			}
+
+			// pull out named params if named params are greedy or a rule exists.
+			if (
+				($greedyNamed || isset($allowedNamedParams[$key])) &&
+				($value !== false && $value !== null)
+			) {
+				$named[$key] = $value;
+				continue;
+			}
+
 			// keys that don't exist are different.
-			if (!$keyExists && !empty($value)) {
+			if (!$defaultExists && !empty($value)) {
 				return false;
 			}
 		}
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 29e38dc3a..76e801aec 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -914,10 +914,10 @@ class Router {
 			$key = $keys[$i];
 			if (is_numeric($keys[$i])) {
 				$args[] = $url[$key];
-			} elseif ($key[0] === CakeRoute::SIGIL_NAMED) {
-				$named[substr($key, 1)] = $url[$key];
 			} elseif ($key[0] === CakeRoute::SIGIL_QUERYSTRING) {
 				$query[substr($key, 1)] = $url[$key];
+			} else {
+				$named[$key] = $url[$key];
 			}
 		}
 
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index 3107e0084..0831ab814 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -310,7 +310,7 @@ class CakeRouteTestCase extends CakeTestCase {
  */
 	function testGreedyRouteFailureNamedParam() {
 		$route = new CakeRoute('/:controller/:action', array('plugin' => null));
-		$result = $route->match(array('controller' => 'posts', 'action' => 'view', ':page' => 1));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'page' => 1));
 		$this->assertFalse($result);
 	}
 
@@ -334,9 +334,9 @@ class CakeRouteTestCase extends CakeTestCase {
  */
 	function testMatchWithNamedParametersAndPassedArgs() {
 		Router::connectNamed(true);
-
+/*
 		$route = new CakeRoute('/:controller/:action/*', array('plugin' => null));
-		$result = $route->match(array('controller' => 'posts', 'action' => 'index', 'plugin' => null, ':page' => 1));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'index', 'plugin' => null, 'page' => 1));
 		$this->assertEqual($result, '/posts/index/page:1');
 
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5));
@@ -348,9 +348,9 @@ class CakeRouteTestCase extends CakeTestCase {
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, '0'));
 		$this->assertEqual($result, '/posts/view/0');
 
-		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, ':page' => 1, ':limit' => 20, ':order' => 'title'));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, 'page' => 1, 'limit' => 20, 'order' => 'title'));
 		$this->assertEqual($result, '/posts/view/5/page:1/limit:20/order:title');
-
+*/
 
 		$route = new CakeRoute('/test2/*', array('controller' => 'pages', 'action' => 'display', 2));
 		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 1));
@@ -370,7 +370,7 @@ class CakeRouteTestCase extends CakeTestCase {
  */
 	function testNamedParamsWithNullFalse() {
 		$route = new CakeRoute('/:controller/:action/*');
-		$result = $route->match(array('controller' => 'posts', 'action' => 'index', ':page' => null, 'sort' => false));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'index', 'page' => null, 'sort' => false));
 		$this->assertEquals('/posts/index/', $result);
 	}
 

From e5588f746c9885288a572db5f1f4bd2cd00da597 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 19 Dec 2010 23:11:02 -0500
Subject: [PATCH 37/90] Reversing changes that required a : sigil for named
 parameters.  Also removing ?foo style parameters for querystring args. Having
 two ways to create querystring args was not sitting well with me. Tests
 updated.

---
 cake/libs/controller/components/paginator.php |  3 +-
 cake/libs/route/cake_route.php                | 20 ---------
 cake/libs/router.php                          |  6 ---
 cake/libs/view/helpers/paginator.php          | 22 +++-------
 .../cases/libs/route/cake_route.test.php      | 39 +---------------
 cake/tests/cases/libs/router.test.php         | 44 +++++++++----------
 cake/tests/cases/libs/view/helper.test.php    |  6 +--
 .../libs/view/helpers/paginator.test.php      | 22 +++++-----
 8 files changed, 46 insertions(+), 116 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index caa911c06..b69f75a2b 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -63,9 +63,8 @@ class PaginatorComponent extends Component {
  * - `limit` The initial number of items per page.  Defaults to 20.
  * - `page` The starting page, defaults to 1.
  * - `paramType` What type of parameters you want pagination to use?
- *      - `named` Use named parameters.
+ *      - `named` Use named parameters / routed parameters.
  *      - `querystring` Use query string parameters.
- *      - `route` Use routed parameters, these require you to setup routes that include the pagination params
  *
  * @var array
  */
diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 364b18641..a3a9413e9 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -73,16 +73,6 @@ class CakeRoute {
  */
 	protected $_compiledRoute = null;
 
-/**
- * Constant for the sigil that indicates a route param is a named parameter.
- */
-	const SIGIL_NAMED = ':';
-
-/**
- * Constant for the sigil that indicates a route param is a query string parameter.
- */
-	const SIGIL_QUERYSTRING = '?';
-
 /**
  * HTTP header shortcut map.  Used for evaluating header-based route expressions.
  *
@@ -314,13 +304,6 @@ class CakeRoute {
 				continue;
 			}
 
-			// pull out querystring params
-			if ($key[0] === CakeRoute::SIGIL_QUERYSTRING && ($value !== false && $value !== null)) {
-				$_query[substr($key, 1)] = $value;
-				unset($url[$key]);
-				continue;
-			}
-
 			// pull out named params if named params are greedy or a rule exists.
 			if (
 				($greedyNamed || isset($allowedNamedParams[$key])) &&
@@ -402,9 +385,6 @@ class CakeRoute {
 		if (strpos($this->template, '*')) {
 			$out = str_replace('*', $params['pass'], $out);
 		}
-		if (!empty($params['_query'])) {
-			$out .= $this->queryString($params['_query']);
-		}
 		$out = str_replace('//', '/', $out);
 		return $out;
 	}
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 76e801aec..7e9157fde 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -914,8 +914,6 @@ class Router {
 			$key = $keys[$i];
 			if (is_numeric($keys[$i])) {
 				$args[] = $url[$key];
-			} elseif ($key[0] === CakeRoute::SIGIL_QUERYSTRING) {
-				$query[substr($key, 1)] = $url[$key];
 			} else {
 				$named[$key] = $url[$key];
 			}
@@ -1078,10 +1076,6 @@ class Router {
 			$params['pass'], $params['named'], $params['paging'], $params['models'], $params['url'], $url['url'],
 			$params['autoRender'], $params['bare'], $params['requested'], $params['return']
 		);
-		foreach ($named as $key => $value) {
-			$named[CakeRoute::SIGIL_NAMED . $key] = $value;
-			unset($named[$key]);
-		}
 		$params = array_merge($params, $pass, $named);
 		if (!empty($url)) {
 			$params['?'] = $url;
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 5caaf7ed9..69da3a24a 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -119,12 +119,7 @@ class PaginatorHelper extends AppHelper {
  * @return void
  */
 	public function beforeRender($viewFile) {
-		$named = $this->request->params['named'];
-		foreach ($named as $key => $val) {
-			$named[CakeRoute::SIGIL_NAMED . $key] = $val;
-			unset($named[$key]);
-		}
-		$this->options['url'] = array_merge($this->request->params['pass'], $named);
+		$this->options['url'] = array_merge($this->request->params['pass'], $this->request->params['named']);
 		parent::beforeRender($viewFile);
 	}
 
@@ -405,18 +400,15 @@ class PaginatorHelper extends AppHelper {
  * @return converted url params.
  */
 	protected function _convertUrlKeys($url, $type) {
-		$prefix = '';
-		switch ($type) {
-			case 'named':
-				$prefix = CakeRoute::SIGIL_NAMED;
-				break;
-			case 'querystring':
-				$prefix = CakeRoute::SIGIL_QUERYSTRING;
-				break;
+		if ($type == 'named') {
+			return $url;
+		}
+		if (!isset($url['?'])) {
+			$url['?'] = array();
 		}
 		foreach ($this->convertKeys as $key) {
 			if (isset($url[$key])) {
-				$url[$prefix . $key] = $url[$key];
+				$url['?'][$key] = $url[$key];
 				unset($url[$key]);
 			}
 		}
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/cake/tests/cases/libs/route/cake_route.test.php
index 0831ab814..c1433451c 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/cake/tests/cases/libs/route/cake_route.test.php
@@ -334,7 +334,7 @@ class CakeRouteTestCase extends CakeTestCase {
  */
 	function testMatchWithNamedParametersAndPassedArgs() {
 		Router::connectNamed(true);
-/*
+
 		$route = new CakeRoute('/:controller/:action/*', array('plugin' => null));
 		$result = $route->match(array('controller' => 'posts', 'action' => 'index', 'plugin' => null, 'page' => 1));
 		$this->assertEqual($result, '/posts/index/page:1');
@@ -350,7 +350,7 @@ class CakeRouteTestCase extends CakeTestCase {
 
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, 'page' => 1, 'limit' => 20, 'order' => 'title'));
 		$this->assertEqual($result, '/posts/view/5/page:1/limit:20/order:title');
-*/
+
 
 		$route = new CakeRoute('/test2/*', array('controller' => 'pages', 'action' => 'display', 2));
 		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 1));
@@ -473,39 +473,4 @@ class CakeRouteTestCase extends CakeTestCase {
 		$this->assertFalse($result);
 	}
 
-/**
- * test sigil based query string params
- *
- * @return void
- */
-	function testQueryStringParams() {
-		$route = new CakeRoute('/:controller/:action/*');
-		$result = $route->match(array('controller' => 'posts', 'action' => 'index', '?test' => 'value'));
-		$expected = '/posts/index/?test=value';
-		$this->assertEquals($expected, $result);
-
-		$result = $route->match(array(
-			'controller' => 'posts', 'action' => 'index', '?test' => array(1, 2, 3)
-		));
-		$expected = '/posts/index/?test%5B0%5D=1&test%5B1%5D=2&test%5B2%5D=3';
-		$this->assertEquals($expected, $result);
-		
-		$result = $route->match(array(
-			'controller' => 'posts', 'action' => 'index', '?test' => 'value', '?other' => 'value'
-		));
-		$expected = '/posts/index/?test=value&other=value';
-		$this->assertEquals($expected, $result);
-	}
-
-/**
- * test that querystring params work with non greedy routes.
- *
- * @return void
- */
-	function testQueryStringNonGreedy() {
-		$route = new CakeRoute('/:controller/:action');
-		$result = $route->match(array('controller' => 'posts', 'action' => 'index', '?test' => 'value'));
-		$expected = '/posts/index?test=value';
-		$this->assertEquals($expected, $result);
-	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index c44f27619..c1ed8fb43 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -328,7 +328,7 @@ class RouterTest extends CakeTestCase {
 		Router::connect('short_controller_name/:action/*', array('controller' => 'real_controller_name'));
 		Router::parse('/');
 
-		$result = Router::url(array('controller' => 'real_controller_name', ':page' => '1'));
+		$result = Router::url(array('controller' => 'real_controller_name', 'page' => '1'));
 		$expected = '/short_controller_name/index/page:1';
 		$this->assertEqual($result, $expected);
 
@@ -389,14 +389,14 @@ class RouterTest extends CakeTestCase {
  * @return void
  */
 	function testArrayNamedParameters() {
-		$result = Router::url(array('controller' => 'tests', ':pages' => array(
+		$result = Router::url(array('controller' => 'tests', 'pages' => array(
 			1, 2, 3
 		)));
 		$expected = '/tests/index/pages[0]:1/pages[1]:2/pages[2]:3';
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'tests',
-			':pages' => array(
+			'pages' => array(
 				'param1' => array(
 					'one',
 					'two'
@@ -408,7 +408,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'tests',
-			':pages' => array(
+			'pages' => array(
 				'param1' => array(
 					'one' => 1,
 					'two' => 2
@@ -420,7 +420,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'tests',
-			':super' => array(
+			'super' => array(
 				'nested' => array(
 					'array' => 'awesome',
 					'something' => 'else'
@@ -431,7 +431,7 @@ class RouterTest extends CakeTestCase {
 		$expected = '/tests/index/super[nested][array]:awesome/super[nested][something]:else/super[0]:cool';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'tests', ':namedParam' => array(
+		$result = Router::url(array('controller' => 'tests', 'namedParam' => array(
 			'keyed' => 'is an array',
 			'test'
 		)));
@@ -630,7 +630,7 @@ class RouterTest extends CakeTestCase {
 		$request->webroot = '/';
 		Router::setRequestInfo($request);
 
-		$result = Router::url(array(':page' => 2));
+		$result = Router::url(array('page' => 2));
 		$expected = '/admin/registrations/index/page:2';
 		$this->assertEqual($result, $expected);
 
@@ -648,7 +648,7 @@ class RouterTest extends CakeTestCase {
 
 		Router::parse('/');
 
-		$result = Router::url(array(':page' => 3));
+		$result = Router::url(array('page' => 3));
 		$expected = '/magazine/admin/subscriptions/index/page:3';
 		$this->assertEquals($expected, $result);
 
@@ -860,7 +860,7 @@ class RouterTest extends CakeTestCase {
 
 		$result = Router::url(array(
 			'lang' => 'en',
-			'controller' => 'shows', 'action' => 'index', ':page' => '1',
+			'controller' => 'shows', 'action' => 'index', 'page' => '1',
 		));
 		$expected = '/en/shows/shows/page:1';
 		$this->assertEqual($result, $expected);
@@ -1361,11 +1361,11 @@ class RouterTest extends CakeTestCase {
  * @return void
  */
 	function testNamedArgsUrlGeneration() {
-		$result = Router::url(array('controller' => 'posts', 'action' => 'index', ':published' => 1, ':deleted' => 1));
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', 'published' => 1, 'deleted' => 1));
 		$expected = '/posts/index/published:1/deleted:1';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'posts', 'action' => 'index', ':published' => 0, ':deleted' => 0));
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', 'published' => 0, 'deleted' => 0));
 		$expected = '/posts/index/published:0/deleted:0';
 		$this->assertEqual($result, $expected);
 
@@ -1375,11 +1375,11 @@ class RouterTest extends CakeTestCase {
 		Router::connect('/', array('controller' => 'graphs', 'action' => 'index'));
 		Router::connect('/:id/*', array('controller' => 'graphs', 'action' => 'view'), array('id' => $ID));
 
-		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 'id' => 12, ':file' => 'asdf.png'));
+		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 'id' => 12, 'file' => 'asdf.png'));
 		$expected = '/12/file:asdf.png';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 12, ':file' => 'asdf.foo'));
+		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 12, 'file' => 'asdf.foo'));
 		$expected = '/graphs/view/12/file:asdf.foo';
 		$this->assertEqual($result, $expected);
 
@@ -1398,7 +1398,7 @@ class RouterTest extends CakeTestCase {
 		);
 		Router::parse('/');
 
-		$result = Router::url(array(':page' => 1, 0 => null, ':sort' => 'controller', ':direction' => 'asc', ':order' => null));
+		$result = Router::url(array('page' => 1, 0 => null, 'sort' => 'controller', 'direction' => 'asc', 'order' => null));
 		$expected = "/admin/controller/index/page:1/sort:controller/direction:asc";
 		$this->assertEqual($result, $expected);
 
@@ -1411,7 +1411,7 @@ class RouterTest extends CakeTestCase {
 		Router::setRequestInfo($request);
 
 		$result = Router::parse('/admin/controller/index/type:whatever');
-		$result = Router::url(array(':type'=> 'new'));
+		$result = Router::url(array('type'=> 'new'));
 		$expected = "/admin/controller/index/type:new";
 		$this->assertEqual($result, $expected);
 	}
@@ -1546,12 +1546,12 @@ class RouterTest extends CakeTestCase {
 		$expected = '/protected/others/edit/1';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':page' => 1));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'page' => 1));
 		$expected = '/protected/others/edit/1/page:1';
 		$this->assertEqual($result, $expected);
 
 		Router::connectNamed(array('random'));
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':random' => 'my-value'));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'random' => 'my-value'));
 		$expected = '/protected/others/edit/1/random:my-value';
 		$this->assertEqual($result, $expected);
 	}
@@ -1610,12 +1610,12 @@ class RouterTest extends CakeTestCase {
 		$expected = '/protected/others/edit/1';
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':page' => 1));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'page' => 1));
 		$expected = '/protected/others/edit/1/page:1';
 		$this->assertEqual($result, $expected);
 
 		Router::connectNamed(array('random'));
-		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, ':random' => 'my-value'));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'random' => 'my-value'));
 		$expected = '/protected/others/edit/1/random:my-value';
 		$this->assertEqual($result, $expected);
 	}
@@ -1721,7 +1721,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('controller' => 'my_controller', 'action' => 'my_action', 'base' => true));
-		$expected = '/base/my_controller/my_action';
+		$expected = '/base/my_controller/my_action/base:1';
 		$this->assertEqual($result, $expected);
 	}
 
@@ -1908,7 +1908,7 @@ class RouterTest extends CakeTestCase {
 		$expected = array('pass' => array(), 'named' => array(), 'prefix' => 'members', 'plugin' => null, 'controller' => 'posts', 'action' => 'index', 'members' => true);
 		$this->assertEqual($result, $expected);
 
-		$result = Router::url(array('members' => true, 'controller' => 'posts', 'action' =>'index', ':page' => 2));
+		$result = Router::url(array('members' => true, 'controller' => 'posts', 'action' =>'index', 'page' => 2));
 		$expected = '/base/members/posts/index/page:2';
 		$this->assertEqual($result, $expected);
 
@@ -2083,7 +2083,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = Router::url(array('action' => 'test_another_action', 'locale' => 'badness'));
-		$expected = '/test/test_another_action';
+		$expected = '/test/test_another_action/locale:badness';
 		$this->assertEqual($result, $expected);
 	}
 
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 9e57e3028..4ef761091 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -477,7 +477,7 @@ class HelperTest extends CakeTestCase {
 		$result = $this->Helper->url('/controller/action/1?one=1&two=2');
 		$this->assertEqual($result, '/controller/action/1?one=1&amp;two=2');
 
-		$result = $this->Helper->url(array('controller' => 'posts', 'action' => 'index', ':page' => '1" onclick="alert(\'XSS\');"'));
+		$result = $this->Helper->url(array('controller' => 'posts', 'action' => 'index', 'page' => '1" onclick="alert(\'XSS\');"'));
 		$this->assertEqual($result, "/posts/index/page:1&quot; onclick=&quot;alert(&#039;XSS&#039;);&quot;");
 
 		$result = $this->Helper->url('/controller/action/1/param:this+one+more');
@@ -490,12 +490,12 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($result, '/controller/action/1/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24');
 
 		$result = $this->Helper->url(array(
-			'controller' => 'posts', 'action' => 'index', ':param' => '%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24'
+			'controller' => 'posts', 'action' => 'index', 'param' => '%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24'
 		));
 		$this->assertEqual($result, "/posts/index/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24");
 
 		$result = $this->Helper->url(array(
-			'controller' => 'posts', 'action' => 'index', ':page' => '1',
+			'controller' => 'posts', 'action' => 'index', 'page' => '1',
 			'?' => array('one' => 'value', 'two' => 'value', 'three' => 'purple')
 		));
 		$this->assertEqual($result, "/posts/index/page:1?one=value&amp;two=value&amp;three=purple");
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index ab400702b..c52ec5e92 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -674,7 +674,7 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		$result = $this->Paginator->sort('title');
 		$expected = array(
-			'a' => array('href' => '/articles/index/2/foo:bar/page:1/sort:title/direction:asc'),
+			'a' => array('href' => '/articles/index/2/page:1/foo:bar/sort:title/direction:asc'),
 			'Title',
 			'/a'
 		);
@@ -684,24 +684,24 @@ class PaginatorHelperTest extends CakeTestCase {
 		$expected = array(
 			array('span' => array('class' => 'current')), '1', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:2')), '2', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:2/foo:bar')), '2', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:3')), '3', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:3/foo:bar')), '3', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:4')), '4', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:4/foo:bar')), '4', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:5')), '5', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:5/foo:bar')), '5', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:6')), '6', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:6/foo:bar')), '6', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/articles/index/2/foo:bar/page:7')), '7', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:7/foo:bar')), '7', '/a', '/span',
 		);
 		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/articles/index/2/foo:bar/page:2', 'class' => 'next'),
+			'a' => array('href' => '/articles/index/2/page:2/foo:bar', 'class' => 'next'),
 			'Next',
 			'/a',
 			'/span'
@@ -915,10 +915,10 @@ class PaginatorHelperTest extends CakeTestCase {
 			)
 		);
 		$this->Paginator->options(array('url' => array(12, 'page' => 3)));
-		$result = $this->Paginator->prev('Prev', array('url' => array(':foo' => 'bar')));
+		$result = $this->Paginator->prev('Prev', array('url' => array('foo' => 'bar')));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/12/foo:bar/page:1/limit:10', 'class' => 'prev'),
+			'a' => array('href' => '/index/12/page:1/limit:10/foo:bar', 'class' => 'prev'),
 			'Prev',
 			'/a',
 			'/span'
@@ -2199,7 +2199,7 @@ class PaginatorHelperTest extends CakeTestCase {
 	function testQuerystringLinkGeneration() {
 		$this->Paginator->request->params['paging']['Article']['paramType'] = 'querystring';
 		$result = $this->Paginator->url(array('page' => '4'));
-		$expected = '/index?page=4';
+		$expected = '/?page=4';
 		$this->assertEquals($expected, $result);
 	}
 

From d7e411650fee8ebb1b33b24d63c66c806649807e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 20 Dec 2010 13:39:22 -0500
Subject: [PATCH 38/90] Moving some tests around so its easier to figure out
 what's being tested. Adding a querystring test.

---
 .../libs/view/helpers/paginator.test.php      | 110 +++++++++---------
 1 file changed, 53 insertions(+), 57 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index c52ec5e92..54602424f 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -47,6 +47,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->Paginator->request->addParams(array(
 			'paging' => array(
 				'Article' => array(
+					'page' => 2,
 					'current' => 9,
 					'count' => 62,
 					'prevPage' => false,
@@ -1763,6 +1764,51 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * test first() and last() with tag options
+ *
+ * @return void
+ */
+	function testFirstAndLastTag() {
+		$result = $this->Paginator->first('<<', array('tag' => 'li'));
+		$expected = array(
+			'<li',
+			'a' => array('href' => '/index/page:1'),
+			'&lt;&lt;',
+			'/a',
+			'/li'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last(2, array('tag' => 'li'));
+
+		$expected = array(
+			'...',
+			'<li',
+			array('a' => array('href' => '/index/page:6')), '6', '/a',
+			'/li',
+			' | ',
+			'<li',
+			array('a' => array('href' => '/index/page:7')), '7', '/a',
+			'/li',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that on the last page you don't get a link ot the last page.
+ *
+ * @return void
+ */
+	function testLastNoOutput() {
+		$this->Paginator->request->params['paging']['Article']['page'] = 15;
+		$this->Paginator->request->params['paging']['Article']['pageCount'] = 15;
+
+		$result = $this->Paginator->last();
+		$expected = '';
+		$this->assertEqual($result, $expected);
+	}
+
 /**
  * testFirstAndLast method
  *
@@ -1787,20 +1833,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$expected = '';
 		$this->assertEqual($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array(
-			'Client' => array(
-				'page' => 4,
-				'current' => 3, 
-				'count' => 30, 
-				'prevPage' => false, 
-				'nextPage' => 2, 
-				'pageCount' => 15,
-				'options' => array(
-					'page' => 1, 
-				),
-				'paramType' => 'named'
-			)
-		);
+		$this->Paginator->request->params['paging']['Client']['page'] = 4;
 
 		$result = $this->Paginator->first();
 		$expected = array(
@@ -1812,16 +1845,6 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Paginator->first('<<', array('tag' => 'li'));
-		$expected = array(
-			'<li',
-			'a' => array('href' => '/index/page:1'),
-			'&lt;&lt;',
-			'/a',
-			'/li'
-		);
-		$this->assertTags($result, $expected);
-
 		$result = $this->Paginator->last();
 		$expected = array(
 			'<span',
@@ -1856,37 +1879,6 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Paginator->last(2, array('tag' => 'li'));
-		$expected = array(
-			'...',
-			'<li',
-			array('a' => array('href' => '/index/page:14')), '14', '/a',
-			'/li',
-			' | ',
-			'<li',
-			array('a' => array('href' => '/index/page:15')), '15', '/a',
-			'/li',
-		);
-		$this->assertTags($result, $expected);
-
-		$this->Paginator->request->params['paging'] = array(
-			'Client' => array(
-				'page' => 15, 
-				'current' => 3, 
-				'count' => 30, 
-				'prevPage' => false, 
-				'nextPage' => 2, 
-				'pageCount' => 15,
-				'options' => array(
-					'page' => 1, 
-				),
-				'paramType' => 'named'
-			)
-		);
-		$result = $this->Paginator->last();
-		$expected = '';
-		$this->assertEqual($result, $expected);
-
 		$this->Paginator->request->params['paging'] = array(
 			'Client' => array(
 				'page' => 4, 
@@ -2192,15 +2184,19 @@ class PaginatorHelperTest extends CakeTestCase {
 	}
 
 /**
- * test that querystring links can be generated.
+ * test that querystring urls can be generated.
  *
  * @return void
  */
-	function testQuerystringLinkGeneration() {
+	function testQuerystringUrlGeneration() {
 		$this->Paginator->request->params['paging']['Article']['paramType'] = 'querystring';
 		$result = $this->Paginator->url(array('page' => '4'));
 		$expected = '/?page=4';
 		$this->assertEquals($expected, $result);
+
+		$result = $this->Paginator->url(array('page' => '4', 'limit' => 10, 'something' => 'else'));
+		$expected = '/index/something:else?page=4&amp;limit=10';
+		$this->assertEquals($expected, $result);
 	}
 
 }

From 0b90195a5256118858c35369b1e2cfef75e025da Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 20 Dec 2010 13:59:09 -0500
Subject: [PATCH 39/90] Adding tests for creating next/prev links with
 querystrings. Removing code that doesn't seem to do anything, no tests fail
 when its removed.

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

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 69da3a24a..6f7145643 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -357,11 +357,10 @@ class PaginatorHelper extends AppHelper {
 			$url = array_merge((array)$options['url'], (array)$url);
 			unset($options['url']);
 		}
+
 		$url = $this->url($url, true, $model);
 
 		$obj = isset($options['update']) ? $this->_ajaxHelperClass : 'Html';
-		$url = array_merge(array('page' => $this->current($model)), $url);
-		$url = array_merge(Set::filter($url, true), array_intersect_key($url, array('plugin' => true)));
 		return $this->{$obj}->link($title, $url, $options);
 	}
 
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 54602424f..2bad399f4 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -2199,4 +2199,36 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test querystring paging link.
+ *
+ * @return void
+ */
+	function testQuerystringNextAndPrev() {
+		$this->Paginator->request->params['paging']['Article']['paramType'] = 'querystring';
+		$this->Paginator->request->params['paging']['Article']['page'] = 2;
+		$this->Paginator->request->params['paging']['Article']['nextPage'] = true;
+		$this->Paginator->request->params['paging']['Article']['prevPage'] = true;
+		
+		$result = $this->Paginator->next('Next');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/?page=3', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+		
+		$result = $this->Paginator->prev('Prev');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/?page=1', 'class' => 'prev'),
+			'Prev',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 }

From abc6a28ecaac6b74972408ae1aceaf39b77725ca Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 20 Dec 2010 14:02:12 -0500
Subject: [PATCH 40/90] Increasing code coverage.

---
 .../cases/libs/view/helpers/paginator.test.php      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 2bad399f4..b0c5ae18c 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -2231,4 +2231,17 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * test the current() method
+ *
+ * @return void
+ */
+	function testCurrent() {
+		$result = $this->Paginator->current();
+		$this->assertEquals($this->Paginator->request->params['paging']['Article']['page'], $result);
+
+		$result = $this->Paginator->current('Incorrect');
+		$this->assertEquals(1, $result);
+	}
+
 }

From 6f62c22cbc0ca1aed6ee80cee1a3ec141171f7aa Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 20 Dec 2010 20:27:27 -0500
Subject: [PATCH 41/90] Fixing fencepost errors. Splitting tests up into
 smaller groups.

---
 cake/libs/view/helpers/paginator.php          |   4 +-
 .../libs/view/helpers/paginator.test.php      | 119 ++++++++++--------
 2 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 6f7145643..f7369e408 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -754,7 +754,7 @@ class PaginatorHelper extends AppHelper {
 
 		$out = '';
 
-		if (is_int($first) && $params['page'] > $first) {
+		if (is_int($first) && $params['page'] >= $first) {
 			if ($after === null) {
 				$after = $ellipsis;
 			}
@@ -811,7 +811,7 @@ class PaginatorHelper extends AppHelper {
 		$out = '';
 		$lower = $params['pageCount'] - $last + 1;
 
-		if (is_int($last) && $params['page'] < $lower) {
+		if (is_int($last) && $params['page'] <= $lower) {
 			if ($before === null) {
 				$before = $ellipsis;
 			}
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index b0c5ae18c..b5e37983b 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -1810,31 +1810,45 @@ class PaginatorHelperTest extends CakeTestCase {
 	}
 
 /**
- * testFirstAndLast method
+ * test first() on the first page.
  *
- * @access public
  * @return void
  */
-	function testFirstAndLast() {
-		$this->Paginator->request->params['paging'] = array(
-			'Client' => array(
-				'page' => 1, 
-				'current' => 3, 
-				'count' => 30, 
-				'prevPage' => false, 
-				'nextPage' => 2, 
-				'pageCount' => 15,
-				'options' => array(),
-				'paramType' => 'named'
-			)
-		);
+	function testFirstEmpty() {
+		$this->Paginator->request->params['paging']['Article']['page'] = 1;
 
 		$result = $this->Paginator->first();
 		$expected = '';
 		$this->assertEqual($result, $expected);
+	}
 
-		$this->Paginator->request->params['paging']['Client']['page'] = 4;
+/**
+ * test first() and options()
+ *
+ * @return void
+ */
+	function testFirstFullBaseUrl() {
+		$this->Paginator->request->params['paging']['Article']['options']['order'] = array('Article.title' => 'DESC');
 
+		$this->Paginator->options(array('url' => array('full_base' => true)));
+
+		$result = $this->Paginator->first();
+		$expected = array(
+			'<span',
+			array('a' => array('href' => FULL_BASE_URL . '/index/page:1/sort:Article.title/direction:DESC')), 
+			'&lt;&lt; first', 
+			'/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test first() on the fence-post
+ *
+ * @return void
+ */
+	function testFirstBoundaries() {
 		$result = $this->Paginator->first();
 		$expected = array(
 			'<span',
@@ -1845,10 +1859,30 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
+		$result = $this->Paginator->first(2);
+		$expected = array(
+			'<span',
+			array('a' => array('href' => '/index/page:1')), '1', '/a',
+			'/span',
+			' | ',
+			'<span',
+			array('a' => array('href' => '/index/page:2')), '2', '/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test Last method
+ *
+ * @access public
+ * @return void
+ */
+	function testLast() {
 		$result = $this->Paginator->last();
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:15'),
+			'a' => array('href' => '/index/page:7'),
 			'last &gt;&gt;',
 			'/a',
 			'/span'
@@ -1859,26 +1893,35 @@ class PaginatorHelperTest extends CakeTestCase {
 		$expected = array(
 			'...',
 			'<span',
-			'a' => array('href' => '/index/page:15'),
-			'15',
+			'a' => array('href' => '/index/page:7'),
+			'7',
 			'/a',
 			'/span'
 		);
 		$this->assertTags($result, $expected);
 
+		$this->Paginator->request->params['paging']['Article']['page'] = 6;
+
 		$result = $this->Paginator->last(2);
 		$expected = array(
 			'...',
 			'<span',
-			array('a' => array('href' => '/index/page:14')), '14', '/a',
+			array('a' => array('href' => '/index/page:6')), '6', '/a',
 			'/span',
 			' | ',
 			'<span',
-			array('a' => array('href' => '/index/page:15')), '15', '/a',
+			array('a' => array('href' => '/index/page:7')), '7', '/a',
 			'/span',
 		);
 		$this->assertTags($result, $expected);
-
+	}
+	
+/**
+ * undocumented function
+ *
+ * @return void
+ */
+	function testLastOptions() {
 		$this->Paginator->request->params['paging'] = array(
 			'Client' => array(
 				'page' => 4, 
@@ -1895,14 +1938,6 @@ class PaginatorHelperTest extends CakeTestCase {
 			)
 		);
 
-		$result = $this->Paginator->first();
-		$expected = array(
-			'<span',
-			array('a' => array('href' => '/index/page:1/sort:Client.name/direction:DESC')), '&lt;&lt; first', '/a',
-			'/span',
-		);
-		$this->assertTags($result, $expected);
-
 		$result = $this->Paginator->last();
 		$expected = array(
 			'<span',
@@ -1910,7 +1945,7 @@ class PaginatorHelperTest extends CakeTestCase {
 			'/span',
 		);
 		$this->assertTags($result, $expected);
-
+		
 		$result = $this->Paginator->last(1);
 		$expected = array(
 			'...',
@@ -1933,19 +1968,6 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Paginator->last(2, array('ellipsis' => '~~~'));
-		$expected = array(
-			'~~~',
-			'<span',
-			array('a' => array('href' => '/index/page:14/sort:Client.name/direction:DESC')), '14', '/a',
-			'/span',
-			' | ',
-			'<span',
-			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), '15', '/a',
-			'/span',
-		);
-		$this->assertTags($result, $expected);
-
 		$result = $this->Paginator->last(2, array('ellipsis' => '<span class="ellipsis">...</span>'));
 		$expected = array(
 			array('span' => array('class' => 'ellipsis')), '...', '/span',
@@ -1958,15 +1980,6 @@ class PaginatorHelperTest extends CakeTestCase {
 			'/span',
 		);
 		$this->assertTags($result, $expected);
-
-		$this->Paginator->options(array('url' => array('full_base' => true)));
-		$result = $this->Paginator->first();
-		$expected = array(
-			'<span',
-			array('a' => array('href' => FULL_BASE_URL . '/index/page:1/sort:Client.name/direction:DESC')), '&lt;&lt; first', '/a',
-			'/span',
-		);
-		$this->assertTags($result, $expected);
 	}
 
 /**

From f85567a5666f7f9b5c52a93b8d146ff575f87593 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 21 Dec 2010 20:53:39 -0500
Subject: [PATCH 42/90] Removing @author tags that snuck in.

---
 cake/libs/cake_log.php                   | 1 -
 cake/tests/cases/libs/view/view.test.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index afc8df033..997698ed9 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -50,7 +50,6 @@ interface CakeLogInterface {
  * @param string $type 
  * @param string $message 
  * @return void
- * @author Mark Story
  */
 	public function write($type, $message);
 }
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index 9e4d7a44a..e50934dd9 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -121,7 +121,6 @@ class TestView extends View {
  * @param string $loadHelpers 
  * @param string $cached 
  * @return void
- * @author Mark Story
  */
 	function render_($___viewFn, $___dataForView, $loadHelpers = true, $cached = false) {
 		return $this->_render($___viewFn, $___dataForView, $loadHelpers, $cached);

From 4312a26b2ff39945066daf78b0eb3954274eae0e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 21 Dec 2010 21:59:25 -0500
Subject: [PATCH 43/90] Removing View::$autoRender it wasn't used. Removing
 @access tags, which just restated the visibility keywords. Adding
 documentation to a number of parameters and methods.

---
 cake/libs/cache.php     | 26 ++++++++++---
 cake/libs/view/view.php | 82 +++++++++++++++++------------------------
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 17ba3f8d7..008c71b15 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -13,17 +13,33 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0.4933
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
 /**
- * Caching for CakePHP.
+ * Cache provides a consistent interface to Caching in your application. It allows you
+ * to use several different Cache engines, without coupling your application to a specific 
+ * implementation.  It also allows you to change out cache storage or configuration without effecting 
+ * the rest of your application.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * You can configure Cache engines in your application's `bootstrap.php` file.  A sample configuration would 
+ * be 
+ *
+ * {{{
+ *	Cache::config('shared', array(
+ *		'engine' => 'Apc',
+ *		'prefix' => 'my_app_'
+ *  ));
+ * }}}
+ *
+ * This would configure an APC cache engine to the 'shared' alias.  You could then read and write
+ * to that cache alias by using it for the `$config` parameter in the various Cache methods.  In 
+ * general all Cache operations are supported by all cache engines.  However, Cache::increment() and
+ * Cache::decrement() are not supported by File caching.
+ *
+ * @package    cake.libs
  */
 class Cache {
 
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index af035292f..dba1a147b 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -25,12 +25,16 @@ App::import('View', 'HelperCollection', false);
 App::import('View', 'Helper', false);
 
 /**
- * View, the V in the MVC triad.
+ * View, the V in the MVC triad. View interacts with Helpers and view variables passed
+ * in from the controller to render the results of the controller action.  Often this is HTML,
+ * but can also take the form of JSON, XML, PDF's or streaming files.
  *
- * Class holding methods for displaying presentation data.
+ * CakePHP uses a two-step-view pattern.  This means that the view content is rendered first, 
+ * and then inserted into the selected layout.  A special `$content_for_layout` variable is available
+ * in the layout, and it contains the rendered view.  This also means you can pass data from the view to the 
+ * layout using `$this->set()`
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package    cake.libs.view
  */
 class View extends Object {
 
@@ -53,7 +57,6 @@ class View extends Object {
  * Name of the controller.
  *
  * @var string Name of controller
- * @access public
  */
 	public $name = null;
 
@@ -68,7 +71,6 @@ class View extends Object {
  * An array of names of built-in helpers to include.
  *
  * @var mixed A single name as a string or a list of names as an array.
- * @access public
  */
 	public $helpers = array('Html');
 
@@ -83,7 +85,6 @@ class View extends Object {
  * Variables for the view
  *
  * @var array
- * @access public
  */
 	public $viewVars = array();
 
@@ -91,7 +92,6 @@ class View extends Object {
  * Name of layout to use with this View.
  *
  * @var string
- * @access public
  */
 	public $layout = 'default';
 
@@ -103,18 +103,10 @@ class View extends Object {
 	public $layoutPath = null;
 
 /**
- * Turns on or off Cake's conventional mode of rendering views. On by default.
+ * Turns on or off Cake's conventional mode of applying layout files. On by default.
+ * Setting to off means that layouts will not be automatically applied to rendered views.
  *
  * @var boolean
- * @access public
- */
-	public $autoRender = true;
-
-/**
- * Turns on or off Cake's conventional mode of finding layout files. On by default.
- *
- * @var boolean
- * @access public
  */
 	public $autoLayout = true;
 
@@ -122,23 +114,21 @@ class View extends Object {
  * File extension. Defaults to Cake's template ".ctp".
  *
  * @var string
- * @access public
  */
 	public $ext = '.ctp';
 
 /**
- * Sub-directory for this view file.
+ * Sub-directory for this view file.  This is often used for extension based routing.
+ * for example with an `xml` extension, $subDir would be `xml/`
  *
  * @var string
- * @access public
  */
 	public $subDir = null;
 	
 /**
- * Theme name.
+ * Theme name.  If you are using themes, you should remember to use ThemeView as well.
  *
  * @var string
- * @access public
  */
 	public $theme = null;
 
@@ -147,7 +137,6 @@ class View extends Object {
  *
  * @see Controller::$cacheAction
  * @var mixed
- * @access public
  */
 	public $cacheAction = false;
 
@@ -155,7 +144,6 @@ class View extends Object {
  * holds current errors for the model validation
  *
  * @var array
- * @access public
  */
 	public $validationErrors = array();
 
@@ -163,7 +151,6 @@ class View extends Object {
  * True when the view has been rendered.
  *
  * @var boolean
- * @access public
  */
 	public $hasRendered = false;
 
@@ -171,7 +158,6 @@ class View extends Object {
  * True if in scope of model-specific region
  *
  * @var boolean
- * @access public
  */
 	public $modelScope = false;
 
@@ -179,7 +165,6 @@ class View extends Object {
  * Name of current model this view context is attached to
  *
  * @var string
- * @access public
  */
 	public $model = null;
 
@@ -187,7 +172,6 @@ class View extends Object {
  * Name of association model this view context is attached to
  *
  * @var string
- * @access public
  */
 	public $association = null;
 
@@ -195,7 +179,6 @@ class View extends Object {
  * Name of current model field this view context is attached to
  *
  * @var string
- * @access public
  */
 	public $field = null;
 
@@ -203,7 +186,6 @@ class View extends Object {
  * Suffix of current field this view context is attached to
  *
  * @var string
- * @access public
  */
 	public $fieldSuffix = null;
 
@@ -211,7 +193,6 @@ class View extends Object {
  * The current model ID this view context is attached to
  *
  * @var mixed
- * @access public
  */
 	public $modelId = null;
 
@@ -219,7 +200,6 @@ class View extends Object {
  * List of generated DOM UUIDs
  *
  * @var array
- * @access public
  */
 	public $uuids = array();
 
@@ -227,7 +207,6 @@ class View extends Object {
  * Holds View output.
  *
  * @var string
- * @access public
  */
 	public $output = false;
 
@@ -254,10 +233,9 @@ class View extends Object {
  * List of variables to collect from the associated controller
  *
  * @var array
- * @access protected
  */
 	private $__passedVars = array(
-		'viewVars', 'autoLayout', 'autoRender', 'ext', 'helpers', 'layout', 'name',
+		'viewVars', 'autoLayout', 'ext', 'helpers', 'layout', 'name',
 		'layoutPath', 'viewPath', 'request', 'plugin', 'passedArgs', 'cacheAction'
 	);
 
@@ -265,7 +243,6 @@ class View extends Object {
  * Scripts (and/or other <head /> tags) for the layout
  *
  * @var array
- * @access protected
  */
 	protected $_scripts = array();
 
@@ -273,7 +250,6 @@ class View extends Object {
  * Holds an array of paths.
  *
  * @var array
- * @access private
  */
 	private $__paths = array();
 
@@ -304,9 +280,8 @@ class View extends Object {
 /**
  * Renders a piece of PHP with provided parameters and returns HTML, XML, or any other string.
  *
- * This realizes the concept of Elements, (or "partial layouts")
- * and the $params array is used to send data to be used in the
- * Element.  Elements can be cached through use of the cache key.
+ * This realizes the concept of Elements, (or "partial layouts")  and the $params array is used to send 
+ * data to be used in the element.  Elements can be cached improving performance by using the `cache` option.
  *
  * ### Special params
  *
@@ -381,9 +356,20 @@ class View extends Object {
  * Renders view for given action and layout. If $file is given, that is used
  * for a view filename (e.g. customFunkyView.ctp).
  *
- * @param string $action Name of action to render for
- * @param string $layout Layout to use
- * @param string $file Custom filename for view
+ * Render triggers helper callbacks, which are fired before and after the view are rendered,
+ * as well as before and after the layout.  The helper callbacks are called
+ *
+ * - `beforeRender`
+ * - `afterRender`
+ * - `beforeLayout`
+ * - `afterLayout`
+ *
+ * If View::$autoRender is false and no `$layout` is provided, the view will be returned bare.
+ *
+ * @param string $action Name of action to render for, this will be used as the filename to render, unless
+ *   $file is give as well.
+ * @param string $layout Layout to use.
+ * @param string $file Custom filename for view. Providing this will render a specific file for the given action.
  * @return string Rendered Element
  * @throws CakeException if there is an error in the view.
  */
@@ -582,7 +568,7 @@ class View extends Object {
 
 /**
  * Allows a template or element to set a variable that will be available in
- * a layout or other element. Analagous to Controller::set.
+ * a layout or other element. Analagous to Controller::set().
  *
  * @param mixed $one A string or an array of data.
  * @param mixed $two Value in case $one is a string (which then works as the key).
@@ -648,12 +634,10 @@ class View extends Object {
  * array of data.
  *
  * @param string $___viewFn Filename of the view
- * @param array $___dataForView Data to include in rendered view
- * @param boolean $loadHelpers Boolean to indicate that helpers should be loaded.
- * @param boolean $cached Whether or not to trigger the creation of a cache file.
+ * @param array $___dataForView Data to include in rendered view. If empty the current View::$viewVars will be used.
  * @return string Rendered output
  */
-	protected function _render($___viewFn, $___dataForView = array(), $loadHelpers = true, $cached = false) {
+	protected function _render($___viewFn, $___dataForView = array()) {
 		if (empty($___dataForView)) {
 			$___dataForView = $this->viewVars;
 		}

From d5589d26bd6b8c25b90deac6c557fbcf3fe78107 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 21 Dec 2010 22:27:17 -0500
Subject: [PATCH 44/90] more doc blocks.

---
 cake/libs/controller/controller.php | 40 ++++++++++++++++++++---------
 cake/libs/router.php                | 20 ++++++++++++---
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index de0553b01..7f91f5dd9 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -27,15 +27,28 @@ App::import('Controller', 'Component', false);
 App::import('View', 'View', false);
 
 /**
- * Controller
- *
  * Application controller class for organization of business logic.
  * Provides basic functionality, such as rendering views inside layouts,
  * automatic model availability, redirection, callbacks, and more.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller
- * @link          http://book.cakephp.org/view/956/Introduction
+ * Controllers should provide a number of 'action' methods.  These are public methods on the controller
+ * that are not prefixed with a '_' and not part of Controller.  Each action serves as an endpoint for 
+ * performing a specific action on a resource or collection of resources.  For example adding or editing a new
+ * object, or listing a set of objects.
+ *
+ * You can access request parameters, using `$this->request`.  The request object contains all the POST, GET and FILES
+ * that were part of the request. 
+ *
+ * After performing the required actions, controllers are responsible for creating a response.  This usually
+ * takes the form of a generated View, or possibly a redirection to another controller action.  In either case
+ * `$this->response` allows you to manipulate all aspects of the response.
+ *
+ * Controllers are created by Dispatcher based on request parameters and routing. By default controllers and actions
+ * use conventional names.  For example `/posts/index` maps to `PostsController::index()`.  You can re-map urls
+ * using Router::connect().
+ *
+ * @package    cake.libs.controller
+ * @link       http://book.cakephp.org/view/956/Introduction
  */
 class Controller extends Object {
 
@@ -148,7 +161,7 @@ class Controller extends Object {
 	public $autoLayout = true;
 
 /**
- * Instance of Component used to handle callbacks.
+ * Instance of ComponentCollection used to handle callbacks.
  *
  * @var string
  */
@@ -240,7 +253,8 @@ class Controller extends Object {
 	public $scaffold = false;
 
 /**
- * Holds current methods of the controller
+ * Holds current methods of the controller.  This is a list of all the methods reachable
+ * via url.  Modifying this array, will allow you to change which methods can be reached.
  *
  * @var array
  */
@@ -550,7 +564,7 @@ class Controller extends Object {
  *
  * @return mixed Associative array of the HTTP codes as keys, and the message
  *    strings as values, or null of the given $code does not exist.
- * @deprecated
+ * @deprecated Use CakeResponse::httpCodes();
  */
 	public function httpCodes($code = null) {
 		return $this->response->httpCodes($code);
@@ -671,7 +685,7 @@ class Controller extends Object {
  *
  * @param string $status The header message that is being set.
  * @return void
- * @deprecated
+ * @deprecated Use CakeResponse::header()
  */
 	public function header($status) {
 		$this->response->header($status);
@@ -859,7 +873,7 @@ class Controller extends Object {
  *
  * @return void
  * @link http://book.cakephp.org/view/988/disableCache
- * @deprecated
+ * @deprecated Use CakeResponse::disableCache()
  */
 	public function disableCache() {
 		$this->response->disableCache();
@@ -960,7 +974,8 @@ class Controller extends Object {
 	}
 
 /**
- * Called before the controller action.
+ * Called before the controller action.  You can use this method to configure and customize components
+ * or perform logic that needs to happen before each controller action.
  *
  * @link http://book.cakephp.org/view/984/Callbacks
  */
@@ -968,7 +983,8 @@ class Controller extends Object {
 	}
 
 /**
- * Called after the controller action is run, but before the view is rendered.
+ * Called after the controller action is run, but before the view is rendered. You can use this method
+ * to perform logic or set view variables that are required on every request.
  *
  * @link http://book.cakephp.org/view/984/Callbacks
  */
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 611301867..ac0ae9d50 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -22,10 +22,23 @@ App::import('Core', 'CakeRequest');
 App::import('Core', 'route/CakeRoute');
 
 /**
- * Parses the request URL into controller, action, and parameters.
+ * Parses the request URL into controller, action, and parameters.  Uses the connected routes
+ * to match the incoming url string to parameters that will allow the request to be dispatched.  Also
+ * handles converting parameter lists into url strings, using the connected routes.  Routing allows you to decouple
+ * the way the world interacts with your application (urls) and the implementation (controllers and actions).
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * ### Connecting routes
+ *
+ * Connecting routes is done using Router::connect().  When parsing incoming requests or reverse matching
+ * parameters, routes are enumerated in the order they were connected.  You can modify the order of connected
+ * routes using Router::promote().  For more information on routes and how to connect them see Router::connect().
+ *
+ * ### Named parameters
+ *
+ * Named parameters allow you to embed key:value pairs into path segments.  This allows you create hash
+ * structures using urls.  You can define how named parameters work in your application using Router::connectNamed()
+ *
+ * @package       cake.libs
  */
 class Router {
 
@@ -276,6 +289,7 @@ class Router {
  * Redirects /posts/* to http://google.com with a HTTP status of 302
  *
  * ### Options:
+ *
  * - `status` Sets the HTTP status (default 301)
  * - `persist` Passes the params to the redirected route, if it can
  *

From afbc73a3b5f4602f85ef881ff1cdb2851d3e8c3e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 21 Dec 2010 22:36:37 -0500
Subject: [PATCH 45/90] More documentation.

---
 cake/libs/cake_request.php  | 16 +++++++++++++---
 cake/libs/cake_response.php | 22 ++++++++++++++++------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/cake/libs/cake_request.php b/cake/libs/cake_request.php
index 580f51296..23c925883 100644
--- a/cake/libs/cake_request.php
+++ b/cake/libs/cake_request.php
@@ -519,7 +519,8 @@ class CakeRequest implements ArrayAccess {
 	}
 
 /**
- * Add parameters to the request's parsed parameter set. This will overwrite any existing parameters
+ * Add parameters to the request's parsed parameter set. This will overwrite any existing parameters.
+ * This modifies the parameters available through `$request->params`.
  *
  * @param array $params Array of parameters to merge in
  * @return The current object, you can chain this method.
@@ -531,6 +532,7 @@ class CakeRequest implements ArrayAccess {
 
 /**
  * Add paths to the requests' paths vars.  This will overwrite any existing paths.
+ * Provides an easy way to modify, here, webroot and base.
  *
  * @param array $paths Array of paths to merge in
  * @return the current object, you can chain this method.
@@ -605,11 +607,11 @@ class CakeRequest implements ArrayAccess {
  *
  * #### Get all types:
  *
- * `$request->accepts();`
+ * `$this->request->accepts();`
  *
  * #### Check for a single type:
  *
- * `$request->accepts('json');`
+ * `$this->request->accepts('json');`
  *
  * @param string $type The content type to check for.  Leave null to get all types a client accepts.
  * @return mixed Either an array of all the types the client accepts or a boolean if they accept the
@@ -632,6 +634,14 @@ class CakeRequest implements ArrayAccess {
 /**
  * Get the lanaguages accepted by the client, or check if a specific language is accepted.
  *
+ * Get the list of accepted languages:
+ *
+ * {{{ CakeRequest::acceptLanguage(); }}}
+ *
+ * Check if a specific language is accepted:
+ *
+ * {{{ CakeRequest::acceptLanguage('es-es'); }}}
+ *
  * @param string $language The language to test.
  * @return If a $language is provided, a boolean. Otherwise the array of accepted languages.
  */
diff --git a/cake/libs/cake_response.php b/cake/libs/cake_response.php
index 6c3d751c2..df2ab71a0 100644
--- a/cake/libs/cake_response.php
+++ b/cake/libs/cake_response.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * CakeResponse is responsible for managing the response text, status and headers of a HTTP response.
- * 
- * By default controllers will use this class to render their response. If you are going to use 
- * a custom response class it should subclass this object in order to ensure compatibility.
+ * CakeResponse 
  *
  * PHP 5
  *
@@ -20,6 +17,14 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+/**
+ * CakeResponse is responsible for managing the response text, status and headers of a HTTP response.
+ * 
+ * By default controllers will use this class to render their response. If you are going to use 
+ * a custom response class it should subclass this object in order to ensure compatibility.
+ *
+ * @package cake.libs
+ */
 class CakeResponse {
 
 /**
@@ -501,15 +506,19 @@ class CakeResponse {
  * if $contentType is an associative array, it will be stored as a content type definition
  *
  * ### Setting the content type
+ *
  * e.g `type('jpg');`
  *
  * ### Returning the current content type
+ *
  * e.g `type();`
  *
  * ### Storing a content type definition
+ *
  * e.g `type(array('keynote' => 'application/keynote'));`
  *
  * ### Replacing a content type definition
+ *
  * e.g `type(array('jpg' => 'text/plain'));`
  *
  * @param string $contentType
@@ -624,7 +633,8 @@ class CakeResponse {
 	}
 
 /**
- * Sets the correct output buffering handler to send a compressed response
+ * Sets the correct output buffering handler to send a compressed response. Responses will
+ * be compressed with zlib, if the extension is available.
  *
  * @return boolean false if client does not accept compressed responses or no handler is available, true otherwise
  */
@@ -636,7 +646,7 @@ class CakeResponse {
 	}
 
 /**
- * Sets the correct headers to instruct the browser to dowload the response as a file
+ * Sets the correct headers to instruct the browser to dowload the response as a file.
  *
  * @param string $filename the name of the file as the browser will download the response
  * @return void

From 1c6b261ff1d2d7cb3845184c77b586ee25496eba Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 21 Dec 2010 23:11:23 -0500
Subject: [PATCH 46/90] Correcting and expanding documentation on console
 classes.

---
 cake/console/libs/console_error_handler.php   | 21 +++------
 cake/console/libs/console_input.php           |  2 +-
 cake/console/libs/console_input_argument.php  | 34 ++++++++++++--
 cake/console/libs/console_input_option.php    | 46 +++++++++++++++++--
 .../console/libs/console_input_subcommand.php | 25 ++++++++--
 cake/console/libs/console_option_parser.php   | 28 +++++------
 cake/console/libs/console_output.php          | 10 ++--
 cake/console/libs/help_formatter.php          |  7 ++-
 8 files changed, 123 insertions(+), 50 deletions(-)

diff --git a/cake/console/libs/console_error_handler.php b/cake/console/libs/console_error_handler.php
index 120c09d74..bd2228c7a 100644
--- a/cake/console/libs/console_error_handler.php
+++ b/cake/console/libs/console_error_handler.php
@@ -51,8 +51,9 @@ class ConsoleErrorHandler extends ErrorHandler {
 	}
 
 /**
- * Handle a exception in the console environment.
+ * Handle a exception in the console environment. Prints a message to stderr.
  *
+ * @param Exception $exception The exception to handle
  * @return void
  */
 	public static function handleException(Exception $exception) {
@@ -67,6 +68,11 @@ class ConsoleErrorHandler extends ErrorHandler {
 /**
  * Handle errors in the console environment.
  *
+ * @param int $code Error code
+ * @param string $description Description of the error.
+ * @param string $file The file the error occurred in.
+ * @param int $line The line the error ocurrred on.
+ * @param array $context The backtrace of the error.
  * @return void
  */
 	public static function handleError($code, $description, $file = null, $line = null, $context = null) {
@@ -84,17 +90,4 @@ class ConsoleErrorHandler extends ErrorHandler {
 		}
 	}
 
-/**
- * undocumented function
- *
- * @return void
- */
-	public function render() {
-		$this->stderr->write(sprintf(
-			__("<error>Error:</error> %s\n%s"), 
-			$this->error->getMessage(), 
-			$this->error->getTraceAsString()
-		));
-	}
-
 }
diff --git a/cake/console/libs/console_input.php b/cake/console/libs/console_input.php
index 33127ae9b..751035f53 100644
--- a/cake/console/libs/console_input.php
+++ b/cake/console/libs/console_input.php
@@ -33,7 +33,7 @@ class ConsoleInput {
 /**
  * Constructor
  *
- * @return void
+ * @param string $handle The location of the stream to use as input.
  */
 	public function __construct($handle = 'php://stdin') {
 		$this->_input = fopen($handle, 'r');
diff --git a/cake/console/libs/console_input_argument.php b/cake/console/libs/console_input_argument.php
index 200582353..34ce98414 100644
--- a/cake/console/libs/console_input_argument.php
+++ b/cake/console/libs/console_input_argument.php
@@ -25,8 +25,33 @@
  * @package cake.console
  */
 class ConsoleInputArgument {
+/**
+ * Name of the argument.
+ *
+ * @var string
+ */
+	protected $_name;
 
-	protected $_name, $_help, $_required, $_choices;
+/**
+ * Help string
+ *
+ * @var string
+ */
+	protected $_help;
+
+/**
+ * Is this option required?
+ *
+ * @var boolean
+ */
+	protected $_required;
+
+/**
+ * An array of valid choices for this argument.
+ *
+ * @var array
+ */
+	protected $_choices;
 
 /**
  * Make a new Input Argument
@@ -34,8 +59,7 @@ class ConsoleInputArgument {
  * @param mixed $name The long name of the option, or an array with all the properites.
  * @param string $help The help text for this option
  * @param boolean $required Whether this argument is required. Missing required args will trigger exceptions
- * @param arraty $choices Valid choices for this option.
- * @return void
+ * @param array $choices Valid choices for this option.
  */
 	public function __construct($name, $help = '', $required = false, $choices = array()) {
 		if (is_array($name) && isset($name['name'])) {
@@ -60,7 +84,7 @@ class ConsoleInputArgument {
 	}
 
 /**
- * Generate the help for this this argument.
+ * Generate the help for this argument.
  *
  * @param int $width The width to make the name of the option.
  * @return string 
@@ -125,7 +149,7 @@ class ConsoleInputArgument {
 	}
 
 /**
- * Append this argument to the passed in SimpleXml object.
+ * Append this arguments XML representation to the passed in SimpleXml object.
  *
  * @param SimpleXmlElement The parent element.
  * @return SimpleXmlElement The parent with this argument appended.
diff --git a/cake/console/libs/console_input_option.php b/cake/console/libs/console_input_option.php
index 56b01d448..925d64dd4 100644
--- a/cake/console/libs/console_input_option.php
+++ b/cake/console/libs/console_input_option.php
@@ -26,8 +26,47 @@
  * @package cake.console
  */
 class ConsoleInputOption {
+/**
+ * Name of the option
+ *
+ * @var string
+ */
+	protected $_name;
 
-	protected $_name, $_short, $_help, $_boolean, $_default, $_choices;
+/**
+ * Short (1 character) alias for the option.
+ *
+ * @var string
+ */
+	protected $_short;
+
+/**
+ * Help text for the option.
+ *
+ * @var string
+ */
+	protected $_help;
+
+/**
+ * Is the option a boolean option.  Boolean options do not consume a parameter.
+ *
+ * @var boolean
+ */
+	protected $_boolean;
+
+/**
+ * Default value for the option
+ *
+ * @var mixed
+ */
+	protected $_default;
+
+/**
+ * An array of choices for the option.
+ *
+ * @var array
+ */
+	protected $_choices;
 
 /**
  * Make a new Input Option
@@ -37,8 +76,7 @@ class ConsoleInputOption {
  * @param string $help The help text for this option
  * @param boolean $boolean Whether this option is a boolean option.  Boolean options don't consume extra tokens
  * @param string $default The default value for this option.
- * @param arraty $choices Valid choices for this option.
- * @return void
+ * @param array $choices Valid choices for this option.
  */
 	public function __construct($name, $short = null, $help = '', $boolean = false, $default = '', $choices = array()) {
 		if (is_array($name) && isset($name['name'])) {
@@ -117,7 +155,7 @@ class ConsoleInputOption {
 /**
  * Get the default value for this option
  *
- * @return void
+ * @return mixed
  */
 	public function defaultValue() {
 		return $this->_default;
diff --git a/cake/console/libs/console_input_subcommand.php b/cake/console/libs/console_input_subcommand.php
index 76bd19d2f..d628425c8 100644
--- a/cake/console/libs/console_input_subcommand.php
+++ b/cake/console/libs/console_input_subcommand.php
@@ -27,15 +27,34 @@
  */
 class ConsoleInputSubcommand {
 
-	protected $_name, $_help, $_parser;
+/**
+ * Name of the subcommand
+ *
+ * @var string
+ */
+	protected $_name;
+
+/**
+ * Help string for the subcommand
+ *
+ * @var string
+ */
+	protected $_help; 
+
+/**
+ * The ConsoleOptionParser for this subcommand.
+ *
+ * @var ConsoleOptionParser
+ */
+	protected $_parser;
 
 /**
  * Make a new Subcommand
  *
  * @param mixed $name The long name of the subcommand, or an array with all the properites.
  * @param string $help The help text for this option
- * @param ConsoleOptionParser $parser A parser for this subcommand.
- * @return void
+ * @param mixed $parser A parser for this subcommand. Either a ConsoleOptionParser, or an array that can be 
+ *   used with ConsoleOptionParser::buildFromArray()
  */
 	public function __construct($name, $help = '', $parser = null) {
 		if (is_array($name) && isset($name['name'])) {
diff --git a/cake/console/libs/console_option_parser.php b/cake/console/libs/console_option_parser.php
index 5af733e2d..6e9dcce39 100644
--- a/cake/console/libs/console_option_parser.php
+++ b/cake/console/libs/console_option_parser.php
@@ -88,7 +88,7 @@ class ConsoleOptionParser {
  * preceeded by one - and are only one character long.  They usually match with a long option,
  * and provide a more terse alternative.
  *
- * #### Using Options
+ * ### Using Options
  *
  * Options can be defined with both long and short forms.  By using `$parser->addOption()`
  * you can define new options.  The name of the option is used as its long form, and you
@@ -195,7 +195,7 @@ class ConsoleOptionParser {
 	}
 
 /**
- * Get or set the command name for shell/task
+ * Get or set the command name for shell/task.
  *
  * @param string $text The text to set, or null if you want to read
  * @return mixed If reading, the value of the command. If setting $this will be returned
@@ -209,7 +209,7 @@ class ConsoleOptionParser {
 	}
 
 /**
- * Get or set the description text for shell/task
+ * Get or set the description text for shell/task.
  *
  * @param mixed $text The text to set, or null if you want to read. . If an array the text will be imploded with "\n"
  * @return mixed If reading, the value of the description. If setting $this will be returned
@@ -247,7 +247,7 @@ class ConsoleOptionParser {
  * Add an option to the option parser. Options allow you to define optional or required
  * parameters for your console application. Options are defined by the parameters they use.
  *
- * ### Params
+ * ### Options
  *
  * - `short` - The single letter variant for this option, leave undefined for none.
  * - `help` - Help text for this option.  Used when generating help for the option.
@@ -260,11 +260,12 @@ class ConsoleOptionParser {
  * - `choices` A list of valid choices for this option.  If left empty all values are valid..
  *   An exception will be raised when parse() encounters an invalid value.
  *
- * @param string $name The long name you want to the value to be parsed out as when options are parsed.
+ * @param mixed $name The long name you want to the value to be parsed out as when options are parsed.
+ *   Will also accept an instance of ConsoleInputOption
  * @param array $params An array of parameters that define the behavior of the option
  * @return returns $this.
  */
-	public function addOption($name, $params = array()) {
+	public function addOption($name, $options = array()) {
 		if (is_object($name) && $name instanceof ConsoleInputOption) {
 			$option = $name;
 			$name = $option->name();
@@ -277,7 +278,7 @@ class ConsoleOptionParser {
 				'boolean' => false,
 				'choices' => array()
 			);
-			$options = array_merge($defaults, $params);
+			$options = array_merge($defaults, $options);
 			$option = new ConsoleInputOption($options);
 		}
 		$this->_options[$name] = $option;
@@ -300,7 +301,7 @@ class ConsoleOptionParser {
  * - `choices` A list of valid choices for this argument.  If left empty all values are valid..
  *   An exception will be raised when parse() encounters an invalid value.
  *
- * @param string $name The name of the argument.
+ * @param mixed $name The name of the argument.  Will also accept an instance of ConsoleInputArgument
  * @param array $params Parameters for the argument, see above.
  * @return $this.
  */
@@ -357,21 +358,20 @@ class ConsoleOptionParser {
 
 /**
  * Append a subcommand to the subcommand list.
- * Subcommands are usually methods on your Shell, but can also be used to document
- * Tasks
+ * Subcommands are usually methods on your Shell, but can also be used to document Tasks.
  *
- * ### Params
+ * ### Options
  *
  * - `help` - Help text for the subcommand.
  * - `parser` - A ConsoleOptionParser for the subcommand.  This allows you to create method
  *    specific option parsers.  When help is generated for a subcommand, if a parser is present
  *    it will be used.
  *
- * @param string $name Name of the subcommand
+ * @param mixed $name Name of the subcommand. Will also accept an instance of ConsoleInputSubcommand
  * @param array $params Array of params, see above.
  * @return $this.
  */
-	public function addSubcommand($name, $params = array()) {
+	public function addSubcommand($name, $options = array()) {
 		if (is_object($name) && $name instanceof ConsoleInputSubcommand) {
 			$command = $name;
 			$name = $command->name();
@@ -381,7 +381,7 @@ class ConsoleOptionParser {
 				'help' => '',
 				'parser' => null
 			);
-			$options = array_merge($defaults, $params);
+			$options = array_merge($defaults, $options);
 			$command = new ConsoleInputSubcommand($options);
 		}
 		$this->_subcommands[$name] = $command;
diff --git a/cake/console/libs/console_output.php b/cake/console/libs/console_output.php
index ef47266f0..5f89ac100 100644
--- a/cake/console/libs/console_output.php
+++ b/cake/console/libs/console_output.php
@@ -21,7 +21,7 @@
  * Object wrapper for outputing information from a shell application.
  * Can be connected to any stream resource that can be used with fopen()
  * 
- * Can generate colourzied output on consoles that support it. There are a few 
+ * Can generate colourized output on consoles that support it. There are a few 
  * built in styles
  *
  * - `error` Error messages.
@@ -143,8 +143,8 @@ class ConsoleOutput {
  *
  * Checks for a pretty console enviornment.  Ansicon allows pretty consoles
  * on windows, and is supported.
- *
- * @return void
+ * 
+ * @param string $stream The identifier of the stream to write output to.
  */
 	public function __construct($stream = 'php://stdout') {
 		$this->_output = fopen($stream, 'w');
@@ -156,7 +156,7 @@ class ConsoleOutput {
 
 /**
  * Outputs a single or multiple messages to stdout. If no parameters
- * are passed outputs just a newline.
+ * are passed, outputs just a newline.
  *
  * @param mixed $message A string or a an array of strings to output
  * @param integer $newlines Number of newlines to append
@@ -216,7 +216,7 @@ class ConsoleOutput {
 	}
 
 /**
- * Writes a message to the output stream
+ * Writes a message to the output stream.
  *
  * @param string $message Message to write.
  * @return boolean success
diff --git a/cake/console/libs/help_formatter.php b/cake/console/libs/help_formatter.php
index 002689899..2afdd5e90 100644
--- a/cake/console/libs/help_formatter.php
+++ b/cake/console/libs/help_formatter.php
@@ -12,9 +12,6 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
- * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Core', 'String', false);
@@ -28,12 +25,14 @@ App::import('Core', 'String', false);
  *
  * Xml output is useful for intergration with other tools like IDE's or other build tools.
  *
+ * @package    cake.console
+ * @since      CakePHP(tm) v 2.0
  */
 class HelpFormatter {
 /**
  * Build the help formatter for a an OptionParser
  *
- * @return void
+ * @param ConsoleOptionParser $parser The option parser help is being generated for.
  */
 	public function __construct(ConsoleOptionParser $parser) {
 		$this->_parser = $parser;

From af2a5123b5753f78d50a73fffcfc2462a293488c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 21 Dec 2010 23:14:17 -0500
Subject: [PATCH 47/90] Fixing issue where prefixes would not be correctly
 loaded for a request.

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

diff --git a/cake/libs/router.php b/cake/libs/router.php
index ac0ae9d50..2cd9128b4 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -711,6 +711,7 @@ class Router {
 	public static function reload() {
 		if (empty(self::$_initialState)) {
 			self::$_initialState = get_class_vars('Router');
+			self::_setPrefixes();
 			return;
 		}
 		foreach (self::$_initialState as $key => $val) {

From 3c6fc55eed7d7dbc41b6600456459972e4175085 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 21 Dec 2010 23:45:47 -0500
Subject: [PATCH 48/90] Removing strlower() calls as they are not needed in
 php5 land.

---
 cake/libs/controller/components/security.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index b3ae711d8..90a934aea 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -319,7 +319,6 @@ class SecurityComponent extends Component {
 		}
 		$this->loginOptions = array_merge($base, $this->loginOptions);
 		$this->_requireMethod('Login', $args);
-
 		if (isset($this->loginOptions['users'])) {
 			$this->loginUsers =& $this->loginOptions['users'];
 		}
@@ -555,9 +554,9 @@ class SecurityComponent extends Component {
  */
 	protected function _loginRequired($controller) {
 		if (is_array($this->requireLogin) && !empty($this->requireLogin)) {
-			$requireLogin = array_map('strtolower', $this->requireLogin);
+			$requireLogin = $this->requireLogin;
 
-			if (in_array($this->_action, $requireLogin) || $this->requireLogin == array('*')) {
+			if (in_array($this->_action, $this->requireLogin) || $this->requireLogin == array('*')) {
 				$login = $this->loginCredentials($this->loginOptions['type']);
 
 				if ($login == null) {

From 27477bbac31ad10dc503cd75d4b0deeb665450e2 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 23 Dec 2010 00:32:53 -0200
Subject: [PATCH 49/90] Removing extra parameter.

---
 cake/console/templates/default/views/form.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/console/templates/default/views/form.ctp b/cake/console/templates/default/views/form.ctp
index 455648ed7..85fef3fa0 100644
--- a/cake/console/templates/default/views/form.ctp
+++ b/cake/console/templates/default/views/form.ctp
@@ -20,7 +20,7 @@
 <div class="<?php echo $pluralVar;?> form">
 <?php echo "<?php echo \$this->Form->create('{$modelClass}');?>\n";?>
 	<fieldset>
- 		<legend><?php printf("<?php __('%s %s', true); ?>", Inflector::humanize($action), $singularHumanName); ?></legend>
+ 		<legend><?php printf("<?php __('%s %s'); ?>", Inflector::humanize($action), $singularHumanName); ?></legend>
 <?php
 		echo "\t<?php\n";
 		foreach ($fields as $field) {

From aff5cd7e152f6358dff5bb92bbfee1e1a073c4da Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 22 Dec 2010 21:49:53 -0500
Subject: [PATCH 50/90] Adding a doc block and code sample for MediaView.

---
 cake/libs/view/media.php | 50 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index 5bc0d179e..fec019906 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -19,6 +19,41 @@
  */
 App::import('View', 'View', false);
 
+/**
+ * Media View provides a custom view implementation for sending files to visitors.  Its great
+ * for making the response of a controller action be a file that is saved somewhere on the filesystem.
+ *
+ * An example use comes from the CakePHP internals. MediaView is used to serve plugin and theme assets,
+ * as they are not normally accessible from an application's webroot.  Unlike other views, MediaView
+ * uses several viewVars that have special meaning:
+ *
+ * - `id` The filename on the server's filesystem, including extension.
+ * - `name` The filename that will be sent to the user, specified without the extension.
+ * - `download` Set to true to set a `Content-Disposition` header.  This is ideal for file downloads.
+ * - `extension` The extension of the file being served.  This is used to set the mimetype
+ * - `path` The absolute path, including the trailing / on the server's filesystem to `id`.
+ * - `mimeType` The mime type of the file if CakeResponse doesn't know about it.
+ *
+ * ### Usage
+ *
+ * {{{
+ * class ExampleController extends AppController {
+ *		function download () {
+ *			$this->view = 'Media';
+ *			$params = array(
+ *				'id' => 'example.zip',
+ *				'name' => 'example',
+ *				'download' => true,
+ *				'extension' => 'zip',
+ *				'path' => APP . 'files' . DS
+ *			);
+ *			$this->set($params);
+ *		}
+ * }
+ * }}}
+ *
+ * @package cake.libs.view
+ */
 class MediaView extends View {
 /**
  * Indicates whether response gzip compression was enabled for this class
@@ -34,11 +69,10 @@ class MediaView extends View {
  */
 	public $response = null;
 
-
 /**
  * Constructor
  *
- * @param object $controller
+ * @param object $controller The controller with viewVars
  */
 	function __construct($controller = null) {
 		parent::__construct($controller);
@@ -53,7 +87,7 @@ class MediaView extends View {
 /**
  * Display or download the given file
  *
- * @return unknown
+ * @return mixed
  */
 	function render() {
 		$name = $download = $extension = $id = $modified = $path = $size = $cache = $mimeType = $compress = null;
@@ -160,6 +194,12 @@ class MediaView extends View {
 		return false;
 	}
 
+/**
+ * Reads out a file handle, and echos the content to the client.
+ *
+ * @param resource $handle A file handle or stream
+ * @return void
+ */
 	protected function _sendFile($handle) {
 		$chunkSize = 8192;
 		$buffer = '';
@@ -180,6 +220,7 @@ class MediaView extends View {
 
 /**
  * Returns true if connection is still active
+ *
  * @return boolean
  */
 	protected function _isActive() {
@@ -188,6 +229,7 @@ class MediaView extends View {
 
 /**
  * Clears the contents of the topmost output buffer and discards them
+ *
  * @return boolean
  */
 	protected function _clearBuffer() {
@@ -196,6 +238,8 @@ class MediaView extends View {
 
 /**
  * Flushes the contents of the output buffer
+ * 
+ * @return void
  */
 	protected function _flushBuffer() {
 		@flush();

From 98c356a9c53be1480b563c80794f0ba031f3af99 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 22 Dec 2010 22:26:43 -0500
Subject: [PATCH 51/90] Adding some more documentation to ModelBehavior as well
 as basic usage.

---
 cake/libs/model/model_behavior.php | 49 +++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
index d0093e95e..0cf027163 100644
--- a/cake/libs/model/model_behavior.php
+++ b/cake/libs/model/model_behavior.php
@@ -23,10 +23,26 @@
 /**
  * Model behavior base class.
  *
- * Defines the Behavior interface, and contains common model interaction functionality.
+ * Defines the Behavior interface, and contains common model interaction functionality.  Behaviors
+ * allow you to simulate mixins, and create resuable blocks of application logic, that can be reused across
+ * several models.  Behaviors also provide a way to hook into model callbacks and augment their behavior.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * ### Mixin methods
+ *
+ * Behaviors can provide mixin like features by declaring public methods.  These methods should expect
+ * the model instance to be shifted onto the parameter list.
+ *
+ * {{{
+ * function doSomething($model, $arg1, $arg2) {
+ *		//do something
+ * }
+ * }}}
+ * 
+ * Would be called like `$this->Model->doSomething($arg1, $arg2);`.
+ *
+ * @package    cake.libs.model
+ * @see Model::$actsAs
+ * @see BehaviorCollection::load()
  */
 class ModelBehavior extends Object {
 
@@ -37,7 +53,6 @@ class ModelBehavior extends Object {
  * associative array, keyed off of the model name.
  *
  * @var array
- * @access public
  * @see Model::$alias
  */
 	public $settings = array();
@@ -49,7 +64,6 @@ class ModelBehavior extends Object {
  * the findBy* / findAllBy* magic methods.
  *
  * @var array
- * @access public
  */
 	public $mapMethods = array();
 
@@ -66,7 +80,6 @@ class ModelBehavior extends Object {
  * detached from a model using Model::detach().
  *
  * @param object $model Model using this behavior
- * @access public
  * @see BehaviorCollection::detach()
  */
 	function cleanup($model) {
@@ -76,31 +89,33 @@ class ModelBehavior extends Object {
 	}
 
 /**
- * Before find callback
+ * beforeFind can be used to cancel find operations, or modify the query that will be executed.
+ * By returning null/false you can abort a find.  By returning an array you can modify/replace the query
+ * that is going to be run.
  *
  * @param object $model Model using this behavior
  * @param array $queryData Data used to execute this query, i.e. conditions, order, etc.
  * @return mixed False or null will abort the operation. You can return an array to replace the 
  *   $query that will be eventually run.
- * @access public
  */
 	public function beforeFind($model, $query) {
 		return true;
 	}
 
 /**
- * After find callback. Can be used to modify any results returned by find and findAll.
+ * After find callback. Can be used to modify any results returned by find.
  *
  * @param object $model Model using this behavior
  * @param mixed $results The results of the find operation
  * @param boolean $primary Whether this model is being queried directly (vs. being queried as an association)
  * @return mixed An array value will replace the value of $results - any other value will be ignored.
- * @access public
  */
 	public function afterFind($model, $results, $primary) { }
 
 /**
- * Before validate callback
+ * beforeValidate is called before a model is validated, you can use this callback to 
+ * add behavior validation rules into a models validate array.  Returning false
+ * will allow you to make the validation fail.
  *
  * @param object $model Model using this behavior
  * @return mixed False or null will abort the operation. Any other result will continue.
@@ -111,18 +126,18 @@ class ModelBehavior extends Object {
 	}
 
 /**
- * Before save callback
+ * beforeSave is called before a model is saved.  Returning false from a beforeSave callback
+ * will abort the save operation.
  *
  * @param object $model Model using this behavior
  * @return mixed False if the operation should abort. Any other result will continue.
- * @access public
  */
 	public function beforeSave($model) { 
 		return true;
 	}
 
 /**
- * After save callback
+ * afterSave is called after a model is saved.
  *
  * @param object $model Model using this behavior
  * @param boolean $created True if this save created a new record
@@ -132,7 +147,8 @@ class ModelBehavior extends Object {
 	}
 
 /**
- * Before delete callback
+ * Before delete is called before any delete occurs on the attached model, but after the model's
+ * beforeDelete is called.  Returning false from a beforeDelete will abort the delete.
  *
  * @param object $model Model using this behavior
  * @param boolean $cascade If true records that depend on this record will also be deleted
@@ -144,7 +160,7 @@ class ModelBehavior extends Object {
 	}
 
 /**
- * After delete callback
+ * After delete is called after any delete occurs on the attached model.
  *
  * @param object $model Model using this behavior
  */
@@ -166,7 +182,6 @@ class ModelBehavior extends Object {
  *
  * @param object $model Model using this behavior
  * @param string $field Field to be added to $model's whitelist
- * @access protected
  * @return void
  */
 	function _addToWhitelist($model, $field) {

From a37b3a15984d24162fe3cf1abbdb15ce34330142 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 22 Dec 2010 22:33:17 -0500
Subject: [PATCH 52/90] Adding more documentation to DboSource.

---
 cake/libs/model/datasources/dbo_source.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 52be136e9..da92471a1 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -253,9 +253,10 @@ class DboSource extends DataSource {
 
 
 /**
- * Returns an object to represent a database identifier in a query
+ * Returns an object to represent a database identifier in a query. Expression objects
+ * are not sanitized or esacped.
  *
- * @param string $identifier
+ * @param string $identifier A SQL expression to be used as an identifier
  * @return object An object representing a database identifier to be used in a query
  */
 	public function identifier($identifier) {
@@ -266,9 +267,10 @@ class DboSource extends DataSource {
 	}
 
 /**
- * Returns an object to represent a database expression in a query
+ * Returns an object to represent a database expression in a query.  Expression objects
+ * are not sanitized or esacped.
  *
- * @param string $expression
+ * @param string $expression An arbitrary SQL expression to be inserted into a query.
  * @return object An object representing a database expression to be used in a query
  */
 	public function expression($expression) {
@@ -282,6 +284,7 @@ class DboSource extends DataSource {
  * Executes given SQL statement.
  *
  * @param string $sql SQL statement
+ * @param array $params Additional options for the query.
  * @return boolean
  */
 	public function rawQuery($sql, $params = array()) {
@@ -381,6 +384,7 @@ class DboSource extends DataSource {
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
  *
+ * @param string $source
  * @return integer Number of affected rows
  */
 	function lastAffected($source = null) {
@@ -394,6 +398,7 @@ class DboSource extends DataSource {
  * Returns number of rows in previous resultset. If no previous resultset exists,
  * this returns false.
  *
+ * @param string $source
  * @return integer Number of rows in resultset
  */
 	function lastNumRows($source = null) {
@@ -498,6 +503,7 @@ class DboSource extends DataSource {
 /**
  * Returns a row from current resultset as an array
  *
+ * @param string $sql Some SQL to be executed.
  * @return array The fetched row as an array
  */
 	public function fetchRow($sql = null) {
@@ -575,7 +581,7 @@ class DboSource extends DataSource {
 /**
  * Modifies $result array to place virtual fields in model entry where they belongs to
  *
- * @param array $resut REference to the fetched row
+ * @param array $resut Reference to the fetched row
  * @return void
  */
 	public function fetchVirtualField(&$result) {
@@ -736,6 +742,7 @@ class DboSource extends DataSource {
  * Get the query log as an array.
  *
  * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
+ * @param boolean $clear If True the existing log will cleared.
  * @return array Array of queries run as an array
  */
 	public function getLog($sorted = false, $clear = true) {

From 8eaba29c3f3840f74d2e824524e17ac99de22081 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 22 Dec 2010 23:19:04 -0500
Subject: [PATCH 53/90] Fixing an entirely wrong condition that prevented
 routes from being loaded.

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

diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php
index 0b498b5b2..5352f9d4a 100644
--- a/cake/libs/dispatcher.php
+++ b/cake/libs/dispatcher.php
@@ -195,7 +195,7 @@ class Dispatcher {
  * @return CakeRequest The request object with routing params set.
  */
 	public function parseParams(CakeRequest $request, $additionalParams = array()) {
-		if (count(Router::$routes) > 0) {
+		if (count(Router::$routes) == 0) {
 			$namedExpressions = Router::getNamedExpressions();
 			extract($namedExpressions);
 			$this->__loadRoutes();

From e20ea8ad7234d8fcbc486ba95865be0dd69d60c1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 24 Dec 2010 12:54:04 -0500
Subject: [PATCH 54/90] Renaming Dispatcher::__loadRoutes ->
 Dispatcher::_loadRoutes to match naming conventions. Updating method name
 usage, as assertType is deprecated as of PHPUnit 3.5.6

---
 cake/libs/dispatcher.php                       |  5 ++---
 .../cases/console/libs/help_formatter.test.php |  2 +-
 .../console/libs/task_collection.test.php      | 12 ++++++------
 cake/tests/cases/console/shells/shell.test.php |  6 +++---
 .../cases/libs/controller/component.test.php   | 14 +++++++-------
 .../controller/component_collection.test.php   | 12 ++++++------
 .../cases/libs/controller/controller.test.php  |  6 +++---
 .../cases/libs/controller_test_case.test.php   |  7 +++----
 cake/tests/cases/libs/debugger.test.php        |  6 +++---
 .../libs/error/exception_renderer.test.php     |  4 ++--
 .../libs/model/model_integration.test.php      | 18 +++++++++---------
 .../cases/libs/object_collection.test.php      |  4 ++--
 .../libs/session/database_session.test.php     |  2 +-
 cake/tests/cases/libs/test_manager.test.php    |  2 +-
 cake/tests/cases/libs/view/helper.test.php     |  4 ++--
 .../cases/libs/view/helper_collection.test.php | 12 ++++++------
 cake/tests/cases/libs/view/view.test.php       |  6 +++---
 cake/tests/fixtures/fixturized_test_case.php   |  2 +-
 cake/tests/lib/cake_test_case.php              |  2 +-
 cake/tests/lib/controller_test_case.php        |  5 ++---
 20 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php
index 5352f9d4a..f9b7b059d 100644
--- a/cake/libs/dispatcher.php
+++ b/cake/libs/dispatcher.php
@@ -198,7 +198,7 @@ class Dispatcher {
 		if (count(Router::$routes) == 0) {
 			$namedExpressions = Router::getNamedExpressions();
 			extract($namedExpressions);
-			$this->__loadRoutes();
+			$this->_loadRoutes();
 		}
 
 		$params = Router::parse($request->url);
@@ -254,9 +254,8 @@ class Dispatcher {
  * Loads route configuration
  *
  * @return void
- * @access protected
  */
-	protected function __loadRoutes() {
+	protected function _loadRoutes() {
 		include CONFIGS . 'routes.php';
 	}
 
diff --git a/cake/tests/cases/console/libs/help_formatter.test.php b/cake/tests/cases/console/libs/help_formatter.test.php
index a957843b1..5caae1490 100644
--- a/cake/tests/cases/console/libs/help_formatter.test.php
+++ b/cake/tests/cases/console/libs/help_formatter.test.php
@@ -435,6 +435,6 @@ TEXT;
 
 		$formatter = new HelpFormatter($parser);
 		$result = $formatter->xml(false);
-		$this->assertType('SimpleXmlElement', $result);
+		$this->assertInstanceOf('SimpleXmlElement', $result);
 	}
 }
diff --git a/cake/tests/cases/console/libs/task_collection.test.php b/cake/tests/cases/console/libs/task_collection.test.php
index b89de158c..3bbbd12c8 100644
--- a/cake/tests/cases/console/libs/task_collection.test.php
+++ b/cake/tests/cases/console/libs/task_collection.test.php
@@ -49,8 +49,8 @@ class TaskCollectionTest extends CakeTestCase {
  */
 	function testLoad() {
 		$result = $this->Tasks->load('DbConfig');
-		$this->assertType('DbConfigTask', $result);
-		$this->assertType('DbConfigTask', $this->Tasks->DbConfig);
+		$this->assertInstanceOf('DbConfigTask', $result);
+		$this->assertInstanceOf('DbConfigTask', $this->Tasks->DbConfig);
 
 		$result = $this->Tasks->attached();
 		$this->assertEquals(array('DbConfig'), $result, 'attached() results are wrong.');
@@ -65,8 +65,8 @@ class TaskCollectionTest extends CakeTestCase {
  */
 	function testLoadWithEnableFalse() {
 		$result = $this->Tasks->load('DbConfig', array(), false);
-		$this->assertType('DbConfigTask', $result);
-		$this->assertType('DbConfigTask', $this->Tasks->DbConfig);
+		$this->assertInstanceOf('DbConfigTask', $result);
+		$this->assertInstanceOf('DbConfigTask', $this->Tasks->DbConfig);
 
 		$this->assertFalse($this->Tasks->enabled('DbConfig'), 'DbConfigTask should be disabled');
 	}
@@ -94,8 +94,8 @@ class TaskCollectionTest extends CakeTestCase {
 		$this->Tasks = new TaskCollection($shell, $dispatcher);
 
 		$result = $this->Tasks->load('TestPlugin.OtherTask');
-		$this->assertType('OtherTaskTask', $result, 'Task class is wrong.');
-		$this->assertType('OtherTaskTask', $this->Tasks->OtherTask, 'Class is wrong');
+		$this->assertInstanceOf('OtherTaskTask', $result, 'Task class is wrong.');
+		$this->assertInstanceOf('OtherTaskTask', $this->Tasks->OtherTask, 'Class is wrong');
 	}
 
 /**
diff --git a/cake/tests/cases/console/shells/shell.test.php b/cake/tests/cases/console/shells/shell.test.php
index 91c623cda..900ebaad8 100644
--- a/cake/tests/cases/console/shells/shell.test.php
+++ b/cake/tests/cases/console/shells/shell.test.php
@@ -143,9 +143,9 @@ class ShellTest extends CakeTestCase {
  */
 	public function testConstruct() {
 		$this->assertEqual($this->Shell->name, 'ShellTestShell');
-		$this->assertType('ConsoleInput', $this->Shell->stdin);
-		$this->assertType('ConsoleOutput', $this->Shell->stdout);
-		$this->assertType('ConsoleOutput', $this->Shell->stderr);
+		$this->assertInstanceOf('ConsoleInput', $this->Shell->stdin);
+		$this->assertInstanceOf('ConsoleOutput', $this->Shell->stdout);
+		$this->assertInstanceOf('ConsoleOutput', $this->Shell->stderr);
 	}
 
 /**
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index 3c8dc99c6..e42c1e0b6 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -284,7 +284,7 @@ class ComponentTest extends CakeTestCase {
 		$Collection = new ComponentCollection();
 		$Component = new AppleComponent($Collection);
 
-		$this->assertType('OrangeComponent', $Component->Orange, 'class is wrong');
+		$this->assertInstanceOf('OrangeComponent', $Component->Orange, 'class is wrong');
 	}
 
 /**
@@ -296,8 +296,8 @@ class ComponentTest extends CakeTestCase {
 		$Collection = new ComponentCollection();
 		$Apple = new AppleComponent($Collection);
 
-		$this->assertType('OrangeComponent', $Apple->Orange, 'class is wrong');
-		$this->assertType('BananaComponent', $Apple->Orange->Banana, 'class is wrong');
+		$this->assertInstanceOf('OrangeComponent', $Apple->Orange, 'class is wrong');
+		$this->assertInstanceOf('BananaComponent', $Apple->Orange->Banana, 'class is wrong');
 		$this->assertTrue(empty($Apple->Session));
 		$this->assertTrue(empty($Apple->Orange->Session));
 	}
@@ -311,7 +311,7 @@ class ComponentTest extends CakeTestCase {
 		$Collection = new ComponentCollection();
 		$Apple = $Collection->load('Apple');
 
-		$this->assertType('OrangeComponent', $Apple->Orange, 'class is wrong');
+		$this->assertInstanceOf('OrangeComponent', $Apple->Orange, 'class is wrong');
 		$result = $Collection->enabled();
 		$this->assertEquals(array('Apple'), $result, 'Too many components enabled.');
 	}
@@ -346,9 +346,9 @@ class ComponentTest extends CakeTestCase {
 		$Controller->beforeFilter();
 		$Controller->Components->trigger('startup', array(&$Controller));
 
-		$this->assertType('SomethingWithEmailComponent', $Controller->SomethingWithEmail);
-		$this->assertType('EmailComponent', $Controller->SomethingWithEmail->Email);
-		$this->assertType('ComponentTestController', $Controller->SomethingWithEmail->Email->Controller);
+		$this->assertInstanceOf('SomethingWithEmailComponent', $Controller->SomethingWithEmail);
+		$this->assertInstanceOf('EmailComponent', $Controller->SomethingWithEmail->Email);
+		$this->assertInstanceOf('ComponentTestController', $Controller->SomethingWithEmail->Email->Controller);
 	}
 
 }
diff --git a/cake/tests/cases/libs/controller/component_collection.test.php b/cake/tests/cases/libs/controller/component_collection.test.php
index ecdac7775..3e0e7bc53 100644
--- a/cake/tests/cases/libs/controller/component_collection.test.php
+++ b/cake/tests/cases/libs/controller/component_collection.test.php
@@ -47,8 +47,8 @@ class ComponentCollectionTest extends CakeTestCase {
  */
 	function testLoad() {
 		$result = $this->Components->load('Cookie');
-		$this->assertType('CookieComponent', $result);
-		$this->assertType('CookieComponent', $this->Components->Cookie);
+		$this->assertInstanceOf('CookieComponent', $result);
+		$this->assertInstanceOf('CookieComponent', $this->Components->Cookie);
 
 		$result = $this->Components->attached();
 		$this->assertEquals(array('Cookie'), $result, 'attached() results are wrong.');
@@ -66,8 +66,8 @@ class ComponentCollectionTest extends CakeTestCase {
  */
 	function testLoadWithEnableFalse() {
 		$result = $this->Components->load('Cookie', array('enabled' => false));
-		$this->assertType('CookieComponent', $result);
-		$this->assertType('CookieComponent', $this->Components->Cookie);
+		$this->assertInstanceOf('CookieComponent', $result);
+		$this->assertInstanceOf('CookieComponent', $this->Components->Cookie);
 
 		$this->assertFalse($this->Components->enabled('Cookie'), 'Cookie should be disabled');
 	}
@@ -91,8 +91,8 @@ class ComponentCollectionTest extends CakeTestCase {
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
 		$result = $this->Components->load('TestPlugin.OtherComponent');
-		$this->assertType('OtherComponentComponent', $result, 'Component class is wrong.');
-		$this->assertType('OtherComponentComponent', $this->Components->OtherComponent, 'Class is wrong');
+		$this->assertInstanceOf('OtherComponentComponent', $result, 'Component class is wrong.');
+		$this->assertInstanceOf('OtherComponentComponent', $this->Components->OtherComponent, 'Class is wrong');
 		App::build();
 	}
 
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 39563931b..0ab068cb6 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -462,7 +462,7 @@ class ControllerTest extends CakeTestCase {
 
 		$result = $Controller->loadModel('Comment');
 		$this->assertTrue($result);
-		$this->assertType('Comment', $Controller->Comment);
+		$this->assertInstanceOf('Comment', $Controller->Comment);
 		$this->assertTrue(in_array('Comment', $Controller->modelNames));
 
 		ClassRegistry::flush();
@@ -1248,8 +1248,8 @@ class ControllerTest extends CakeTestCase {
 
 		$Controller = new TestController($request);
 		$Controller->constructClasses();
-		$this->assertType('SecurityComponent', $Controller->Security);
-		$this->assertType('ControllerComment', $Controller->ControllerComment);
+		$this->assertInstanceOf('SecurityComponent', $Controller->Security);
+		$this->assertInstanceOf('ControllerComment', $Controller->ControllerComment);
 	}
 
 /**
diff --git a/cake/tests/cases/libs/controller_test_case.test.php b/cake/tests/cases/libs/controller_test_case.test.php
index c457da428..585e07bb2 100644
--- a/cake/tests/cases/libs/controller_test_case.test.php
+++ b/cake/tests/cases/libs/controller_test_case.test.php
@@ -171,7 +171,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 			)
 		));
 		$this->assertNull($Posts->Post->save(array()));
-		$this->assertIsA($Posts->Post->find('all'), 'array');
+		$this->assertInternalType('array', $Posts->Post->find('all'));
 
 		$Posts = $this->Case->generate('Posts', array(
 			'models' => array('Post'),
@@ -198,7 +198,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 	function testTestAction() {
 		$Controller = $this->Case->generate('TestsApps');
 		$this->Case->testAction('/tests_apps/index');
-		$this->assertIsA($this->Case->controller->viewVars, 'array');
+		$this->assertInternalType('array', $this->Case->controller->viewVars);
 
 		$this->Case->testAction('/tests_apps/set_action');
 		$results = $this->Case->controller->viewVars;
@@ -254,8 +254,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 		include TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
 
 		$this->Case->loadRoutes = false;
-
-		$result = $this->Case->testAction('/tests_apps/index.json', array('return' => 'view'));
+		$result = $this->Case->testAction('/tests_apps/missing_action.json', array('return' => 'view'));
 	}
 
 /**
diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
index d6ea5ac8e..21e7d8057 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/cake/tests/cases/libs/debugger.test.php
@@ -232,7 +232,6 @@ class DebuggerTest extends CakeTestCase {
 		View::$viewVars = array
 		View::$layout = "default"
 		View::$layoutPath = NULL
-		View::$autoRender = true
 		View::$autoLayout = true
 		View::$ext = ".ctp"
 		View::$subDir = NULL
@@ -250,8 +249,9 @@ class DebuggerTest extends CakeTestCase {
 		View::$output = false
 		View::$request = NULL
 		View::$elementCache = "default"';
-		$result = str_replace(array("\t", "\r\n", "\n"), "", strtolower($result));
-		$expected =  str_replace(array("\t", "\r\n", "\n"), "", strtolower($expected));
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $result);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $expected);
 		$this->assertEqual($result, $expected);
 	}
 
diff --git a/cake/tests/cases/libs/error/exception_renderer.test.php b/cake/tests/cases/libs/error/exception_renderer.test.php
index 4de432fb9..0b147958f 100644
--- a/cake/tests/cases/libs/error/exception_renderer.test.php
+++ b/cake/tests/cases/libs/error/exception_renderer.test.php
@@ -265,7 +265,7 @@ class ExceptionRendererTest extends CakeTestCase {
 		$exception = new NotFoundException('Page not found');
 		$ExceptionRenderer = new ExceptionRenderer($exception);
 
-		$this->assertType('CakeErrorController', $ExceptionRenderer->controller);
+		$this->assertInstanceOf('CakeErrorController', $ExceptionRenderer->controller);
 		$this->assertEquals('error400', $ExceptionRenderer->method);
 		$this->assertEquals($exception, $ExceptionRenderer->error);
 	}
@@ -280,7 +280,7 @@ class ExceptionRendererTest extends CakeTestCase {
 		$exception = new MissingActionException('Page not found');
 		$ExceptionRenderer = new ExceptionRenderer($exception);
 
-		$this->assertType('CakeErrorController', $ExceptionRenderer->controller);
+		$this->assertInstanceOf('CakeErrorController', $ExceptionRenderer->controller);
 		$this->assertEquals('error400', $ExceptionRenderer->method);
 		$this->assertEquals($exception, $ExceptionRenderer->error);
 	}
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index a8b5a6796..2770657f1 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -61,27 +61,27 @@ class ModelIntegrationTest extends BaseModelTest {
 		$Article = new ArticleFeatured();
 		$this->assertTrue(isset($Article->belongsTo['User']));
 		$this->assertFalse(property_exists($Article, 'User'));
-		$this->assertType('User', $Article->User);
+		$this->assertInstanceOf('User', $Article->User);
 
 		$this->assertTrue(isset($Article->belongsTo['Category']));
 		$this->assertFalse(property_exists($Article, 'Category'));
 		$this->assertTrue(isset($Article->Category));
-		$this->assertType('Category', $Article->Category);
+		$this->assertInstanceOf('Category', $Article->Category);
 
 		$this->assertTrue(isset($Article->hasMany['Comment']));
 		$this->assertFalse(property_exists($Article, 'Comment'));
 		$this->assertTrue(isset($Article->Comment));
-		$this->assertType('Comment', $Article->Comment);
+		$this->assertInstanceOf('Comment', $Article->Comment);
 
 		$this->assertTrue(isset($Article->hasAndBelongsToMany['Tag']));
 		//There was not enough information to setup the association (joinTable and associationForeignKey)
 		//so the model was not lazy loaded
 		$this->assertTrue(property_exists($Article, 'Tag'));
 		$this->assertTrue(isset($Article->Tag));
-		$this->assertType('Tag', $Article->Tag);
+		$this->assertInstanceOf('Tag', $Article->Tag);
 
 		$this->assertFalse(property_exists($Article, 'ArticleFeaturedsTag'));
-		$this->assertType('AppModel', $Article->ArticleFeaturedsTag);
+		$this->assertInstanceOf('AppModel', $Article->ArticleFeaturedsTag);
 		$this->assertEquals($Article->hasAndBelongsToMany['Tag']['joinTable'], 'article_featureds_tags');
 		$this->assertEquals($Article->hasAndBelongsToMany['Tag']['associationForeignKey'], 'tag_id');
 	}
@@ -97,10 +97,10 @@ class ModelIntegrationTest extends BaseModelTest {
 		$Article = new ArticleB();
 		$this->assertTrue(isset($Article->hasAndBelongsToMany['TagB']));
 		$this->assertFalse(property_exists($Article, 'TagB'));
-		$this->assertType('TagB', $Article->TagB);
+		$this->assertInstanceOf('TagB', $Article->TagB);
 
 		$this->assertFalse(property_exists($Article, 'ArticlesTag'));
-		$this->assertType('AppModel', $Article->ArticlesTag);
+		$this->assertInstanceOf('AppModel', $Article->ArticlesTag);
 
 		$UuidTag = new UuidTag();
 		$this->assertTrue(isset($UuidTag->hasAndBelongsToMany['Fruit']));
@@ -110,7 +110,7 @@ class ModelIntegrationTest extends BaseModelTest {
 
 		$this->assertFalse(property_exists($UuidTag, 'FruitsUuidTag'));
 		$this->assertTrue(isset($UuidTag->FruitsUuidTag));
-		$this->assertType('FruitsUuidTag', $UuidTag->FruitsUuidTag);
+		$this->assertInstanceOf('FruitsUuidTag', $UuidTag->FruitsUuidTag);
 	}
 
 /**
@@ -129,7 +129,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$Article->bindModel(array('belongsTo' => array('User')));
 		$this->assertTrue(isset($Article->belongsTo['User']));
 		$this->assertFalse(property_exists($Article, 'User'));
-		$this->assertType('User', $Article->User);
+		$this->assertInstanceOf('User', $Article->User);
 	}
 
 /**
diff --git a/cake/tests/cases/libs/object_collection.test.php b/cake/tests/cases/libs/object_collection.test.php
index 3eecfd70d..26ab24951 100644
--- a/cake/tests/cases/libs/object_collection.test.php
+++ b/cake/tests/cases/libs/object_collection.test.php
@@ -98,8 +98,8 @@ class ObjectCollectionTest extends CakeTestCase {
  */
 	function testLoad() {
 		$result = $this->Objects->load('First');
-		$this->assertType('FirstGenericObject', $result);
-		$this->assertType('FirstGenericObject', $this->Objects->First);
+		$this->assertInstanceOf('FirstGenericObject', $result);
+		$this->assertInstanceOf('FirstGenericObject', $this->Objects->First);
 
 		$result = $this->Objects->attached();
 		$this->assertEquals(array('First'), $result, 'attached() results are wrong.');
diff --git a/cake/tests/cases/libs/session/database_session.test.php b/cake/tests/cases/libs/session/database_session.test.php
index 013ea6f2d..deb867db6 100644
--- a/cake/tests/cases/libs/session/database_session.test.php
+++ b/cake/tests/cases/libs/session/database_session.test.php
@@ -96,7 +96,7 @@ class DatabaseSessionTest extends CakeTestCase {
 		$storage = new DatabaseSession();
 
 		$session = ClassRegistry::getObject('session');
-		$this->assertType('SessionTestModel', $session);
+		$this->assertInstanceOf('SessionTestModel', $session);
 		$this->assertEquals('Session', $session->alias);
 		$this->assertEquals('test', $session->useDbConfig);
 	}
diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php
index ae4c90dc1..b0cbbc6e3 100644
--- a/cake/tests/cases/libs/test_manager.test.php
+++ b/cake/tests/cases/libs/test_manager.test.php
@@ -106,7 +106,7 @@ class TestManagerTest extends CakeTestCase {
 		$file = 'libs/test_manager.test.php';
 		$result = $this->TestManager->runTestCase($file, $this->Reporter, true);
 		$this->assertEquals(1, $this->_countFiles);
-		$this->assertType('PHPUnit_Framework_TestResult', $result);
+		$this->assertInstanceOf('PHPUnit_Framework_TestResult', $result);
 	}
 
 }
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 4ef761091..025dffae1 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -858,8 +858,8 @@ class HelperTest extends CakeTestCase {
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),	
 		));
 		$Helper = new TestHelper($this->View);
-		$this->assertType('OtherHelperHelper', $Helper->OtherHelper);
-		$this->assertType('HtmlHelper', $Helper->Html);
+		$this->assertInstanceOf('OtherHelperHelper', $Helper->OtherHelper);
+		$this->assertInstanceOf('HtmlHelper', $Helper->Html);
 		App::build();
 	}
 
diff --git a/cake/tests/cases/libs/view/helper_collection.test.php b/cake/tests/cases/libs/view/helper_collection.test.php
index d5f1480dd..d3b7698fe 100644
--- a/cake/tests/cases/libs/view/helper_collection.test.php
+++ b/cake/tests/cases/libs/view/helper_collection.test.php
@@ -48,8 +48,8 @@ class HelperCollectionTest extends CakeTestCase {
  */
 	function testLoad() {
 		$result = $this->Helpers->load('Html');
-		$this->assertType('HtmlHelper', $result);
-		$this->assertType('HtmlHelper', $this->Helpers->Html);
+		$this->assertInstanceOf('HtmlHelper', $result);
+		$this->assertInstanceOf('HtmlHelper', $this->Helpers->Html);
 
 		$result = $this->Helpers->attached();
 		$this->assertEquals(array('Html'), $result, 'attached() results are wrong.');
@@ -64,8 +64,8 @@ class HelperCollectionTest extends CakeTestCase {
  */
 	function testLoadWithEnabledFalse() {
 		$result = $this->Helpers->load('Html', array('enabled' => false));
-		$this->assertType('HtmlHelper', $result);
-		$this->assertType('HtmlHelper', $this->Helpers->Html);
+		$this->assertInstanceOf('HtmlHelper', $result);
+		$this->assertInstanceOf('HtmlHelper', $this->Helpers->Html);
 
 		$this->assertFalse($this->Helpers->enabled('Html'), 'Html should be disabled');
 	}
@@ -90,8 +90,8 @@ class HelperCollectionTest extends CakeTestCase {
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
 		$result = $this->Helpers->load('TestPlugin.OtherHelper');
-		$this->assertType('OtherHelperHelper', $result, 'Helper class is wrong.');
-		$this->assertType('OtherHelperHelper', $this->Helpers->OtherHelper, 'Class is wrong');
+		$this->assertInstanceOf('OtherHelperHelper', $result, 'Helper class is wrong.');
+		$this->assertInstanceOf('OtherHelperHelper', $this->Helpers->OtherHelper, 'Class is wrong');
 
 		App::build();
 	}
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index e50934dd9..30ff72866 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -546,7 +546,7 @@ class ViewTest extends CakeTestCase {
 	function test__get() {
 		$View = new View($this->PostsController);
 		$View->loadHelper('Html');
-		$this->assertType('HtmlHelper', $View->Html);
+		$this->assertInstanceOf('HtmlHelper', $View->Html);
 	}
 
 /**
@@ -561,8 +561,8 @@ class ViewTest extends CakeTestCase {
 		$View->helpers = array('Html', 'Form');
 		$View->loadHelpers();
 
-		$this->assertType('HtmlHelper', $View->Html, 'Object type is wrong.');
-		$this->assertType('FormHelper', $View->Form, 'Object type is wrong.');
+		$this->assertInstanceOf('HtmlHelper', $View->Html, 'Object type is wrong.');
+		$this->assertInstanceOf('FormHelper', $View->Form, 'Object type is wrong.');
 	}
 
 /**
diff --git a/cake/tests/fixtures/fixturized_test_case.php b/cake/tests/fixtures/fixturized_test_case.php
index c9b932b3e..ad2486784 100644
--- a/cake/tests/fixtures/fixturized_test_case.php
+++ b/cake/tests/fixtures/fixturized_test_case.php
@@ -22,7 +22,7 @@ class FixturizedTestCase extends CakeTestCase {
  * @return void
  */
 	public function testFixturePresent() {
-		$this->assertType('CakeFixtureManager', $this->fixtureManager);
+		$this->assertInstanceOf('CakeFixtureManager', $this->fixtureManager);
 	}
 
 /**
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index 184dc7912..1a8131679 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -494,7 +494,7 @@ class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @return void
  */
 	protected function assertIsA($object, $type, $message = '') {
-		return $this->assertType($type, $object, $message);
+		return $this->assertInstanceOf($type, $object, $message);
 	}
 
 /**
diff --git a/cake/tests/lib/controller_test_case.php b/cake/tests/lib/controller_test_case.php
index 63188b059..91940f928 100644
--- a/cake/tests/lib/controller_test_case.php
+++ b/cake/tests/lib/controller_test_case.php
@@ -65,10 +65,9 @@ class ControllerTestDispatcher extends Dispatcher {
  * Loads routes and resets if the test case dictates it should
  * 
  * @return void
- * @access private
  */
-	protected function __loadRoutes() {
-		parent::__loadRoutes();
+	protected function _loadRoutes() {
+		parent::_loadRoutes();
 		if (!$this->loadRoutes) {
 			Router::reload();
 		}

From 3fc8a1f8c19fad555efafbb0b14c986456f0abaf Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 24 Dec 2010 12:54:18 -0500
Subject: [PATCH 55/90] Removing whitespace.

---
 cake/libs/router.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 2cd9128b4..6b4d7dcf6 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -353,8 +353,6 @@ class Router {
  * @return array
  */
 	public static function connectNamed($named, $options = array()) {
-		
-
 		if (isset($options['argSeparator'])) {
 			self::$named['separator'] = $options['argSeparator'];
 			unset($options['argSeparator']);
@@ -396,7 +394,6 @@ class Router {
  * @return void
  */
 	public static function defaults($connect = true) {
-		
 		self::$_connectDefaults = $connect;
 	}
 
@@ -414,7 +411,6 @@ class Router {
  * @return array Array of mapped resources
  */
 	public static function mapResources($controller, $options = array()) {
-		
 		$options = array_merge(array('prefix' => '/', 'id' => self::$__named['ID'] . '|' . self::$__named['UUID']), $options);
 		$prefix = $options['prefix'];
 
@@ -441,7 +437,6 @@ class Router {
  * @return array A list of prefixes used in connected routes
  */
 	public static function prefixes() {
-		
 		return self::$_prefixes;
 	}
 
@@ -452,8 +447,6 @@ class Router {
  * @return array Parsed elements from URL
  */
 	public static function parse($url) {
-
-		
 		if (!self::$_defaultsMapped && self::$_connectDefaults) {
 			self::__connectDefaultRoutes();
 		}

From ff18fe4e3e16d1ce43843b73714538ea658b792a Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Fri, 24 Dec 2010 16:52:15 -0200
Subject: [PATCH 56/90] Optimization in postLink and create methods from
 FormHelper.

---
 cake/libs/view/helpers/form.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 06a465e84..4fdf5d9dd 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -210,11 +210,13 @@ class FormHelper extends AppHelper {
 			}
 		}
 
-		$object = $this->_introspectModel($model);
-		$this->setEntity($model . '.', true);
+		if ($model !== false) {
+			$object = $this->_introspectModel($model);
+			$this->setEntity($model . '.', true);
+		}
 
 		$modelEntity = $this->model();
-		if (isset($this->fieldset[$modelEntity]['key'])) {
+		if ($model !== false && isset($this->fieldset[$modelEntity]['key'])) {
 			$data = $this->fieldset[$modelEntity];
 			$recordExists = (
 				isset($this->request->data[$model]) &&
@@ -1322,6 +1324,7 @@ class FormHelper extends AppHelper {
 			unset($options['confirm']);
 		}
 
+		$url = $this->url($url);
 		$formName = uniqid('post_');
 		$out = $this->create(false, array('url' => $url, 'name' => $formName, 'id' => $formName, 'style' => 'display:none;'));
 		if (isset($options['data']) && is_array($options['data'])) {

From ef77e60cb023acc27dfb9c92f990c0852ee6cd17 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 24 Dec 2010 13:57:20 -0500
Subject: [PATCH 57/90] Removing @subpackage tags, moving contents of
 @subpackage into @package. Removing duplicate cake.cake in @package tags.
 Renaming cake.app -> app

---
 app/config/acl.ini.php                        |   3 +-
 app/config/bootstrap.php                      |   3 +-
 app/config/core.php                           |   3 +-
 app/config/database.php.default               |   6 +-
 app/config/routes.php                         |   3 +-
 app/config/schema/db_acl.php                  |   3 +-
 app/config/schema/i18n.php                    |   3 +-
 app/config/schema/sessions.php                |   3 +-
 app/console/cake                              |   3 +-
 app/console/cake.bat                          |   5 +-
 app/console/cake.php                          |   3 +-
 app/index.php                                 |   3 +-
 app/webroot/css.php                           |   3 +-
 app/webroot/css/cake.generic.css              |   3 +-
 app/webroot/index.php                         |   3 +-
 app/webroot/test.php                          |   3 +-
 cake/VERSION.txt                              |   3 +-
 cake/basics.php                               |   1 -
 cake/bootstrap.php                            |   1 -
 cake/config/config.php                        |   3 +-
 cake/config/paths.php                         |   3 +-
 cake/config/unicode/casefolding/0080_00ff.php |   3 +-
 cake/config/unicode/casefolding/0100_017f.php |   3 +-
 cake/config/unicode/casefolding/0180_024F.php |   3 +-
 cake/config/unicode/casefolding/0250_02af.php |   3 +-
 cake/config/unicode/casefolding/0370_03ff.php |   3 +-
 cake/config/unicode/casefolding/0400_04ff.php |   3 +-
 cake/config/unicode/casefolding/0500_052f.php |   3 +-
 cake/config/unicode/casefolding/0530_058f.php |   3 +-
 cake/config/unicode/casefolding/1e00_1eff.php |   3 +-
 cake/config/unicode/casefolding/1f00_1fff.php |   3 +-
 cake/config/unicode/casefolding/2100_214f.php |   3 +-
 cake/config/unicode/casefolding/2150_218f.php |   3 +-
 cake/config/unicode/casefolding/2460_24ff.php |   3 +-
 cake/config/unicode/casefolding/2c00_2c5f.php |   3 +-
 cake/config/unicode/casefolding/2c60_2c7f.php |   3 +-
 cake/config/unicode/casefolding/2c80_2cff.php |   3 +-
 cake/config/unicode/casefolding/ff00_ffef.php |   3 +-
 cake/console/cake                             |   5 +-
 cake/console/cake.bat                         |   5 +-
 cake/console/cake.php                         |   3 +-
 cake/console/libs/console_error_handler.php   |   6 +-
 cake/console/libs/console_input.php           |   3 +-
 cake/console/libs/console_input_argument.php  |   3 +-
 cake/console/libs/console_input_option.php    |   3 +-
 .../console/libs/console_input_subcommand.php |   3 +-
 cake/console/libs/console_option_parser.php   |   6 +-
 cake/console/libs/console_output.php          |   3 +-
 cake/console/libs/task_collection.php         |   3 +-
 cake/console/shell_dispatcher.php             |   6 +-
 cake/console/shells/acl.php                   |   6 +-
 cake/console/shells/api.php                   |   6 +-
 cake/console/shells/app_shell.php             |   6 +-
 cake/console/shells/bake.php                  |   6 +-
 cake/console/shells/command_list.php          |   3 +-
 cake/console/shells/console.php               |   6 +-
 cake/console/shells/i18n.php                  |   6 +-
 cake/console/shells/schema.php                |   6 +-
 cake/console/shells/shell.php                 |   6 +-
 cake/console/shells/tasks/bake.php            |   3 +-
 cake/console/shells/tasks/controller.php      |   6 +-
 cake/console/shells/tasks/db_config.php       |   6 +-
 cake/console/shells/tasks/extract.php         |   6 +-
 cake/console/shells/tasks/fixture.php         |   6 +-
 cake/console/shells/tasks/model.php           |   6 +-
 cake/console/shells/tasks/plugin.php          |   6 +-
 cake/console/shells/tasks/project.php         |   6 +-
 cake/console/shells/tasks/template.php        |   3 +-
 cake/console/shells/tasks/test.php            |   6 +-
 cake/console/shells/tasks/view.php            |   6 +-
 cake/console/shells/testsuite.php             |   3 +-
 .../default/actions/controller_actions.ctp    |   3 +-
 .../templates/default/classes/controller.ctp  |   3 +-
 .../templates/default/classes/fixture.ctp     |   3 +-
 .../templates/default/classes/model.ctp       |   3 +-
 .../templates/default/classes/test.ctp        |   3 +-
 cake/console/templates/default/views/form.ctp |   3 +-
 .../console/templates/default/views/index.ctp |   3 +-
 cake/console/templates/default/views/view.ctp |   3 +-
 .../console/templates/skel/app_controller.php |   6 +-
 cake/console/templates/skel/app_helper.php    |   2 -
 cake/console/templates/skel/app_model.php     |   6 +-
 .../console/templates/skel/config/acl.ini.php |   3 +-
 .../templates/skel/config/bootstrap.php       |   3 +-
 cake/console/templates/skel/config/core.php   |   3 +-
 .../skel/config/database.php.default          |   6 +-
 cake/console/templates/skel/config/routes.php |   3 +-
 .../templates/skel/config/schema/db_acl.php   |   3 +-
 .../templates/skel/config/schema/i18n.php     |   3 +-
 .../templates/skel/config/schema/sessions.php |   3 +-
 cake/console/templates/skel/console/cake      |   3 +-
 cake/console/templates/skel/console/cake.bat  |   3 +-
 cake/console/templates/skel/console/cake.php  |   3 +-
 .../skel/controllers/pages_controller.php     |   6 +-
 cake/console/templates/skel/index.php         |   3 +-
 .../views/elements/email/html/default.ctp     |   3 +-
 .../views/elements/email/text/default.ctp     |   3 +-
 .../templates/skel/views/layouts/ajax.ctp     |   3 +-
 .../templates/skel/views/layouts/default.ctp  |   3 +-
 .../skel/views/layouts/email/html/default.ctp |   3 +-
 .../skel/views/layouts/email/text/default.ctp |   3 +-
 .../templates/skel/views/layouts/flash.ctp    |   3 +-
 cake/console/templates/skel/webroot/css.php   |   3 +-
 .../skel/webroot/css/cake.generic.css         |   3 +-
 cake/console/templates/skel/webroot/index.php |   3 +-
 cake/console/templates/skel/webroot/test.php  |   3 +-
 cake/libs/app.php                             |   6 +-
 cake/libs/cache.php                           |   3 +-
 cake/libs/cache/apc.php                       |   6 +-
 cake/libs/cache/file.php                      |   6 +-
 cake/libs/cache/memcache.php                  |   6 +-
 cake/libs/cache/xcache.php                    |   6 +-
 cake/libs/cake_log.php                        |   6 +-
 cake/libs/cake_request.php                    |   1 -
 cake/libs/cake_response.php                   |   3 +-
 cake/libs/cake_session.php                    |   6 +-
 cake/libs/cake_socket.php                     |   6 +-
 cake/libs/class_registry.php                  |   6 +-
 cake/libs/config/ini_reader.php               |   3 +-
 cake/libs/config/php_reader.php               |   3 +-
 cake/libs/configure.php                       |   6 +-
 cake/libs/controller/app_controller.php       |   6 +-
 .../libs/controller/cake_error_controller.php |   3 +-
 cake/libs/controller/component.php            |   6 +-
 cake/libs/controller/component_collection.php |   3 +-
 cake/libs/controller/components/acl.php       |  15 +-
 cake/libs/controller/components/auth.php      |   6 +-
 cake/libs/controller/components/cookie.php    |   6 +-
 cake/libs/controller/components/email.php     |   6 +-
 cake/libs/controller/components/paginator.php |   6 +-
 .../controller/components/request_handler.php |   6 +-
 cake/libs/controller/components/security.php  |   6 +-
 cake/libs/controller/components/session.php   |   6 +-
 cake/libs/controller/controller.php           |   3 +-
 cake/libs/controller/pages_controller.php     |   6 +-
 cake/libs/controller/scaffold.php             |   6 +-
 cake/libs/debugger.php                        |   6 +-
 cake/libs/dispatcher.php                      |   4 +-
 cake/libs/error/error_handler.php             |   6 +-
 cake/libs/error/exception_renderer.php        |   6 +-
 cake/libs/error/exceptions.php                |   3 +-
 cake/libs/file.php                            |   6 +-
 cake/libs/folder.php                          |   6 +-
 cake/libs/http/basic_authentication.php       |   6 +-
 cake/libs/http/digest_authentication.php      |   6 +-
 cake/libs/http_response.php                   |   3 +-
 cake/libs/http_socket.php                     |   6 +-
 cake/libs/i18n.php                            |   6 +-
 cake/libs/inflector.php                       |   6 +-
 cake/libs/l10n.php                            |   6 +-
 cake/libs/log/file_log.php                    |   6 +-
 cake/libs/magic_db.php                        |   7 +-
 cake/libs/model/app_model.php                 |   6 +-
 cake/libs/model/behavior_collection.php       |   6 +-
 cake/libs/model/behaviors/acl.php             |   6 +-
 cake/libs/model/behaviors/containable.php     |   6 +-
 cake/libs/model/behaviors/translate.php       |   9 +-
 cake/libs/model/behaviors/tree.php            |   6 +-
 cake/libs/model/cake_schema.php               |   6 +-
 cake/libs/model/connection_manager.php        |   6 +-
 cake/libs/model/datasources/datasource.php    |   6 +-
 cake/libs/model/datasources/dbo/dbo_mssql.php |   6 +-
 cake/libs/model/datasources/dbo/dbo_mysql.php |   6 +-
 .../libs/model/datasources/dbo/dbo_oracle.php |   6 +-
 .../model/datasources/dbo/dbo_postgres.php    |   6 +-
 .../libs/model/datasources/dbo/dbo_sqlite.php |   5 +-
 cake/libs/model/datasources/dbo_source.php    |   6 +-
 cake/libs/model/db_acl.php                    |  18 +-
 cake/libs/model/model.php                     |   6 +-
 cake/libs/model/model_behavior.php            |   3 +-
 cake/libs/multibyte.php                       |   6 +-
 cake/libs/object.php                          |   5 +-
 cake/libs/route/cake_route.php                |   3 +-
 cake/libs/route/plugin_short_route.php        |   3 +-
 cake/libs/route/redirect_route.php            |   3 +-
 cake/libs/router.php                          |   3 +-
 cake/libs/sanitize.php                        |   6 +-
 cake/libs/security.php                        |   6 +-
 cake/libs/session/cache_session.php           |   6 +-
 cake/libs/session/database_session.php        |   5 +-
 cake/libs/set.php                             |   6 +-
 cake/libs/string.php                          |   6 +-
 cake/libs/validation.php                      |   6 +-
 .../libs/view/elements/email/html/default.ctp |   3 +-
 .../libs/view/elements/email/text/default.ctp |   3 +-
 .../view/elements/exception_stack_trace.ctp   |   3 +-
 cake/libs/view/elements/sql_dump.ctp          |   3 +-
 cake/libs/view/errors/error400.ctp            |   3 +-
 cake/libs/view/errors/error500.ctp            |   3 +-
 cake/libs/view/errors/missing_action.ctp      |   3 +-
 .../view/errors/missing_behavior_class.ctp    |   3 +-
 .../view/errors/missing_behavior_file.ctp     |   3 +-
 .../view/errors/missing_component_class.ctp   |   3 +-
 .../view/errors/missing_component_file.ctp    |   3 +-
 cake/libs/view/errors/missing_connection.ctp  |   3 +-
 cake/libs/view/errors/missing_controller.ctp  |   3 +-
 cake/libs/view/errors/missing_database.ctp    |   3 +-
 .../libs/view/errors/missing_helper_class.ctp |   3 +-
 cake/libs/view/errors/missing_helper_file.ctp |   3 +-
 cake/libs/view/errors/missing_layout.ctp      |   3 +-
 cake/libs/view/errors/missing_table.ctp       |   3 +-
 cake/libs/view/errors/missing_view.ctp        |   3 +-
 cake/libs/view/errors/private_action.ctp      |   3 +-
 cake/libs/view/errors/scaffold_error.ctp      |   3 +-
 cake/libs/view/helper.php                     |   6 +-
 cake/libs/view/helper_collection.php          |   3 +-
 cake/libs/view/helpers/app_helper.php         |   5 +-
 cake/libs/view/helpers/cache.php              |   6 +-
 cake/libs/view/helpers/form.php               |  14 +-
 cake/libs/view/helpers/html.php               |   6 +-
 cake/libs/view/helpers/jquery_engine.php      |   3 +-
 cake/libs/view/helpers/js.php                 |   6 +-
 cake/libs/view/helpers/mootools_engine.php    |   3 +-
 cake/libs/view/helpers/number.php             |   6 +-
 cake/libs/view/helpers/paginator.php          |   6 +-
 cake/libs/view/helpers/prototype_engine.php   |   3 +-
 cake/libs/view/helpers/rss.php                |   6 +-
 cake/libs/view/helpers/session.php            |   6 +-
 cake/libs/view/helpers/text.php               |   6 +-
 cake/libs/view/helpers/time.php               |   6 +-
 cake/libs/view/layouts/ajax.ctp               |   3 +-
 cake/libs/view/layouts/default.ctp            |   3 +-
 cake/libs/view/layouts/email/html/default.ctp |   3 +-
 cake/libs/view/layouts/email/text/default.ctp |   3 +-
 cake/libs/view/layouts/flash.ctp              |   3 +-
 cake/libs/view/media.php                      |   3 +-
 cake/libs/view/pages/home.ctp                 |   3 +-
 cake/libs/view/scaffold.php                   |   3 +-
 cake/libs/view/scaffolds/form.ctp             |   3 +-
 cake/libs/view/scaffolds/index.ctp            |   3 +-
 cake/libs/view/scaffolds/view.ctp             |   3 +-
 cake/libs/view/theme.php                      |   6 +-
 cake/libs/view/view.php                       |   3 +-
 cake/libs/xml.php                             |   3 +-
 cake/tests/cases/basics.test.php              |   6 +-
 cake/tests/cases/console/all_console.test.php |   6 +-
 .../cases/console/all_console_libs.test.php   |   6 +-
 cake/tests/cases/console/all_shells.test.php  |   6 +-
 cake/tests/cases/console/all_tasks.test.php   |   6 +-
 .../libs/console_error_handler.test.php       |   3 +-
 .../libs/console_option_parser.test.php       |   3 +-
 .../console/libs/console_output.test.php      |   3 +-
 .../console/libs/task_collection.test.php     |   3 +-
 .../cases/console/shell_dispatcher.test.php   |   9 +-
 cake/tests/cases/console/shells/acl.test.php  |   6 +-
 cake/tests/cases/console/shells/api.test.php  |   6 +-
 cake/tests/cases/console/shells/bake.test.php |   3 +-
 .../console/shells/command_list.test.php      |   3 +-
 .../cases/console/shells/schema.test.php      |   9 +-
 .../tests/cases/console/shells/shell.test.php |  15 +-
 .../console/shells/tasks/controller.test.php  |   6 +-
 .../console/shells/tasks/db_config.test.php   |   6 +-
 .../console/shells/tasks/extract.test.php     |   6 +-
 .../console/shells/tasks/fixture.test.php     |   6 +-
 .../cases/console/shells/tasks/model.test.php |   6 +-
 .../console/shells/tasks/plugin.test.php      |   6 +-
 .../console/shells/tasks/project.test.php     |   6 +-
 .../console/shells/tasks/template.test.php    |   6 +-
 .../cases/console/shells/tasks/test.test.php  |  16 +-
 .../cases/console/shells/tasks/view.test.php  |  14 +-
 .../cases/console/shells/testsuite.test.php   |   3 +-
 cake/tests/cases/libs/all_behaviors.test.php  |   6 +-
 .../cases/libs/all_cache_engines.test.php     |   6 +-
 cake/tests/cases/libs/all_components.test.php |   6 +-
 cake/tests/cases/libs/all_configure.test.php  |   6 +-
 .../tests/cases/libs/all_controllers.test.php |   6 +-
 cake/tests/cases/libs/all_database.test.php   |   6 +-
 cake/tests/cases/libs/all_error.test.php      |   6 +-
 cake/tests/cases/libs/all_helpers.test.php    |   6 +-
 cake/tests/cases/libs/all_js_helpers.test.php |   6 +-
 cake/tests/cases/libs/all_libs.test.php       |   6 +-
 .../cases/libs/all_localization.test.php      |   6 +-
 cake/tests/cases/libs/all_model.test.php      |   6 +-
 cake/tests/cases/libs/all_routing.test.php    |   6 +-
 cake/tests/cases/libs/all_socket.test.php     |   6 +-
 cake/tests/cases/libs/all_test_suite.test.php |   6 +-
 cake/tests/cases/libs/all_tests.test.php      |   6 +-
 cake/tests/cases/libs/all_views.test.php      |   6 +-
 cake/tests/cases/libs/all_xml.test.php        |   6 +-
 cake/tests/cases/libs/app.test.php            |   3 +-
 cake/tests/cases/libs/cache.test.php          |   6 +-
 cake/tests/cases/libs/cache/apc.test.php      |   6 +-
 cake/tests/cases/libs/cache/file.test.php     |   6 +-
 cake/tests/cases/libs/cache/memcache.test.php |   6 +-
 cake/tests/cases/libs/cache/xcache.test.php   |   6 +-
 cake/tests/cases/libs/cake_log.test.php       |   6 +-
 cake/tests/cases/libs/cake_request.test.php   |   3 +-
 cake/tests/cases/libs/cake_session.test.php   |   6 +-
 cake/tests/cases/libs/cake_socket.test.php    |   6 +-
 cake/tests/cases/libs/cake_test_case.test.php |   6 +-
 .../cases/libs/cake_test_fixture.test.php     |  17 +-
 cake/tests/cases/libs/class_registry.test.php |  27 +-
 .../cases/libs/config/ini_reader.test.php     |   3 +-
 .../cases/libs/config/php_reader.test.php     |   3 +-
 cake/tests/cases/libs/configure.test.php      |   6 +-
 .../cases/libs/controller/component.test.php  |  30 +-
 .../controller/component_collection.test.php  |   3 +-
 .../libs/controller/components/acl.test.php   |  21 +-
 .../libs/controller/components/auth.test.php  |  19 +-
 .../controller/components/cookie.test.php     |   9 +-
 .../libs/controller/components/email.test.php |  12 +-
 .../controller/components/paginator.test.php  |  15 +-
 .../components/request_handler.test.php       |  12 +-
 .../controller/components/security.test.php   |  10 +-
 .../controller/components/session.test.php    |  12 +-
 .../cases/libs/controller/controller.test.php |  33 +-
 .../controller/controller_merge_vars.test.php |   5 +-
 .../libs/controller/pages_controller.test.php |   6 +-
 .../cases/libs/controller/scaffold.test.php   |  33 +-
 .../cases/libs/controller_test_case.test.php  |  12 +-
 cake/tests/cases/libs/debugger.test.php       |   9 +-
 cake/tests/cases/libs/dispatcher.test.php     |  39 +-
 .../cases/libs/error/error_handler.test.php   |   6 +-
 .../libs/error/exception_renderer.test.php    |  18 +-
 cake/tests/cases/libs/file.test.php           |   6 +-
 cake/tests/cases/libs/folder.test.php         |   6 +-
 .../cases/libs/html_coverage_report.test.php  |   1 -
 .../libs/http/basic_authentication.test.php   |   6 +-
 .../libs/http/digest_authentication.test.php  |   6 +-
 cake/tests/cases/libs/http_response.test.php  |   9 +-
 cake/tests/cases/libs/http_socket.test.php    |   8 +-
 cake/tests/cases/libs/i18n.test.php           |   6 +-
 cake/tests/cases/libs/inflector.test.php      |   4 +-
 cake/tests/cases/libs/l10n.test.php           |   6 +-
 cake/tests/cases/libs/log/file_log.test.php   |   6 +-
 cake/tests/cases/libs/magic_db.test.php       |  12 +-
 .../libs/model/behavior_collection.test.php   |  27 +-
 .../cases/libs/model/behaviors/acl.test.php   |  11 +-
 .../libs/model/behaviors/containable.test.php |   6 +-
 .../libs/model/behaviors/translate.test.php   |   6 +-
 .../cases/libs/model/behaviors/tree.test.php  |  15 +-
 .../cases/libs/model/cake_schema.test.php     |  35 +-
 .../libs/model/connection_manager.test.php    |   6 +-
 .../model/datasources/dbo/dbo_mssql.test.php  |  15 +-
 .../model/datasources/dbo/dbo_mysql.test.php  |   6 +-
 .../model/datasources/dbo/dbo_oracle.test.php |   6 +-
 .../datasources/dbo/dbo_postgres.test.php     |  15 +-
 .../model/datasources/dbo/dbo_sqlite.test.php |   9 +-
 .../model/datasources/dbo_source.test.php     |   6 +-
 cake/tests/cases/libs/model/db_acl.test.php   |  27 +-
 cake/tests/cases/libs/model/model.test.php    |   6 +-
 .../cases/libs/model/model_delete.test.php    |   6 +-
 .../libs/model/model_integration.test.php     |   6 +-
 .../cases/libs/model/model_read.test.php      |   6 +-
 .../libs/model/model_validation.test.php      |   6 +-
 .../cases/libs/model/model_write.test.php     |   6 +-
 cake/tests/cases/libs/model/models.php        | 396 ++++++------------
 cake/tests/cases/libs/multibyte.test.php      |   6 +-
 cake/tests/cases/libs/object.test.php         |  21 +-
 .../cases/libs/object_collection.test.php     |   3 +-
 cake/tests/cases/libs/router.test.php         |   6 +-
 cake/tests/cases/libs/sanitize.test.php       |  12 +-
 cake/tests/cases/libs/security.test.php       |   6 +-
 .../cases/libs/session/cache_session.test.php |   3 +-
 .../libs/session/database_session.test.php    |   3 +-
 cake/tests/cases/libs/set.test.php            |   6 +-
 cake/tests/cases/libs/string.test.php         |   6 +-
 cake/tests/cases/libs/test_manager.test.php   |   6 +-
 cake/tests/cases/libs/validation.test.php     |   9 +-
 cake/tests/cases/libs/view/helper.test.php    |  21 +-
 .../libs/view/helper_collection.test.php      |   3 +-
 .../cases/libs/view/helpers/cache.test.php    |   9 +-
 .../cases/libs/view/helpers/form.test.php     |  27 +-
 .../cases/libs/view/helpers/html.test.php     |   9 +-
 .../libs/view/helpers/jquery_engine.test.php  |   2 +-
 .../tests/cases/libs/view/helpers/js.test.php |   6 +-
 .../view/helpers/mootools_engine.test.php     |   2 +-
 .../cases/libs/view/helpers/number.test.php   |   6 +-
 .../libs/view/helpers/paginator.test.php      |   6 +-
 .../view/helpers/prototype_engine.test.php    |   2 +-
 .../cases/libs/view/helpers/rss.test.php      |   6 +-
 .../cases/libs/view/helpers/session.test.php  |   6 +-
 .../cases/libs/view/helpers/text.test.php     |   6 +-
 .../cases/libs/view/helpers/time.test.php     |   6 +-
 cake/tests/cases/libs/view/media.test.php     |   6 +-
 cake/tests/cases/libs/view/theme.test.php     |  12 +-
 cake/tests/cases/libs/view/view.test.php      |  15 +-
 cake/tests/cases/libs/xml.test.php            |  12 +-
 cake/tests/fixtures/account_fixture.php       |   6 +-
 cake/tests/fixtures/aco_action_fixture.php    |   6 +-
 cake/tests/fixtures/aco_fixture.php           |   6 +-
 cake/tests/fixtures/aco_two_fixture.php       |   6 +-
 cake/tests/fixtures/ad_fixture.php            |   6 +-
 cake/tests/fixtures/advertisement_fixture.php |   6 +-
 cake/tests/fixtures/after_tree_fixture.php    |   6 +-
 .../fixtures/another_article_fixture.php      |   6 +-
 cake/tests/fixtures/apple_fixture.php         |   6 +-
 cake/tests/fixtures/aro_fixture.php           |   6 +-
 cake/tests/fixtures/aro_two_fixture.php       |   6 +-
 cake/tests/fixtures/aros_aco_fixture.php      |   6 +-
 cake/tests/fixtures/aros_aco_two_fixture.php  |   6 +-
 .../fixtures/article_featured_fixture.php     |   6 +-
 .../article_featureds_tags_fixture.php        |   6 +-
 cake/tests/fixtures/article_fixture.php       |   6 +-
 cake/tests/fixtures/articles_tag_fixture.php  |   6 +-
 cake/tests/fixtures/assert_tags_test_case.php |   3 +-
 cake/tests/fixtures/attachment_fixture.php    |   6 +-
 .../auth_user_custom_field_fixture.php        |   6 +-
 cake/tests/fixtures/auth_user_fixture.php     |   6 +-
 cake/tests/fixtures/author_fixture.php        |   6 +-
 cake/tests/fixtures/bake_article_fixture.php  |   6 +-
 .../bake_articles_bake_tag_fixture.php        |   6 +-
 cake/tests/fixtures/bake_comment_fixture.php  |   6 +-
 cake/tests/fixtures/bake_tag_fixture.php      |   6 +-
 cake/tests/fixtures/basket_fixture.php        |   6 +-
 cake/tests/fixtures/bid_fixture.php           |   6 +-
 cake/tests/fixtures/binary_test_fixture.php   |   6 +-
 cake/tests/fixtures/book_fixture.php          |   6 +-
 .../fixtures/cache_test_model_fixture.php     |   6 +-
 cake/tests/fixtures/callback_fixture.php      |   6 +-
 cake/tests/fixtures/campaign_fixture.php      |   6 +-
 cake/tests/fixtures/category_fixture.php      |   6 +-
 .../fixtures/category_thread_fixture.php      |   6 +-
 cake/tests/fixtures/cd_fixture.php            |   6 +-
 cake/tests/fixtures/comment_fixture.php       |   6 +-
 .../fixtures/content_account_fixture.php      |   6 +-
 cake/tests/fixtures/content_fixture.php       |   6 +-
 .../fixtures/counter_cache_post_fixture.php   |   6 +-
 ...e_post_nonstandard_primary_key_fixture.php |   6 +-
 .../fixtures/counter_cache_user_fixture.php   |   6 +-
 ...e_user_nonstandard_primary_key_fixture.php |   6 +-
 cake/tests/fixtures/data_test_fixture.php     |   6 +-
 cake/tests/fixtures/datatype_fixture.php      |   6 +-
 cake/tests/fixtures/dependency_fixture.php    |   6 +-
 cake/tests/fixtures/device_fixture.php        |   6 +-
 .../fixtures/device_type_category_fixture.php |   6 +-
 cake/tests/fixtures/device_type_fixture.php   |   6 +-
 .../fixtures/document_directory_fixture.php   |   6 +-
 cake/tests/fixtures/document_fixture.php      |   6 +-
 .../exterior_type_category_fixture.php        |   6 +-
 cake/tests/fixtures/feature_set_fixture.php   |   6 +-
 cake/tests/fixtures/featured_fixture.php      |   6 +-
 cake/tests/fixtures/film_file_fixture.php     |   6 +-
 cake/tests/fixtures/fixturized_test_case.php  |   3 +-
 cake/tests/fixtures/flag_tree_fixture.php     |   6 +-
 cake/tests/fixtures/fruit_fixture.php         |   6 +-
 .../fixtures/fruits_uuid_tag_fixture.php      |   6 +-
 .../fixtures/group_update_all_fixture.php     |   6 +-
 cake/tests/fixtures/home_fixture.php          |   6 +-
 cake/tests/fixtures/image_fixture.php         |   6 +-
 cake/tests/fixtures/item_fixture.php          |   6 +-
 .../fixtures/items_portfolio_fixture.php      |   6 +-
 cake/tests/fixtures/join_a_b_fixture.php      |   6 +-
 cake/tests/fixtures/join_a_c_fixture.php      |   6 +-
 cake/tests/fixtures/join_a_fixture.php        |   6 +-
 cake/tests/fixtures/join_b_fixture.php        |   6 +-
 cake/tests/fixtures/join_c_fixture.php        |   6 +-
 cake/tests/fixtures/join_thing_fixture.php    |   6 +-
 cake/tests/fixtures/message_fixture.php       |   6 +-
 .../my_categories_my_products_fixture.php     |   6 +-
 .../my_categories_my_users_fixture.php        |   6 +-
 cake/tests/fixtures/my_category_fixture.php   |   6 +-
 cake/tests/fixtures/my_product_fixture.php    |   6 +-
 cake/tests/fixtures/my_user_fixture.php       |   6 +-
 cake/tests/fixtures/node_fixture.php          |   6 +-
 cake/tests/fixtures/number_tree_fixture.php   |   6 +-
 .../fixtures/number_tree_two_fixture.php      |   6 +-
 .../fixtures/numeric_article_fixture.php      |   6 +-
 .../fixtures/overall_favorite_fixture.php     |   6 +-
 cake/tests/fixtures/person_fixture.php        |   6 +-
 cake/tests/fixtures/portfolio_fixture.php     |   6 +-
 cake/tests/fixtures/post_fixture.php          |   6 +-
 cake/tests/fixtures/posts_tag_fixture.php     |   6 +-
 cake/tests/fixtures/primary_model_fixture.php |   6 +-
 cake/tests/fixtures/product_fixture.php       |   6 +-
 .../fixtures/product_update_all_fixture.php   |   6 +-
 cake/tests/fixtures/project_fixture.php       |   6 +-
 cake/tests/fixtures/sample_fixture.php        |   6 +-
 .../fixtures/secondary_model_fixture.php      |   6 +-
 cake/tests/fixtures/session_fixture.php       |   6 +-
 .../tests/fixtures/something_else_fixture.php |   6 +-
 cake/tests/fixtures/something_fixture.php     |   6 +-
 cake/tests/fixtures/stories_tag_fixture.php   |   6 +-
 cake/tests/fixtures/story_fixture.php         |   6 +-
 cake/tests/fixtures/syfile_fixture.php        |   6 +-
 cake/tests/fixtures/tag_fixture.php           |   6 +-
 .../fixtures/test_plugin_article_fixture.php  |   6 +-
 .../fixtures/test_plugin_comment_fixture.php  |   6 +-
 .../fixtures/the_paper_monkies_fixture.php    |   6 +-
 cake/tests/fixtures/thread_fixture.php        |   6 +-
 .../fixtures/translate_article_fixture.php    |   6 +-
 cake/tests/fixtures/translate_fixture.php     |   6 +-
 .../fixtures/translate_table_fixture.php      |   6 +-
 .../translate_with_prefix_fixture.php         |   6 +-
 .../fixtures/translated_article_fixture.php   |   6 +-
 .../fixtures/translated_item_fixture.php      |   6 +-
 .../fixtures/unconventional_tree_fixture.php  |   6 +-
 .../fixtures/underscore_field_fixture.php     |   6 +-
 cake/tests/fixtures/user_fixture.php          |   6 +-
 cake/tests/fixtures/uuid_fixture.php          |   6 +-
 cake/tests/fixtures/uuid_tag_fixture.php      |   6 +-
 cake/tests/fixtures/uuid_tree_fixture.php     |   6 +-
 cake/tests/fixtures/uuiditem_fixture.php      |   6 +-
 .../uuiditems_uuidportfolio_fixture.php       |   6 +-
 ...ditems_uuidportfolio_numericid_fixture.php |   6 +-
 cake/tests/fixtures/uuidportfolio_fixture.php |   6 +-
 cake/tests/lib/cake_fixture_manager.php       |   3 +-
 cake/tests/lib/cake_test_case.php             |   6 +-
 cake/tests/lib/cake_test_fixture.php          |   6 +-
 cake/tests/lib/cake_test_model.php            |   6 +-
 cake/tests/lib/cake_test_suite.php            |   3 +-
 cake/tests/lib/cake_test_suite_dispatcher.php |   3 +-
 cake/tests/lib/cake_web_test_case.php         |   6 +-
 cake/tests/lib/controller_test_case.php       |  12 +-
 .../lib/coverage/base_coverage_report.php     |   1 -
 .../lib/coverage/html_coverage_report.php     |   1 -
 .../lib/coverage/text_coverage_report.php     |   1 -
 .../tests/lib/reporter/cake_base_reporter.php |   5 +-
 .../tests/lib/reporter/cake_html_reporter.php |   5 +-
 .../tests/lib/reporter/cake_text_reporter.php |   5 +-
 cake/tests/lib/templates/footer.php           |   3 +-
 cake/tests/lib/templates/header.php           |   3 +-
 cake/tests/lib/templates/menu.php             |   3 +-
 .../lib/templates/missing_conenction.php      |   3 +-
 cake/tests/lib/templates/phpunit.php          |   3 +-
 cake/tests/lib/templates/xdebug.php           |   3 +-
 cake/tests/lib/test_manager.php               |   6 +-
 cake/tests/lib/test_runner.php                |   6 +-
 cake/tests/test_app/config/acl.ini.php        |   3 +-
 cake/tests/test_app/config/routes.php         |   3 +-
 cake/tests/test_app/console/shells/sample.php |   3 +-
 .../controllers/tests_apps_controller.php     |   3 +-
 .../tests_apps_posts_controller.php           |   3 +-
 .../test_app/libs/cache/test_app_cache.php    |   3 +-
 cake/tests/test_app/libs/library.php          |   3 +-
 cake/tests/test_app/libs/log/test_app_log.php |   3 +-
 .../behaviors/persister_one_behavior.php      |   6 +-
 .../behaviors/persister_two_behavior.php      |   6 +-
 cake/tests/test_app/models/comment.php        |   3 +-
 cake/tests/test_app/models/persister_one.php  |   3 +-
 cake/tests/test_app/models/persister_two.php  |   3 +-
 cake/tests/test_app/models/post.php           |   3 +-
 .../plugins/test_plugin/config/load.php       |   3 +-
 .../plugins/test_plugin/config/more.load.php  |   3 +-
 .../test_plugin/config/schema/schema.php      |   3 +-
 .../test_plugin/console/shells/example.php    |   3 +-
 .../console/shells/tasks/other_task.php       |   3 +-
 .../components/other_component.php            |   3 +-
 .../components/plugins_component.php          |   3 +-
 .../components/test_plugin_component.php      |   3 +-
 .../test_plugin_other_component.php           |   3 +-
 .../controllers/test_plugin_controller.php    |   3 +-
 .../controllers/tests_controller.php          |   3 +-
 .../libs/cache/test_plugin_cache.php          |   3 +-
 .../test_plugin/libs/log/test_plugin_log.php  |   3 +-
 .../test_plugin/libs/test_plugin_library.php  |   3 +-
 .../behaviors/test_plugin_persister_one.php   |   6 +-
 .../behaviors/test_plugin_persister_two.php   |   6 +-
 .../models/test_plugin_auth_user.php          |   3 +-
 .../models/test_plugin_authors.php            |   3 +-
 .../models/test_plugin_comment.php            |   3 +-
 .../test_plugin/models/test_plugin_post.php   |   3 +-
 .../test_plugin_app_controller.php            |   3 +-
 .../test_plugin/test_plugin_app_model.php     |   3 +-
 .../vendors/sample/sample_plugin.php          |   3 +-
 .../plugins/test_plugin/vendors/welcome.php   |   3 +-
 .../views/helpers/other_helper.php            |   3 +-
 .../views/helpers/plugged_helper.php          |   3 +-
 .../console/shells/example.php                |   3 +-
 .../console/shells/welcome.php                |   3 +-
 cake/tests/test_app/vendors/Test/MyTest.php   |   3 +-
 cake/tests/test_app/vendors/Test/hello.php    |   3 +-
 .../sample/configure_test_vendor_sample.php   |   3 +-
 .../test_app/vendors/somename/some.name.php   |   3 +-
 cake/tests/test_app/vendors/welcome.php       |   3 +-
 .../views/elements/email/html/custom.ctp      |   3 +-
 .../views/elements/email/html/default.ctp     |   3 +-
 .../views/elements/email/text/custom.ctp      |   3 +-
 .../views/elements/email/text/default.ctp     |   3 +-
 .../views/elements/email/text/wide.ctp        |   3 +-
 cake/tests/test_app/views/helpers/banana.php  |   3 +-
 cake/tests/test_app/views/layouts/ajax.ctp    |   3 +-
 cake/tests/test_app/views/layouts/ajax2.ctp   |   3 +-
 .../test_app/views/layouts/cache_layout.ctp   |   3 +-
 cake/tests/test_app/views/layouts/default.ctp |   3 +-
 .../views/layouts/email/html/default.ctp      |   3 +-
 .../views/layouts/email/html/thin.ctp         |   3 +-
 .../views/layouts/email/text/default.ctp      |   3 +-
 cake/tests/test_app/views/layouts/flash.ctp   |   3 +-
 .../test_app/views/layouts/multi_cache.ctp    |   3 +-
 .../views/posts/sequencial_nocache.ctp        |   3 +-
 .../views/posts/test_nocache_tags.ctp         |   3 +-
 index.php                                     |   1 -
 583 files changed, 1241 insertions(+), 2436 deletions(-)

diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php
index c3e055341..3245634aa 100644
--- a/app/config/acl.ini.php
+++ b/app/config/acl.ini.php
@@ -14,8 +14,7 @@
 ; *
 ; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; * @link          http://cakephp.org CakePHP(tm) Project
-; * @package       cake
-; * @subpackage    cake.app.config
+; * @package       app.config
 ; * @since         CakePHP(tm) v 0.10.0.1076
 ; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 ; */
diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index b0c33554b..ceeb85670 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.10.8.2117
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/config/core.php b/app/config/core.php
index c9560d15a..9744da06c 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/config/database.php.default b/app/config/database.php.default
index f85b56922..2078240ea 100644
--- a/app/config/database.php.default
+++ b/app/config/database.php.default
@@ -14,16 +14,14 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 /**
  * In this file you set up your database connection details.
  *
- * @package       cake
- * @subpackage    cake.config
+ * @package       cake.config
  */
 /**
  * Database configuration class.
diff --git a/app/config/routes.php b/app/config/routes.php
index 4e470c363..cbb816e18 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -16,8 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/config/schema/db_acl.php b/app/config/schema/db_acl.php
index d13a20609..25b6ee6df 100644
--- a/app/config/schema/db_acl.php
+++ b/app/config/schema/db_acl.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config.sql
+ * @package       app.config.sql
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/config/schema/i18n.php b/app/config/schema/i18n.php
index 13db98f12..f57bbce7f 100644
--- a/app/config/schema/i18n.php
+++ b/app/config/schema/i18n.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config.sql
+ * @package       app.config.sql
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/config/schema/sessions.php b/app/config/schema/sessions.php
index 584d0002b..e5ae37dc1 100644
--- a/app/config/schema/sessions.php
+++ b/app/config/schema/sessions.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config.sql
+ * @package       app.config.sql
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/console/cake b/app/console/cake
index d4d067d59..bd1b6da06 100755
--- a/app/console/cake
+++ b/app/console/cake
@@ -12,8 +12,7 @@
 #
 # @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
 # @link				http://cakephp.org CakePHP(tm) Project
-# @package			cake
-# @subpackage		cake.app.console
+# @package   		app.console
 # @since			CakePHP(tm) v 2.0
 # @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
 #
diff --git a/app/console/cake.bat b/app/console/cake.bat
index 6499c2f22..ed04546c9 100644
--- a/app/console/cake.bat
+++ b/app/console/cake.bat
@@ -10,9 +10,8 @@
 :: Redistributions of files must retain the above copyright notice.
 ::
 :: @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
-:: @link				http://cakephp.org CakePHP(tm) Project
-:: @package			cake
-:: @subpackage		cake.app.console
+:: @link			http://cakephp.org CakePHP(tm) Project
+:: @package   		app.console
 :: @since			CakePHP(tm) v 2.0
 :: @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
 ::
diff --git a/app/console/cake.php b/app/console/cake.php
index af02ae4ff..9200fd36b 100755
--- a/app/console/cake.php
+++ b/app/console/cake.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       app.console
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/index.php b/app/index.php
index a9e0270cb..ac4fde167 100644
--- a/app/index.php
+++ b/app/index.php
@@ -10,8 +10,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app
+ * @package       app
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/webroot/css.php b/app/webroot/css.php
index 26cddcb14..19ba84dc2 100644
--- a/app/webroot/css.php
+++ b/app/webroot/css.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index 4f6f5a2cd..3559401dc 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -10,8 +10,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.webroot.css
+ * @package       app.webroot.css
  * @since         CakePHP(tm)
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/webroot/index.php b/app/webroot/index.php
index 719f172c4..5955688f6 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/webroot/test.php b/app/webroot/test.php
index 7a27e8e29..eddcc437f 100644
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/VERSION.txt b/cake/VERSION.txt
index e5c64475c..90bd8f82d 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -12,8 +12,7 @@
 //
 // @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 // @link          http://cakephp.org
-// @package       cake
-// @subpackage    cake.cake.libs
+// @package       cake.libs
 // @since         CakePHP(tm) v 0.2.9
 // @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 // +--------------------------------------------------------------------------------------------+ //
diff --git a/cake/basics.php b/cake/basics.php
index a5ee633dd..5a968cdeb 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -15,7 +15,6 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index acfc7bb2f..65931eb39 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -15,7 +15,6 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/config.php b/cake/config/config.php
index 071441c21..30b6e24d1 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       cake.config
  * @since         CakePHP(tm) v 1.1.11.4062
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/paths.php b/cake/config/paths.php
index e8ac21c49..365cdb4c1 100644
--- a/cake/config/paths.php
+++ b/cake/config/paths.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.app.config
+ * @package       cake.config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0080_00ff.php b/cake/config/unicode/casefolding/0080_00ff.php
index 0d2fa16be..ef01fe904 100644
--- a/cake/config/unicode/casefolding/0080_00ff.php
+++ b/cake/config/unicode/casefolding/0080_00ff.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0100_017f.php b/cake/config/unicode/casefolding/0100_017f.php
index 64ab7d393..1f7f1449c 100644
--- a/cake/config/unicode/casefolding/0100_017f.php
+++ b/cake/config/unicode/casefolding/0100_017f.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0180_024F.php b/cake/config/unicode/casefolding/0180_024F.php
index 23c692632..f2a5a849b 100644
--- a/cake/config/unicode/casefolding/0180_024F.php
+++ b/cake/config/unicode/casefolding/0180_024F.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0250_02af.php b/cake/config/unicode/casefolding/0250_02af.php
index 1ef96c6af..3140c1312 100644
--- a/cake/config/unicode/casefolding/0250_02af.php
+++ b/cake/config/unicode/casefolding/0250_02af.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.6833
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0370_03ff.php b/cake/config/unicode/casefolding/0370_03ff.php
index 50618afb8..7609089da 100644
--- a/cake/config/unicode/casefolding/0370_03ff.php
+++ b/cake/config/unicode/casefolding/0370_03ff.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0400_04ff.php b/cake/config/unicode/casefolding/0400_04ff.php
index a04d3df66..3b12b059e 100644
--- a/cake/config/unicode/casefolding/0400_04ff.php
+++ b/cake/config/unicode/casefolding/0400_04ff.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0500_052f.php b/cake/config/unicode/casefolding/0500_052f.php
index 661f66d63..453b9b7df 100644
--- a/cake/config/unicode/casefolding/0500_052f.php
+++ b/cake/config/unicode/casefolding/0500_052f.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/0530_058f.php b/cake/config/unicode/casefolding/0530_058f.php
index 232649ec4..3181438ec 100644
--- a/cake/config/unicode/casefolding/0530_058f.php
+++ b/cake/config/unicode/casefolding/0530_058f.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/1e00_1eff.php b/cake/config/unicode/casefolding/1e00_1eff.php
index 3a8378691..ed49211a9 100644
--- a/cake/config/unicode/casefolding/1e00_1eff.php
+++ b/cake/config/unicode/casefolding/1e00_1eff.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/1f00_1fff.php b/cake/config/unicode/casefolding/1f00_1fff.php
index a4040b852..2b0d24bf2 100644
--- a/cake/config/unicode/casefolding/1f00_1fff.php
+++ b/cake/config/unicode/casefolding/1f00_1fff.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/2100_214f.php b/cake/config/unicode/casefolding/2100_214f.php
index 1685ebb71..a10d613f4 100644
--- a/cake/config/unicode/casefolding/2100_214f.php
+++ b/cake/config/unicode/casefolding/2100_214f.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/2150_218f.php b/cake/config/unicode/casefolding/2150_218f.php
index 44bf3ff89..6ccd3de8c 100644
--- a/cake/config/unicode/casefolding/2150_218f.php
+++ b/cake/config/unicode/casefolding/2150_218f.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/2460_24ff.php b/cake/config/unicode/casefolding/2460_24ff.php
index 4376e2b71..2e7a85321 100644
--- a/cake/config/unicode/casefolding/2460_24ff.php
+++ b/cake/config/unicode/casefolding/2460_24ff.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/2c00_2c5f.php b/cake/config/unicode/casefolding/2c00_2c5f.php
index e8a70bc32..797cf964d 100644
--- a/cake/config/unicode/casefolding/2c00_2c5f.php
+++ b/cake/config/unicode/casefolding/2c00_2c5f.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/2c60_2c7f.php b/cake/config/unicode/casefolding/2c60_2c7f.php
index dabdb88a2..058193ca6 100644
--- a/cake/config/unicode/casefolding/2c60_2c7f.php
+++ b/cake/config/unicode/casefolding/2c60_2c7f.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/2c80_2cff.php b/cake/config/unicode/casefolding/2c80_2cff.php
index c0245fa16..d439bc2e7 100644
--- a/cake/config/unicode/casefolding/2c80_2cff.php
+++ b/cake/config/unicode/casefolding/2c80_2cff.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/config/unicode/casefolding/ff00_ffef.php b/cake/config/unicode/casefolding/ff00_ffef.php
index 74a2b5c4a..0b8106532 100644
--- a/cake/config/unicode/casefolding/ff00_ffef.php
+++ b/cake/config/unicode/casefolding/ff00_ffef.php
@@ -18,8 +18,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.config.unicode.casefolding
+ * @package       cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/cake b/cake/console/cake
index d0bdb5cc0..81df781da 100755
--- a/cake/console/cake
+++ b/cake/console/cake
@@ -12,9 +12,8 @@
 #
 # @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
 # @link				http://cakephp.org CakePHP(tm) Project
-# @package			cake
-# @subpackage		cake.cake.console
-# @since				CakePHP(tm) v 1.2.0.5012
+# @package   		cake.console
+# @since			CakePHP(tm) v 1.2.0.5012
 # @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
 #
 ################################################################################
diff --git a/cake/console/cake.bat b/cake/console/cake.bat
index cb1831d94..40a271425 100644
--- a/cake/console/cake.bat
+++ b/cake/console/cake.bat
@@ -10,9 +10,8 @@
 :: Redistributions of files must retain the above copyright notice.
 ::
 :: @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
-:: @link				http://cakephp.org CakePHP(tm) Project
-:: @package			cake
-:: @subpackage		cake.cake.console
+:: @link			http://cakephp.org CakePHP(tm) Project
+:: @package   		cake.console
 :: @since			CakePHP(tm) v 1.2.0.5012
 :: @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
 ::
diff --git a/cake/console/cake.php b/cake/console/cake.php
index 02468c38f..c9bce3193 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_error_handler.php b/cake/console/libs/console_error_handler.php
index bd2228c7a..2de7b2e25 100644
--- a/cake/console/libs/console_error_handler.php
+++ b/cake/console/libs/console_error_handler.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ require_once 'console_output.php';
  * Error Handler for Cake console. Does simple printing of the 
  * exception that occurred and the stack trace of the error.
  *
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  */
 class ConsoleErrorHandler extends ErrorHandler {
 
diff --git a/cake/console/libs/console_input.php b/cake/console/libs/console_input.php
index 751035f53..da3551399 100644
--- a/cake/console/libs/console_input.php
+++ b/cake/console/libs/console_input.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_input_argument.php b/cake/console/libs/console_input_argument.php
index 34ce98414..b2e9d4f16 100644
--- a/cake/console/libs/console_input_argument.php
+++ b/cake/console/libs/console_input_argument.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_input_option.php b/cake/console/libs/console_input_option.php
index 925d64dd4..c72638eca 100644
--- a/cake/console/libs/console_input_option.php
+++ b/cake/console/libs/console_input_option.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_input_subcommand.php b/cake/console/libs/console_input_subcommand.php
index d628425c8..82048b853 100644
--- a/cake/console/libs/console_input_subcommand.php
+++ b/cake/console/libs/console_input_subcommand.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_option_parser.php b/cake/console/libs/console_option_parser.php
index 6e9dcce39..2f63651ec 100644
--- a/cake/console/libs/console_option_parser.php
+++ b/cake/console/libs/console_option_parser.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ require_once CONSOLE_LIBS . 'help_formatter.php';
  * for GetOpt compatible option definition.  Provides a builder pattern implementation
  * for creating shell option parsers.
  *
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  */
 class ConsoleOptionParser {
 
diff --git a/cake/console/libs/console_output.php b/cake/console/libs/console_output.php
index 5f89ac100..27c1c4e66 100644
--- a/cake/console/libs/console_output.php
+++ b/cake/console/libs/console_output.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/task_collection.php b/cake/console/libs/task_collection.php
index d28b13b6d..32f0b31a4 100644
--- a/cake/console/libs/task_collection.php
+++ b/cake/console/libs/task_collection.php
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shell_dispatcher.php b/cake/console/shell_dispatcher.php
index 029a91442..1b520500b 100644
--- a/cake/console/shell_dispatcher.php
+++ b/cake/console/shell_dispatcher.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Shell dispatcher handles dispatching cli commands.
  *
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       cake.console
  */
 class ShellDispatcher {
 
diff --git a/cake/console/shells/acl.php b/cake/console/shells/acl.php
index e29e4f4ef..5fe8f70e6 100644
--- a/cake/console/shells/acl.php
+++ b/cake/console/shells/acl.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Model', 'DbAcl');
  * Shell for ACL management.  This console is known to have issues with zend.ze1_compatibility_mode 
  * being enabled.  Be sure to turn it off when using this shell.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class AclShell extends Shell {
 
diff --git a/cake/console/shells/api.php b/cake/console/shells/api.php
index 0c036d09d..5abd5d48b 100644
--- a/cake/console/shells/api.php
+++ b/cake/console/shells/api.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Core', 'File');
 /**
  * API shell to show method signatures of CakePHP core classes.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class ApiShell extends Shell {
 
diff --git a/cake/console/shells/app_shell.php b/cake/console/shells/app_shell.php
index 59fcc2a09..a624a31ad 100644
--- a/cake/console/shells/app_shell.php
+++ b/cake/console/shells/app_shell.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.console.shells
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  * Add your application-wide methods in the class below, your shells
  * will inherit them.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class AppShell extends Shell {
 
diff --git a/cake/console/shells/bake.php b/cake/console/shells/bake.php
index 7e4dbb016..266b6495c 100644
--- a/cake/console/shells/bake.php
+++ b/cake/console/shells/bake.php
@@ -16,8 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
 /**
  * Bake is a command-line code generation utility for automating programmer chores.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @link          http://book.cakephp.org/view/1522/Code-Generation-with-Bake
  */
 class BakeShell extends Shell {
diff --git a/cake/console/shells/command_list.php b/cake/console/shells/command_list.php
index cd05af4ba..9a198b47c 100644
--- a/cake/console/shells/command_list.php
+++ b/cake/console/shells/command_list.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs
+ * @package       cake.tests.cases.console.libs
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/console.php b/cake/console/shells/console.php
index 20ab1615d..b3b1033ae 100644
--- a/cake/console/shells/console.php
+++ b/cake/console/shells/console.php
@@ -12,15 +12,13 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
 /**
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class ConsoleShell extends Shell {
 
diff --git a/cake/console/shells/i18n.php b/cake/console/shells/i18n.php
index c40160e54..13477eb44 100644
--- a/cake/console/shells/i18n.php
+++ b/cake/console/shells/i18n.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Shell for I18N management.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class I18nShell extends Shell {
 
diff --git a/cake/console/shells/schema.php b/cake/console/shells/schema.php
index 969fad12a..ed7090f53 100644
--- a/cake/console/shells/schema.php
+++ b/cake/console/shells/schema.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ App::import('Model', 'CakeSchema', false);
 /**
  * Schema is a command-line database management utility for automating programmer chores.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @link          http://book.cakephp.org/view/1523/Schema-management-and-migrations
  */
 class SchemaShell extends Shell {
diff --git a/cake/console/shells/shell.php b/cake/console/shells/shell.php
index 55c81f94d..ac6240329 100644
--- a/cake/console/shells/shell.php
+++ b/cake/console/shells/shell.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ require_once CONSOLE_LIBS . 'console_option_parser.php';
 /**
  * Base class for command-line utilities for automating programmer chores.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class Shell extends Object {
 
diff --git a/cake/console/shells/tasks/bake.php b/cake/console/shells/tasks/bake.php
index 6a89e187c..61413e6e1 100644
--- a/cake/console/shells/tasks/bake.php
+++ b/cake/console/shells/tasks/bake.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/tasks/controller.php b/cake/console/shells/tasks/controller.php
index 6ec3c4371..3a17a525c 100644
--- a/cake/console/shells/tasks/controller.php
+++ b/cake/console/shells/tasks/controller.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating controller files.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class ControllerTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/db_config.php b/cake/console/shells/tasks/db_config.php
index a98b6b053..7cc811f2d 100644
--- a/cake/console/shells/tasks/db_config.php
+++ b/cake/console/shells/tasks/db_config.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Task class for creating and updating the database configuration file.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class DbConfigTask extends Shell {
 
diff --git a/cake/console/shells/tasks/extract.php b/cake/console/shells/tasks/extract.php
index 34c24314e..451b79417 100644
--- a/cake/console/shells/tasks/extract.php
+++ b/cake/console/shells/tasks/extract.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@ App::import('Core', 'File');
 /**
  * Language string extractor
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class ExtractTask extends Shell {
 
diff --git a/cake/console/shells/tasks/fixture.php b/cake/console/shells/tasks/fixture.php
index 3bf60f3ae..f19585839 100644
--- a/cake/console/shells/tasks/fixture.php
+++ b/cake/console/shells/tasks/fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating fixtures files.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class FixtureTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/model.php b/cake/console/shells/tasks/model.php
index ffa06640a..0af02a635 100644
--- a/cake/console/shells/tasks/model.php
+++ b/cake/console/shells/tasks/model.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating model files.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class ModelTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/plugin.php b/cake/console/shells/tasks/plugin.php
index 6ae7bd5cb..1ea700081 100644
--- a/cake/console/shells/tasks/plugin.php
+++ b/cake/console/shells/tasks/plugin.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'File');
 /**
  * Task class for creating a plugin
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class PluginTask extends Shell {
 
diff --git a/cake/console/shells/tasks/project.php b/cake/console/shells/tasks/project.php
index bb2a8f34b..c773b57ac 100644
--- a/cake/console/shells/tasks/project.php
+++ b/cake/console/shells/tasks/project.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.bake
+ * @package       cake.console.bake
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'File');
 /**
  * Task class for creating new project apps and plugins
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class ProjectTask extends Shell {
 
diff --git a/cake/console/shells/tasks/template.php b/cake/console/shells/tasks/template.php
index 85eed96c6..08dbb30eb 100644
--- a/cake/console/shells/tasks/template.php
+++ b/cake/console/shells/tasks/template.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/tasks/test.php b/cake/console/shells/tasks/test.php
index 093457421..3e14c1fe8 100644
--- a/cake/console/shells/tasks/test.php
+++ b/cake/console/shells/tasks/test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Model', 'ClassRegistry');
 /**
  * Task class for creating and updating test files.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class TestTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/view.php b/cake/console/shells/tasks/view.php
index bf8777238..3e23d0d7e 100644
--- a/cake/console/shells/tasks/view.php
+++ b/cake/console/shells/tasks/view.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating view files.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs.tasks
+ * @package       cake.console.libs.tasks
  */
 class ViewTask extends BakeTask {
 
diff --git a/cake/console/shells/testsuite.php b/cake/console/shells/testsuite.php
index 8814242a2..2e477a0a9 100644
--- a/cake/console/shells/testsuite.php
+++ b/cake/console/shells/testsuite.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/actions/controller_actions.ctp b/cake/console/templates/default/actions/controller_actions.ctp
index 0a4c9d311..f80d3d374 100644
--- a/cake/console/templates/default/actions/controller_actions.ctp
+++ b/cake/console/templates/default/actions/controller_actions.ctp
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.console.libs.template.objects
+ * @package       cake.console.libs.template.objects
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/classes/controller.ctp b/cake/console/templates/default/classes/controller.ctp
index a66e0faa5..52f968824 100644
--- a/cake/console/templates/default/classes/controller.ctp
+++ b/cake/console/templates/default/classes/controller.ctp
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.
+ * @package       cake.
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/classes/fixture.ctp b/cake/console/templates/default/classes/fixture.ctp
index a8d1bbfb2..dd1b5b478 100644
--- a/cake/console/templates/default/classes/fixture.ctp
+++ b/cake/console/templates/default/classes/fixture.ctp
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.
+ * @package       cake.
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/classes/model.ctp b/cake/console/templates/default/classes/model.ctp
index 222dd0da8..ece196dba 100644
--- a/cake/console/templates/default/classes/model.ctp
+++ b/cake/console/templates/default/classes/model.ctp
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.console.libs.templates.objects
+ * @package       cake.console.libs.templates.objects
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/classes/test.ctp b/cake/console/templates/default/classes/test.ctp
index 5811e8446..f9dd98b0b 100644
--- a/cake/console/templates/default/classes/test.ctp
+++ b/cake/console/templates/default/classes/test.ctp
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.console.libs.templates.objects
+ * @package       cake.console.libs.templates.objects
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/views/form.ctp b/cake/console/templates/default/views/form.ctp
index 85fef3fa0..ce2b525f9 100644
--- a/cake/console/templates/default/views/form.ctp
+++ b/cake/console/templates/default/views/form.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.templates.views
+ * @package       cake.console.libs.templates.views
  * @since         CakePHP(tm) v 1.2.0.5234
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/views/index.ctp b/cake/console/templates/default/views/index.ctp
index 0732fe058..01c834d64 100644
--- a/cake/console/templates/default/views/index.ctp
+++ b/cake/console/templates/default/views/index.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.templates.views
+ * @package       cake.console.libs.templates.views
  * @since         CakePHP(tm) v 1.2.0.5234
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/default/views/view.ctp b/cake/console/templates/default/views/view.ctp
index 9e791196f..8ed607d83 100644
--- a/cake/console/templates/default/views/view.ctp
+++ b/cake/console/templates/default/views/view.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.templates.views
+ * @package       cake.console.libs.templates.views
  * @since         CakePHP(tm) v 1.2.0.5234
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/app_controller.php b/cake/console/templates/skel/app_controller.php
index 2139202a3..8573bb7c4 100644
--- a/cake/console/templates/skel/app_controller.php
+++ b/cake/console/templates/skel/app_controller.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app
+ * @package       app
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@
  * Add your application-wide methods in the class below, your controllers
  * will inherit them.
  *
- * @package       cake
- * @subpackage    cake.app
+ * @package       app
  */
 class AppController extends Controller {
 }
diff --git a/cake/console/templates/skel/app_helper.php b/cake/console/templates/skel/app_helper.php
index 2dd482b90..02955a34e 100644
--- a/cake/console/templates/skel/app_helper.php
+++ b/cake/console/templates/skel/app_helper.php
@@ -16,7 +16,6 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -30,7 +29,6 @@ App::import('Helper', 'Helper', false);
  * will inherit them.
  *
  * @package       cake
- * @subpackage    cake.cake
  */
 class AppHelper extends Helper {
 }
diff --git a/cake/console/templates/skel/app_model.php b/cake/console/templates/skel/app_model.php
index bb4236c45..87a130a8a 100644
--- a/cake/console/templates/skel/app_model.php
+++ b/cake/console/templates/skel/app_model.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app
+ * @package       app
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@
  * Add your application-wide methods in the class below, your models
  * will inherit them.
  *
- * @package       cake
- * @subpackage    cake.app
+ * @package       app
  */
 class AppModel extends Model {
 }
diff --git a/cake/console/templates/skel/config/acl.ini.php b/cake/console/templates/skel/config/acl.ini.php
index 7a90814db..3da8e407f 100644
--- a/cake/console/templates/skel/config/acl.ini.php
+++ b/cake/console/templates/skel/config/acl.ini.php
@@ -14,8 +14,7 @@
 ; *
 ; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; * @link          http://cakephp.org CakePHP(tm) Project
-; * @package       cake
-; * @subpackage    cake.app.config
+; * @package       app.config
 ; * @since         CakePHP(tm) v 0.10.0.1076
 ; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 ; */
diff --git a/cake/console/templates/skel/config/bootstrap.php b/cake/console/templates/skel/config/bootstrap.php
index f4a85e10f..697274852 100644
--- a/cake/console/templates/skel/config/bootstrap.php
+++ b/cake/console/templates/skel/config/bootstrap.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.10.8.2117
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/config/core.php b/cake/console/templates/skel/config/core.php
index c9560d15a..9744da06c 100644
--- a/cake/console/templates/skel/config/core.php
+++ b/cake/console/templates/skel/config/core.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/config/database.php.default b/cake/console/templates/skel/config/database.php.default
index 8003d2bbb..0952dac47 100644
--- a/cake/console/templates/skel/config/database.php.default
+++ b/cake/console/templates/skel/config/database.php.default
@@ -14,16 +14,14 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 /**
  * In this file you set up your database connection details.
  *
- * @package       cake
- * @subpackage    cake.config
+ * @package       cake.config
  */
 /**
  * Database configuration class.
diff --git a/cake/console/templates/skel/config/routes.php b/cake/console/templates/skel/config/routes.php
index 8aa7561ba..b6089eb2d 100644
--- a/cake/console/templates/skel/config/routes.php
+++ b/cake/console/templates/skel/config/routes.php
@@ -16,8 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/config/schema/db_acl.php b/cake/console/templates/skel/config/schema/db_acl.php
index 511250f62..8400e85ed 100644
--- a/cake/console/templates/skel/config/schema/db_acl.php
+++ b/cake/console/templates/skel/config/schema/db_acl.php
@@ -16,8 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config.sql
+ * @package       app.config.sql
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/config/schema/i18n.php b/cake/console/templates/skel/config/schema/i18n.php
index a2f02ea72..504f00812 100644
--- a/cake/console/templates/skel/config/schema/i18n.php
+++ b/cake/console/templates/skel/config/schema/i18n.php
@@ -16,8 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config.sql
+ * @package       app.config.sql
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/config/schema/sessions.php b/cake/console/templates/skel/config/schema/sessions.php
index 8a37814f4..29a40a566 100644
--- a/cake/console/templates/skel/config/schema/sessions.php
+++ b/cake/console/templates/skel/config/schema/sessions.php
@@ -16,8 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config.sql
+ * @package       app.config.sql
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/console/cake b/cake/console/templates/skel/console/cake
index d4d067d59..bd1b6da06 100644
--- a/cake/console/templates/skel/console/cake
+++ b/cake/console/templates/skel/console/cake
@@ -12,8 +12,7 @@
 #
 # @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
 # @link				http://cakephp.org CakePHP(tm) Project
-# @package			cake
-# @subpackage		cake.app.console
+# @package   		app.console
 # @since			CakePHP(tm) v 2.0
 # @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
 #
diff --git a/cake/console/templates/skel/console/cake.bat b/cake/console/templates/skel/console/cake.bat
index 84ed04a4f..ed04546c9 100644
--- a/cake/console/templates/skel/console/cake.bat
+++ b/cake/console/templates/skel/console/cake.bat
@@ -11,8 +11,7 @@
 ::
 :: @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
 :: @link			http://cakephp.org CakePHP(tm) Project
-:: @package			cake
-:: @subpackage		cake.app.console
+:: @package   		app.console
 :: @since			CakePHP(tm) v 2.0
 :: @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
 ::
diff --git a/cake/console/templates/skel/console/cake.php b/cake/console/templates/skel/console/cake.php
index 8ccac0bfb..d4f4ef1c0 100644
--- a/cake/console/templates/skel/console/cake.php
+++ b/cake/console/templates/skel/console/cake.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console
+ * @package       app.console
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/controllers/pages_controller.php b/cake/console/templates/skel/controllers/pages_controller.php
index 650adda94..f0cf2ce27 100644
--- a/cake/console/templates/skel/controllers/pages_controller.php
+++ b/cake/console/templates/skel/controllers/pages_controller.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  *
  * Override this controller by placing a copy in controllers directory of an application
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  */
 class PagesController extends AppController {
 
diff --git a/cake/console/templates/skel/index.php b/cake/console/templates/skel/index.php
index a9e0270cb..ac4fde167 100644
--- a/cake/console/templates/skel/index.php
+++ b/cake/console/templates/skel/index.php
@@ -10,8 +10,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app
+ * @package       app
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/views/elements/email/html/default.ctp b/cake/console/templates/skel/views/elements/email/html/default.ctp
index 45a84c9e0..3ab3f4cc6 100644
--- a/cake/console/templates/skel/views/elements/email/html/default.ctp
+++ b/cake/console/templates/skel/views/elements/email/html/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @package       cake.libs.view.templates.elements.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/views/elements/email/text/default.ctp b/cake/console/templates/skel/views/elements/email/text/default.ctp
index 9d384e3f8..7655f1430 100644
--- a/cake/console/templates/skel/views/elements/email/text/default.ctp
+++ b/cake/console/templates/skel/views/elements/email/text/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @package       cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/views/layouts/ajax.ctp b/cake/console/templates/skel/views/layouts/ajax.ctp
index dadf156ed..93371552b 100644
--- a/cake/console/templates/skel/views/layouts/ajax.ctp
+++ b/cake/console/templates/skel/views/layouts/ajax.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/views/layouts/default.ctp b/cake/console/templates/skel/views/layouts/default.ctp
index a07b907b3..e8b6b3c50 100644
--- a/cake/console/templates/skel/views/layouts/default.ctp
+++ b/cake/console/templates/skel/views/layouts/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.templates.skel.views.layouts
+ * @package       cake.console.libs.templates.skel.views.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/views/layouts/email/html/default.ctp b/cake/console/templates/skel/views/layouts/email/html/default.ctp
index 8b5a339f8..cc4364bb1 100644
--- a/cake/console/templates/skel/views/layouts/email/html/default.ctp
+++ b/cake/console/templates/skel/views/layouts/email/html/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @package       cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/views/layouts/email/text/default.ctp b/cake/console/templates/skel/views/layouts/email/text/default.ctp
index e509b1b32..f85bd7ea2 100644
--- a/cake/console/templates/skel/views/layouts/email/text/default.ctp
+++ b/cake/console/templates/skel/views/layouts/email/text/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts.email.text
+ * @package       cake.libs.view.templates.layouts.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/views/layouts/flash.ctp b/cake/console/templates/skel/views/layouts/flash.ctp
index bfd9a4621..554fb377c 100644
--- a/cake/console/templates/skel/views/layouts/flash.ctp
+++ b/cake/console/templates/skel/views/layouts/flash.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/webroot/css.php b/cake/console/templates/skel/webroot/css.php
index 9a1313877..59505c4e9 100644
--- a/cake/console/templates/skel/webroot/css.php
+++ b/cake/console/templates/skel/webroot/css.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/webroot/css/cake.generic.css b/cake/console/templates/skel/webroot/css/cake.generic.css
index 7f978afc0..66deb64a8 100644
--- a/cake/console/templates/skel/webroot/css/cake.generic.css
+++ b/cake/console/templates/skel/webroot/css/cake.generic.css
@@ -10,8 +10,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.webroot.css
+ * @package       app.webroot.css
  * @since         CakePHP(tm)
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/webroot/index.php b/cake/console/templates/skel/webroot/index.php
index 719f172c4..5955688f6 100644
--- a/cake/console/templates/skel/webroot/index.php
+++ b/cake/console/templates/skel/webroot/index.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/templates/skel/webroot/test.php b/cake/console/templates/skel/webroot/test.php
index 7a27e8e29..eddcc437f 100644
--- a/cake/console/templates/skel/webroot/test.php
+++ b/cake/console/templates/skel/webroot/test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/app.php b/cake/libs/app.php
index f18bb0719..7d8868814 100644
--- a/cake/libs/app.php
+++ b/cake/libs/app.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0.6001
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -43,8 +42,7 @@
  * which application controllers App knows about.
  *
  * @link          http://book.cakephp.org/view/933/The-App-Class
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class App {
 
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 008c71b15..66f255b34 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -472,8 +472,7 @@ class Cache {
 /**
  * Storage engine for CakePHP caching
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 abstract class CacheEngine {
 
diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php
index dbc4df8cc..544a0c908 100644
--- a/cake/libs/cache/apc.php
+++ b/cake/libs/cache/apc.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4933
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
 /**
  * APC storage engine for cache
  *
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  */
 class ApcEngine extends CacheEngine {
 
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index 7560d8113..46ff892a3 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4933
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  * File Storage engine for cache
  *
  * @todo use the File and Folder classes (if it's not a too big performance hit)
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  */
 class FileEngine extends CacheEngine {
 
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index d4a1dbfa8..79d98376e 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4933
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@
  * control you have over expire times far in the future.  See MemcacheEngine::write() for
  * more information.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  */
 class MemcacheEngine extends CacheEngine {
 
diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index be8f53c22..53b0d08b9 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4947
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  * Xcache storage engine for cache
  *
  * @link          http://trac.lighttpd.net/xcache/ Xcache
- * @package       cake
- * @subpackage    cake.cake.libs.cache
+ * @package       cake.libs.cache
  */
 class XcacheEngine extends CacheEngine {
 
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index 997698ed9..e632c2898 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -59,8 +58,7 @@ interface CakeLogInterface {
  * using CakeLogs's methods.  If you don't configure any adapters, and write to the logs
  * a default FileLog will be autoconfigured for you.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class CakeLog {
 
diff --git a/cake/libs/cake_request.php b/cake/libs/cake_request.php
index 23c925883..b7a10058e 100644
--- a/cake/libs/cake_request.php
+++ b/cake/libs/cake_request.php
@@ -12,7 +12,6 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/cake_response.php b/cake/libs/cake_response.php
index df2ab71a0..9c200cbcb 100644
--- a/cake/libs/cake_response.php
+++ b/cake/libs/cake_response.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index 2d201f81d..a08fd49c3 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -17,8 +17,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v .0.10.0.1222
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -32,8 +31,7 @@ if (!class_exists('Security')) {
  * Cake abstracts the handling of sessions. There are several convenient methods to access session information.
  * This class is the implementation of those methods. They are mostly used by the Session Component.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class CakeSession {
 
diff --git a/cake/libs/cake_socket.php b/cake/libs/cake_socket.php
index e6f51ee54..82610ff92 100644
--- a/cake/libs/cake_socket.php
+++ b/cake/libs/cake_socket.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Core', 'Validation');
  *
  * Core base class for network communication.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class CakeSocket {
 
diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index 4e7b22c38..25659089f 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.9.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@
  * If you try to add an object with the same key twice, nothing will come of it.
  * If you need a second instance of an object, give it another key.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class ClassRegistry {
 
diff --git a/cake/libs/config/ini_reader.php b/cake/libs/config/ini_reader.php
index e901d4e18..915bf9498 100644
--- a/cake/libs/config/ini_reader.php
+++ b/cake/libs/config/ini_reader.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.libs.config
+ * @package       cake.libs.config
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/config/php_reader.php b/cake/libs/config/php_reader.php
index 1e2734d12..c122f0808 100644
--- a/cake/libs/config/php_reader.php
+++ b/cake/libs/config/php_reader.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.libs.config
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index ce05b018e..1546ae087 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.0.0.2363
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  * as methods for loading additional configuration files or storing runtime configuration 
  * for future use.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @link          http://book.cakephp.org/view/924/The-Configuration-Class
  */
 class Configure {
diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php
index c8423a41b..07c117dff 100644
--- a/cake/libs/controller/app_controller.php
+++ b/cake/libs/controller/app_controller.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@
  * Add your application-wide methods in the class below, your controllers
  * will inherit them.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @link http://book.cakephp.org/view/957/The-App-Controller
  */
 class AppController extends Controller {
diff --git a/cake/libs/controller/cake_error_controller.php b/cake/libs/controller/cake_error_controller.php
index 443024840..f55649672 100644
--- a/cake/libs/controller/cake_error_controller.php
+++ b/cake/libs/controller/cake_error_controller.php
@@ -4,8 +4,7 @@
  *
  * Controller used by ErrorHandler to render error views.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class CakeErrorController extends AppController {
 	public $name = 'CakeError';
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index 95ceb00b8..f55840d1f 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -35,8 +34,7 @@ App::import('Controller', 'ComponentCollection', false);
  *    but before Controller::afterFilter(). 
  * - `beforeRedirect()` - Fired before a redirect() is done.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @link          http://book.cakephp.org/view/993/Components
  * @see Controller::$components
  */
diff --git a/cake/libs/controller/component_collection.php b/cake/libs/controller/component_collection.php
index b644902a9..3d9e23c47 100644
--- a/cake/libs/controller/component_collection.php
+++ b/cake/libs/controller/component_collection.php
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.libs.controller
+ * @package       cake.libs.controller
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index 1b7b31486..6795ab335 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@
  * You can define by changing `Configure::write('Acl.classname', 'DbAcl');` in your core.php. Concrete ACL
  * implementations should extend `AclBase` and implement the methods it defines.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @link http://book.cakephp.org/view/1242/Access-Control-Lists
  */
 class AclComponent extends Component {
@@ -186,8 +184,7 @@ class AclComponent extends Component {
  * Access Control List interface.
  * Implementing classes are used by AclComponent to perform ACL checks in Cake.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  */
 interface AclInterface {
 
@@ -255,8 +252,7 @@ interface AclInterface {
  *			edit
  * }}}
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class DbAcl extends Object implements AclInterface {
 
@@ -525,8 +521,7 @@ class DbAcl extends Object implements AclInterface {
  * IniAcl implements an access control system using an INI file.  An example 
  * of the ini file used can be found in /config/acl.ini.php.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.iniacl
+ * @package       cake.libs.model.iniacl
  */
 class IniAcl extends Object implements AclInterface {
 
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index f8e74f3a1..063960f91 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@ App::import('Core', 'Security', false);
  *
  * Binds access control with user authentication and session management.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @link http://book.cakephp.org/view/1250/Authentication
  */
 class AuthComponent extends Component {
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index f8aac83a0..87fb4a802 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.4213
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@ App::import('Core', 'Security');
  *
  * Cookie handling for the controller.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @link http://book.cakephp.org/view/1280/Cookies
  *
  */
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index bcb854be3..031ef8543 100755
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.3467
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ App::import('Core', 'Multibyte');
  * This component is used for handling Internet Message Format based
  * based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @link http://book.cakephp.org/view/1283/Email
  *
  */
diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 9bf89f991..fe6a34bdd 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This component is used to handle automatic model data pagination
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  *
  */
 class PaginatorComponent extends Component {
diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index b688c755d..3889f716c 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.4.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
 /**
  * Request object for handling HTTP requests
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @link http://book.cakephp.org/view/1291/Request-Handling
  *
  */
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 90a934aea..daf0bc8bb 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.8.2156
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'Security', false);
 /**
  * SecurityComponent
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @link http://book.cakephp.org/view/1296/Security-Component
  */
 class SecurityComponent extends Component {
diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index af4474c6c..09a9f6da6 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.0.1232
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ if (!class_exists('cakesession')) {
  *
  * Session handling from the controller.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller.components
+ * @package       cake.libs.controller.components
  * @link http://book.cakephp.org/view/1310/Sessions
  *
  */
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 7f91f5dd9..758d41225 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php
index bc7a380e7..65e8b0465 100644
--- a/cake/libs/controller/pages_controller.php
+++ b/cake/libs/controller/pages_controller.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  *
  * Override this controller by placing a copy in controllers directory of an application
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @link http://book.cakephp.org/view/958/The-Pages-Controller
  */
 class PagesController extends AppController {
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index c58fba7d1..97a2533d7 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  * @since         Cake v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +28,7 @@ App::import('View', 'Scaffold');
  * and afford the web developer an early look at the data, and the possibility to over-ride
  * scaffolded actions with custom-made ones.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.controller
+ * @package       cake.libs.controller
  */
 class Scaffold {
 
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 33f665a2c..942aa1c63 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.4560
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -36,8 +35,7 @@ if (!class_exists('String')) {
  *
  * Debugger overrides PHP's default error handling to provide stack traces and enhanced logging
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @link          http://book.cakephp.org/view/1191/Using-the-Debugger-Class
  */
 class Debugger {
diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php
index f9b7b059d..f8c833bc9 100644
--- a/cake/libs/dispatcher.php
+++ b/cake/libs/dispatcher.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -35,7 +34,6 @@ App::import('Controller', 'Controller', false);
  * the controller.
  *
  * @package       cake
- * @subpackage    cake.cake
  */
 class Dispatcher {
 
diff --git a/cake/libs/error/error_handler.php b/cake/libs/error/error_handler.php
index b25582fac..775bd8d43 100644
--- a/cake/libs/error/error_handler.php
+++ b/cake/libs/error/error_handler.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs.error
  * @since         CakePHP(tm) v 0.10.5.1732
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -88,8 +87,7 @@
  *
  * Would enable handling for all non Notice errors.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs.error
  * @see ExceptionRenderer for more information on how to customize exception rendering.
  */
 class ErrorHandler {
diff --git a/cake/libs/error/exception_renderer.php b/cake/libs/error/exception_renderer.php
index 6666f4414..5745564df 100644
--- a/cake/libs/error/exception_renderer.php
+++ b/cake/libs/error/exception_renderer.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs.error
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -45,8 +44,7 @@
  * can configure your class in your core.php, with `Configure::write('Exception.renderer', 'MyClass');`
  * You should place any custom exception renderers in `app/libs`.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs.error
  */
 class ExceptionRenderer {
 
diff --git a/cake/libs/error/exceptions.php b/cake/libs/error/exceptions.php
index dc8538334..75224c557 100644
--- a/cake/libs/error/exceptions.php
+++ b/cake/libs/error/exceptions.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.libs
+ * @package       cake.libs.error
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/file.php b/cake/libs/file.php
index 47f922d9d..49d030e4d 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +28,7 @@ if (!class_exists('Folder')) {
 /**
  * Convenience class for reading, writing and appending to files.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class File {
 
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 733315a1a..02b097227 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  * Folder structure browser, lists folders and files.
  * Provides an Object interface for Common directory related tasks.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class Folder {
 
diff --git a/cake/libs/http/basic_authentication.php b/cake/libs/http/basic_authentication.php
index 111246210..49b12fc5f 100644
--- a/cake/libs/http/basic_authentication.php
+++ b/cake/libs/http/basic_authentication.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.http
+ * @package       cake.libs.http
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Basic authentication
  *
- * @package       cake
- * @subpackage    cake.cake.libs.http
+ * @package       cake.libs.http
  */
 class BasicAuthentication {
 
diff --git a/cake/libs/http/digest_authentication.php b/cake/libs/http/digest_authentication.php
index 21f7ea8e6..14275f4e5 100644
--- a/cake/libs/http/digest_authentication.php
+++ b/cake/libs/http/digest_authentication.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.http
+ * @package       cake.libs.http
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Digest authentication
  *
- * @package       cake
- * @subpackage    cake.cake.libs.http
+ * @package       cake.libs.http
  */
 class DigestAuthentication {
 
diff --git a/cake/libs/http_response.php b/cake/libs/http_response.php
index ade1b14f4..51aff7a78 100644
--- a/cake/libs/http_response.php
+++ b/cake/libs/http_response.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index b1df3f25d..c4b36f1ff 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ App::import('Core', 'Router');
  * Core base class for HTTP network communication. HttpSocket can be used as an
  * Object Oriented replacement for cURL in many places.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class HttpSocket extends CakeSocket {
 
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 05ec9c9e8..63cc47b19 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0.4116
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ App::import('Core', 'Multibyte');
 /**
  * I18n handles translation of Text and time format strings.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class I18n {
 
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index d1bf78cfa..0e3eb0278 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@
  * Inflector pluralizes and singularizes English nouns.
  * Used by Cake's naming conventions throughout the framework.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @link          http://book.cakephp.org/view/1478/Inflector
  */
 class Inflector {
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 4f5868412..2da41af34 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0.4116
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'CakeRequest');
 /**
  * Localization
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class L10n {
 
diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php
index fbd4cff3e..c7adb306d 100644
--- a/cake/libs/log/file_log.php
+++ b/cake/libs/log/file_log.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.log
+ * @package       cake.libs.log
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  * File Storage stream for Logging.  Writes logs to different files
  * based on the type of log it is.
  *
- * @package cake
- * @subpackage cake.cake.libs.log
+ * @package cake.libs.log
  */
 class FileLog implements CakeLogInterface {
 
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index 1a3143b4e..07c3686af 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,7 +27,7 @@ if (!class_exists('File')) {
  * A class to parse and use the MagicDb for file type analysis
  *
  * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MagicDb extends Object {
 
@@ -173,7 +172,7 @@ class MagicDb extends Object {
  * undocumented class
  *
  * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MagicFileResource extends Object{
 
diff --git a/cake/libs/model/app_model.php b/cake/libs/model/app_model.php
index e18dca1c1..4af1eb2e5 100644
--- a/cake/libs/model/app_model.php
+++ b/cake/libs/model/app_model.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@
  * Create the same file in app/app_model.php
  * Add your application-wide methods to the class, your models will inherit them.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class AppModel extends Model {
 }
diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php
index c2f397b82..da9970560 100644
--- a/cake/libs/model/behavior_collection.php
+++ b/cake/libs/model/behavior_collection.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @since         CakePHP(tm) v 1.2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ App::import('Core', 'ObjectCollection');
  *
  * Defines the Behavior interface, and contains common model interaction functionality.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class BehaviorCollection extends ObjectCollection {
 
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index fc2893bfa..b03586657 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.behaviors
+ * @package       cake.libs.model.behaviors
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
 /**
  * ACL behavior
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.behaviors
+ * @package       cake.libs.model.behaviors
  * @link http://book.cakephp.org/view/1320/ACL
  */
 class AclBehavior extends ModelBehavior {
diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index 508dcf87f..03963a723 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  * @link http://book.cakephp.org/view/1323/Containable
  */
 class ContainableBehavior extends ModelBehavior {
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index e480a720f..3f0c462d5 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.behaviors
+ * @package       cake.libs.model.behaviors
  * @since         CakePHP(tm) v 1.2.0.4525
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Translate behavior
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.behaviors
+ * @package       cake.libs.model.behaviors
  * @link http://book.cakephp.org/view/1328/Translate
  */
 class TranslateBehavior extends ModelBehavior {
@@ -501,8 +499,7 @@ class TranslateBehavior extends ModelBehavior {
 }
 
 /**
- * @package       cake
- * @subpackage    cake.cake.libs.model.behaviors
+ * @package       cake.libs.model.behaviors
  */
 class I18nModel extends AppModel {
 	public $name = 'I18nModel';
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index 9bec6f0ae..032d9e1a9 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.behaviors
+ * @package       cake.libs.model.behaviors
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@
  * Enables a model object to act as a node-based tree. Using Modified Preorder Tree Traversal
  *
  * @see http://en.wikipedia.org/wiki/Tree_traversal
- * @package       cake
- * @subpackage    cake.cake.libs.model.behaviors
+ * @package       cake.libs.model.behaviors
  * @link http://book.cakephp.org/view/1339/Tree
  */
 class TreeBehavior extends ModelBehavior {
diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
index fc4e32d28..a38e0ed7b 100644
--- a/cake/libs/model/cake_schema.php
+++ b/cake/libs/model/cake_schema.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'ConnectionManager');
 /**
  * Base Class for Schema management
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class CakeSchema extends Object {
 
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 42b2c5003..9581431fc 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @since         CakePHP(tm) v 0.10.x.1402
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ include_once CONFIGS . 'database.php';
 /**
  * Manages loaded instances of DataSource objects
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class ConnectionManager {
 
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index 166c5362c..d38e8bf10 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources
+ * @package       cake.libs.model.datasources
  * @since         CakePHP(tm) v 0.10.5.1790
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * DataSource base class
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources
+ * @package       cake.libs.model.datasources
  */
 class DataSource extends Object {
 
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 4fa73bf8e..91db76c5f 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.10.5.1790
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * Long description for class
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  */
 class DboMssql extends DboSource {
 
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index f39b50420..1d6052f6a 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.10.5.1790
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * Provides connection and SQL generation for MySQL RDMS
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  */
 class DboMysql extends DboSource {
 
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index fb5df6806..4b4444211 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  * @since         CakePHP v 1.2.0.4041
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * Long description for class
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  */
 class DboOracle extends DboSource {
 
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 7e001344d..e5e12d2bc 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.9.1.114
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * Long description for class
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  */
 class DboPostgres extends DboSource {
 
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index e4a50b4c2..f2bcda3fd 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.9.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,7 +23,7 @@
  * A DboSource adapter for SQLite 3 using PDO
  *
  * @package datasources
- * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @package       cake.libs.model.datasources.dbo
  */
 class DboSqlite extends DboSource {
 
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index da92471a1..717e5ca92 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources
+ * @package       cake.libs.model.datasources
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Core', 'String');
  *
  * Creates DBO-descendant objects from a given db connection configuration
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model.datasources
+ * @package       cake.libs.model.datasources
  */
 class DboSource extends DataSource {
 
diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
index 70826bdb7..e8a31cef7 100644
--- a/cake/libs/model/db_acl.php
+++ b/cake/libs/model/db_acl.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +28,7 @@ App::import('Model', 'App');
  * ACL Node
  *
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class AclNode extends AppModel {
 
@@ -193,8 +191,7 @@ class AclNode extends AppModel {
 /**
  * Access Control Object
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class Aco extends AclNode {
 
@@ -218,8 +215,7 @@ class Aco extends AclNode {
 /**
  * Action for Access Control Object
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class AcoAction extends AppModel {
 
@@ -243,8 +239,7 @@ class AcoAction extends AppModel {
 /**
  * Access Request Object
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class Aro extends AclNode {
 
@@ -268,8 +263,7 @@ class Aro extends AclNode {
 /**
  * Permissions linking AROs with ACOs
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  */
 class Permission extends AppModel {
 
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 7c8b5f2e6..b55616028 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @since         CakePHP(tm) v 0.10.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -38,8 +37,7 @@ App::import('Model', 'ConnectionManager', false);
  * (i.e. class 'User' => table 'users'; class 'Man' => table 'men')
  * The table is required to have at least 'id auto_increment' primary key.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @link          http://book.cakephp.org/view/1000/Models
  */
 class Model extends Object {
diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
index 0cf027163..482bd2e1e 100644
--- a/cake/libs/model/model_behavior.php
+++ b/cake/libs/model/model_behavior.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.model
+ * @package       cake.libs.model
  * @since         CakePHP(tm) v 1.2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index 69c23188f..123d3d11b 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0.6833
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -256,8 +255,7 @@ if (!function_exists('mb_encode_mimeheader')) {
  * Multibyte handling methods.
  *
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class Multibyte {
 
diff --git a/cake/libs/object.php b/cake/libs/object.php
index 0f1d49030..c574402ce 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,7 +27,7 @@
  * to call other Controllers' Actions from anywhere.
  *
  * @package cake
- * @subpackage cake.cake.libs
+ * @package    cake.cake.libs
  */
 class Object {
 
diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php
index 979f90dcf..eb64b2b62 100644
--- a/cake/libs/route/cake_route.php
+++ b/cake/libs/route/cake_route.php
@@ -16,8 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs.route
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/route/plugin_short_route.php b/cake/libs/route/plugin_short_route.php
index 1c1c4330b..9509c5d32 100644
--- a/cake/libs/route/plugin_short_route.php
+++ b/cake/libs/route/plugin_short_route.php
@@ -14,8 +14,7 @@ App::import('Core', 'route/CakeRoute');
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs.route
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/route/redirect_route.php b/cake/libs/route/redirect_route.php
index 148ce358f..1a8f6ecbd 100644
--- a/cake/libs/route/redirect_route.php
+++ b/cake/libs/route/redirect_route.php
@@ -14,8 +14,7 @@ App::import('Core', 'route/CakeRoute');
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.route
+ * @package       cake.libs.route
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 6b4d7dcf6..3a11ac4f4 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index 34ed32e79..d538b46bd 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@
  * Removal of alpahnumeric characters, SQL-safe slash-added strings, HTML-friendly strings,
  * and all of the above on arrays.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class Sanitize {
 
diff --git a/cake/libs/security.php b/cake/libs/security.php
index 348402de2..e8b01e2b8 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v .0.10.0.1233
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Security Library contains utility methods related to security
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class Security {
 
diff --git a/cake/libs/session/cache_session.php b/cake/libs/session/cache_session.php
index 5c8f2eae5..9b1b4ded0 100644
--- a/cake/libs/session/cache_session.php
+++ b/cake/libs/session/cache_session.php
@@ -12,15 +12,15 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 /**
  * CacheSession provides method for saving sessions into a Cache engine. Used with CakeSession
  *
- * @package cake.libs
+ * @package cake.libs.session
+ * @see CakeSession for configuration information.
  */
 class CacheSession implements CakeSessionHandlerInterface {
 /**
diff --git a/cake/libs/session/database_session.php b/cake/libs/session/database_session.php
index e10fe5a93..574d1f5c0 100644
--- a/cake/libs/session/database_session.php
+++ b/cake/libs/session/database_session.php
@@ -12,15 +12,14 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 /**
  * DatabaseSession provides methods to be used with CakeSession.
  *
- * @package cake.libs
+ * @package cake.libs.session
  */
 class DatabaseSession implements CakeSessionHandlerInterface {
 
diff --git a/cake/libs/set.php b/cake/libs/set.php
index 294b8ac7d..14282682d 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Class used for manipulation of arrays.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class Set {
 
diff --git a/cake/libs/string.php b/cake/libs/string.php
index affcc263b..8fc0a2ddf 100644
--- a/cake/libs/string.php
+++ b/cake/libs/string.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0.5551
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  * String handling methods.
  *
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  */
 class String {
 
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index adda137c0..aefa47756 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0.3830
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ if (!class_exists('Multibyte')) {
 /**
  * Offers different validation methods.
  *
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP v 1.2.0.3830
  */
 class Validation {
diff --git a/cake/libs/view/elements/email/html/default.ctp b/cake/libs/view/elements/email/html/default.ctp
index 45a84c9e0..3ab3f4cc6 100644
--- a/cake/libs/view/elements/email/html/default.ctp
+++ b/cake/libs/view/elements/email/html/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @package       cake.libs.view.templates.elements.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/elements/email/text/default.ctp b/cake/libs/view/elements/email/text/default.ctp
index 9d384e3f8..7655f1430 100644
--- a/cake/libs/view/elements/email/text/default.ctp
+++ b/cake/libs/view/elements/email/text/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @package       cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/elements/exception_stack_trace.ctp b/cake/libs/view/elements/exception_stack_trace.ctp
index 9219e21ae..247c45169 100644
--- a/cake/libs/view/elements/exception_stack_trace.ctp
+++ b/cake/libs/view/elements/exception_stack_trace.ctp
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements
+ * @package       cake.libs.view.templates.elements
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/elements/sql_dump.ctp b/cake/libs/view/elements/sql_dump.ctp
index 025d5ae93..b770dfbaa 100644
--- a/cake/libs/view/elements/sql_dump.ctp
+++ b/cake/libs/view/elements/sql_dump.ctp
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements
+ * @package       cake.libs.view.templates.elements
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/error400.ctp b/cake/libs/view/errors/error400.ctp
index 4d1660517..b6487ee91 100644
--- a/cake/libs/view/errors/error400.ctp
+++ b/cake/libs/view/errors/error400.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/error500.ctp b/cake/libs/view/errors/error500.ctp
index b5bdcfde0..e032b9eed 100644
--- a/cake/libs/view/errors/error500.ctp
+++ b/cake/libs/view/errors/error500.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp
index 19cfe6222..5b6fdb970 100644
--- a/cake/libs/view/errors/missing_action.ctp
+++ b/cake/libs/view/errors/missing_action.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_behavior_class.ctp b/cake/libs/view/errors/missing_behavior_class.ctp
index eb19034b8..e7c454069 100644
--- a/cake/libs/view/errors/missing_behavior_class.ctp
+++ b/cake/libs/view/errors/missing_behavior_class.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_behavior_file.ctp b/cake/libs/view/errors/missing_behavior_file.ctp
index 6f90206c1..09e90b350 100644
--- a/cake/libs/view/errors/missing_behavior_file.ctp
+++ b/cake/libs/view/errors/missing_behavior_file.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp
index ccb0497ef..cf06671dc 100644
--- a/cake/libs/view/errors/missing_component_class.ctp
+++ b/cake/libs/view/errors/missing_component_class.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp
index 592238fb4..527afc9c3 100644
--- a/cake/libs/view/errors/missing_component_file.ctp
+++ b/cake/libs/view/errors/missing_component_file.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_connection.ctp b/cake/libs/view/errors/missing_connection.ctp
index 2f11f4f5f..dfda66e3a 100644
--- a/cake/libs/view/errors/missing_connection.ctp
+++ b/cake/libs/view/errors/missing_connection.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp
index d45d8d31c..7f9e7d27f 100644
--- a/cake/libs/view/errors/missing_controller.ctp
+++ b/cake/libs/view/errors/missing_controller.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_database.ctp b/cake/libs/view/errors/missing_database.ctp
index d3e4944f6..7aa2d5e80 100644
--- a/cake/libs/view/errors/missing_database.ctp
+++ b/cake/libs/view/errors/missing_database.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp
index 9742a1563..842ded905 100644
--- a/cake/libs/view/errors/missing_helper_class.ctp
+++ b/cake/libs/view/errors/missing_helper_class.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp
index 69bf38e30..6ba0e9b6f 100644
--- a/cake/libs/view/errors/missing_helper_file.ctp
+++ b/cake/libs/view/errors/missing_helper_file.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp
index 28445cc77..011e59a64 100644
--- a/cake/libs/view/errors/missing_layout.ctp
+++ b/cake/libs/view/errors/missing_layout.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp
index b639856fe..1288dd06a 100644
--- a/cake/libs/view/errors/missing_table.ctp
+++ b/cake/libs/view/errors/missing_table.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp
index 658f4d1ce..9d8c7cb91 100644
--- a/cake/libs/view/errors/missing_view.ctp
+++ b/cake/libs/view/errors/missing_view.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp
index c91062ba2..833f42112 100644
--- a/cake/libs/view/errors/private_action.ctp
+++ b/cake/libs/view/errors/private_action.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp
index 931cbdca5..40f09c90a 100644
--- a/cake/libs/view/errors/scaffold_error.ctp
+++ b/cake/libs/view/errors/scaffold_error.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.errors
+ * @package       cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 6397cf722..c83dd9b03 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@ if (!class_exists('Router')) {
  * Abstract base class for all other Helpers in CakePHP.
  * Provides common methods and features.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  */
 class Helper extends Object {
 
diff --git a/cake/libs/view/helper_collection.php b/cake/libs/view/helper_collection.php
index 18b700812..9d5fcbf17 100644
--- a/cake/libs/view/helper_collection.php
+++ b/cake/libs/view/helper_collection.php
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php
index d09503bb0..9ded31b9c 100644
--- a/cake/libs/view/helpers/app_helper.php
+++ b/cake/libs/view/helpers/app_helper.php
@@ -15,8 +15,6 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +27,7 @@ App::import('View', 'Helper', false);
  * Add your application-wide methods in the class below, your helpers
  * will inherit them.
  *
- * @package       cake
- * @subpackage    cake.cake
+ * @package       cake.libs.view.helpers
  */
 class AppHelper extends Helper {
 }
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 6a1c430ea..34f1c9ef3 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.0.0.2277
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@
  * When using CacheHelper you don't call any of its methods, they are all automatically
  * called by View, and use the $cacheAction settings set in the controller.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1376/Cache
  */
 class CacheHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 4fdf5d9dd..dd1c7d85f 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -12,12 +12,11 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright	 Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link		  http://cakephp.org CakePHP(tm) Project
- * @package	   cake
- * @subpackage	cake.cake.libs.view.helpers
- * @since		 CakePHP(tm) v 0.10.0.1076
- * @license	   MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @copyright   Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link        http://cakephp.org CakePHP(tm) Project
+ * @package     cake.libs.view.helpers
+ * @since       CakePHP(tm) v 0.10.0.1076
+ * @license     MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
 /**
@@ -25,8 +24,7 @@
  *
  * Automatic generation of HTML FORMs from given data.
  *
- * @package	   cake
- * @subpackage	cake.cake.libs.view.helpers
+ * @package     cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1383/Form
  */
 class FormHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index b0965c449..c5165515f 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.9.1
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  *
  * HtmlHelper encloses all methods needed while working with HTML pages.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1434/HTML
  */
 class HtmlHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/jquery_engine.php b/cake/libs/view/helpers/jquery_engine.php
index f09c70c33..b0864fba1 100644
--- a/cake/libs/view/helpers/jquery_engine.php
+++ b/cake/libs/view/helpers/jquery_engine.php
@@ -18,8 +18,7 @@
  *
  * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link            http://cakephp.org CakePHP Project
- * @package         cake
- * @subpackage      cake.view.helpers
+ * @package         cake.libs.view.helpers
  * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Helper', 'Js');
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index 41f0ffbd5..e285481ad 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@
  * JsHelper provides an abstract interface for authoring JavaScript with a
  * given client-side library.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  */
 class JsHelper extends AppHelper {
 /**
diff --git a/cake/libs/view/helpers/mootools_engine.php b/cake/libs/view/helpers/mootools_engine.php
index bd0b676dd..5064db644 100644
--- a/cake/libs/view/helpers/mootools_engine.php
+++ b/cake/libs/view/helpers/mootools_engine.php
@@ -20,8 +20,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 03e01eea2..c88cd8ff2 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  *
  * Methods to make numbers more readable.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1452/Number
  */
 class NumberHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 11b897226..8c3c3a434 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * PaginationHelper encloses all methods needed when working with pagination.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1458/Paginator
  */
 class PaginatorHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/prototype_engine.php b/cake/libs/view/helpers/prototype_engine.php
index 7f3e230b4..69a088f79 100644
--- a/cake/libs/view/helpers/prototype_engine.php
+++ b/cake/libs/view/helpers/prototype_engine.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index ae1ab6239..c1b7d219d 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Xml');
 /**
  * RSS Helper class for easy output RSS structures.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1460/RSS
  */
 class RssHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index b12fa3190..fb26c91c7 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.1.7.3328
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ if (!class_exists('CakeSession')) {
  *
  * Session reading from the view.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1465/Session
  */
 class SessionHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index 3f6933bbd..12eff3893 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -36,8 +35,7 @@ if (!class_exists('Multibyte')) {
  *
  * Text manipulations: Highlight, excerpt, truncate, strip of links, convert email addresses to mailto: links...
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1469/Text
  */
 class TextHelper extends AppHelper {
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index 31093a556..f65b62de0 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * Manipulation of time data.
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view.helpers
+ * @package       cake.libs.view.helpers
  * @link http://book.cakephp.org/view/1470/Time
  */
 class TimeHelper extends AppHelper {
diff --git a/cake/libs/view/layouts/ajax.ctp b/cake/libs/view/layouts/ajax.ctp
index dadf156ed..93371552b 100644
--- a/cake/libs/view/layouts/ajax.ctp
+++ b/cake/libs/view/layouts/ajax.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index 30ec1a7dc..f247f3c35 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/layouts/email/html/default.ctp b/cake/libs/view/layouts/email/html/default.ctp
index 41ce9a42d..7a8a1e7df 100644
--- a/cake/libs/view/layouts/email/html/default.ctp
+++ b/cake/libs/view/layouts/email/html/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @package       cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/layouts/email/text/default.ctp b/cake/libs/view/layouts/email/text/default.ctp
index 979535832..236b8ebb3 100644
--- a/cake/libs/view/layouts/email/text/default.ctp
+++ b/cake/libs/view/layouts/email/text/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts.email.text
+ * @package       cake.libs.view.templates.layouts.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/layouts/flash.ctp b/cake/libs/view/layouts/flash.ctp
index 970589df0..cbe4c5abc 100644
--- a/cake/libs/view/layouts/flash.ctp
+++ b/cake/libs/view/layouts/flash.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index fec019906..880383b30 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  * @since         CakePHP(tm) v 1.2.0.5714
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index 95ead2a18..5fddec45c 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.pages
+ * @package       cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/scaffold.php b/cake/libs/view/scaffold.php
index ed8daa358..6f051a211 100644
--- a/cake/libs/view/scaffold.php
+++ b/cake/libs/view/scaffold.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  * @since         Cake v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/scaffolds/form.ctp b/cake/libs/view/scaffolds/form.ctp
index 7fb2c4c8b..1a3992e38 100644
--- a/cake/libs/view/scaffolds/form.ctp
+++ b/cake/libs/view/scaffolds/form.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.scaffolds
+ * @package       cake.libs.view.templates.scaffolds
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp
index d92b88320..c3da1d4d8 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/cake/libs/view/scaffolds/index.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.templates.views
+ * @package       cake.console.libs.templates.views
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp
index 963c59acc..c31b7397f 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/cake/libs/view/scaffolds/view.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.scaffolds
+ * @package       cake.libs.view.templates.scaffolds
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 80e56ae42..24e06e29b 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +28,7 @@ App::import('View', 'View');
  *
  * Example of theme path with `$this->theme = 'super_hot';` Would be `app/views/themed/super_hot/posts`
  *
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  */
 class ThemeView extends View {
 /**
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index dba1a147b..ef1d46b9f 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view
+ * @package       cake.libs.view
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 0027d1631..1a90ddf94 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP v .0.10.3.1400
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 524c8857a..c5f4c3ca3 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'Folder');
 /**
  * BasicsTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class BasicsTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/all_console.test.php b/cake/tests/cases/console/all_console.test.php
index 101a8faba..305ebbfc3 100644
--- a/cake/tests/cases/console/all_console.test.php
+++ b/cake/tests/cases/console/all_console.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run all console classes.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console
+ * @package       cake.tests.cases.console
  */
 class AllConsoleTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/console/all_console_libs.test.php b/cake/tests/cases/console/all_console_libs.test.php
index 70fb8746d..ad1f60fbd 100644
--- a/cake/tests/cases/console/all_console_libs.test.php
+++ b/cake/tests/cases/console/all_console_libs.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run all console lib classes.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console
+ * @package       cake.tests.cases.console
  */
 class AllConsoleLibsTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/console/all_shells.test.php b/cake/tests/cases/console/all_shells.test.php
index 7f657af82..e8ca96ac5 100644
--- a/cake/tests/cases/console/all_shells.test.php
+++ b/cake/tests/cases/console/all_shells.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run all top level shell classes.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console
+ * @package       cake.tests.cases.console
  */
 class AllShellsTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/console/all_tasks.test.php b/cake/tests/cases/console/all_tasks.test.php
index 51decf3d1..91ca6abdc 100644
--- a/cake/tests/cases/console/all_tasks.test.php
+++ b/cake/tests/cases/console/all_tasks.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run all the task tests.
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllTasksTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/console/libs/console_error_handler.test.php b/cake/tests/cases/console/libs/console_error_handler.test.php
index f00232bfb..51d16ab0f 100644
--- a/cake/tests/cases/console/libs/console_error_handler.test.php
+++ b/cake/tests/cases/console/libs/console_error_handler.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.tests.cases.console
+ * @package       cake.tests.cases.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/console/libs/console_option_parser.test.php b/cake/tests/cases/console/libs/console_option_parser.test.php
index e010bbaf4..fac420ecd 100644
--- a/cake/tests/cases/console/libs/console_option_parser.test.php
+++ b/cake/tests/cases/console/libs/console_option_parser.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.console
+ * @package       cake.tests.cases.console
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/console/libs/console_output.test.php b/cake/tests/cases/console/libs/console_output.test.php
index 9e9c8710d..d2af99d04 100644
--- a/cake/tests/cases/console/libs/console_output.test.php
+++ b/cake/tests/cases/console/libs/console_output.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.console
+ * @package       cake.tests.cases.console
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/console/libs/task_collection.test.php b/cake/tests/cases/console/libs/task_collection.test.php
index 3bbbd12c8..27a43e619 100644
--- a/cake/tests/cases/console/libs/task_collection.test.php
+++ b/cake/tests/cases/console/libs/task_collection.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/console/shell_dispatcher.test.php b/cake/tests/cases/console/shell_dispatcher.test.php
index 2da5bbe81..eb6fd2bd6 100644
--- a/cake/tests/cases/console/shell_dispatcher.test.php
+++ b/cake/tests/cases/console/shell_dispatcher.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.console
+ * @package       cake.tests.cases.console
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * TestShellDispatcher class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console
+ * @package       cake.tests.cases.console
  */
 class TestShellDispatcher extends ShellDispatcher {
 
@@ -105,8 +103,7 @@ class TestShellDispatcher extends ShellDispatcher {
 /**
  * ShellDispatcherTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ShellDispatcherTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/acl.test.php b/cake/tests/cases/console/shells/acl.test.php
index 0bb6489b1..b13d593b4 100644
--- a/cake/tests/cases/console/shells/acl.test.php
+++ b/cake/tests/cases/console/shells/acl.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * AclShellTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class AclShellTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/api.test.php b/cake/tests/cases/console/shells/api.test.php
index 7ed9b85a3..e43c55d33 100644
--- a/cake/tests/cases/console/shells/api.test.php
+++ b/cake/tests/cases/console/shells/api.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * ApiShellTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class ApiShellTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/bake.test.php b/cake/tests/cases/console/shells/bake.test.php
index 89383b1ff..7b2767389 100644
--- a/cake/tests/cases/console/shells/bake.test.php
+++ b/cake/tests/cases/console/shells/bake.test.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/console/shells/command_list.test.php b/cake/tests/cases/console/shells/command_list.test.php
index bdabc2230..7b518730a 100644
--- a/cake/tests/cases/console/shells/command_list.test.php
+++ b/cake/tests/cases/console/shells/command_list.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs
+ * @package       cake.tests.cases.console.libs
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/console/shells/schema.test.php b/cake/tests/cases/console/shells/schema.test.php
index 6a7a619a1..d18b7a478 100644
--- a/cake/tests/cases/console/shells/schema.test.php
+++ b/cake/tests/cases/console/shells/schema.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.Shells
+ * @package       cake.tests.cases.console.libs.Shells
  * @since         CakePHP v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * Test for Schema database management
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class SchemaShellTestSchema extends CakeSchema {
 
@@ -89,8 +87,7 @@ class SchemaShellTestSchema extends CakeSchema {
 /**
  * SchemaShellTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.Shells
+ * @package       cake.tests.cases.console.libs.Shells
  */
 class SchemaShellTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/shell.test.php b/cake/tests/cases/console/shells/shell.test.php
index 900ebaad8..ac5d77faf 100644
--- a/cake/tests/cases/console/shells/shell.test.php
+++ b/cake/tests/cases/console/shells/shell.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs
+ * @package       cake.tests.cases.console.libs
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * ShellTestShell class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs
+ * @package       cake.tests.cases.console.libs
  */
 class ShellTestShell extends Shell {
 
@@ -88,8 +86,7 @@ class TestMergeShell extends Shell {
 /**
  * TestAppleTask class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs
+ * @package       cake.tests.cases.console.libs
  */
 class TestAppleTask extends Shell {
 }
@@ -97,8 +94,7 @@ class TestAppleTask extends Shell {
 /**
  * TestBananaTask class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs
+ * @package       cake.tests.cases.console.libs
  */
 class TestBananaTask extends Shell {
 }
@@ -106,8 +102,7 @@ class TestBananaTask extends Shell {
 /**
  * ShellTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs
+ * @package       cake.tests.cases.console.libs
  */
 class ShellTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/controller.test.php b/cake/tests/cases/console/shells/tasks/controller.test.php
index 86ff8fb77..5abda16c9 100644
--- a/cake/tests/cases/console/shells/tasks/controller.test.php
+++ b/cake/tests/cases/console/shells/tasks/controller.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -49,8 +48,7 @@ if (!$imported) {
 /**
  * ControllerTaskTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class ControllerTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/db_config.test.php b/cake/tests/cases/console/shells/tasks/db_config.test.php
index aca87ac94..6d37ffbb8 100644
--- a/cake/tests/cases/console/shells/tasks/db_config.test.php
+++ b/cake/tests/cases/console/shells/tasks/db_config.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -48,8 +47,7 @@ class TEST_DATABASE_CONFIG {
 /**
  * DbConfigTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class DbConfigTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/extract.test.php b/cake/tests/cases/console/shells/tasks/extract.test.php
index 21993e0d4..0b2fbf4bc 100644
--- a/cake/tests/cases/console/shells/tasks/extract.test.php
+++ b/cake/tests/cases/console/shells/tasks/extract.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * ExtractTaskTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class ExtractTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/fixture.test.php b/cake/tests/cases/console/shells/tasks/fixture.test.php
index 7121f7fd1..9265fdfb6 100644
--- a/cake/tests/cases/console/shells/tasks/fixture.test.php
+++ b/cake/tests/cases/console/shells/tasks/fixture.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +28,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * FixtureTaskTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class FixtureTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/model.test.php b/cake/tests/cases/console/shells/tasks/model.test.php
index ac2a2c7fc..98ad033cd 100644
--- a/cake/tests/cases/console/shells/tasks/model.test.php
+++ b/cake/tests/cases/console/shells/tasks/model.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.6
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -31,8 +30,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * ModelTaskTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class ModelTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/plugin.test.php b/cake/tests/cases/console/shells/tasks/plugin.test.php
index 327b258c2..22131744e 100644
--- a/cake/tests/cases/console/shells/tasks/plugin.test.php
+++ b/cake/tests/cases/console/shells/tasks/plugin.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.3.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -32,8 +31,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * PluginTaskPlugin class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class PluginTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/project.test.php b/cake/tests/cases/console/shells/tasks/project.test.php
index 8e92b7949..65a5b4a52 100644
--- a/cake/tests/cases/console/shells/tasks/project.test.php
+++ b/cake/tests/cases/console/shells/tasks/project.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.3.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +28,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * ProjectTask Test class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class ProjectTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/template.test.php b/cake/tests/cases/console/shells/tasks/template.test.php
index bbd81404d..0085d4f75 100644
--- a/cake/tests/cases/console/shells/tasks/template.test.php
+++ b/cake/tests/cases/console/shells/tasks/template.test.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -28,8 +27,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 /**
  * TemplateTaskTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class TemplateTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/test.test.php b/cake/tests/cases/console/shells/tasks/test.test.php
index 14b603e54..394098a38 100644
--- a/cake/tests/cases/console/shells/tasks/test.test.php
+++ b/cake/tests/cases/console/shells/tasks/test.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -34,7 +33,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
  * Test Article model
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class TestTaskArticle extends Model {
 
@@ -111,7 +110,7 @@ class TestTaskArticle extends Model {
  * Tag Testing Model
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class TestTaskTag extends Model {
 
@@ -151,7 +150,7 @@ class TestTaskTag extends Model {
  * Simulated plugin
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class TestTaskAppModel extends Model {
 }
@@ -160,7 +159,7 @@ class TestTaskAppModel extends Model {
  * Testing AppMode (TaskComment)
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class TestTaskComment extends TestTaskAppModel {
 
@@ -198,7 +197,7 @@ class TestTaskComment extends TestTaskAppModel {
  * Test Task Comments Controller
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class TestTaskCommentsController extends Controller {
 
@@ -222,8 +221,7 @@ class TestTaskCommentsController extends Controller {
 /**
  * TestTaskTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class TestTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/tasks/view.test.php b/cake/tests/cases/console/shells/tasks/view.test.php
index 5a2dfcce5..99f1afdf9 100644
--- a/cake/tests/cases/console/shells/tasks/view.test.php
+++ b/cake/tests/cases/console/shells/tasks/view.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -34,7 +33,7 @@ require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
  * Test View Task Comment Model
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class ViewTaskComment extends Model {
 
@@ -72,7 +71,7 @@ class ViewTaskComment extends Model {
  * Test View Task Article Model
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class ViewTaskArticle extends Model {
 
@@ -97,7 +96,7 @@ class ViewTaskArticle extends Model {
  * Test View Task Comments Controller
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class ViewTaskCommentsController extends Controller {
 
@@ -130,7 +129,7 @@ class ViewTaskCommentsController extends Controller {
  * Test View Task Articles Controller
  *
  * @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package    cake.tests.cases.console.libs.tasks
  */
 class ViewTaskArticlesController extends Controller {
 
@@ -202,8 +201,7 @@ class ViewTaskArticlesController extends Controller {
 /**
  * ViewTaskTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.console.libs.tasks
+ * @package       cake.tests.cases.console.libs.tasks
  */
 class ViewTaskTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/shells/testsuite.test.php b/cake/tests/cases/console/shells/testsuite.test.php
index bfe463dbf..c57d1573b 100644
--- a/cake/tests/cases/console/shells/testsuite.test.php
+++ b/cake/tests/cases/console/shells/testsuite.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/all_behaviors.test.php b/cake/tests/cases/libs/all_behaviors.test.php
index b27a1cfe4..88720d386 100644
--- a/cake/tests/cases/libs/all_behaviors.test.php
+++ b/cake/tests/cases/libs/all_behaviors.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  *
  * This test group will run all test in the cases/libs/models/behaviors directory
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllBehaviorsTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_cache_engines.test.php b/cake/tests/cases/libs/all_cache_engines.test.php
index 64d2da93c..5c03437cd 100644
--- a/cake/tests/cases/libs/all_cache_engines.test.php
+++ b/cake/tests/cases/libs/all_cache_engines.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run cache engine tests.
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllCacheEnginesTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_components.test.php b/cake/tests/cases/libs/all_components.test.php
index 6724303ca..28e59aadf 100644
--- a/cake/tests/cases/libs/all_components.test.php
+++ b/cake/tests/cases/libs/all_components.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run component class tests
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class AllComponentsTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_configure.test.php b/cake/tests/cases/libs/all_configure.test.php
index 6b1b23fc8..6e35aef74 100644
--- a/cake/tests/cases/libs/all_configure.test.php
+++ b/cake/tests/cases/libs/all_configure.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run cache engine tests.
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllConfigureTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_controllers.test.php b/cake/tests/cases/libs/all_controllers.test.php
index ab3cf5581..8164896d9 100644
--- a/cake/tests/cases/libs/all_controllers.test.php
+++ b/cake/tests/cases/libs/all_controllers.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run cache engine tests.
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllControllersTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_database.test.php b/cake/tests/cases/libs/all_database.test.php
index 8c4fc024a..21cef27b6 100644
--- a/cake/tests/cases/libs/all_database.test.php
+++ b/cake/tests/cases/libs/all_database.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run database tests not in model or behavior group.
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllDatabaseTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_error.test.php b/cake/tests/cases/libs/all_error.test.php
index e37176908..b64c87542 100644
--- a/cake/tests/cases/libs/all_error.test.php
+++ b/cake/tests/cases/libs/all_error.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run error handling related tests.
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllErrorTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_helpers.test.php b/cake/tests/cases/libs/all_helpers.test.php
index 389290d27..247a10deb 100644
--- a/cake/tests/cases/libs/all_helpers.test.php
+++ b/cake/tests/cases/libs/all_helpers.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run all test in the cases/libs/view/helpers directory.
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllHelpersTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_js_helpers.test.php b/cake/tests/cases/libs/all_js_helpers.test.php
index b17e6b4fc..9dd0ab750 100644
--- a/cake/tests/cases/libs/all_js_helpers.test.php
+++ b/cake/tests/cases/libs/all_js_helpers.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  * This test group will run all test in the cases/libs/view/helpers directory related
  * to Js helper and its engines
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllJavascriptHelpersTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_libs.test.php b/cake/tests/cases/libs/all_libs.test.php
index b0a070b49..ba0388850 100644
--- a/cake/tests/cases/libs/all_libs.test.php
+++ b/cake/tests/cases/libs/all_libs.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run all non mvc related lib class tests
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class AllLibsTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_localization.test.php b/cake/tests/cases/libs/all_localization.test.php
index ce7d0cc95..d30ab86b0 100644
--- a/cake/tests/cases/libs/all_localization.test.php
+++ b/cake/tests/cases/libs/all_localization.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run i18n/l10n tests
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class AllLocalizationTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_model.test.php b/cake/tests/cases/libs/all_model.test.php
index fb99184c0..bf968b0c3 100644
--- a/cake/tests/cases/libs/all_model.test.php
+++ b/cake/tests/cases/libs/all_model.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run model class tests
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllModelTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_routing.test.php b/cake/tests/cases/libs/all_routing.test.php
index cf1ff215e..68f0520f9 100644
--- a/cake/tests/cases/libs/all_routing.test.php
+++ b/cake/tests/cases/libs/all_routing.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run view class tests (view, theme)
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllRoutingTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_socket.test.php b/cake/tests/cases/libs/all_socket.test.php
index 01af39255..811822f9e 100644
--- a/cake/tests/cases/libs/all_socket.test.php
+++ b/cake/tests/cases/libs/all_socket.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run socket class tests
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllSocketTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_test_suite.test.php b/cake/tests/cases/libs/all_test_suite.test.php
index f1d52c2dc..b85ea0a19 100644
--- a/cake/tests/cases/libs/all_test_suite.test.php
+++ b/cake/tests/cases/libs/all_test_suite.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run socket class tests
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllTestSuiteTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_tests.test.php b/cake/tests/cases/libs/all_tests.test.php
index b3c94cb82..f7bdc72d3 100644
--- a/cake/tests/cases/libs/all_tests.test.php
+++ b/cake/tests/cases/libs/all_tests.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  *
  * This test group will run all test in the cases/libs/models/behaviors directory
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllTests extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_views.test.php b/cake/tests/cases/libs/all_views.test.php
index a84cd0c6d..0201426e4 100644
--- a/cake/tests/cases/libs/all_views.test.php
+++ b/cake/tests/cases/libs/all_views.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run view class tests (view, theme)
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllViewsTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/all_xml.test.php b/cake/tests/cases/libs/all_xml.test.php
index aed5b21d1..e56714ab0 100644
--- a/cake/tests/cases/libs/all_xml.test.php
+++ b/cake/tests/cases/libs/all_xml.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@
  *
  * This test group will run xml class tests
  *
- * @package       cake
- * @subpackage    cake.tests.groups
+ * @package       cake.tests.groups
  */
 class AllXmlTest extends PHPUnit_Framework_TestSuite {
 
diff --git a/cake/tests/cases/libs/app.test.php b/cake/tests/cases/libs/app.test.php
index cbebd4bf3..6e7793072 100644
--- a/cake/tests/cases/libs/app.test.php
+++ b/cake/tests/cases/libs/app.test.php
@@ -3,8 +3,7 @@
 /**
  * AppImportTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class AppImportTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index ad24b70d3..0a35c9794 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ if (!class_exists('Cache')) {
 /**
  * CacheTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CacheTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php
index bfdcea470..0abd07778 100644
--- a/cake/tests/cases/libs/cache/apc.test.php
+++ b/cake/tests/cases/libs/cache/apc.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ if (!class_exists('Cache')) {
 /**
  * ApcEngineTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  */
 class ApcEngineTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 33361f040..fb6741a7a 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ if (!class_exists('Cache')) {
 /**
  * FileEngineTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  */
 class FileEngineTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index e69e243a2..42324a8bc 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -37,8 +36,7 @@ class TestMemcacheEngine extends MemcacheEngine {
 /**
  * MemcacheEngineTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  */
 class MemcacheEngineTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index d889d713c..eea1c4b2c 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ if (!class_exists('Cache')) {
 /**
  * XcacheEngineTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.cache
+ * @package       cake.tests.cases.libs.cache
  */
 class XcacheEngineTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index 72fe1e8e8..0d21cb5b2 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'log/FileLog');
 /**
  * CakeLogTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeLogTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cake_request.test.php b/cake/tests/cases/libs/cake_request.test.php
index f423ac19d..58cc50631 100644
--- a/cake/tests/cases/libs/cake_request.test.php
+++ b/cake/tests/cases/libs/cake_request.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php
index e25c9416d..3673121fd 100644
--- a/cake/tests/cases/libs/cake_session.test.php
+++ b/cake/tests/cases/libs/cake_session.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -34,8 +33,7 @@ class TestCakeSession extends CakeSession {
 /**
  * CakeSessionTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeSessionTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cake_socket.test.php b/cake/tests/cases/libs/cake_socket.test.php
index ce84dedfb..ac12b4553 100644
--- a/cake/tests/cases/libs/cake_socket.test.php
+++ b/cake/tests/cases/libs/cake_socket.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'CakeSocket');
 /**
  * SocketTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeSocketTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index f9e5e8410..505dd8a08 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
+ * @package       cake.libs.
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -31,8 +30,7 @@ if (!class_exists('AppController')) {
 /**
  * CakeTestCaseTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeTestCaseTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index 2042eb922..82c08be98 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Datasource', 'DboSource', false);
 /**
  * CakeTestFixtureTestFixture class
  *
- * @package       cake
- * @subpackage    cake.cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeTestFixtureTestFixture extends CakeTestFixture {
 
@@ -67,8 +65,7 @@ class CakeTestFixtureTestFixture extends CakeTestFixture {
 /**
  * CakeTestFixtureImportFixture class
  *
- * @package       cake
- * @subpackage    cake.cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeTestFixtureImportFixture extends CakeTestFixture {
 
@@ -90,8 +87,7 @@ class CakeTestFixtureImportFixture extends CakeTestFixture {
 /**
  * CakeTestFixtureDefaultImportFixture class
  *
- * @package       cake
- * @subpackage    cake.cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
 
@@ -107,7 +103,7 @@ class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
  * FixtureImportTestModel class
  *
  * @package       default
- * @subpackage    cake.cake.tests.cases.libs.
+ * @package       cake.tests.cases.libs.
  */
 class FixtureImportTestModel extends Model {
 	public $name = 'FixtureImport';
@@ -125,8 +121,7 @@ class FixturePrefixTest extends Model {
 /**
  * Test case for CakeTestFixture
  *
- * @package       cake
- * @subpackage    cake.cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeTestFixtureTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/class_registry.test.php b/cake/tests/cases/libs/class_registry.test.php
index 7c0c14b23..21aa081b1 100644
--- a/cake/tests/cases/libs/class_registry.test.php
+++ b/cake/tests/cases/libs/class_registry.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'ClassRegistry');
 /**
  * ClassRegisterModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ClassRegisterModel extends CakeTestModel {
 
@@ -39,8 +37,7 @@ class ClassRegisterModel extends CakeTestModel {
 /**
  * RegisterArticle class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RegisterArticle extends ClassRegisterModel {
 
@@ -56,8 +53,7 @@ class RegisterArticle extends ClassRegisterModel {
 /**
  * RegisterArticleFeatured class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RegisterArticleFeatured extends ClassRegisterModel {
 
@@ -73,8 +69,7 @@ class RegisterArticleFeatured extends ClassRegisterModel {
 /**
  * RegisterArticleTag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RegisterArticleTag extends ClassRegisterModel {
 
@@ -90,8 +85,7 @@ class RegisterArticleTag extends ClassRegisterModel {
 /**
  * RegistryPluginAppModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RegistryPluginAppModel extends ClassRegisterModel {
 
@@ -107,8 +101,7 @@ class RegistryPluginAppModel extends ClassRegisterModel {
 /**
  * TestRegistryPluginModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class TestRegistryPluginModel extends RegistryPluginAppModel {
 
@@ -124,8 +117,7 @@ class TestRegistryPluginModel extends RegistryPluginAppModel {
 /**
  * RegisterCategory class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RegisterCategory extends ClassRegisterModel {
 
@@ -141,8 +133,7 @@ class RegisterCategory extends ClassRegisterModel {
 /**
  * ClassRegistryTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ClassRegistryTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/config/ini_reader.test.php b/cake/tests/cases/libs/config/ini_reader.test.php
index b0bd31ee0..2fb8eb2dd 100644
--- a/cake/tests/cases/libs/config/ini_reader.test.php
+++ b/cake/tests/cases/libs/config/ini_reader.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/config/php_reader.test.php b/cake/tests/cases/libs/config/php_reader.test.php
index 539f56666..63957ea62 100644
--- a/cake/tests/cases/libs/config/php_reader.test.php
+++ b/cake/tests/cases/libs/config/php_reader.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index eb9cb63b5..e58874e21 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Core', 'config/PhpReader');
 /**
  * ConfigureTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ConfigureTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index e42c1e0b6..eb01dae61 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Controller', 'Component', false);
 /**
  * ParamTestComponent
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ParamTestComponent extends Component {
 
@@ -66,8 +64,7 @@ class ParamTestComponent extends Component {
 /**
  * ComponentTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ComponentTestController extends Controller {
 
@@ -92,8 +89,7 @@ class ComponentTestController extends Controller {
 /**
  * AppleComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class AppleComponent extends Component {
 
@@ -128,8 +124,7 @@ class AppleComponent extends Component {
 /**
  * OrangeComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class OrangeComponent extends Component {
 
@@ -167,8 +162,7 @@ class OrangeComponent extends Component {
 /**
  * BananaComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class BananaComponent extends Component {
 
@@ -194,8 +188,7 @@ class BananaComponent extends Component {
 /**
  * MutuallyReferencingOneComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class MutuallyReferencingOneComponent extends Component {
 
@@ -211,8 +204,7 @@ class MutuallyReferencingOneComponent extends Component {
 /**
  * MutuallyReferencingTwoComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class MutuallyReferencingTwoComponent extends Component {
 
@@ -228,8 +220,7 @@ class MutuallyReferencingTwoComponent extends Component {
 /**
  * SomethingWithEmailComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class SomethingWithEmailComponent extends Component {
 
@@ -246,8 +237,7 @@ class SomethingWithEmailComponent extends Component {
 /**
  * ComponentTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ComponentTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/component_collection.test.php b/cake/tests/cases/libs/controller/component_collection.test.php
index 3e0e7bc53..3d84142d2 100644
--- a/cake/tests/cases/libs/controller/component_collection.test.php
+++ b/cake/tests/cases/libs/controller/component_collection.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php
index 544ff44b1..4e10cce48 100644
--- a/cake/tests/cases/libs/controller/components/acl.test.php
+++ b/cake/tests/cases/libs/controller/components/acl.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('model' . DS . 'db_acl');
 /**
  * AclNodeTwoTestBase class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class AclNodeTwoTestBase extends AclNode {
 
@@ -48,8 +46,7 @@ class AclNodeTwoTestBase extends AclNode {
 /**
  * AroTwoTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class AroTwoTest extends AclNodeTwoTestBase {
 
@@ -81,8 +78,7 @@ class AroTwoTest extends AclNodeTwoTestBase {
 /**
  * AcoTwoTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class AcoTwoTest extends AclNodeTwoTestBase {
 
@@ -114,8 +110,7 @@ class AcoTwoTest extends AclNodeTwoTestBase {
 /**
  * PermissionTwoTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class PermissionTwoTest extends CakeTestModel {
 
@@ -163,8 +158,7 @@ class PermissionTwoTest extends CakeTestModel {
 /**
  * DbAclTwoTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class DbAclTwoTest extends DbAcl {
 
@@ -185,8 +179,7 @@ class DbAclTwoTest extends DbAcl {
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class AclComponentTest extends CakeTestCase {
 /**
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 5b6f7262e..371edd2ed 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.5347
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,7 +25,7 @@ App::import('Core', 'Xml');
 * TestAuthComponent class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class TestAuthComponent extends AuthComponent {
 
@@ -61,7 +60,7 @@ class TestAuthComponent extends AuthComponent {
 * AuthUser class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class AuthUser extends CakeTestModel {
 
@@ -122,8 +121,7 @@ class AuthUser extends CakeTestModel {
 /**
  * AuthUserCustomField class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class AuthUserCustomField extends AuthUser {
 
@@ -140,7 +138,7 @@ class AuthUserCustomField extends AuthUser {
 * UuidUser class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class UuidUser extends CakeTestModel {
 
@@ -210,7 +208,7 @@ class UuidUser extends CakeTestModel {
 * AuthTestController class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class AuthTestController extends Controller {
 
@@ -364,8 +362,7 @@ class AuthTestController extends Controller {
 /**
  * AjaxAuthController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class AjaxAuthController extends Controller {
 
@@ -444,7 +441,7 @@ class AjaxAuthController extends Controller {
 * AuthTest class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class AuthTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php
index 7d441e4c2..0dc3ccd38 100644
--- a/cake/tests/cases/libs/controller/components/cookie.test.php
+++ b/cake/tests/cases/libs/controller/components/cookie.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Component', 'Cookie');
 /**
  * CookieComponentTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class CookieComponentTestController extends Controller {
 
@@ -55,8 +53,7 @@ class CookieComponentTestController extends Controller {
 /**
  * CookieComponentTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class CookieComponentTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 9ce4602e1..411a93c09 100755
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.5347
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ App::import('Core', 'CakeSocket');
 /**
  * EmailTestComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class EmailTestComponent extends EmailComponent {
 
@@ -153,8 +151,7 @@ class EmailTestComponent extends EmailComponent {
 /**
  * EmailTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class EmailTestController extends Controller {
 
@@ -194,8 +191,7 @@ class EmailTestController extends Controller {
 /**
  * EmailTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class EmailComponentTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 20abfd8da..f7d094f7b 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ App::import('Core', array('CakeRequest', 'CakeResponse'));
 /**
  * PaginatorTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class PaginatorTestController extends Controller {
 /**
@@ -57,8 +55,7 @@ class PaginatorTestController extends Controller {
 /**
  * PaginatorControllerPost class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class PaginatorControllerPost extends CakeTestModel {
 
@@ -126,8 +123,7 @@ class PaginatorControllerPost extends CakeTestModel {
 /**
  * ControllerPaginateModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class ControllerPaginateModel extends CakeTestModel {
 
@@ -170,8 +166,7 @@ class ControllerPaginateModel extends CakeTestModel {
 /**
  * PaginatorControllerCommentclass
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class PaginatorControllerComment extends CakeTestModel {
 
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 a9fe81d81..3ce9ccc4e 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Core', array('CakeRequest', 'CakeResponse'));
 /**
  * RequestHandlerTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class RequestHandlerTestController extends Controller {
 
@@ -80,8 +78,7 @@ class RequestHandlerTestController extends Controller {
 /**
  * RequestHandlerTestDisabledController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class RequestHandlerTestDisabledController extends Controller {
 
@@ -106,8 +103,7 @@ class RequestHandlerTestDisabledController extends Controller {
 /**
  * RequestHandlerComponentTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class RequestHandlerComponentTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 33548c70e..cb7197392 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,7 +23,7 @@ App::import('Component', 'Security');
 * TestSecurityComponent
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class TestSecurityComponent extends SecurityComponent {
 
@@ -43,7 +42,7 @@ class TestSecurityComponent extends SecurityComponent {
 * SecurityTestController
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class SecurityTestController extends Controller {
 
@@ -116,8 +115,7 @@ class SecurityTestController extends Controller {
 /**
  * SecurityComponentTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class SecurityComponentTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php
index a2fa96410..938d8dd00 100644
--- a/cake/tests/cases/libs/controller/components/session.test.php
+++ b/cake/tests/cases/libs/controller/components/session.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Component', 'Session');
 /**
  * SessionTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class SessionTestController extends Controller {
 
@@ -49,8 +47,7 @@ class SessionTestController extends Controller {
 /**
  * OrangeSessionTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class OrangeSessionTestController extends Controller {
 
@@ -75,8 +72,7 @@ class OrangeSessionTestController extends Controller {
 /**
  * SessionComponentTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class SessionComponentTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 0ab068cb6..266132684 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ App::import('Component', 'Cookie');
 /**
  * AppController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ControllerTestAppController extends Controller {
 /**
@@ -57,8 +55,7 @@ class ControllerTestAppController extends Controller {
 /**
  * ControllerPost class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ControllerPost extends CakeTestModel {
 
@@ -126,8 +123,7 @@ class ControllerPost extends CakeTestModel {
 /**
  * ControllerPostsController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ControllerCommentsController extends ControllerTestAppController {
 
@@ -145,8 +141,7 @@ class ControllerCommentsController extends ControllerTestAppController {
 /**
  * ControllerComment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ControllerComment extends CakeTestModel {
 
@@ -186,8 +181,7 @@ class ControllerComment extends CakeTestModel {
 /**
  * ControllerAlias class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ControllerAlias extends CakeTestModel {
 
@@ -219,8 +213,7 @@ class ControllerAlias extends CakeTestModel {
 /**
  * NameTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class NameTest extends CakeTestModel {
 
@@ -250,8 +243,7 @@ class NameTest extends CakeTestModel {
 /**
  * TestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class TestController extends ControllerTestAppController {
 
@@ -307,8 +299,7 @@ class TestController extends ControllerTestAppController {
 /**
  * TestComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class TestComponent extends Object {
 
@@ -360,8 +351,7 @@ class TestComponent extends Object {
 /**
  * AnotherTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class AnotherTestController extends ControllerTestAppController {
 
@@ -385,8 +375,7 @@ class AnotherTestController extends ControllerTestAppController {
 /**
  * ControllerTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ControllerTest extends CakeTestCase {
 
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 b90a6b6e9..80e12d88c 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  * @since         CakePHP(tm) v 1.2.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,7 +24,7 @@ App::import('Core', 'Controller');
  * Test case AppController
  *
  * @package cake
- * @subpackage cake.tests.cases.libs.controller
+ * @package    cake.tests.cases.libs.controller
  */
 class MergeVarsAppController extends Controller {
 
diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/cake/tests/cases/libs/controller/pages_controller.test.php
index 3d3084719..1d9d3febc 100644
--- a/cake/tests/cases/libs/controller/pages_controller.test.php
+++ b/cake/tests/cases/libs/controller/pages_controller.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Controller', 'Pages');
 /**
  * PagesControllerTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class PagesControllerTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index a68e7ad2b..031d8a0c5 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'Controller', false);
 /**
  * ScaffoldMockController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldMockController extends Controller {
 
@@ -48,8 +46,7 @@ class ScaffoldMockController extends Controller {
 /**
  * ScaffoldMockControllerWithFields class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldMockControllerWithFields extends Controller {
 
@@ -83,8 +80,7 @@ class ScaffoldMockControllerWithFields extends Controller {
 /**
  * TestScaffoldMock class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class TestScaffoldMock extends Scaffold {
 
@@ -110,8 +106,7 @@ class TestScaffoldMock extends Scaffold {
 /**
  * ScaffoldMock class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldMock extends CakeTestModel {
 
@@ -166,8 +161,7 @@ class ScaffoldMock extends CakeTestModel {
 /**
  * ScaffoldUser class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldUser extends CakeTestModel {
 
@@ -196,8 +190,7 @@ class ScaffoldUser extends CakeTestModel {
 /**
  * ScaffoldComment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldComment extends CakeTestModel {
 
@@ -226,8 +219,7 @@ class ScaffoldComment extends CakeTestModel {
 /**
  * ScaffoldTag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldTag extends CakeTestModel {
 /**
@@ -241,8 +233,7 @@ class ScaffoldTag extends CakeTestModel {
 /**
  * TestScaffoldView class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class TestScaffoldView extends ScaffoldView {
 
@@ -261,8 +252,7 @@ class TestScaffoldView extends ScaffoldView {
 /**
  * ScaffoldViewTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldViewTest extends CakeTestCase {
 
@@ -661,8 +651,7 @@ class ScaffoldViewTest extends CakeTestCase {
 /**
  * Scaffold Test class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 class ScaffoldTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller_test_case.test.php b/cake/tests/cases/libs/controller_test_case.test.php
index 585e07bb2..72bb959cb 100644
--- a/cake/tests/cases/libs/controller_test_case.test.php
+++ b/cake/tests/cases/libs/controller_test_case.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
+ * @package       cake.libs.
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,15 +26,13 @@ require_once dirname(__FILE__) . DS . 'model' . DS . 'models.php';
 /**
  * AppController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller
+ * @package       cake.tests.cases.libs.controller
  */
 if (!class_exists('AppController')) {
 	/**
 	 * AppController class
 	 *
-	 * @package       cake
-	 * @subpackage    cake.tests.cases.libs.controller
+		 * @package       cake.tests.cases.libs.controller
 	 */
 	class AppController extends Controller {
 	/**
@@ -87,8 +84,7 @@ if (!class_exists('PostsController')) {
 /**
  * ControllerTestCaseTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ControllerTestCaseTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
index 21e7d8057..a76945566 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/cake/tests/cases/libs/debugger.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Debugger');
 /**
  * DebugggerTestCaseDebuggger class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class DebuggerTestCaseDebugger extends Debugger {
 }
@@ -31,8 +29,7 @@ class DebuggerTestCaseDebugger extends Debugger {
 /**
  * DebuggerTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class DebuggerTest extends CakeTestCase {
 // !!!
diff --git a/cake/tests/cases/libs/dispatcher.test.php b/cake/tests/cases/libs/dispatcher.test.php
index 0192e6740..20fab006b 100644
--- a/cake/tests/cases/libs/dispatcher.test.php
+++ b/cake/tests/cases/libs/dispatcher.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -40,8 +39,7 @@ class DispatcherMockCakeResponse extends CakeResponse {
 /**
  * TestDispatcher class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class TestDispatcher extends Dispatcher {
 
@@ -75,8 +73,7 @@ class TestDispatcher extends Dispatcher {
 /**
  * MyPluginAppController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class MyPluginAppController extends AppController {
 }
@@ -84,8 +81,7 @@ class MyPluginAppController extends AppController {
 /**
  * MyPluginController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class MyPluginController extends MyPluginAppController {
 
@@ -137,8 +133,7 @@ class MyPluginController extends MyPluginAppController {
 /**
  * SomePagesController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class SomePagesController extends AppController {
 
@@ -199,8 +194,7 @@ class SomePagesController extends AppController {
 /**
  * OtherPagesController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class OtherPagesController extends MyPluginAppController {
 
@@ -243,8 +237,7 @@ class OtherPagesController extends MyPluginAppController {
 /**
  * TestDispatchPagesController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class TestDispatchPagesController extends AppController {
 
@@ -286,8 +279,7 @@ class TestDispatchPagesController extends AppController {
 /**
  * ArticlesTestAppController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class ArticlesTestAppController extends AppController {
 }
@@ -295,8 +287,7 @@ class ArticlesTestAppController extends AppController {
 /**
  * ArticlesTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class ArticlesTestController extends ArticlesTestAppController {
 
@@ -337,8 +328,7 @@ class ArticlesTestController extends ArticlesTestAppController {
 /**
  * SomePostsController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class SomePostsController extends AppController {
 
@@ -402,8 +392,7 @@ class SomePostsController extends AppController {
 /**
  * TestCachedPagesController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class TestCachedPagesController extends Controller {
 
@@ -498,8 +487,7 @@ class TestCachedPagesController extends Controller {
 /**
  * TimesheetsController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class TimesheetsController extends Controller {
 
@@ -532,8 +520,7 @@ class TimesheetsController extends Controller {
 /**
  * DispatcherTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases
+ * @package       cake.tests.cases
  */
 class DispatcherTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/error/error_handler.test.php b/cake/tests/cases/libs/error/error_handler.test.php
index c6f33d600..ee5e43bca 100644
--- a/cake/tests/cases/libs/error/error_handler.test.php
+++ b/cake/tests/cases/libs/error/error_handler.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', array('ErrorHandler', 'Controller', 'Router'));
 /**
  * ErrorHandlerTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ErrorHandlerTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/error/exception_renderer.test.php b/cake/tests/cases/libs/error/exception_renderer.test.php
index 0b147958f..1bc7e8bf0 100644
--- a/cake/tests/cases/libs/error/exception_renderer.test.php
+++ b/cake/tests/cases/libs/error/exception_renderer.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', array('ExceptionRenderer', 'Controller', 'Component'));
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class AuthBlueberryUser extends CakeTestModel {
 
@@ -48,8 +46,7 @@ class AuthBlueberryUser extends CakeTestModel {
 /**
  * BlueberryComponent class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class BlueberryComponent extends Component {
 
@@ -75,8 +72,7 @@ class BlueberryComponent extends Component {
 /**
  * TestErrorController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class TestErrorController extends Controller {
 
@@ -121,8 +117,7 @@ class TestErrorController extends Controller {
 /**
  * MyCustomExceptionRenderer class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MyCustomExceptionRenderer extends ExceptionRenderer {
 
@@ -146,8 +141,7 @@ class MissingWidgetThingException extends NotFoundException { }
 /**
  * ExceptionRendererTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ExceptionRendererTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php
index 2895deb88..d120ff8f3 100644
--- a/cake/tests/cases/libs/file.test.php
+++ b/cake/tests/cases/libs/file.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'File');
 /**
  * FileTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class FileTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index 472385243..b30bfc616 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'File');
 /**
  * FolderTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class FolderTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/html_coverage_report.test.php b/cake/tests/cases/libs/html_coverage_report.test.php
index 39f41fb60..90fe7f69a 100644
--- a/cake/tests/cases/libs/html_coverage_report.test.php
+++ b/cake/tests/cases/libs/html_coverage_report.test.php
@@ -13,7 +13,6 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/http/basic_authentication.test.php b/cake/tests/cases/libs/http/basic_authentication.test.php
index f886a6686..990ed0750 100644
--- a/cake/tests/cases/libs/http/basic_authentication.test.php
+++ b/cake/tests/cases/libs/http/basic_authentication.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.http
+ * @package       cake.tests.cases.libs.http
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ App::import('Lib', 'http/BasicAuthentication');
 /**
  * BasicMethodTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.http
+ * @package       cake.tests.cases.libs.http
  */
 class BasicMethodTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/http/digest_authentication.test.php b/cake/tests/cases/libs/http/digest_authentication.test.php
index 2166aee24..17832ce45 100644
--- a/cake/tests/cases/libs/http/digest_authentication.test.php
+++ b/cake/tests/cases/libs/http/digest_authentication.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.http
+ * @package       cake.tests.cases.libs.http
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -51,8 +50,7 @@ class DigestHttpSocket extends HttpSocket {
 /**
  * DigestAuthenticationTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.http
+ * @package       cake.tests.cases.libs.http
  */
 class DigestAuthenticationTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/http_response.test.php b/cake/tests/cases/libs/http_response.test.php
index 5d1647ebf..9155bb8a3 100644
--- a/cake/tests/cases/libs/http_response.test.php
+++ b/cake/tests/cases/libs/http_response.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'HttpResponse');
 /**
  * TestHttpResponse class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class TestHttpResponse extends HttpResponse {
 
@@ -83,8 +81,7 @@ class TestHttpResponse extends HttpResponse {
 /**
  * HttpResponseTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class HttpResponseTest extends CakeTestCase {
 /**
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index cefd649e2..94de48389 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,7 +22,7 @@ App::import('Core', 'HttpSocket');
  * TestAuthentication class
  *
  * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package    cake.tests.cases.libs
  */
 class TestAuthentication {
 
@@ -168,8 +167,7 @@ class TestHttpSocket extends HttpSocket {
 /**
  * HttpSocketTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class HttpSocketTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index 1ca37bcb1..5fdf3a93a 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'i18n');
 /**
  * I18nTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class I18nTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index 4d383c887..3c04e0363 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -15,7 +15,7 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing
  * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       Open Group Test Suite License (http://www.opensource.org/licenses/opengroup.php)
  */
@@ -30,7 +30,7 @@ App::import('Core', 'Inflector');
  * Short description for class.
  *
  * @package		  cake.tests
- * @subpackage	  cake.tests.cases.libs
+ * @package   	  cake.tests.cases.libs
  */
 class InflectorTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
index a1b35aee1..dd7a5a79c 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/cake/tests/cases/libs/l10n.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'l10n');
 /**
  * L10nTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class L10nTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/log/file_log.test.php b/cake/tests/cases/libs/log/file_log.test.php
index f07ab9771..d861426b3 100644
--- a/cake/tests/cases/libs/log/file_log.test.php
+++ b/cake/tests/cases/libs/log/file_log.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.log
+ * @package       cake.tests.cases.libs.log
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'log/FileLog');
 /**
  * CakeLogTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class FileLogTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index e871a541d..80586925b 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ if (!class_exists('MagicDb')) {
 /**
  * The test class for the MagicDb class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MagicDbTest extends UnitTestCase {
 /**
@@ -144,14 +142,12 @@ class MagicDbTest extends UnitTestCase {
 /**
  * Test data holding object for MagicDb tests
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 /**
  * MagicDbTestData class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MagicDbTestData extends Object {
 /**
diff --git a/cake/tests/cases/libs/model/behavior_collection.test.php b/cake/tests/cases/libs/model/behavior_collection.test.php
index 27c71e2f9..efe549297 100644
--- a/cake/tests/cases/libs/model/behavior_collection.test.php
+++ b/cake/tests/cases/libs/model/behavior_collection.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ require_once dirname(__FILE__) . DS . 'models.php';
 /**
  * TestBehavior class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TestBehavior extends ModelBehavior {
 
@@ -340,8 +338,7 @@ class TestBehavior extends ModelBehavior {
 /**
  * Test2Behavior class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Test2Behavior extends TestBehavior{
 }
@@ -349,8 +346,7 @@ class Test2Behavior extends TestBehavior{
 /**
  * Test3Behavior class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Test3Behavior extends TestBehavior{
 }
@@ -358,8 +354,7 @@ class Test3Behavior extends TestBehavior{
 /**
  * Test4Behavior class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Test4Behavior extends ModelBehavior{
 	function setup($model, $config = null) {
@@ -372,8 +367,7 @@ class Test4Behavior extends ModelBehavior{
 /**
  * Test5Behavior class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Test5Behavior extends ModelBehavior{
 	function setup($model, $config = null) {
@@ -386,8 +380,7 @@ class Test5Behavior extends ModelBehavior{
 /**
  * Test6Behavior class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Test6Behavior extends ModelBehavior{
 	function setup($model, $config = null) {
@@ -400,8 +393,7 @@ class Test6Behavior extends ModelBehavior{
 /**
  * Test7Behavior class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Test7Behavior extends ModelBehavior{
 	function setup($model, $config = null) {
@@ -414,8 +406,7 @@ class Test7Behavior extends ModelBehavior{
 /**
  * BehaviorCollection class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class BehaviorCollectionTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
index a7705dcd9..e3ec6daf9 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.tests.model.behaviors.acl
+ * @package       cake.libs.tests.model.behaviors.acl
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,7 +25,7 @@ App::import('Core', 'db_acl');
 * Test Person class - self joined model
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.model.behaviors
+* @package       cake.tests.cases.libs.model.behaviors
 */
 class AclPerson extends CakeTestModel {
 
@@ -106,7 +105,7 @@ class AclPerson extends CakeTestModel {
 * AclUser class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.model.behaviors
+* @package       cake.tests.cases.libs.model.behaviors
 */
 class AclUser extends CakeTestModel {
 
@@ -147,7 +146,7 @@ class AclUser extends CakeTestModel {
 * AclPost class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.model.behaviors
+* @package       cake.tests.cases.libs.model.behaviors
 */
 class AclPost extends CakeTestModel {
 
@@ -188,7 +187,7 @@ class AclPost extends CakeTestModel {
 * AclBehaviorTest class
 *
 * @package       cake
-* @subpackage    cake.tests.cases.libs.controller.components
+* @package       cake.tests.cases.libs.controller.components
 */
 class AclBehaviorTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index d2ccdc5aa..2c190f04b 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
 /**
  * ContainableTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  */
 class ContainableBehaviorTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
index ee13fe3bb..24f39807d 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
 /**
  * TranslateBehaviorTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  */
 class TranslateBehaviorTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php
index 75375459f..96e4e174d 100644
--- a/cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/cake/tests/cases/libs/model/behaviors/tree.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  * @since         CakePHP(tm) v 1.2.0.5330
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
 /**
  * NumberTreeTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  */
 class NumberTreeTest extends CakeTestCase {
 
@@ -1279,8 +1277,7 @@ class NumberTreeTest extends CakeTestCase {
 /**
  * ScopedTreeTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  */
 class ScopedTreeTest extends CakeTestCase {
 
@@ -1580,8 +1577,7 @@ class ScopedTreeTest extends CakeTestCase {
 /**
  * AfterTreeTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  */
 class AfterTreeTest extends CakeTestCase {
 
@@ -1636,8 +1632,7 @@ class AfterTreeTest extends CakeTestCase {
 /**
  * UuidTreeTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @package       cake.tests.cases.libs.model.behaviors
  */
 class UuidTreeTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php
index ff5c8ffdd..62050194d 100644
--- a/cake/tests/cases/libs/model/cake_schema.test.php
+++ b/cake/tests/cases/libs/model/cake_schema.test.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Model', 'CakeSchema', false);
 /**
  * Test for Schema database management
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MyAppSchema extends CakeSchema {
 
@@ -125,8 +123,7 @@ class MyAppSchema extends CakeSchema {
 /**
  * TestAppSchema class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TestAppSchema extends CakeSchema {
 
@@ -239,8 +236,7 @@ class TestAppSchema extends CakeSchema {
 /**
  * SchmeaPost class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SchemaPost extends CakeTestModel {
 
@@ -280,8 +276,7 @@ class SchemaPost extends CakeTestModel {
 /**
  * SchemaComment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SchemaComment extends CakeTestModel {
 
@@ -313,8 +308,7 @@ class SchemaComment extends CakeTestModel {
 /**
  * SchemaTag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SchemaTag extends CakeTestModel {
 
@@ -346,8 +340,7 @@ class SchemaTag extends CakeTestModel {
 /**
  * SchemaDatatype class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SchemaDatatype extends CakeTestModel {
 
@@ -377,7 +370,7 @@ class SchemaDatatype extends CakeTestModel {
  *
  * @uses          CakeTestModel
  * @package
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Testdescribe extends CakeTestModel {
 
@@ -393,8 +386,7 @@ class Testdescribe extends CakeTestModel {
 /**
  * SchemaCrossDatabase class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SchemaCrossDatabase extends CakeTestModel {
 
@@ -426,8 +418,7 @@ class SchemaCrossDatabase extends CakeTestModel {
 /**
  * SchemaCrossDatabaseFixture class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SchemaCrossDatabaseFixture extends CakeTestFixture {
 
@@ -472,8 +463,7 @@ class SchemaCrossDatabaseFixture extends CakeTestFixture {
 /**
  * SchemaPrefixAuthUser class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SchemaPrefixAuthUser extends CakeTestModel {
 /**
@@ -499,8 +489,7 @@ class SchemaPrefixAuthUser extends CakeTestModel {
 /**
  * CakeSchemaTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CakeSchemaTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php
index 04212fa4a..54f022963 100644
--- a/cake/tests/cases/libs/model/connection_manager.test.php
+++ b/cake/tests/cases/libs/model/connection_manager.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'ConnectionManager');
 /**
  * ConnectionManagerTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.models
+ * @package       cake.tests.cases.models
  */
 class ConnectionManagerTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index 8ea86d221..1b25e9435 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,8 +25,7 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_mssql.php';
 /**
  * DboMssqlTestDb class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ * @package       cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMssqlTestDb extends DboMssql {
 
@@ -130,8 +128,7 @@ class DboMssqlTestDb extends DboMssql {
 /**
  * MssqlTestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class MssqlTestModel extends Model {
 
@@ -232,8 +229,7 @@ class MssqlTestModel extends Model {
 /**
  * MssqlClientTestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class MssqlClientTestModel extends Model {
 /**
@@ -267,8 +263,7 @@ class MssqlClientTestModel extends Model {
 /**
  * DboMssqlTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ * @package       cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMssqlTest extends CakeTestCase {
 
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 bd29b5d39..1e4c0ed93 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
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
 /**
  * DboMysqlTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ * @package       cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMysqlTest extends CakeTestCase {
 /**
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
index 3efa451bd..592b1eac0 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo' . DS . 'dbo_oracle
 /**
  * DboOracleTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ * @package       cake.tests.cases.libs.model.datasources.dbo
  */
 class DboOracleTest extends CakeTestCase {
 
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 c71836f5d..35b465f63 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
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
 /**
  * DboPostgresTestDb class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class DboPostgresTestDb extends DboPostgres {
 
@@ -63,8 +61,7 @@ class DboPostgresTestDb extends DboPostgres {
 /**
  * PostgresTestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class PostgresTestModel extends Model {
 
@@ -157,8 +154,7 @@ class PostgresTestModel extends Model {
 /**
  * PostgresClientTestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class PostgresClientTestModel extends Model {
 
@@ -198,8 +194,7 @@ class PostgresClientTestModel extends Model {
 /**
  * DboPostgresTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ * @package       cake.tests.cases.libs.model.datasources.dbo
  */
 class DboPostgresTest extends CakeTestCase {
 
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 b42b6209a..a1fc1cd4a 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
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs
+ * @package       cake.libs
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboSqlite'));
 /**
  * DboSqliteTestDb class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class DboSqliteTestDb extends DboSqlite {
 
@@ -61,8 +59,7 @@ class DboSqliteTestDb extends DboSqlite {
 /**
  * DboSqliteTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ * @package       cake.tests.cases.libs.model.datasources.dbo
  */
 class DboSqliteTest extends CakeTestCase {
 
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 fa5edf6c6..66b4a9cc1 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ require_once dirname(dirname(__FILE__)) . DS . 'models.php';
 /**
  * DboSourceTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class DboSourceTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php
index fb0a9f3f3..537f2f361 100644
--- a/cake/tests/cases/libs/model/db_acl.test.php
+++ b/cake/tests/cases/libs/model/db_acl.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components.dbacl.models
+ * @package       cake.tests.cases.libs.controller.components.dbacl.models
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'db_acl');
 /**
  * DB ACL wrapper test class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class DbAclNodeTestBase extends AclNode {
 
@@ -48,8 +46,7 @@ class DbAclNodeTestBase extends AclNode {
 /**
  * Aro Test Wrapper
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class DbAroTest extends DbAclNodeTestBase {
 
@@ -81,8 +78,7 @@ class DbAroTest extends DbAclNodeTestBase {
 /**
  * Aco Test Wrapper
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class DbAcoTest extends DbAclNodeTestBase {
 
@@ -114,8 +110,7 @@ class DbAcoTest extends DbAclNodeTestBase {
 /**
  * Permission Test Wrapper
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class DbPermissionTest extends CakeTestModel {
 
@@ -155,8 +150,7 @@ class DbPermissionTest extends CakeTestModel {
 /**
  * DboActionTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class DbAcoActionTest extends CakeTestModel {
 
@@ -188,8 +182,7 @@ class DbAcoActionTest extends CakeTestModel {
 /**
  * DbAroUserTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class DbAroUserTest extends CakeTestModel {
 
@@ -227,8 +220,7 @@ class DbAroUserTest extends CakeTestModel {
 /**
  * TestDbAcl class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components
+ * @package       cake.tests.cases.libs.controller.components
  */
 class TestDbAcl extends DbAcl {
 
@@ -249,8 +241,7 @@ class TestDbAcl extends DbAcl {
 /**
  * AclNodeTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.controller.components.dbacl.models
+ * @package       cake.tests.cases.libs.controller.components.dbacl.models
  */
 class AclNodeTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
index 9809b3a0d..3fa31afd6 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/cake/tests/cases/libs/model/model.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 /**
  * ModelBaseTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 abstract class BaseModelTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index e61865e57..ae4045743 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php';
 /**
  * ModelDeleteTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.operations
+ * @package       cake.tests.cases.libs.model.operations
  */
 class ModelDeleteTest extends BaseModelTest {
 
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index 2770657f1..fdd410bde 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -45,8 +44,7 @@ class DboMock extends DboSource {
 /**
  * ModelIntegrationTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.operations
+ * @package       cake.tests.cases.libs.model.operations
  */
 class ModelIntegrationTest extends BaseModelTest {
 
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 93808578c..5be36aaf3 100755
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php';
 /**
  * ModelReadTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.operations
+ * @package       cake.tests.cases.libs.model.operations
  */
 class ModelReadTest extends BaseModelTest {
 
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index d921618c0..0da3c18e9 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php';
 /**
  * ModelValidationTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.operations
+ * @package       cake.tests.cases.libs.model.operations
  */
 class ModelValidationTest extends BaseModelTest {
 
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index c726ea47f..44a6585c6 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php';
 /**
  * ModelWriteTest
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.operations
+ * @package       cake.tests.cases.libs.model.operations
  */
 class ModelWriteTest extends BaseModelTest {
 
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index b116962b0..6c61254fb 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  * @since         CakePHP(tm) v 1.2.0.6464
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 /**
  * Test class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Test extends CakeTestModel {
 
@@ -65,8 +63,7 @@ class Test extends CakeTestModel {
 /**
  * TestAlias class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TestAlias extends CakeTestModel {
 
@@ -113,8 +110,7 @@ class TestAlias extends CakeTestModel {
 /**
  * TestValidate class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TestValidate extends CakeTestModel {
 
@@ -178,8 +174,7 @@ class TestValidate extends CakeTestModel {
 /**
  * User class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class User extends CakeTestModel {
 
@@ -203,8 +198,7 @@ class User extends CakeTestModel {
 /**
  * Article class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Article extends CakeTestModel {
 
@@ -302,8 +296,7 @@ class BeforeDeleteComment extends CakeTestModel {
 /**
  * NumericArticle class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class NumericArticle extends CakeTestModel {
 
@@ -327,8 +320,7 @@ class NumericArticle extends CakeTestModel {
 /**
  * Article10 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Article10 extends CakeTestModel {
 
@@ -360,8 +352,7 @@ class Article10 extends CakeTestModel {
 /**
  * ArticleFeatured class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ArticleFeatured extends CakeTestModel {
 
@@ -417,8 +408,7 @@ class ArticleFeatured extends CakeTestModel {
 /**
  * Featured class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Featured extends CakeTestModel {
 
@@ -442,8 +432,7 @@ class Featured extends CakeTestModel {
 /**
  * Tag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Tag extends CakeTestModel {
 
@@ -459,8 +448,7 @@ class Tag extends CakeTestModel {
 /**
  * ArticlesTag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ArticlesTag extends CakeTestModel {
 
@@ -476,8 +464,7 @@ class ArticlesTag extends CakeTestModel {
 /**
  * ArticleFeaturedsTag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ArticleFeaturedsTag extends CakeTestModel {
 
@@ -493,8 +480,7 @@ class ArticleFeaturedsTag extends CakeTestModel {
 /**
  * Comment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Comment extends CakeTestModel {
 
@@ -526,8 +512,7 @@ class Comment extends CakeTestModel {
 /**
  * Modified Comment Class has afterFind Callback
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ModifiedComment extends CakeTestModel {
 
@@ -571,8 +556,7 @@ class ModifiedComment extends CakeTestModel {
 /**
  * Modified Comment Class has afterFind Callback
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class AgainModifiedComment extends CakeTestModel {
 
@@ -616,8 +600,7 @@ class AgainModifiedComment extends CakeTestModel {
 /**
  * MergeVarPluginAppModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MergeVarPluginAppModel extends AppModel {
 
@@ -634,8 +617,7 @@ class MergeVarPluginAppModel extends AppModel {
 /**
  * MergeVarPluginPost class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MergeVarPluginPost extends MergeVarPluginAppModel {
 
@@ -659,8 +641,7 @@ class MergeVarPluginPost extends MergeVarPluginAppModel {
 /**
  * MergeVarPluginComment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MergeVarPluginComment extends MergeVarPluginAppModel {
 
@@ -685,8 +666,7 @@ class MergeVarPluginComment extends MergeVarPluginAppModel {
 /**
  * Attachment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Attachment extends CakeTestModel {
 
@@ -702,8 +682,7 @@ class Attachment extends CakeTestModel {
 /**
  * Category class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Category extends CakeTestModel {
 
@@ -719,8 +698,7 @@ class Category extends CakeTestModel {
 /**
  * CategoryThread class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class CategoryThread extends CakeTestModel {
 
@@ -744,8 +722,7 @@ class CategoryThread extends CakeTestModel {
 /**
  * Apple class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Apple extends CakeTestModel {
 
@@ -793,8 +770,7 @@ class Apple extends CakeTestModel {
 /**
  * Sample class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Sample extends CakeTestModel {
 
@@ -818,8 +794,7 @@ class Sample extends CakeTestModel {
 /**
  * AnotherArticle class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class AnotherArticle extends CakeTestModel {
 
@@ -843,8 +818,7 @@ class AnotherArticle extends CakeTestModel {
 /**
  * Advertisement class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Advertisement extends CakeTestModel {
 
@@ -868,8 +842,7 @@ class Advertisement extends CakeTestModel {
 /**
  * Home class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Home extends CakeTestModel {
 
@@ -893,8 +866,7 @@ class Home extends CakeTestModel {
 /**
  * Post class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Post extends CakeTestModel {
 
@@ -930,8 +902,7 @@ class Post extends CakeTestModel {
 /**
  * Author class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Author extends CakeTestModel {
 
@@ -967,8 +938,7 @@ class Author extends CakeTestModel {
 /**
  * ModifiedAuthor class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ModifiedAuthor extends Author {
 
@@ -998,8 +968,7 @@ class ModifiedAuthor extends Author {
 /**
  * Project class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Project extends CakeTestModel {
 
@@ -1023,8 +992,7 @@ class Project extends CakeTestModel {
 /**
  * Thread class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Thread extends CakeTestModel {
 
@@ -1056,8 +1024,7 @@ class Thread extends CakeTestModel {
 /**
  * Message class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Message extends CakeTestModel {
 
@@ -1081,8 +1048,7 @@ class Message extends CakeTestModel {
 /**
  * Bid class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Bid extends CakeTestModel {
 
@@ -1106,8 +1072,7 @@ class Bid extends CakeTestModel {
 /**
  * NodeAfterFind class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class NodeAfterFind extends CakeTestModel {
 
@@ -1174,8 +1139,7 @@ class NodeAfterFind extends CakeTestModel {
 /**
  * NodeAfterFindSample class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class NodeAfterFindSample extends CakeTestModel {
 
@@ -1207,8 +1171,7 @@ class NodeAfterFindSample extends CakeTestModel {
 /**
  * NodeNoAfterFind class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class NodeNoAfterFind extends CakeTestModel {
 
@@ -1264,8 +1227,7 @@ class NodeNoAfterFind extends CakeTestModel {
 /**
  * Node class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Node extends CakeTestModel{
 
@@ -1297,8 +1259,7 @@ class Node extends CakeTestModel{
 /**
  * Dependency class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Dependency extends CakeTestModel {
 
@@ -1314,8 +1275,7 @@ class Dependency extends CakeTestModel {
 /**
  * ModelA class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ModelA extends CakeTestModel {
 
@@ -1347,8 +1307,7 @@ class ModelA extends CakeTestModel {
 /**
  * ModelB class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ModelB extends CakeTestModel {
 
@@ -1380,8 +1339,7 @@ class ModelB extends CakeTestModel {
 /**
  * ModelC class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ModelC extends CakeTestModel {
 
@@ -1413,8 +1371,7 @@ class ModelC extends CakeTestModel {
 /**
  * ModelD class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ModelD extends CakeTestModel {
 
@@ -1438,8 +1395,7 @@ class ModelD extends CakeTestModel {
 /**
  * Something class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Something extends CakeTestModel {
 
@@ -1463,8 +1419,7 @@ class Something extends CakeTestModel {
 /**
  * SomethingElse class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SomethingElse extends CakeTestModel {
 
@@ -1488,8 +1443,7 @@ class SomethingElse extends CakeTestModel {
 /**
  * JoinThing class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class JoinThing extends CakeTestModel {
 
@@ -1513,8 +1467,7 @@ class JoinThing extends CakeTestModel {
 /**
  * Portfolio class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Portfolio extends CakeTestModel {
 
@@ -1538,8 +1491,7 @@ class Portfolio extends CakeTestModel {
 /**
  * Item class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Item extends CakeTestModel {
 
@@ -1571,8 +1523,7 @@ class Item extends CakeTestModel {
 /**
  * ItemsPortfolio class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ItemsPortfolio extends CakeTestModel {
 
@@ -1588,8 +1539,7 @@ class ItemsPortfolio extends CakeTestModel {
 /**
  * Syfile class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Syfile extends CakeTestModel {
 
@@ -1613,8 +1563,7 @@ class Syfile extends CakeTestModel {
 /**
  * Image class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Image extends CakeTestModel {
 
@@ -1630,8 +1579,7 @@ class Image extends CakeTestModel {
 /**
  * DeviceType class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class DeviceType extends CakeTestModel {
 
@@ -1675,8 +1623,7 @@ class DeviceType extends CakeTestModel {
 /**
  * DeviceTypeCategory class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class DeviceTypeCategory extends CakeTestModel {
 
@@ -1692,8 +1639,7 @@ class DeviceTypeCategory extends CakeTestModel {
 /**
  * FeatureSet class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class FeatureSet extends CakeTestModel {
 
@@ -1709,8 +1655,7 @@ class FeatureSet extends CakeTestModel {
 /**
  * ExteriorTypeCategory class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ExteriorTypeCategory extends CakeTestModel {
 
@@ -1734,8 +1679,7 @@ class ExteriorTypeCategory extends CakeTestModel {
 /**
  * Document class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Document extends CakeTestModel {
 
@@ -1759,8 +1703,7 @@ class Document extends CakeTestModel {
 /**
  * Device class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Device extends CakeTestModel {
 
@@ -1776,8 +1719,7 @@ class Device extends CakeTestModel {
 /**
  * DocumentDirectory class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class DocumentDirectory extends CakeTestModel {
 
@@ -1793,8 +1735,7 @@ class DocumentDirectory extends CakeTestModel {
 /**
  * PrimaryModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class PrimaryModel extends CakeTestModel {
 
@@ -1810,8 +1751,7 @@ class PrimaryModel extends CakeTestModel {
 /**
  * SecondaryModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class SecondaryModel extends CakeTestModel {
 
@@ -1827,8 +1767,7 @@ class SecondaryModel extends CakeTestModel {
 /**
  * JoinA class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class JoinA extends CakeTestModel {
 
@@ -1852,8 +1791,7 @@ class JoinA extends CakeTestModel {
 /**
  * JoinB class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class JoinB extends CakeTestModel {
 
@@ -1877,8 +1815,7 @@ class JoinB extends CakeTestModel {
 /**
  * JoinC class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class JoinC extends CakeTestModel {
 
@@ -1902,8 +1839,7 @@ class JoinC extends CakeTestModel {
 /**
  * ThePaper class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ThePaper extends CakeTestModel {
 
@@ -1943,8 +1879,7 @@ class ThePaper extends CakeTestModel {
 /**
  * Monkey class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Monkey extends CakeTestModel {
 
@@ -1968,8 +1903,7 @@ class Monkey extends CakeTestModel {
 /**
  * AssociationTest1 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class AssociationTest1 extends CakeTestModel {
 
@@ -2003,8 +1937,7 @@ class AssociationTest1 extends CakeTestModel {
 /**
  * AssociationTest2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class AssociationTest2 extends CakeTestModel {
 
@@ -2038,8 +1971,7 @@ class AssociationTest2 extends CakeTestModel {
 /**
  * Callback class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Callback extends CakeTestModel {
 
@@ -2047,8 +1979,7 @@ class Callback extends CakeTestModel {
 /**
  * CallbackPostTestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class CallbackPostTestModel extends CakeTestModel {
 	public $useTable = 'posts';
@@ -2099,8 +2030,7 @@ class CallbackPostTestModel extends CakeTestModel {
 /**
  * Uuid class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Uuid extends CakeTestModel {
 
@@ -2116,8 +2046,7 @@ class Uuid extends CakeTestModel {
 /**
  * DataTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class DataTest extends CakeTestModel {
 
@@ -2133,8 +2062,7 @@ class DataTest extends CakeTestModel {
 /**
  * TheVoid class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TheVoid extends CakeTestModel {
 
@@ -2158,8 +2086,7 @@ class TheVoid extends CakeTestModel {
 /**
  * ValidationTest1 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ValidationTest1 extends CakeTestModel {
 
@@ -2250,8 +2177,7 @@ class ValidationTest1 extends CakeTestModel {
 /**
  * ValidationTest2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ValidationTest2 extends CakeTestModel {
 
@@ -2312,8 +2238,7 @@ class ValidationTest2 extends CakeTestModel {
 /**
  * Person class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Person extends CakeTestModel {
 
@@ -2343,8 +2268,7 @@ class Person extends CakeTestModel {
 /**
  * UnderscoreField class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class UnderscoreField extends CakeTestModel {
 
@@ -2360,8 +2284,7 @@ class UnderscoreField extends CakeTestModel {
 /**
  * Product class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Product extends CakeTestModel {
 
@@ -2377,8 +2300,7 @@ class Product extends CakeTestModel {
 /**
  * Story class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Story extends CakeTestModel {
 
@@ -2418,8 +2340,7 @@ class Story extends CakeTestModel {
 /**
  * Cd class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Cd extends CakeTestModel {
 
@@ -2443,8 +2364,7 @@ class Cd extends CakeTestModel {
 /**
  * Book class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Book extends CakeTestModel {
 
@@ -2468,8 +2388,7 @@ class Book extends CakeTestModel {
 /**
  * OverallFavorite class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class OverallFavorite extends CakeTestModel {
 
@@ -2485,8 +2404,7 @@ class OverallFavorite extends CakeTestModel {
 /**
  * MyUser class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MyUser extends CakeTestModel {
 
@@ -2510,8 +2428,7 @@ class MyUser extends CakeTestModel {
 /**
  * MyCategory class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MyCategory extends CakeTestModel {
 
@@ -2535,8 +2452,7 @@ class MyCategory extends CakeTestModel {
 /**
  * MyProduct class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MyProduct extends CakeTestModel {
 
@@ -2560,8 +2476,7 @@ class MyProduct extends CakeTestModel {
 /**
  * MyCategoriesMyUser class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MyCategoriesMyUser extends CakeTestModel {
 
@@ -2577,8 +2492,7 @@ class MyCategoriesMyUser extends CakeTestModel {
 /**
  * MyCategoriesMyProduct class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class MyCategoriesMyProduct extends CakeTestModel {
 
@@ -2595,8 +2509,7 @@ class MyCategoriesMyProduct extends CakeTestModel {
 /**
  * NumberTree class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class NumberTree extends CakeTestModel {
 
@@ -2662,8 +2575,7 @@ class NumberTree extends CakeTestModel {
 /**
  * NumberTreeTwo class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class NumberTreeTwo extends NumberTree {
 
@@ -2687,8 +2599,7 @@ class NumberTreeTwo extends NumberTree {
 /**
  * FlagTree class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class FlagTree extends NumberTree {
 
@@ -2704,8 +2615,7 @@ class FlagTree extends NumberTree {
 /**
  * UnconventionalTree class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class UnconventionalTree extends NumberTree {
 
@@ -2728,8 +2638,7 @@ class UnconventionalTree extends NumberTree {
 /**
  * UuidTree class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class UuidTree extends NumberTree {
 
@@ -2745,8 +2654,7 @@ class UuidTree extends NumberTree {
 /**
  * Campaign class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Campaign extends CakeTestModel {
 
@@ -2770,8 +2678,7 @@ class Campaign extends CakeTestModel {
 /**
  * Ad class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Ad extends CakeTestModel {
 
@@ -2803,8 +2710,7 @@ class Ad extends CakeTestModel {
 /**
  * AfterTree class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class AfterTree extends NumberTree {
 
@@ -2834,8 +2740,7 @@ class AfterTree extends NumberTree {
 /**
  * Nonconformant Content class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Content extends CakeTestModel {
 
@@ -2875,8 +2780,7 @@ class Content extends CakeTestModel {
 /**
  * Nonconformant Account class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Account extends CakeTestModel {
 
@@ -2908,8 +2812,7 @@ class Account extends CakeTestModel {
 /**
  * Nonconformant ContentAccount class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class ContentAccount extends CakeTestModel {
 
@@ -2941,8 +2844,7 @@ class ContentAccount extends CakeTestModel {
 /**
  * FilmFile class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class FilmFile extends CakeTestModel {
 	public $name = 'FilmFile';
@@ -2951,8 +2853,7 @@ class FilmFile extends CakeTestModel {
 /**
  * Basket test model
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Basket extends CakeTestModel {
 	public $name = 'Basket';
@@ -2971,8 +2872,7 @@ class Basket extends CakeTestModel {
 /**
  * TestPluginArticle class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TestPluginArticle extends CakeTestModel {
 
@@ -3010,8 +2910,7 @@ class TestPluginArticle extends CakeTestModel {
 /**
  * TestPluginComment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TestPluginComment extends CakeTestModel {
 
@@ -3041,8 +2940,7 @@ class TestPluginComment extends CakeTestModel {
 /**
  * Uuidportfolio class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Uuidportfolio extends CakeTestModel {
 
@@ -3066,8 +2964,7 @@ class Uuidportfolio extends CakeTestModel {
 /**
  * Uuiditem class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class Uuiditem extends CakeTestModel {
 
@@ -3092,8 +2989,7 @@ class Uuiditem extends CakeTestModel {
 /**
  * UuiditemsPortfolio class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class UuiditemsUuidportfolio extends CakeTestModel {
 
@@ -3109,8 +3005,7 @@ class UuiditemsUuidportfolio extends CakeTestModel {
 /**
  * UuiditemsPortfolioNumericid class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class UuiditemsUuidportfolioNumericid extends CakeTestModel {
 
@@ -3126,8 +3021,7 @@ class UuiditemsUuidportfolioNumericid extends CakeTestModel {
 /**
  * TranslateTestModel class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TranslateTestModel extends CakeTestModel {
 
@@ -3159,8 +3053,7 @@ class TranslateTestModel extends CakeTestModel {
 /**
  * TranslateTestModel class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TranslateWithPrefix extends CakeTestModel {
 /**
@@ -3188,8 +3081,7 @@ class TranslateWithPrefix extends CakeTestModel {
 /**
  * TranslatedItem class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TranslatedItem extends CakeTestModel {
 
@@ -3229,8 +3121,7 @@ class TranslatedItem extends CakeTestModel {
 /**
  * TranslatedItem class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TranslatedItem2 extends CakeTestModel {
 /**
@@ -3265,8 +3156,7 @@ class TranslatedItem2 extends CakeTestModel {
 /**
  * TranslatedItemWithTable class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TranslatedItemWithTable extends CakeTestModel {
 
@@ -3322,8 +3212,7 @@ class TranslatedItemWithTable extends CakeTestModel {
 /**
  * TranslateArticleModel class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TranslateArticleModel extends CakeTestModel {
 
@@ -3355,8 +3244,7 @@ class TranslateArticleModel extends CakeTestModel {
 /**
  * TranslatedArticle class.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model
+ * @package       cake.tests.cases.libs.model
  */
 class TranslatedArticle extends CakeTestModel {
 
@@ -3564,8 +3452,7 @@ class TransactionTestModel extends CakeTestModel {
 /**
  * TestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel extends CakeTestModel {
 
@@ -3644,8 +3531,7 @@ class TestModel extends CakeTestModel {
 /**
  * TestModel2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel2 extends CakeTestModel {
 
@@ -3669,8 +3555,7 @@ class TestModel2 extends CakeTestModel {
 /**
  * TestModel4 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel3 extends CakeTestModel {
 
@@ -3694,8 +3579,7 @@ class TestModel3 extends CakeTestModel {
 /**
  * TestModel4 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel4 extends CakeTestModel {
 
@@ -3785,8 +3669,7 @@ class TestModel4 extends CakeTestModel {
 /**
  * TestModel4TestModel7 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel4TestModel7 extends CakeTestModel {
 
@@ -3834,8 +3717,7 @@ class TestModel4TestModel7 extends CakeTestModel {
 /**
  * TestModel5 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel5 extends CakeTestModel {
 
@@ -3908,8 +3790,7 @@ class TestModel5 extends CakeTestModel {
 /**
  * TestModel6 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel6 extends CakeTestModel {
 
@@ -3971,8 +3852,7 @@ class TestModel6 extends CakeTestModel {
 /**
  * TestModel7 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel7 extends CakeTestModel {
 
@@ -4022,8 +3902,7 @@ class TestModel7 extends CakeTestModel {
 /**
  * TestModel8 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel8 extends CakeTestModel {
 
@@ -4088,8 +3967,7 @@ class TestModel8 extends CakeTestModel {
 /**
  * TestModel9 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class TestModel9 extends CakeTestModel {
 
@@ -4152,8 +4030,7 @@ class TestModel9 extends CakeTestModel {
 /**
  * Level class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class Level extends CakeTestModel {
 
@@ -4216,8 +4093,7 @@ class Level extends CakeTestModel {
 /**
  * Group class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class Group extends CakeTestModel {
 
@@ -4283,8 +4159,7 @@ class Group extends CakeTestModel {
 /**
  * User2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class User2 extends CakeTestModel {
 
@@ -4361,8 +4236,7 @@ class User2 extends CakeTestModel {
 /**
  * Category2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class Category2 extends CakeTestModel {
 
@@ -4450,8 +4324,7 @@ class Category2 extends CakeTestModel {
 /**
  * Article2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class Article2 extends CakeTestModel {
 
@@ -4527,8 +4400,7 @@ class Article2 extends CakeTestModel {
 /**
  * CategoryFeatured2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class CategoryFeatured2 extends CakeTestModel {
 
@@ -4579,8 +4451,7 @@ class CategoryFeatured2 extends CakeTestModel {
 /**
  * Featured2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class Featured2 extends CakeTestModel {
 
@@ -4642,8 +4513,7 @@ class Featured2 extends CakeTestModel {
 /**
  * Comment2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class Comment2 extends CakeTestModel {
 
@@ -4701,8 +4571,7 @@ class Comment2 extends CakeTestModel {
 /**
  * ArticleFeatured2 class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class ArticleFeatured2 extends CakeTestModel {
 
@@ -4788,8 +4657,7 @@ class ArticleFeatured2 extends CakeTestModel {
 /**
  * MysqlTestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.model.datasources
+ * @package       cake.tests.cases.libs.model.datasources
  */
 class MysqlTestModel extends Model {
 
diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php
index 9ec3538ea..f9998cdf9 100644
--- a/cake/tests/cases/libs/multibyte.test.php
+++ b/cake/tests/cases/libs/multibyte.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.6833
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Multibyte');
 /**
  * MultibyteTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MultibyteTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index a371cf9f2..45126a053 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', array('Object', 'Controller', 'Model'));
 /**
  * RequestActionPost class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.object
+ * @package       cake.tests.cases.libs.object
  */
 class RequestActionPost extends CakeTestModel {
 
@@ -47,8 +45,7 @@ class RequestActionPost extends CakeTestModel {
 /**
  * RequestActionController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RequestActionController extends Controller {
 
@@ -134,8 +131,7 @@ class RequestActionController extends Controller {
 /**
  * RequestActionPersistentController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RequestActionPersistentController extends Controller {
 
@@ -168,8 +164,7 @@ class RequestActionPersistentController extends Controller {
 /**
  * TestObject class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class TestObject extends Object {
 
@@ -319,8 +314,7 @@ class TestObject extends Object {
 /**
  * ObjectTestModel class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ObjectTestModel extends CakeTestModel {
 	public $useTable = false;
@@ -330,8 +324,7 @@ class ObjectTestModel extends CakeTestModel {
 /**
  * Object Test class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ObjectTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/object_collection.test.php b/cake/tests/cases/libs/object_collection.test.php
index 26ab24951..cfb177378 100644
--- a/cake/tests/cases/libs/object_collection.test.php
+++ b/cake/tests/cases/libs/object_collection.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index e0def56f9..963642cfc 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ if (!defined('FULL_BASE_URL')) {
 /**
  * RouterTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class RouterTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php
index 35013ca53..c3f420782 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/cake/tests/cases/libs/sanitize.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5428
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Sanitize');
 /**
  * DataTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class SanitizeDataTest extends CakeTestModel {
 
@@ -47,8 +45,7 @@ class SanitizeDataTest extends CakeTestModel {
 /**
  * Article class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class SanitizeArticle extends CakeTestModel {
 
@@ -72,8 +69,7 @@ class SanitizeArticle extends CakeTestModel {
 /**
  * SanitizeTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class SanitizeTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/security.test.php b/cake/tests/cases/libs/security.test.php
index da37e7e7c..a1c7a18af 100644
--- a/cake/tests/cases/libs/security.test.php
+++ b/cake/tests/cases/libs/security.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Security');
 /**
  * SecurityTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class SecurityTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/session/cache_session.test.php b/cake/tests/cases/libs/session/cache_session.test.php
index 264318c2a..9f0572cd0 100644
--- a/cake/tests/cases/libs/session/cache_session.test.php
+++ b/cake/tests/cases/libs/session/cache_session.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.libs.session
+ * @package       cake.tests.cases.libs.session
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/session/database_session.test.php b/cake/tests/cases/libs/session/database_session.test.php
index deb867db6..b3c457c2d 100644
--- a/cake/tests/cases/libs/session/database_session.test.php
+++ b/cake/tests/cases/libs/session/database_session.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.cases.libs.session
+ * @package       cake.tests.cases.libs.session
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index a4d6a5427..c648940bb 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Set');
 /**
  * SetTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class SetTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php
index 1e5e84d54..124e252d7 100644
--- a/cake/tests/cases/libs/string.test.php
+++ b/cake/tests/cases/libs/string.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'String');
 /**
  * StringTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class StringTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php
index b0cbbc6e3..524e77fc3 100644
--- a/cake/tests/cases/libs/test_manager.test.php
+++ b/cake/tests/cases/libs/test_manager.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -30,8 +29,7 @@ class TestTestManager extends TestManager {
 /**
  * TestManagerTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class TestManagerTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 002902a9d..2766823b9 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Validation');
 /**
  * CustomValidator class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class CustomValidator {
 
@@ -88,8 +86,7 @@ class TestDeValidation {
 /**
  * Test Case for Validation Class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ValidationTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 025dffae1..44b38f903 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', array('View', 'Helper', 'Router'));
 /**
  * HelperTestPost class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class HelperTestPost extends Model {
 
@@ -66,8 +64,7 @@ class HelperTestPost extends Model {
 /**
  * HelperTestComment class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class HelperTestComment extends Model {
 
@@ -101,8 +98,7 @@ class HelperTestComment extends Model {
 /**
  * HelperTestTag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class HelperTestTag extends Model {
 
@@ -134,8 +130,7 @@ class HelperTestTag extends Model {
 /**
  * HelperTestPostsTag class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class HelperTestPostsTag extends Model {
 
@@ -187,8 +182,7 @@ class TestHelper extends Helper {
 /**
  * Html5TestHelper class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class Html5TestHelper extends TestHelper {
 
@@ -217,8 +211,7 @@ class Html5TestHelper extends TestHelper {
 /**
  * HelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class HelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helper_collection.test.php b/cake/tests/cases/libs/view/helper_collection.test.php
index d3b7698fe..e87d67a2b 100644
--- a/cake/tests/cases/libs/view/helper_collection.test.php
+++ b/cake/tests/cases/libs/view/helper_collection.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index 95d8e9a01..cc08e4d83 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Helper', 'Cache');
 /**
  * CacheTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class CacheTestController extends Controller {
 
@@ -55,8 +53,7 @@ class CacheTestController extends Controller {
 /**
  * CacheHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class CacheHelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 8c01f95eb..dccaf21c0 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,7 +24,7 @@ App::import('Helper', 'Form');
  * ContactTestController class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class ContactTestController extends Controller {
 
@@ -50,7 +49,7 @@ class ContactTestController extends Controller {
  * Contact class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class Contact extends CakeTestModel {
 
@@ -147,7 +146,7 @@ class Contact extends CakeTestModel {
  * ContactTagsContact class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class ContactTagsContact extends CakeTestModel {
 
@@ -195,7 +194,7 @@ class ContactTagsContact extends CakeTestModel {
  * ContactNonStandardPk class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class ContactNonStandardPk extends Contact {
 
@@ -233,7 +232,7 @@ class ContactNonStandardPk extends Contact {
  * ContactTag class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class ContactTag extends Model {
 
@@ -263,7 +262,7 @@ class ContactTag extends Model {
  * UserForm class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class UserForm extends CakeTestModel {
 
@@ -323,7 +322,7 @@ class UserForm extends CakeTestModel {
  * OpenidUrl class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class OpenidUrl extends CakeTestModel {
 
@@ -399,7 +398,7 @@ class OpenidUrl extends CakeTestModel {
  * ValidateUser class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class ValidateUser extends CakeTestModel {
 
@@ -468,7 +467,7 @@ class ValidateUser extends CakeTestModel {
  * ValidateProfile class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class ValidateProfile extends CakeTestModel {
 
@@ -548,7 +547,7 @@ class ValidateProfile extends CakeTestModel {
  * ValidateItem class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class ValidateItem extends CakeTestModel {
 
@@ -617,7 +616,7 @@ class ValidateItem extends CakeTestModel {
  * TestMail class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class TestMail extends CakeTestModel {
 
@@ -650,7 +649,7 @@ class TestMail extends CakeTestModel {
  * FormHelperTest class
  *
  * @package	   cake
- * @subpackage	cake.tests.cases.libs.view.helpers
+ * @package   	cake.tests.cases.libs.view.helpers
  */
 class FormHelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 2defe93ab..142fe91b5 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ if (!defined('FULL_BASE_URL')) {
 /**
  * TheHtmlTestController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class TheHtmlTestController extends Controller {
 
@@ -52,8 +50,7 @@ class TheHtmlTestController extends Controller {
 /**
  * HtmlHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class HtmlHelperTest extends CakeTestCase {
 
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 87c2b8b2b..868581ff6 100644
--- a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
@@ -15,7 +15,7 @@
  * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link            http://cakephp.org CakePHP Project
  * @package         cake.tests
- * @subpackage      cake.tests.cases.views.helpers
+ * @package         cake.tests.cases.views.helpers
  * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Helper', array('Html', 'Js', 'JqueryEngine'));
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
index 1fd1602a7..8926ab94e 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -64,8 +63,7 @@ class OptionEngineHelper extends JsBaseEngineHelper {
 /**
  * JsHelper TestCase.
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class JsHelperTest extends CakeTestCase {
 /**
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 53af75a80..1b44d4497 100644
--- a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
@@ -17,7 +17,7 @@
  * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link            http://cakephp.org CakePHP Project
  * @package         cake.tests
- * @subpackage      cake.tests.cases.views.helpers
+ * @package         cake.tests.cases.views.helpers
  * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Helper', array('Html', 'Js', 'MootoolsEngine'));
diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php
index 30022d2cd..99857df99 100644
--- a/cake/tests/cases/libs/view/helpers/number.test.php
+++ b/cake/tests/cases/libs/view/helpers/number.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('View', 'View');
 /**
  * NumberHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class NumberHelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 2d0bda4a9..a1f01ea1e 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ if (!defined('FULL_BASE_URL')) {
 /**
  * PaginatorHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class PaginatorHelperTest extends CakeTestCase {
 
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 395b25cd7..86b8d3a73 100644
--- a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
@@ -15,7 +15,7 @@
  * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link            http://cakephp.org CakePHP Project
  * @package         cake.tests
- * @subpackage      cake.tests.cases.views.helpers
+ * @package         cake.tests.cases.views.helpers
  * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::import('Helper', array('Html', 'Js', 'PrototypeEngine'));
diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php
index f836d890f..93c344d67 100644
--- a/cake/tests/cases/libs/view/helpers/rss.test.php
+++ b/cake/tests/cases/libs/view/helpers/rss.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Helper', array('Rss', 'Time'));
 /**
  * RssHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class RssHelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index c61421bd1..cf5169243 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Helper', array('Session'));
 /**
  * SessionHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class SessionHelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
index cdb5dcecb..03ad9ee2f 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Helper', 'Text');
 /**
  * TextHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class TextHelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index 668467296..67481f5a4 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ App::import('Core', 'View');
 /**
  * TimeHelperTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
+ * @package       cake.tests.cases.libs.view.helpers
  */
 class TimeHelperTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/media.test.php b/cake/tests/cases/libs/view/media.test.php
index 39b9d190d..115f74505 100644
--- a/cake/tests/cases/libs/view/media.test.php
+++ b/cake/tests/cases/libs/view/media.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', array('Media', 'Controller', 'CakeResponse'));
 /**
  * MediaViewTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class MediaViewTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php
index 314d38ba7..dc03b6663 100644
--- a/cake/tests/cases/libs/view/theme.test.php
+++ b/cake/tests/cases/libs/view/theme.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ App::import('Core', 'Controller');
 /**
  * ThemePostsController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class ThemePostsController extends Controller {
 
@@ -57,8 +55,7 @@ class ThemePostsController extends Controller {
 /**
  * TestThemeView class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class TestThemeView extends ThemeView {
 
@@ -101,8 +98,7 @@ class TestThemeView extends ThemeView {
 /**
  * ThemeViewTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ThemeViewTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index 30ff72866..70ef8a6ca 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@ App::import('Core', array('ErrorHandler'));
 /**
  * ViewPostsController class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class ViewPostsController extends Controller {
 
@@ -74,8 +72,7 @@ class ViewPostsController extends Controller {
 /**
  * TestView class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class TestView extends View {
 
@@ -139,8 +136,7 @@ class TestView extends View {
 /**
  * TestAfterHelper class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view
+ * @package       cake.tests.cases.libs.view
  */
 class TestAfterHelper extends Helper {
 
@@ -176,8 +172,7 @@ class TestAfterHelper extends Helper {
 /**
  * ViewTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class ViewTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index 666a4f45d..169c38933 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ App::import('Core', 'Xml');
 /**
  * Article class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class XmlArticle extends CakeTestModel {
 
@@ -50,8 +48,7 @@ class XmlArticle extends CakeTestModel {
 /**
  * User class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class XmlUser extends CakeTestModel {
 
@@ -73,8 +70,7 @@ class XmlUser extends CakeTestModel {
 /**
  * XmlTest class
  *
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  */
 class XmlTest extends CakeTestCase {
 
diff --git a/cake/tests/fixtures/account_fixture.php b/cake/tests/fixtures/account_fixture.php
index f4f948dfa..756d92355 100644
--- a/cake/tests/fixtures/account_fixture.php
+++ b/cake/tests/fixtures/account_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AccountFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php
index e95de48e8..93fc08664 100644
--- a/cake/tests/fixtures/aco_action_fixture.php
+++ b/cake/tests/fixtures/aco_action_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AcoActionFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php
index be296aaf8..77c625781 100644
--- a/cake/tests/fixtures/aco_fixture.php
+++ b/cake/tests/fixtures/aco_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AcoFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php
index d277beea1..a45c2dc6e 100644
--- a/cake/tests/fixtures/aco_two_fixture.php
+++ b/cake/tests/fixtures/aco_two_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AcoTwoFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/ad_fixture.php b/cake/tests/fixtures/ad_fixture.php
index c6f955da4..56989b072 100644
--- a/cake/tests/fixtures/ad_fixture.php
+++ b/cake/tests/fixtures/ad_fixture.php
@@ -13,8 +13,7 @@
  *
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://www.cakephp.org
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
 /**
  * AdFixture class
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AdFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php
index 8c1e8b629..32c7bca5e 100644
--- a/cake/tests/fixtures/advertisement_fixture.php
+++ b/cake/tests/fixtures/advertisement_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AdvertisementFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/after_tree_fixture.php b/cake/tests/fixtures/after_tree_fixture.php
index 098863888..1c5fa8e9c 100644
--- a/cake/tests/fixtures/after_tree_fixture.php
+++ b/cake/tests/fixtures/after_tree_fixture.php
@@ -13,8 +13,7 @@
  *
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://www.cakephp.org
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
 /**
  * AdFixture class
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AfterTreeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php
index d0807c788..a62287a06 100644
--- a/cake/tests/fixtures/another_article_fixture.php
+++ b/cake/tests/fixtures/another_article_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AnotherArticleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php
index 0de5f3bea..e0e9d3e88 100644
--- a/cake/tests/fixtures/apple_fixture.php
+++ b/cake/tests/fixtures/apple_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AppleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php
index f224dfc97..f0f5adceb 100644
--- a/cake/tests/fixtures/aro_fixture.php
+++ b/cake/tests/fixtures/aro_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AroFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php
index 86b774720..409be3489 100644
--- a/cake/tests/fixtures/aro_two_fixture.php
+++ b/cake/tests/fixtures/aro_two_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AroTwoFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php
index 6c204fc49..4265bf011 100644
--- a/cake/tests/fixtures/aros_aco_fixture.php
+++ b/cake/tests/fixtures/aros_aco_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ArosAcoFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php
index 9c3251d64..e62e48306 100644
--- a/cake/tests/fixtures/aros_aco_two_fixture.php
+++ b/cake/tests/fixtures/aros_aco_two_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ArosAcoTwoFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php
index 64c4bc38c..062813621 100644
--- a/cake/tests/fixtures/article_featured_fixture.php
+++ b/cake/tests/fixtures/article_featured_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ArticleFeaturedFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php
index e84b863d5..60c8c7096 100644
--- a/cake/tests/fixtures/article_featureds_tags_fixture.php
+++ b/cake/tests/fixtures/article_featureds_tags_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ArticleFeaturedsTagsFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php
index b6f21e7b3..41b256da1 100644
--- a/cake/tests/fixtures/article_fixture.php
+++ b/cake/tests/fixtures/article_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ArticleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php
index 1091901a6..c475d87a4 100644
--- a/cake/tests/fixtures/articles_tag_fixture.php
+++ b/cake/tests/fixtures/articles_tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ArticlesTagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/assert_tags_test_case.php b/cake/tests/fixtures/assert_tags_test_case.php
index 27cc08d19..1cef87aea 100644
--- a/cake/tests/fixtures/assert_tags_test_case.php
+++ b/cake/tests/fixtures/assert_tags_test_case.php
@@ -5,8 +5,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 /**
  * This class helpes in indirectly testing the functionaliteies of CakeTestCase::assertTags
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AssertTagsTestCase extends CakeTestCase {
 
diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php
index d43defa4f..748c10d78 100644
--- a/cake/tests/fixtures/attachment_fixture.php
+++ b/cake/tests/fixtures/attachment_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AttachmentFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php
index fb727e6a7..8c82b6717 100644
--- a/cake/tests/fixtures/auth_user_custom_field_fixture.php
+++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.1.8013
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AuthUserCustomFieldFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php
index 2613b3d64..5efc6be2e 100644
--- a/cake/tests/fixtures/auth_user_fixture.php
+++ b/cake/tests/fixtures/auth_user_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AuthUserFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php
index 2f9381621..8f705f4fe 100644
--- a/cake/tests/fixtures/author_fixture.php
+++ b/cake/tests/fixtures/author_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class AuthorFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/bake_article_fixture.php b/cake/tests/fixtures/bake_article_fixture.php
index 304bd6b3c..8543ee6ba 100644
--- a/cake/tests/fixtures/bake_article_fixture.php
+++ b/cake/tests/fixtures/bake_article_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BakeArticleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/bake_articles_bake_tag_fixture.php b/cake/tests/fixtures/bake_articles_bake_tag_fixture.php
index d1f6ef5d8..d046718b3 100644
--- a/cake/tests/fixtures/bake_articles_bake_tag_fixture.php
+++ b/cake/tests/fixtures/bake_articles_bake_tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BakeArticlesBakeTagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/bake_comment_fixture.php b/cake/tests/fixtures/bake_comment_fixture.php
index 8de6696be..b75d0821b 100644
--- a/cake/tests/fixtures/bake_comment_fixture.php
+++ b/cake/tests/fixtures/bake_comment_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * BakeCommentFixture fixture for testing bake
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BakeCommentFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/bake_tag_fixture.php b/cake/tests/fixtures/bake_tag_fixture.php
index e5057385e..74dfa473b 100644
--- a/cake/tests/fixtures/bake_tag_fixture.php
+++ b/cake/tests/fixtures/bake_tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BakeTagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/basket_fixture.php b/cake/tests/fixtures/basket_fixture.php
index 7ad9f8d0d..3984c65b1 100644
--- a/cake/tests/fixtures/basket_fixture.php
+++ b/cake/tests/fixtures/basket_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BasketFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php
index dd1b4c130..df915dc71 100644
--- a/cake/tests/fixtures/bid_fixture.php
+++ b/cake/tests/fixtures/bid_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BidFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php
index f1cd03351..868ee4c5c 100644
--- a/cake/tests/fixtures/binary_test_fixture.php
+++ b/cake/tests/fixtures/binary_test_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6700
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BinaryTestFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/book_fixture.php b/cake/tests/fixtures/book_fixture.php
index 83e1b6f09..bf85000af 100644
--- a/cake/tests/fixtures/book_fixture.php
+++ b/cake/tests/fixtures/book_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7198
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class BookFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php
index ace714d5b..84b1a64b1 100644
--- a/cake/tests/fixtures/cache_test_model_fixture.php
+++ b/cake/tests/fixtures/cache_test_model_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CacheTestModelFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php
index 6d6103ca0..f28c6277f 100644
--- a/cake/tests/fixtures/callback_fixture.php
+++ b/cake/tests/fixtures/callback_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CallbackFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/campaign_fixture.php b/cake/tests/fixtures/campaign_fixture.php
index 1d4fb7edb..ec0411b76 100644
--- a/cake/tests/fixtures/campaign_fixture.php
+++ b/cake/tests/fixtures/campaign_fixture.php
@@ -13,8 +13,7 @@
  *
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://www.cakephp.org
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
 /**
  * CampaignFixture class
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CampaignFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php
index 419699773..7ea0fba2d 100644
--- a/cake/tests/fixtures/category_fixture.php
+++ b/cake/tests/fixtures/category_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CategoryFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php
index 65b840cbc..92563dd7b 100644
--- a/cake/tests/fixtures/category_thread_fixture.php
+++ b/cake/tests/fixtures/category_thread_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CategoryThreadFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/cd_fixture.php b/cake/tests/fixtures/cd_fixture.php
index 59b4952cf..c2e668c0a 100644
--- a/cake/tests/fixtures/cd_fixture.php
+++ b/cake/tests/fixtures/cd_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7198
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CdFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php
index 559c78e00..2f5cfaa26 100644
--- a/cake/tests/fixtures/comment_fixture.php
+++ b/cake/tests/fixtures/comment_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CommentFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/content_account_fixture.php b/cake/tests/fixtures/content_account_fixture.php
index b765fc403..4cf803a22 100644
--- a/cake/tests/fixtures/content_account_fixture.php
+++ b/cake/tests/fixtures/content_account_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ContentAccountFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/content_fixture.php b/cake/tests/fixtures/content_fixture.php
index a7e9eb5ca..067410fbf 100644
--- a/cake/tests/fixtures/content_fixture.php
+++ b/cake/tests/fixtures/content_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ContentFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/cake/tests/fixtures/counter_cache_post_fixture.php
index 9aa3f2ce1..ea7ec7b9b 100644
--- a/cake/tests/fixtures/counter_cache_post_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CounterCachePostFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
index efa9c553c..cdb05f0da 100644
--- a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CounterCachePostNonstandardPrimaryKeyFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/cake/tests/fixtures/counter_cache_user_fixture.php
index 9ebc2e3ac..4d47c33cd 100644
--- a/cake/tests/fixtures/counter_cache_user_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CounterCacheUserFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
index 3134f4650..3fe938bc6 100644
--- a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class CounterCacheUserNonstandardPrimaryKeyFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php
index 43c4fd7d3..273777c2f 100644
--- a/cake/tests/fixtures/data_test_fixture.php
+++ b/cake/tests/fixtures/data_test_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6700
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class DataTestFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php
index 9bfaad3d7..39055a018 100644
--- a/cake/tests/fixtures/datatype_fixture.php
+++ b/cake/tests/fixtures/datatype_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7026
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class DatatypeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php
index 5514e696e..d9765317a 100644
--- a/cake/tests/fixtures/dependency_fixture.php
+++ b/cake/tests/fixtures/dependency_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6879//Correct version number as needed**
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for file.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6879//Correct version number as needed**
  */
 class DependencyFixture extends CakeTestFixture {
diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php
index c927feeda..8371cbe21 100644
--- a/cake/tests/fixtures/device_fixture.php
+++ b/cake/tests/fixtures/device_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class DeviceFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php
index 6750ac7ed..7feb7b97c 100644
--- a/cake/tests/fixtures/device_type_category_fixture.php
+++ b/cake/tests/fixtures/device_type_category_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class DeviceTypeCategoryFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php
index ecbdb2091..ddd82adc1 100644
--- a/cake/tests/fixtures/device_type_fixture.php
+++ b/cake/tests/fixtures/device_type_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class DeviceTypeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php
index 485cdeca4..732eae1f2 100644
--- a/cake/tests/fixtures/document_directory_fixture.php
+++ b/cake/tests/fixtures/document_directory_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class DocumentDirectoryFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php
index 5d9f438bf..93c1ec4ae 100644
--- a/cake/tests/fixtures/document_fixture.php
+++ b/cake/tests/fixtures/document_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class DocumentFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php
index f7b609ed7..cbc27668c 100644
--- a/cake/tests/fixtures/exterior_type_category_fixture.php
+++ b/cake/tests/fixtures/exterior_type_category_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ExteriorTypeCategoryFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php
index 3e26310ff..a42084973 100644
--- a/cake/tests/fixtures/feature_set_fixture.php
+++ b/cake/tests/fixtures/feature_set_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class FeatureSetFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php
index 4777e2d36..1070e2732 100644
--- a/cake/tests/fixtures/featured_fixture.php
+++ b/cake/tests/fixtures/featured_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class FeaturedFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/film_file_fixture.php b/cake/tests/fixtures/film_file_fixture.php
index fa9fe736b..9a07df3cd 100644
--- a/cake/tests/fixtures/film_file_fixture.php
+++ b/cake/tests/fixtures/film_file_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class FilmFileFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/fixturized_test_case.php b/cake/tests/fixtures/fixturized_test_case.php
index ad2486784..810a2089f 100644
--- a/cake/tests/fixtures/fixturized_test_case.php
+++ b/cake/tests/fixtures/fixturized_test_case.php
@@ -5,8 +5,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 /**
  * This class helps in testing the life-cycle of fixtures inside a CakeTestCase
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class FixturizedTestCase extends CakeTestCase {
 
diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php
index 31c39e1a6..229ad81eb 100644
--- a/cake/tests/fixtures/flag_tree_fixture.php
+++ b/cake/tests/fixtures/flag_tree_fixture.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5331
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  *
  * Like Number Tree, but uses a flag for testing scope parameters
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class FlagTreeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/fruit_fixture.php b/cake/tests/fixtures/fruit_fixture.php
index 484b99478..abd9eeaa4 100644
--- a/cake/tests/fixtures/fruit_fixture.php
+++ b/cake/tests/fixtures/fruit_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7953
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class FruitFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
index 8d7cff938..afa328b38 100644
--- a/cake/tests/fixtures/fruits_uuid_tag_fixture.php
+++ b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7953
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class FruitsUuidTagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/group_update_all_fixture.php b/cake/tests/fixtures/group_update_all_fixture.php
index e1dd56bcc..ebd320b99 100644
--- a/cake/tests/fixtures/group_update_all_fixture.php
+++ b/cake/tests/fixtures/group_update_all_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class GroupUpdateAllFixture extends CakeTestFixture {
     public $name = 'GroupUpdateAll';
diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php
index e3988bcc4..2f90ea64a 100644
--- a/cake/tests/fixtures/home_fixture.php
+++ b/cake/tests/fixtures/home_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class HomeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php
index 369b877b9..1eaaae118 100644
--- a/cake/tests/fixtures/image_fixture.php
+++ b/cake/tests/fixtures/image_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ImageFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php
index fdca77fcb..8aa2487a1 100644
--- a/cake/tests/fixtures/item_fixture.php
+++ b/cake/tests/fixtures/item_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ItemFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php
index 88029e048..fd128a1eb 100644
--- a/cake/tests/fixtures/items_portfolio_fixture.php
+++ b/cake/tests/fixtures/items_portfolio_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ItemsPortfolioFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php
index f9d9776a3..d979f30c4 100644
--- a/cake/tests/fixtures/join_a_b_fixture.php
+++ b/cake/tests/fixtures/join_a_b_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6317
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class JoinABFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php
index b8c9786ca..f66fa499f 100644
--- a/cake/tests/fixtures/join_a_c_fixture.php
+++ b/cake/tests/fixtures/join_a_c_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6317
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class JoinACFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php
index 0910b132d..891697321 100644
--- a/cake/tests/fixtures/join_a_fixture.php
+++ b/cake/tests/fixtures/join_a_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6317
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class JoinAFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php
index e9f5a9019..a636e7243 100644
--- a/cake/tests/fixtures/join_b_fixture.php
+++ b/cake/tests/fixtures/join_b_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6317
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class JoinBFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php
index c50a606e8..d858a5e11 100644
--- a/cake/tests/fixtures/join_c_fixture.php
+++ b/cake/tests/fixtures/join_c_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6317
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class JoinCFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php
index 75c009f28..13b8dc8f6 100644
--- a/cake/tests/fixtures/join_thing_fixture.php
+++ b/cake/tests/fixtures/join_thing_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class JoinThingFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php
index 0c62b85f9..e491f031f 100644
--- a/cake/tests/fixtures/message_fixture.php
+++ b/cake/tests/fixtures/message_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class MessageFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/cake/tests/fixtures/my_categories_my_products_fixture.php
index a20ad3daa..d33fafa86 100644
--- a/cake/tests/fixtures/my_categories_my_products_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_products_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class MyCategoriesMyProductsFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/cake/tests/fixtures/my_categories_my_users_fixture.php
index 0366794dd..c6c557e0f 100644
--- a/cake/tests/fixtures/my_categories_my_users_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_users_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class MyCategoriesMyUsersFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/my_category_fixture.php b/cake/tests/fixtures/my_category_fixture.php
index ba1225a1c..954a2d429 100644
--- a/cake/tests/fixtures/my_category_fixture.php
+++ b/cake/tests/fixtures/my_category_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class MyCategoryFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php
index e934e4447..424c820c9 100644
--- a/cake/tests/fixtures/my_product_fixture.php
+++ b/cake/tests/fixtures/my_product_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class MyProductFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/my_user_fixture.php b/cake/tests/fixtures/my_user_fixture.php
index fb2d0c236..09922a594 100644
--- a/cake/tests/fixtures/my_user_fixture.php
+++ b/cake/tests/fixtures/my_user_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class MyUserFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php
index e5f88c49d..3e527eb0e 100644
--- a/cake/tests/fixtures/node_fixture.php
+++ b/cake/tests/fixtures/node_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6879 //Correct version number as needed**
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for file.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6879 //Correct version number as needed**
  */
 class NodeFixture extends CakeTestFixture {
diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php
index 80ce2970e..84ea86fce 100644
--- a/cake/tests/fixtures/number_tree_fixture.php
+++ b/cake/tests/fixtures/number_tree_fixture.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5331
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  *
  * Generates a tree of data for use testing the tree behavior
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class NumberTreeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/cake/tests/fixtures/number_tree_two_fixture.php
index 20f154844..2414acb60 100644
--- a/cake/tests/fixtures/number_tree_two_fixture.php
+++ b/cake/tests/fixtures/number_tree_two_fixture.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5331
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,8 +24,7 @@
  *
  * Generates a tree of data for use testing the tree behavior
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class NumberTreeTwoFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php
index dc5b3b45f..06f86e289 100644
--- a/cake/tests/fixtures/numeric_article_fixture.php
+++ b/cake/tests/fixtures/numeric_article_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class NumericArticleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/cake/tests/fixtures/overall_favorite_fixture.php
index ddb555496..fb46f74d1 100644
--- a/cake/tests/fixtures/overall_favorite_fixture.php
+++ b/cake/tests/fixtures/overall_favorite_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7198
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class OverallFavoriteFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php
index ae8b9391d..652b1dc31 100644
--- a/cake/tests/fixtures/person_fixture.php
+++ b/cake/tests/fixtures/person_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6700
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class PersonFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php
index 40a18c7b7..a3c9c3985 100644
--- a/cake/tests/fixtures/portfolio_fixture.php
+++ b/cake/tests/fixtures/portfolio_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class PortfolioFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php
index 98264bd68..dcc808a60 100644
--- a/cake/tests/fixtures/post_fixture.php
+++ b/cake/tests/fixtures/post_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class PostFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php
index cddf3e4ee..9a1217569 100644
--- a/cake/tests/fixtures/posts_tag_fixture.php
+++ b/cake/tests/fixtures/posts_tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class PostsTagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php
index 4194f97a7..058489f58 100644
--- a/cake/tests/fixtures/primary_model_fixture.php
+++ b/cake/tests/fixtures/primary_model_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class PrimaryModelFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/product_fixture.php b/cake/tests/fixtures/product_fixture.php
index 207ae2073..effee768a 100644
--- a/cake/tests/fixtures/product_fixture.php
+++ b/cake/tests/fixtures/product_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ProductFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/product_update_all_fixture.php b/cake/tests/fixtures/product_update_all_fixture.php
index 6ca5377f9..80d11cb2f 100644
--- a/cake/tests/fixtures/product_update_all_fixture.php
+++ b/cake/tests/fixtures/product_update_all_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ProductUpdateAllFixture extends CakeTestFixture {
 	public $name = 'ProductUpdateAll';
diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php
index d28aa1578..961cf532a 100644
--- a/cake/tests/fixtures/project_fixture.php
+++ b/cake/tests/fixtures/project_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ProjectFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php
index f5e915765..fa150a748 100644
--- a/cake/tests/fixtures/sample_fixture.php
+++ b/cake/tests/fixtures/sample_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class SampleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php
index c273850d5..0fcf88699 100644
--- a/cake/tests/fixtures/secondary_model_fixture.php
+++ b/cake/tests/fixtures/secondary_model_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class SecondaryModelFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php
index d517730b1..cbbc89d5c 100644
--- a/cake/tests/fixtures/session_fixture.php
+++ b/cake/tests/fixtures/session_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class SessionFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php
index 5b57d72b1..b6d965298 100644
--- a/cake/tests/fixtures/something_else_fixture.php
+++ b/cake/tests/fixtures/something_else_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class SomethingElseFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php
index c0dfccd6f..356b533ca 100644
--- a/cake/tests/fixtures/something_fixture.php
+++ b/cake/tests/fixtures/something_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class SomethingFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php
index cc2bcf619..4e441b64f 100644
--- a/cake/tests/fixtures/stories_tag_fixture.php
+++ b/cake/tests/fixtures/stories_tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class StoriesTagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php
index 4604a202f..3a8cdfa6a 100644
--- a/cake/tests/fixtures/story_fixture.php
+++ b/cake/tests/fixtures/story_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class StoryFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php
index 59fb672f9..f143adc33 100644
--- a/cake/tests/fixtures/syfile_fixture.php
+++ b/cake/tests/fixtures/syfile_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class SyfileFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php
index a56e4c485..fb792236c 100644
--- a/cake/tests/fixtures/tag_fixture.php
+++ b/cake/tests/fixtures/tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php
index af5dfd8ea..79c3c36ff 100644
--- a/cake/tests/fixtures/test_plugin_article_fixture.php
+++ b/cake/tests/fixtures/test_plugin_article_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 7660
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TestPluginArticleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php
index 854e098bf..d70038e32 100644
--- a/cake/tests/fixtures/test_plugin_comment_fixture.php
+++ b/cake/tests/fixtures/test_plugin_comment_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 7660
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TestPluginCommentFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php
index 24060d815..4d64767ce 100644
--- a/cake/tests/fixtures/the_paper_monkies_fixture.php
+++ b/cake/tests/fixtures/the_paper_monkies_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ThePaperMonkiesFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php
index 76bb1d28b..ed24b6b82 100644
--- a/cake/tests/fixtures/thread_fixture.php
+++ b/cake/tests/fixtures/thread_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class ThreadFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php
index 756153814..d28417539 100644
--- a/cake/tests/fixtures/translate_article_fixture.php
+++ b/cake/tests/fixtures/translate_article_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TranslateArticleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php
index bc7926a4d..730dfad64 100644
--- a/cake/tests/fixtures/translate_fixture.php
+++ b/cake/tests/fixtures/translate_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TranslateFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php
index bae466c86..08a0a3d9a 100644
--- a/cake/tests/fixtures/translate_table_fixture.php
+++ b/cake/tests/fixtures/translate_table_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TranslateTableFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/translate_with_prefix_fixture.php b/cake/tests/fixtures/translate_with_prefix_fixture.php
index 04549b02e..87045605f 100644
--- a/cake/tests/fixtures/translate_with_prefix_fixture.php
+++ b/cake/tests/fixtures/translate_with_prefix_fixture.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5669
  * @version       $Revision$
  * @modifiedby    $LastChangedBy$
@@ -26,8 +25,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TranslateWithPrefixFixture extends CakeTestFixture {
 /**
diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php
index 978a8b5f3..b5238baae 100644
--- a/cake/tests/fixtures/translated_article_fixture.php
+++ b/cake/tests/fixtures/translated_article_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TranslatedArticleFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php
index 91a0571eb..95eede406 100644
--- a/cake/tests/fixtures/translated_item_fixture.php
+++ b/cake/tests/fixtures/translated_item_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class TranslatedItemFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/cake/tests/fixtures/unconventional_tree_fixture.php
index 7d1b39838..ea57f6f06 100644
--- a/cake/tests/fixtures/unconventional_tree_fixture.php
+++ b/cake/tests/fixtures/unconventional_tree_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7879
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@
  * Like Number tree, but doesn't use the default values for lft and rght or parent_id
  *
  * @uses          CakeTestFixture
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UnconventionalTreeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php
index 3322284b1..1962e403d 100644
--- a/cake/tests/fixtures/underscore_field_fixture.php
+++ b/cake/tests/fixtures/underscore_field_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * UnderscoreFieldFixture class
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UnderscoreFieldFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php
index 86683d2e9..2adb7841f 100644
--- a/cake/tests/fixtures/user_fixture.php
+++ b/cake/tests/fixtures/user_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UserFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php
index 559dc810b..50f735ceb 100644
--- a/cake/tests/fixtures/uuid_fixture.php
+++ b/cake/tests/fixtures/uuid_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6700
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UuidFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/cake/tests/fixtures/uuid_tag_fixture.php
index a126903e8..94e1ba7bc 100644
--- a/cake/tests/fixtures/uuid_tag_fixture.php
+++ b/cake/tests/fixtures/uuid_tag_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7953
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UuidTagFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/cake/tests/fixtures/uuid_tree_fixture.php
index c34bc2c3c..5828533e2 100644
--- a/cake/tests/fixtures/uuid_tree_fixture.php
+++ b/cake/tests/fixtures/uuid_tree_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7984
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@
  * UuidTreeFixture class
  *
  * @uses          CakeTestFixture
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UuidTreeFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/cake/tests/fixtures/uuiditem_fixture.php
index 1e70eb287..5b6e15e8e 100644
--- a/cake/tests/fixtures/uuiditem_fixture.php
+++ b/cake/tests/fixtures/uuiditem_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UuiditemFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
index 94a5a2e49..eeafb752d 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UuiditemsUuidportfolioFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
index c4ae9c768..f8f6baedc 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture {
 
diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/cake/tests/fixtures/uuidportfolio_fixture.php
index fb3745d3b..3c6b86f28 100644
--- a/cake/tests/fixtures/uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuidportfolio_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.tests.fixtures
+ * @package       cake.tests.fixtures
  */
 class UuidportfolioFixture extends CakeTestFixture {
 
diff --git a/cake/tests/lib/cake_fixture_manager.php b/cake/tests/lib/cake_fixture_manager.php
index 099da5557..2615847ca 100644
--- a/cake/tests/lib/cake_fixture_manager.php
+++ b/cake/tests/lib/cake_fixture_manager.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index 1a8131679..7581bd6a8 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ require_once CAKE_TESTS_LIB . 'cake_test_fixture.php';
 /**
  * CakeTestCase class
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class CakeTestCase extends PHPUnit_Framework_TestCase {
 
diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
index b7676cf5c..ec56d09ec 100644
--- a/cake/tests/lib/cake_test_fixture.php
+++ b/cake/tests/lib/cake_test_fixture.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,8 +22,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class CakeTestFixture {
 
diff --git a/cake/tests/lib/cake_test_model.php b/cake/tests/lib/cake_test_model.php
index 819c3cbe2..a896a50d9 100644
--- a/cake/tests/lib/cake_test_model.php
+++ b/cake/tests/lib/cake_test_model.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,8 +21,7 @@ require_once LIBS.'model'.DS.'model.php';
 /**
  * Short description for class.
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class CakeTestModel extends Model {
 	public $useDbConfig = 'test';
diff --git a/cake/tests/lib/cake_test_suite.php b/cake/tests/lib/cake_test_suite.php
index c1ad5adb5..f7d7497d5 100644
--- a/cake/tests/lib/cake_test_suite.php
+++ b/cake/tests/lib/cake_test_suite.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
index 4642dc2b4..36937ed2c 100644
--- a/cake/tests/lib/cake_test_suite_dispatcher.php
+++ b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/cake_web_test_case.php b/cake/tests/lib/cake_web_test_case.php
index 8a98e3525..256e75933 100644
--- a/cake/tests/lib/cake_web_test_case.php
+++ b/cake/tests/lib/cake_web_test_case.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,8 +20,7 @@
 /**
  * Simple wrapper for the WebTestCase provided by SimpleTest
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class CakeWebTestCase extends WebTestCase {
 }
diff --git a/cake/tests/lib/controller_test_case.php b/cake/tests/lib/controller_test_case.php
index 91940f928..97e71303e 100644
--- a/cake/tests/lib/controller_test_case.php
+++ b/cake/tests/lib/controller_test_case.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ App::import('Core', array('Router', 'CakeRequest', 'CakeResponse', 'Helper'));
 /**
  * ControllerTestDispatcher class
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class ControllerTestDispatcher extends Dispatcher {
 
@@ -77,8 +75,7 @@ class ControllerTestDispatcher extends Dispatcher {
 /**
  * InterceptContentHelper class
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class InterceptContentHelper extends Helper {
 
@@ -96,8 +93,7 @@ class InterceptContentHelper extends Helper {
 /**
  * ControllerTestCase class
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class ControllerTestCase extends CakeTestCase {
 
diff --git a/cake/tests/lib/coverage/base_coverage_report.php b/cake/tests/lib/coverage/base_coverage_report.php
index d532f06d6..7960a6e75 100644
--- a/cake/tests/lib/coverage/base_coverage_report.php
+++ b/cake/tests/lib/coverage/base_coverage_report.php
@@ -14,7 +14,6 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/coverage/html_coverage_report.php b/cake/tests/lib/coverage/html_coverage_report.php
index ae4fa081c..bdd18e972 100644
--- a/cake/tests/lib/coverage/html_coverage_report.php
+++ b/cake/tests/lib/coverage/html_coverage_report.php
@@ -13,7 +13,6 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/coverage/text_coverage_report.php b/cake/tests/lib/coverage/text_coverage_report.php
index 3450f2b36..66e84d32e 100644
--- a/cake/tests/lib/coverage/text_coverage_report.php
+++ b/cake/tests/lib/coverage/text_coverage_report.php
@@ -13,7 +13,6 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
- * @subpackage    cake.cake
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/cake/tests/lib/reporter/cake_base_reporter.php
index f20bf1928..9f4b3d3ec 100644
--- a/cake/tests/lib/reporter/cake_base_reporter.php
+++ b/cake/tests/lib/reporter/cake_base_reporter.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.libs.reporter
+ * @package       cake.tests.libs.reporter
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,7 +23,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
  * CakeBaseReporter contains common reporting features used in the CakePHP Test suite
  *
  * @package cake
- * @subpackage cake.tests.lib
+ * @package    cake.tests.lib
  */
 class CakeBaseReporter implements PHPUnit_Framework_TestListener {
 
diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
index 2b66df509..63153ba9c 100755
--- a/cake/tests/lib/reporter/cake_html_reporter.php
+++ b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.libs.reporter
+ * @package       cake.tests.libs.reporter
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,7 +25,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
  * in an HTML format / context.
  *
  * @package cake
- * @subpackage cake.tests.lib
+ * @package    cake.tests.lib
  */
 class CakeHtmlReporter extends CakeBaseReporter {
 
diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php
index 070855c1b..cf4cea447 100644
--- a/cake/tests/lib/reporter/cake_text_reporter.php
+++ b/cake/tests/lib/reporter/cake_text_reporter.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.libs.reporter
+ * @package       cake.tests.libs.reporter
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,7 +25,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
  * CakeTextReporter contains reporting features used for plain text based output
  *
  * @package cake
- * @subpackage cake.tests.lib
+ * @package    cake.tests.lib
  */
 class CakeTextReporter extends CakeBaseReporter {
 
diff --git a/cake/tests/lib/templates/footer.php b/cake/tests/lib/templates/footer.php
index e9b6c6746..0f6ab6a69 100644
--- a/cake/tests/lib/templates/footer.php
+++ b/cake/tests/lib/templates/footer.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/templates/header.php b/cake/tests/lib/templates/header.php
index 5f80658c1..df19f02d9 100644
--- a/cake/tests/lib/templates/header.php
+++ b/cake/tests/lib/templates/header.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/templates/menu.php b/cake/tests/lib/templates/menu.php
index a596ac139..bb81dc7cf 100644
--- a/cake/tests/lib/templates/menu.php
+++ b/cake/tests/lib/templates/menu.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/templates/missing_conenction.php b/cake/tests/lib/templates/missing_conenction.php
index 37c242507..eb88d1aaa 100644
--- a/cake/tests/lib/templates/missing_conenction.php
+++ b/cake/tests/lib/templates/missing_conenction.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/templates/phpunit.php b/cake/tests/lib/templates/phpunit.php
index 4a865523b..0e525d5ab 100644
--- a/cake/tests/lib/templates/phpunit.php
+++ b/cake/tests/lib/templates/phpunit.php
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/templates/xdebug.php b/cake/tests/lib/templates/xdebug.php
index 5722a91ff..f826509eb 100644
--- a/cake/tests/lib/templates/xdebug.php
+++ b/cake/tests/lib/templates/xdebug.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 9322db04e..7cb6a3fdd 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -29,8 +28,7 @@ require_once CAKE_TESTS_LIB . 'cake_test_suite.php';
  * TestManager is the base class that handles loading and initiating the running
  * of TestCase and TestSuite classes that the user has selected.
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class TestManager {
 /**
diff --git a/cake/tests/lib/test_runner.php b/cake/tests/lib/test_runner.php
index c2ca7f809..22def2a23 100644
--- a/cake/tests/lib/test_runner.php
+++ b/cake/tests/lib/test_runner.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @package       cake.tests.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,8 +26,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 /**
  * Class to customize loading of test suites from CLI
  *
- * @package       cake
- * @subpackage    cake.cake.tests.lib
+ * @package       cake.tests.lib
  */
 class TestRunner extends PHPUnit_TextUI_Command {
 
diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php
index 3c53bfde1..d2f06fc4d 100644
--- a/cake/tests/test_app/config/acl.ini.php
+++ b/cake/tests/test_app/config/acl.ini.php
@@ -14,8 +14,7 @@
 ; *
 ; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; * @link          http://cakephp.org CakePHP(tm) Project
-; * @package       cake
-; * @subpackage    cake.app.config
+;; * @package       app.config
 ; * @since         CakePHP(tm) v 0.10.0.1076
 ; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 ; */
diff --git a/cake/tests/test_app/config/routes.php b/cake/tests/test_app/config/routes.php
index 17fdccf25..8d401d581 100644
--- a/cake/tests/test_app/config/routes.php
+++ b/cake/tests/test_app/config/routes.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.test_app.config
+ * @package       cake.tests.test_app.config
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/console/shells/sample.php b/cake/tests/test_app/console/shells/sample.php
index 8994803e8..aa892b1ec 100644
--- a/cake/tests/test_app/console/shells/sample.php
+++ b/cake/tests/test_app/console/shells/sample.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.vendors.shells
+ * @package       cake.tests.test_app.vendors.shells
  * @since         CakePHP(tm) v 1.2.0.7871
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/cake/tests/test_app/controllers/tests_apps_controller.php
index f7f2faf9f..24f193b48 100644
--- a/cake/tests/test_app/controllers/tests_apps_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_controller.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
index 0b11bd068..af28f42c4 100644
--- a/cake/tests/test_app/controllers/tests_apps_posts_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.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
index d138764d3..1a8a47ac0 100644
--- a/cake/tests/test_app/libs/cache/test_app_cache.php
+++ b/cake/tests/test_app/libs/cache/test_app_cache.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/libs/library.php b/cake/tests/test_app/libs/library.php
index 5047e0868..10fc5f10f 100644
--- a/cake/tests/test_app/libs/library.php
+++ b/cake/tests/test_app/libs/library.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/libs/log/test_app_log.php b/cake/tests/test_app/libs/log/test_app_log.php
index bd65581dc..129e1b65d 100644
--- a/cake/tests/test_app/libs/log/test_app_log.php
+++ b/cake/tests/test_app/libs/log/test_app_log.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
index eebe0ba5d..8ef3cf6af 100644
--- a/cake/tests/test_app/models/behaviors/persister_one_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.test_app.models
+ * @package       cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class PersisterOneBehaviorBehavior extends ModelBehavior {
 }
diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
index e17180e24..6cbd0483b 100644
--- a/cake/tests/test_app/models/behaviors/persister_two_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.test_app.models
+ * @package       cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,8 +23,7 @@
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class PersisterTwoBehaviorBehavior extends ModelBehavior {
 }
diff --git a/cake/tests/test_app/models/comment.php b/cake/tests/test_app/models/comment.php
index 9ded58dde..0f0b142d8 100644
--- a/cake/tests/test_app/models/comment.php
+++ b/cake/tests/test_app/models/comment.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
+ * @package       cake.libs.
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php
index a13bc3c65..26e1b1dd6 100644
--- a/cake/tests/test_app/models/persister_one.php
+++ b/cake/tests/test_app/models/persister_one.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.test_app.models
+ * @package       cake.tests.test_app.models
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php
index b157e7850..68313cd6e 100644
--- a/cake/tests/test_app/models/persister_two.php
+++ b/cake/tests/test_app/models/persister_two.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.tests.test_app.models
+ * @package       cake.tests.test_app.models
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/models/post.php b/cake/tests/test_app/models/post.php
index 2155d970d..5a1c15370 100644
--- a/cake/tests/test_app/models/post.php
+++ b/cake/tests/test_app/models/post.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
+ * @package       cake.libs.
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
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 709468c0a..07576e051 100644
--- a/cake/tests/test_app/plugins/test_plugin/config/load.php
+++ b/cake/tests/test_app/plugins/test_plugin/config/load.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app
+ * @package       cake.tests.test_app
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
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 bedf5cff0..f0c9744f8 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
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app
+ * @package       cake.tests.test_app
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
index fd3a283c8..9f9bd3571 100644
--- a/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
+++ b/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config.sql
+ * @package       app.config.sql
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/example.php b/cake/tests/test_app/plugins/test_plugin/console/shells/example.php
index 8380eb901..76e750913 100644
--- a/cake/tests/test_app/plugins/test_plugin/console/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin/console/shells/example.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.shells
+ * @package       cake.tests.test_app.plugins.test_plugin.vendors.shells
  * @since         CakePHP(tm) v 1.2.0.7871
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php b/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php
index 4c4dc2823..ca6668b2f 100644
--- a/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php
+++ b/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.shells
+ * @package       cake.tests.test_app.plugins.test_plugin.vendors.shells
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
index 08168bb27..cff9b4a0d 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
index b3bd6f25f..8c478bba6 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
index 78e87ce56..c09948394 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
index 3b2bb344d..28acded03 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
index 87fd60dc7..2ad779059 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
index ea74c447e..36d67e950 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
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 3342755dc..a1afa5d46 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
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
index 3ce8c9837..3072ca08e 100644
--- a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
+++ b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
index decf3ef66..647e33177 100644
--- a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
+++ b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
index 4a54e3554..669ac584c 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.test_app.models
+ * @package       cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
  * @version       $Revision$
  * @modifiedby    $LastChangedBy$
@@ -27,8 +26,7 @@
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class TestPluginPersisterOneBehavior extends ModelBehavior {
 }
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
index 90ba761e0..162078e51 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.tests.test_app.models
+ * @package       cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
  * @version       $Revision$
  * @modifiedby    $LastChangedBy$
@@ -27,8 +26,7 @@
  * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
  * the amount of associations and data returned.
  *
- * @package       cake
- * @subpackage    cake.cake.console.libs
+ * @package       cake.console.libs
  */
 class TestPluginPersisterTwoBehavior extends ModelBehavior {
 }
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
index 430d5c446..74519a19d 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.tests.test_app.plugins.test_plugin
+ * @package       cake.tests.test_app.plugins.test_plugin
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
index ac9782643..0edd39cf1 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
  * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
+ * @package       cake.libs.
  * @since         CakePHP v 1.2.0.7726
  * @version       $Revision$
  * @modifiedby    $LastChangedBy$
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
index 781841fa2..afef031a3 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
@@ -15,8 +15,7 @@
  *
  * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
  * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
+ * @package       cake.libs.
  * @since         CakePHP v 1.2.0.7726
  * @version       $Revision$
  * @modifiedby    $LastChangedBy$
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
index 0c6090a76..b0441191f 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
@@ -14,8 +14,7 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.tests.test_app.plugins.test_plugin
+ * @package       cake.tests.test_app.plugins.test_plugin
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
index 89b70da0d..f8c2265d5 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
index 5f6162fcc..6dc24ad8b 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.cases.libs
+ * @package       cake.tests.cases.libs
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
index 2566444f9..435b67a84 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.sample
+ * @package       cake.tests.test_app.plugins.test_plugin.vendors.sample
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
index 50dbe616f..41d62cbd0 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors
+ * @package       cake.tests.test_app.plugins.test_plugin.vendors
  * @since         CakePHP(tm) v 1.2.0.7629
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
index 07b109f6b..eb70d228c 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
index fee89f004..d92752535 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @package       cake.tests.test_app.plugins.test_plugin.views.helpers
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php b/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php
index dea25fd74..290188779 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
+ * @package       cake.tests.test_app.plugins.test_plugin_two.vendors.shells
  * @since         CakePHP(tm) v 1.2.0.7871
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php b/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php
index 7c091ea92..7c7da0c3a 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
+ * @package       cake.tests.test_app.plugins.test_plugin_two.vendors.shells
  * @since         CakePHP(tm) v 1.2.0.7871
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/vendors/Test/MyTest.php b/cake/tests/test_app/vendors/Test/MyTest.php
index 888c9395d..d1a94d55b 100644
--- a/cake/tests/test_app/vendors/Test/MyTest.php
+++ b/cake/tests/test_app/vendors/Test/MyTest.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.vendors.somename
+ * @package       cake.tests.test_app.vendors.somename
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/vendors/Test/hello.php b/cake/tests/test_app/vendors/Test/hello.php
index e6cd3fbba..7f886aef0 100644
--- a/cake/tests/test_app/vendors/Test/hello.php
+++ b/cake/tests/test_app/vendors/Test/hello.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.vendors.Test
+ * @package       cake.tests.test_app.vendors.Test
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
index 16ba606ba..58e797165 100644
--- a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
+++ b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.vendors.sample
+ * @package       cake.tests.test_app.vendors.sample
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/vendors/somename/some.name.php b/cake/tests/test_app/vendors/somename/some.name.php
index 54c144fe3..1394bf894 100644
--- a/cake/tests/test_app/vendors/somename/some.name.php
+++ b/cake/tests/test_app/vendors/somename/some.name.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.vendors.somename
+ * @package       cake.tests.test_app.vendors.somename
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/vendors/welcome.php b/cake/tests/test_app/vendors/welcome.php
index dedd3e196..6b36caf0c 100644
--- a/cake/tests/test_app/vendors/welcome.php
+++ b/cake/tests/test_app/vendors/welcome.php
@@ -12,8 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.test_app.vendors
+ * @package       cake.tests.test_app.vendors
  * @since         CakePHP(tm) v 1.2.0.7629
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/elements/email/html/custom.ctp b/cake/tests/test_app/views/elements/email/html/custom.ctp
index 6b46d7c65..6d1b5702a 100644
--- a/cake/tests/test_app/views/elements/email/html/custom.ctp
+++ b/cake/tests/test_app/views/elements/email/html/custom.ctp
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @package       cake.libs.view.templates.elements.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @version       $Revision$
  * @modifiedby    $LastChangedBy$
diff --git a/cake/tests/test_app/views/elements/email/html/default.ctp b/cake/tests/test_app/views/elements/email/html/default.ctp
index de87b4eb8..8efbaa94d 100644
--- a/cake/tests/test_app/views/elements/email/html/default.ctp
+++ b/cake/tests/test_app/views/elements/email/html/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @package       cake.libs.view.templates.elements.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/elements/email/text/custom.ctp b/cake/tests/test_app/views/elements/email/text/custom.ctp
index 623dba240..601023b74 100644
--- a/cake/tests/test_app/views/elements/email/text/custom.ctp
+++ b/cake/tests/test_app/views/elements/email/text/custom.ctp
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @package       cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @version       $Revision$
  * @modifiedby    $LastChangedBy$
diff --git a/cake/tests/test_app/views/elements/email/text/default.ctp b/cake/tests/test_app/views/elements/email/text/default.ctp
index 9d384e3f8..7655f1430 100644
--- a/cake/tests/test_app/views/elements/email/text/default.ctp
+++ b/cake/tests/test_app/views/elements/email/text/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @package       cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/elements/email/text/wide.ctp b/cake/tests/test_app/views/elements/email/text/wide.ctp
index 67b03b057..1e476fbee 100644
--- a/cake/tests/test_app/views/elements/email/text/wide.ctp
+++ b/cake/tests/test_app/views/elements/email/text/wide.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @package       cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/helpers/banana.php b/cake/tests/test_app/views/helpers/banana.php
index 0489d80f2..f57db5219 100644
--- a/cake/tests/test_app/views/helpers/banana.php
+++ b/cake/tests/test_app/views/helpers/banana.php
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/ajax.ctp b/cake/tests/test_app/views/layouts/ajax.ctp
index dadf156ed..93371552b 100644
--- a/cake/tests/test_app/views/layouts/ajax.ctp
+++ b/cake/tests/test_app/views/layouts/ajax.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/ajax2.ctp b/cake/tests/test_app/views/layouts/ajax2.ctp
index 0fa4fbacb..673abbaab 100644
--- a/cake/tests/test_app/views/layouts/ajax2.ctp
+++ b/cake/tests/test_app/views/layouts/ajax2.ctp
@@ -13,8 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/cache_layout.ctp b/cake/tests/test_app/views/layouts/cache_layout.ctp
index 1fd6ff624..d76c26936 100644
--- a/cake/tests/test_app/views/layouts/cache_layout.ctp
+++ b/cake/tests/test_app/views/layouts/cache_layout.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/default.ctp b/cake/tests/test_app/views/layouts/default.ctp
index f75592f05..21dacb2d9 100644
--- a/cake/tests/test_app/views/layouts/default.ctp
+++ b/cake/tests/test_app/views/layouts/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.pages
+ * @package       cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/email/html/default.ctp b/cake/tests/test_app/views/layouts/email/html/default.ctp
index 8b5a339f8..cc4364bb1 100644
--- a/cake/tests/test_app/views/layouts/email/html/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @package       cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/email/html/thin.ctp b/cake/tests/test_app/views/layouts/email/html/thin.ctp
index 21ef3747f..87ece8384 100644
--- a/cake/tests/test_app/views/layouts/email/html/thin.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/thin.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @package       cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/email/text/default.ctp b/cake/tests/test_app/views/layouts/email/text/default.ctp
index eb9a46daa..ad1aee411 100644
--- a/cake/tests/test_app/views/layouts/email/text/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/text/default.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts.email.text
+ * @package       cake.libs.view.templates.layouts.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/flash.ctp b/cake/tests/test_app/views/layouts/flash.ctp
index 1b7745cf2..bed0624c4 100644
--- a/cake/tests/test_app/views/layouts/flash.ctp
+++ b/cake/tests/test_app/views/layouts/flash.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/layouts/multi_cache.ctp b/cake/tests/test_app/views/layouts/multi_cache.ctp
index d3bb46503..d14ce36de 100644
--- a/cake/tests/test_app/views/layouts/multi_cache.ctp
+++ b/cake/tests/test_app/views/layouts/multi_cache.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.layouts
+ * @package       cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
index 7fa93fa5c..c6aa3eb09 100644
--- a/cake/tests/test_app/views/posts/sequencial_nocache.ctp
+++ b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.pages
+ * @package       cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
index b3ee6f828..745ef4ad9 100644
--- a/cake/tests/test_app/views/posts/test_nocache_tags.ctp
+++ b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
@@ -11,8 +11,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.libs.view.templates.pages
+ * @package       cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/index.php b/index.php
index cb0352b8a..265576a3c 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,6 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

From d8589323a95fbf08348339087d73944dc1a861c2 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 24 Dec 2010 14:22:40 -0500
Subject: [PATCH 58/90] Missed a package tag.

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

diff --git a/cake/libs/object.php b/cake/libs/object.php
index c574402ce..9096ae121 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -26,8 +26,7 @@
  * Also includes methods for logging and the special method RequestAction,
  * to call other Controllers' Actions from anywhere.
  *
- * @package cake
- * @package    cake.cake.libs
+ * @package    cake.libs
  */
 class Object {
 

From 2385d9c79a4f9356033f062856b1a5af438d33a4 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 24 Dec 2010 14:26:26 -0500
Subject: [PATCH 59/90] Updating console class @package tags.

---
 cake/console/libs/console_error_handler.php    | 2 +-
 cake/console/libs/console_input.php            | 2 +-
 cake/console/libs/console_input_argument.php   | 2 +-
 cake/console/libs/console_input_option.php     | 2 +-
 cake/console/libs/console_input_subcommand.php | 2 +-
 cake/console/libs/console_option_parser.php    | 2 +-
 cake/console/libs/console_output.php           | 2 +-
 cake/console/libs/help_formatter.php           | 2 +-
 cake/console/shells/acl.php                    | 2 +-
 cake/console/shells/api.php                    | 2 +-
 cake/console/shells/bake.php                   | 2 +-
 cake/console/shells/command_list.php           | 3 +--
 cake/console/shells/console.php                | 4 ++--
 cake/console/shells/i18n.php                   | 4 ++--
 cake/console/shells/schema.php                 | 4 ++--
 cake/console/shells/shell.php                  | 4 ++--
 cake/console/shells/tasks/bake.php             | 2 +-
 cake/console/shells/tasks/controller.php       | 4 ++--
 cake/console/shells/tasks/db_config.php        | 4 ++--
 cake/console/shells/tasks/extract.php          | 4 ++--
 cake/console/shells/tasks/fixture.php          | 4 ++--
 cake/console/shells/tasks/model.php            | 4 ++--
 cake/console/shells/tasks/plugin.php           | 4 ++--
 cake/console/shells/tasks/project.php          | 4 ++--
 cake/console/shells/tasks/template.php         | 2 +-
 cake/console/shells/tasks/test.php             | 4 ++--
 cake/console/shells/tasks/view.php             | 2 +-
 cake/console/shells/testsuite.php              | 2 +-
 28 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/cake/console/libs/console_error_handler.php b/cake/console/libs/console_error_handler.php
index 2de7b2e25..e49e3f968 100644
--- a/cake/console/libs/console_error_handler.php
+++ b/cake/console/libs/console_error_handler.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_input.php b/cake/console/libs/console_input.php
index da3551399..00361e453 100644
--- a/cake/console/libs/console_input.php
+++ b/cake/console/libs/console_input.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_input_argument.php b/cake/console/libs/console_input_argument.php
index b2e9d4f16..5877fca37 100644
--- a/cake/console/libs/console_input_argument.php
+++ b/cake/console/libs/console_input_argument.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_input_option.php b/cake/console/libs/console_input_option.php
index c72638eca..cbcc2179a 100644
--- a/cake/console/libs/console_input_option.php
+++ b/cake/console/libs/console_input_option.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_input_subcommand.php b/cake/console/libs/console_input_subcommand.php
index 82048b853..a8878e937 100644
--- a/cake/console/libs/console_input_subcommand.php
+++ b/cake/console/libs/console_input_subcommand.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_option_parser.php b/cake/console/libs/console_option_parser.php
index 2f63651ec..17eefe1eb 100644
--- a/cake/console/libs/console_option_parser.php
+++ b/cake/console/libs/console_option_parser.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/console_output.php b/cake/console/libs/console_output.php
index 27c1c4e66..f9020d411 100644
--- a/cake/console/libs/console_output.php
+++ b/cake/console/libs/console_output.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console
+ * @package       cake.console.libs
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/libs/help_formatter.php b/cake/console/libs/help_formatter.php
index 2afdd5e90..f454fa8b2 100644
--- a/cake/console/libs/help_formatter.php
+++ b/cake/console/libs/help_formatter.php
@@ -25,7 +25,7 @@ App::import('Core', 'String', false);
  *
  * Xml output is useful for intergration with other tools like IDE's or other build tools.
  *
- * @package    cake.console
+ * @package    cake.console.libs
  * @since      CakePHP(tm) v 2.0
  */
 class HelpFormatter {
diff --git a/cake/console/shells/acl.php b/cake/console/shells/acl.php
index 5fe8f70e6..b4d458ba7 100644
--- a/cake/console/shells/acl.php
+++ b/cake/console/shells/acl.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/api.php b/cake/console/shells/api.php
index 5abd5d48b..05cf326b8 100644
--- a/cake/console/shells/api.php
+++ b/cake/console/shells/api.php
@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/bake.php b/cake/console/shells/bake.php
index 266b6495c..ec741ed3a 100644
--- a/cake/console/shells/bake.php
+++ b/cake/console/shells/bake.php
@@ -16,7 +16,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/command_list.php b/cake/console/shells/command_list.php
index 9a198b47c..e9323c6f7 100644
--- a/cake/console/shells/command_list.php
+++ b/cake/console/shells/command_list.php
@@ -12,7 +12,6 @@
  *
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://cakephp.org CakePHP Project
- * @package       cake.tests.cases.console.libs
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -20,7 +19,7 @@
 /**
  * Shows a list of commands available from the console.
  *
- * @package cake.console.libs
+ * @package cake.console.shells
  */
 class CommandListShell extends Shell {
 
diff --git a/cake/console/shells/console.php b/cake/console/shells/console.php
index b3b1033ae..44cc13d45 100644
--- a/cake/console/shells/console.php
+++ b/cake/console/shells/console.php
@@ -12,13 +12,13 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
 /**
- * @package       cake.console.libs
+ * @package       cake.console.shells
  */
 class ConsoleShell extends Shell {
 
diff --git a/cake/console/shells/i18n.php b/cake/console/shells/i18n.php
index 13477eb44..0a2bdeef6 100644
--- a/cake/console/shells/i18n.php
+++ b/cake/console/shells/i18n.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -20,7 +20,7 @@
 /**
  * Shell for I18N management.
  *
- * @package       cake.console.libs
+ * @package       cake.console.shells
  */
 class I18nShell extends Shell {
 
diff --git a/cake/console/shells/schema.php b/cake/console/shells/schema.php
index ed7090f53..c0fe44751 100644
--- a/cake/console/shells/schema.php
+++ b/cake/console/shells/schema.php
@@ -15,7 +15,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,7 +25,7 @@ App::import('Model', 'CakeSchema', false);
 /**
  * Schema is a command-line database management utility for automating programmer chores.
  *
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @link          http://book.cakephp.org/view/1523/Schema-management-and-migrations
  */
 class SchemaShell extends Shell {
diff --git a/cake/console/shells/shell.php b/cake/console/shells/shell.php
index ac6240329..797b88f96 100644
--- a/cake/console/shells/shell.php
+++ b/cake/console/shells/shell.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,7 +24,7 @@ require_once CONSOLE_LIBS . 'console_option_parser.php';
 /**
  * Base class for command-line utilities for automating programmer chores.
  *
- * @package       cake.console.libs
+ * @package       cake.console.shells
  */
 class Shell extends Object {
 
diff --git a/cake/console/shells/tasks/bake.php b/cake/console/shells/tasks/bake.php
index 61413e6e1..bd7f59e69 100644
--- a/cake/console/shells/tasks/bake.php
+++ b/cake/console/shells/tasks/bake.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/tasks/controller.php b/cake/console/shells/tasks/controller.php
index 3a17a525c..f1cac43eb 100644
--- a/cake/console/shells/tasks/controller.php
+++ b/cake/console/shells/tasks/controller.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,7 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating controller files.
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class ControllerTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/db_config.php b/cake/console/shells/tasks/db_config.php
index 7cc811f2d..c3c2b36e1 100644
--- a/cake/console/shells/tasks/db_config.php
+++ b/cake/console/shells/tasks/db_config.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -20,7 +20,7 @@
 /**
  * Task class for creating and updating the database configuration file.
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class DbConfigTask extends Shell {
 
diff --git a/cake/console/shells/tasks/extract.php b/cake/console/shells/tasks/extract.php
index 451b79417..9965876e2 100644
--- a/cake/console/shells/tasks/extract.php
+++ b/cake/console/shells/tasks/extract.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -20,7 +20,7 @@ App::import('Core', 'File');
 /**
  * Language string extractor
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class ExtractTask extends Shell {
 
diff --git a/cake/console/shells/tasks/fixture.php b/cake/console/shells/tasks/fixture.php
index f19585839..8fd60782b 100644
--- a/cake/console/shells/tasks/fixture.php
+++ b/cake/console/shells/tasks/fixture.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -20,7 +20,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating fixtures files.
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class FixtureTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/model.php b/cake/console/shells/tasks/model.php
index 0af02a635..5ac132dd1 100644
--- a/cake/console/shells/tasks/model.php
+++ b/cake/console/shells/tasks/model.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,7 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating model files.
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class ModelTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/plugin.php b/cake/console/shells/tasks/plugin.php
index 1ea700081..118273d45 100644
--- a/cake/console/shells/tasks/plugin.php
+++ b/cake/console/shells/tasks/plugin.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,7 +21,7 @@ App::import('Core', 'File');
 /**
  * Task class for creating a plugin
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class PluginTask extends Shell {
 
diff --git a/cake/console/shells/tasks/project.php b/cake/console/shells/tasks/project.php
index c773b57ac..433ce9616 100644
--- a/cake/console/shells/tasks/project.php
+++ b/cake/console/shells/tasks/project.php
@@ -13,7 +13,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.bake
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -22,7 +22,7 @@ App::import('Core', 'File');
 /**
  * Task class for creating new project apps and plugins
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class ProjectTask extends Shell {
 
diff --git a/cake/console/shells/tasks/template.php b/cake/console/shells/tasks/template.php
index 08dbb30eb..108ffa8a4 100644
--- a/cake/console/shells/tasks/template.php
+++ b/cake/console/shells/tasks/template.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/cake/console/shells/tasks/test.php b/cake/console/shells/tasks/test.php
index 3e14c1fe8..0fe453040 100644
--- a/cake/console/shells/tasks/test.php
+++ b/cake/console/shells/tasks/test.php
@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,7 +23,7 @@ App::import('Model', 'ClassRegistry');
 /**
  * Task class for creating and updating test files.
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class TestTask extends BakeTask {
 
diff --git a/cake/console/shells/tasks/view.php b/cake/console/shells/tasks/view.php
index 3e23d0d7e..51c84f2f3 100644
--- a/cake/console/shells/tasks/view.php
+++ b/cake/console/shells/tasks/view.php
@@ -22,7 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating view files.
  *
- * @package       cake.console.libs.tasks
+ * @package       cake.console.shells.tasks
  */
 class ViewTask extends BakeTask {
 
diff --git a/cake/console/shells/testsuite.php b/cake/console/shells/testsuite.php
index 2e477a0a9..b8eb079b8 100644
--- a/cake/console/shells/testsuite.php
+++ b/cake/console/shells/testsuite.php
@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake.console.libs
+ * @package       cake.console.shells
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

From 4009b6b2c7598e7ea7f857437389028e515b728a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 24 Dec 2010 14:33:41 -0500
Subject: [PATCH 60/90] Fixing more @package tags, and removing duplicate tags
 in classes.

---
 cake/console/libs/console_error_handler.php    | 2 +-
 cake/console/libs/console_input.php            | 2 +-
 cake/console/libs/console_input_argument.php   | 2 +-
 cake/console/libs/console_input_option.php     | 2 +-
 cake/console/libs/console_input_subcommand.php | 2 +-
 cake/console/libs/console_option_parser.php    | 2 +-
 cake/console/libs/console_output.php           | 2 +-
 cake/libs/magic_db.php                         | 6 ++----
 cake/libs/model/datasources/dbo/dbo_sqlite.php | 1 -
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cake/console/libs/console_error_handler.php b/cake/console/libs/console_error_handler.php
index e49e3f968..80136bbcf 100644
--- a/cake/console/libs/console_error_handler.php
+++ b/cake/console/libs/console_error_handler.php
@@ -23,7 +23,7 @@ require_once 'console_output.php';
  * Error Handler for Cake console. Does simple printing of the 
  * exception that occurred and the stack trace of the error.
  *
- * @package       cake.console
+ * @package       cake.console.libs
  */
 class ConsoleErrorHandler extends ErrorHandler {
 
diff --git a/cake/console/libs/console_input.php b/cake/console/libs/console_input.php
index 00361e453..8378b2e85 100644
--- a/cake/console/libs/console_input.php
+++ b/cake/console/libs/console_input.php
@@ -19,7 +19,7 @@
 /**
  * Object wrapper for interacting with stdin 
  *
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInput {
 /**
diff --git a/cake/console/libs/console_input_argument.php b/cake/console/libs/console_input_argument.php
index 5877fca37..263475e9d 100644
--- a/cake/console/libs/console_input_argument.php
+++ b/cake/console/libs/console_input_argument.php
@@ -21,7 +21,7 @@
  * ConsoleOptionParser creates these when you use addArgument()
  *
  * @see ConsoleOptionParser::addArgument()
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInputArgument {
 /**
diff --git a/cake/console/libs/console_input_option.php b/cake/console/libs/console_input_option.php
index cbcc2179a..3c9049248 100644
--- a/cake/console/libs/console_input_option.php
+++ b/cake/console/libs/console_input_option.php
@@ -22,7 +22,7 @@
  * ConsoleOptionParser creates these when you use addOption()
  *
  * @see ConsoleOptionParser::addOption()
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInputOption {
 /**
diff --git a/cake/console/libs/console_input_subcommand.php b/cake/console/libs/console_input_subcommand.php
index a8878e937..b2903aec2 100644
--- a/cake/console/libs/console_input_subcommand.php
+++ b/cake/console/libs/console_input_subcommand.php
@@ -22,7 +22,7 @@
  * ConsoleOptionParser creates these when you use addSubcommand()
  *
  * @see ConsoleOptionParser::addSubcommand()
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInputSubcommand {
 
diff --git a/cake/console/libs/console_option_parser.php b/cake/console/libs/console_option_parser.php
index 17eefe1eb..a96a0759a 100644
--- a/cake/console/libs/console_option_parser.php
+++ b/cake/console/libs/console_option_parser.php
@@ -26,7 +26,7 @@ require_once CONSOLE_LIBS . 'help_formatter.php';
  * for GetOpt compatible option definition.  Provides a builder pattern implementation
  * for creating shell option parsers.
  *
- * @package       cake.console
+ * @package       cake.console.libs
  */
 class ConsoleOptionParser {
 
diff --git a/cake/console/libs/console_output.php b/cake/console/libs/console_output.php
index f9020d411..7d41da4d7 100644
--- a/cake/console/libs/console_output.php
+++ b/cake/console/libs/console_output.php
@@ -41,7 +41,7 @@
  * See ConsoleOutput::styles() to learn more about defining your own styles.  Nested styles are not supported
  * at this time.
  *
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleOutput {
 /**
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index 07c3686af..86a91d82d 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -26,8 +26,7 @@ if (!class_exists('File')) {
 /**
  * A class to parse and use the MagicDb for file type analysis
  *
- * @package       cake.tests
- * @package       cake.tests.cases.libs
+ * @package       cake.libs
  */
 class MagicDb extends Object {
 
@@ -171,8 +170,7 @@ class MagicDb extends Object {
 /**
  * undocumented class
  *
- * @package       cake.tests
- * @package       cake.tests.cases.libs
+ * @package       cake.libs
  */
 class MagicFileResource extends Object{
 
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index f2bcda3fd..66859261e 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -22,7 +22,6 @@
  *
  * A DboSource adapter for SQLite 3 using PDO
  *
- * @package datasources
  * @package       cake.libs.model.datasources.dbo
  */
 class DboSqlite extends DboSource {

From 83d12ce690e0a2d497ae687ad6d4e6dc20192e2f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 13:01:20 -0500
Subject: [PATCH 61/90] Removing deprecated $this->params in Helpers, it got
 missed somehow. Removing PaginatorHelper::$convertKeys.  Its just a regular
 option now. Added some documentation.

---
 cake/libs/view/helper.php            |  1 -
 cake/libs/view/helpers/paginator.php | 37 +++++++++++++---------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index c83dd9b03..16ea94798 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -137,7 +137,6 @@ class Helper extends Object {
  */
 	public function __construct(View $View, $settings = array()) {
 		$this->_View = $View;
-		$this->params = $View->params;
 		$this->request = $View->request;
 		if (!empty($this->helpers)) {
 			$this->_helperMap = ObjectCollection::normalizeObjectArray($this->helpers);
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 90f80baa7..cf0584655 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -53,34 +53,30 @@ class PaginatorHelper extends AppHelper {
  *
  * The values that may be specified are:
  *
- *  - `$options['format']` Format of the counter. Supported formats are 'range' and 'pages'
+ * - `$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.
+ * - `$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['paramType']` The type of parameters to use when creating links.  Valid options are 
+ * - `$options['paramType']` The type of parameters to use when creating links.  Valid options are 
  *     'querystring', 'named', and 'route'.  See PaginatorComponent::$settings for more information.
+ * - `convertKeys` - A list of keys in url arrays that should be converted to querysting params
+ *    if paramType == 'querystring'.
  *
  * @var array
  * @access public
  */
-	public $options = array();
-
-/**
- * A list of keys that will be turned into `$this->options['paramType']` url parameters when links
- * are generated
- *
- * @var array
- */
-	public $convertKeys = array('page', 'limit', 'sort', 'direction');
+	public $options = array(
+		'convertKeys' => array('page', 'limit', 'sort', 'direction')
+	);
 
 /**
  * Constructor for the helper. Sets up the helper that is used for creating 'AJAX' links.
@@ -355,6 +351,7 @@ class PaginatorHelper extends AppHelper {
 			$url = array_merge((array)$options['url'], (array)$url);
 			unset($options['url']);
 		}
+		unset($options['convertKeys']);
 
 		$url = $this->url($url, true, $model);
 
@@ -403,7 +400,7 @@ class PaginatorHelper extends AppHelper {
 		if (!isset($url['?'])) {
 			$url['?'] = array();
 		}
-		foreach ($this->convertKeys as $key) {
+		foreach ($this->options['convertKeys'] as $key) {
 			if (isset($url[$key])) {
 				$url['?'][$key] = $url[$key];
 				unset($url[$key]);

From edf567b9f9d485be69c7d3f5e955cb3901f789b2 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 13:24:05 -0500
Subject: [PATCH 62/90] Adding convertKeys to PaginatorHelper::options(). Added
 a test case. Fixes #1390

---
 cake/libs/view/helpers/paginator.php             |  5 ++++-
 .../cases/libs/view/helpers/paginator.test.php   | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index cf0584655..59acc1f49 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -66,7 +66,7 @@ class PaginatorHelper extends AppHelper {
  * - `$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['paramType']` The type of parameters to use when creating links.  Valid options are 
+ * - `$options['paging']['paramType']` The type of parameters to use when creating links.  Valid options are 
  *     'querystring', 'named', and 'route'.  See PaginatorComponent::$settings for more information.
  * - `convertKeys` - A list of keys in url arrays that should be converted to querysting params
  *    if paramType == 'querystring'.
@@ -163,6 +163,9 @@ class PaginatorHelper extends AppHelper {
 			);
 			unset($options[$model]);
 		}
+		if (!empty($options['convertKeys'])) {
+			$options['convertKeys'] = array_merge($this->options['convertKeys'], $options['convertKeys']);
+		}
 		$this->options = array_filter(array_merge($this->options, $options));
 	}
 
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 63272aad7..5176b3340 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -2242,6 +2242,22 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * test that additional keys can be flagged as query string args.
+ *
+ * @return void
+ */
+	function testOptionsConvertKeys() {
+		$this->Paginator->options(array(
+			'convertKeys' => array('something'),
+			'Article' => array('paramType' => 'querystring')
+		));
+		$result = $this->Paginator->url(array('page' => '4', 'something' => 'bar'));
+		$expected = '/?page=4&amp;something=bar';
+		$this->assertEquals($expected, $result);
+	}
+
+
 /**
  * test the current() method
  *

From 769da1a7c87f993968efda28314e8ba76fe5c9fe Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 14:25:57 -0500
Subject: [PATCH 63/90] Adding basic BehaviorCollection::hasMethod
 implementation. Tests added.

---
 cake/libs/model/behavior_collection.php       | 19 +++++++++
 .../libs/model/behavior_collection.test.php   | 41 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php
index da9970560..848894cb9 100644
--- a/cake/libs/model/behavior_collection.php
+++ b/cake/libs/model/behavior_collection.php
@@ -237,4 +237,23 @@ class BehaviorCollection extends ObjectCollection {
 		return $this->__methods;
 	}
 
+/**
+ * Check to see if a behavior in this collection implements the provided method.  Will
+ * also check mappedMethods.
+ *
+ * @param string $method The method to find.
+ * @return boolean Method was found.
+ */
+	public function hasMethod($method) {
+		if (isset($this->__methods[$method])) {
+			return true;
+		}
+		foreach ($this->__mappedMethods as $pattern => $target) {
+			if (preg_match($pattern . 'i', $method)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 }
diff --git a/cake/tests/cases/libs/model/behavior_collection.test.php b/cake/tests/cases/libs/model/behavior_collection.test.php
index efe549297..4b4ab980d 100644
--- a/cake/tests/cases/libs/model/behavior_collection.test.php
+++ b/cake/tests/cases/libs/model/behavior_collection.test.php
@@ -340,7 +340,16 @@ class TestBehavior extends ModelBehavior {
  *
  * @package       cake.tests.cases.libs.model
  */
-class Test2Behavior extends TestBehavior{
+class Test2Behavior extends TestBehavior {
+	public $mapMethods = array('/mappingRobot(\w+)/' => 'mapped');
+
+	function resolveMethod($model, $stuff) {
+		
+	}
+	
+	function mapped($model, $method, $query) {
+		
+	}
 }
 
 /**
@@ -1116,4 +1125,34 @@ class BehaviorCollectionTest extends CakeTestCase {
 
 		$Sample->Behaviors->trigger('beforeTest', array(&$Sample));
 	}
+
+/**
+ * test that hasMethod works with basic functions.
+ *
+ * @return void
+ */
+	function testHasMethodBasic() {
+		$Sample = new Sample();
+		$Collection = new BehaviorCollection();
+		$Collection->init('Sample', array('Test', 'Test2'));
+	
+		$this->assertTrue($Collection->hasMethod('testMethod'));
+		$this->assertTrue($Collection->hasMethod('resolveMethod'));
+
+		$this->assertFalse($Collection->hasMethod('No method'));
+	}
+
+/**
+ * test that hasMethod works with mapped methods.
+ *
+ * @return void
+ */
+	function testHasMethodMappedMethods() {
+		$Sample = new Sample();
+		$Collection = new BehaviorCollection();
+		$Collection->init('Sample', array('Test', 'Test2'));
+		
+		$this->assertTrue($Collection->hasMethod('look for the remote in the couch'));
+		$this->assertTrue($Collection->hasMethod('mappingRobotOnTheRoof'));
+	}
 }

From 0c4b665ad020512409c602f3152e3672da510d14 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 17:09:20 -0500
Subject: [PATCH 64/90] Adding ability for BehaviorCollection::hasMethod() to
 return the callback. Re-factored BehaviorCollection::dispatchMethod to be
 simpler and faster. Changing now BehaviorCollection stores callbacks so they
 look like normal php callback arrays.

---
 cake/libs/model/behavior_collection.php       | 63 +++++++++----------
 .../libs/model/behavior_collection.test.php   | 27 +++++++-
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php
index 848894cb9..fbf1081fc 100644
--- a/cake/libs/model/behavior_collection.php
+++ b/cake/libs/model/behavior_collection.php
@@ -128,7 +128,7 @@ class BehaviorCollection extends ObjectCollection {
 		$this->_loaded[$name]->setup(ClassRegistry::getObject($this->modelName), $config);
 
 		foreach ($this->_loaded[$name]->mapMethods as $method => $alias) {
-			$this->__mappedMethods[$method] = array($alias, $name);
+			$this->__mappedMethods[$method] = array($name, $alias);
 		}
 		$methods = get_class_methods($this->_loaded[$name]);
 		$parentMethods = array_flip(get_class_methods('ModelBehavior'));
@@ -144,7 +144,7 @@ class BehaviorCollection extends ObjectCollection {
 					!in_array($m, $callbacks)
 				);
 				if ($methodAllowed) {
-					$this->__methods[$m] = array($m, $name);
+					$this->__methods[$m] = array($name, $m);
 				}
 			}
 		}
@@ -171,7 +171,7 @@ class BehaviorCollection extends ObjectCollection {
 			unset($this->_loaded[$name]);
 		}
 		foreach ($this->__methods as $m => $callback) {
-			if (is_array($callback) && $callback[1] == $name) {
+			if (is_array($callback) && $callback[0] == $name) {
 				unset($this->__methods[$m]);
 			}
 		}
@@ -194,42 +194,29 @@ class BehaviorCollection extends ObjectCollection {
  *
  * @return array All methods for all behaviors attached to this object
  */
-	public function dispatchMethod(&$model, $method, $params = array(), $strict = false) {
-		$methods = array_keys($this->__methods);
-		$check = array_flip($methods);
-		$found = isset($check[$method]);
-		$call = null;
-
-		if ($strict && !$found) {
+	public function dispatchMethod($model, $method, $params = array(), $strict = false) {
+		$method = $this->hasMethod($method, true);
+		
+		if ($strict && empty($method)) {
 			trigger_error(__("BehaviorCollection::dispatchMethod() - Method %s not found in any attached behavior", $method), E_USER_WARNING);
 			return null;
-		} elseif ($found) {
-			$methods = array_combine($methods, array_values($this->__methods));
-			$call = $methods[$method];
-		} else {
-			$count = count($this->__mappedMethods);
-			$mapped = array_keys($this->__mappedMethods);
-
-			for ($i = 0; $i < $count; $i++) {
-				if (preg_match($mapped[$i] . 'i', $method)) {
-					$call = $this->__mappedMethods[$mapped[$i]];
-					array_unshift($params, $method);
-					break;
-				}
-			}
 		}
-
-		if (!empty($call)) {
-			return call_user_func_array(
-				array(&$this->_loaded[$call[1]], $call[0]),
-				array_merge(array(&$model), $params)
-			);
+		if (empty($method)) {
+			return array('unhandled');
 		}
-		return array('unhandled');
+		if (count($method) === 3) {
+			array_unshift($params, $method[2]);
+			unset($method[2]);
+		}
+		return call_user_func_array(
+			array($this->_loaded[$method[0]], $method[1]),
+			array_merge(array(&$model), $params)
+		);
 	}
 
 /**
- * Gets the method list for attached behaviors, i.e. all public, non-callback methods
+ * Gets the method list for attached behaviors, i.e. all public, non-callback methods. 
+ * This does not include mappedMethods.
  *
  * @return array All public methods for all behaviors attached to this collection
  */
@@ -242,14 +229,20 @@ class BehaviorCollection extends ObjectCollection {
  * also check mappedMethods.
  *
  * @param string $method The method to find.
- * @return boolean Method was found.
+ * @param boolean $callback Return the callback for the method.
+ * @return mixed If $callback is false, a boolean will be returnned, if its true, an array
+ *   containing callback information will be returnned.  For mapped methods the array will have 3 elements.
  */
-	public function hasMethod($method) {
+	public function hasMethod($method, $callback = false) {
 		if (isset($this->__methods[$method])) {
-			return true;
+			return $callback ? $this->__methods[$method] : true;
 		}
 		foreach ($this->__mappedMethods as $pattern => $target) {
 			if (preg_match($pattern . 'i', $method)) {
+				if ($callback) {
+					$target[] = $method;
+					return $target;
+				}
 				return true;
 			}
 		}
diff --git a/cake/tests/cases/libs/model/behavior_collection.test.php b/cake/tests/cases/libs/model/behavior_collection.test.php
index 4b4ab980d..b7f547d99 100644
--- a/cake/tests/cases/libs/model/behavior_collection.test.php
+++ b/cake/tests/cases/libs/model/behavior_collection.test.php
@@ -1151,8 +1151,33 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Sample = new Sample();
 		$Collection = new BehaviorCollection();
 		$Collection->init('Sample', array('Test', 'Test2'));
-		
+
 		$this->assertTrue($Collection->hasMethod('look for the remote in the couch'));
 		$this->assertTrue($Collection->hasMethod('mappingRobotOnTheRoof'));
 	}
+
+/**
+ * test hasMethod returrning a 'callback'
+ *
+ * @return void
+ */
+	function testHasMethodAsCallback() {
+		$Sample = new Sample();
+		$Collection = new BehaviorCollection();
+		$Collection->init('Sample', array('Test', 'Test2'));
+
+		$result = $Collection->hasMethod('testMethod', true);
+		$expected = array('Test', 'testMethod');
+		$this->assertEquals($expected, $result);
+
+		$result = $Collection->hasMethod('resolveMethod', true);
+		$expected = array('Test2', 'resolveMethod');
+		$this->assertEquals($expected, $result);
+
+		$result = $Collection->hasMethod('mappingRobotOnTheRoof', true);
+		$expected = array('Test2', 'mapped', 'mappingRobotOnTheRoof');
+		$this->assertEquals($expected, $result);
+	}
+
+
 }

From ad5a1ca6b7d28850acd05283aef666cfc54eff67 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 17:10:16 -0500
Subject: [PATCH 65/90] Making __methods and __mappedMethods protected instead
 of private.

---
 cake/libs/model/behavior_collection.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php
index fbf1081fc..e4823bb11 100644
--- a/cake/libs/model/behavior_collection.php
+++ b/cake/libs/model/behavior_collection.php
@@ -42,14 +42,14 @@ class BehaviorCollection extends ObjectCollection {
  *
  * @var array
  */
-	private $__methods = array();
+	protected $_methods = array();
 
 /**
  * Keeps a list of all methods which have been mapped with regular expressions
  *
  * @var array
  */
-	private $__mappedMethods = array();
+	protected $_mappedMethods = array();
 
 /**
  * Attaches a model object and loads a list of behaviors
@@ -128,7 +128,7 @@ class BehaviorCollection extends ObjectCollection {
 		$this->_loaded[$name]->setup(ClassRegistry::getObject($this->modelName), $config);
 
 		foreach ($this->_loaded[$name]->mapMethods as $method => $alias) {
-			$this->__mappedMethods[$method] = array($name, $alias);
+			$this->_mappedMethods[$method] = array($name, $alias);
 		}
 		$methods = get_class_methods($this->_loaded[$name]);
 		$parentMethods = array_flip(get_class_methods('ModelBehavior'));
@@ -140,11 +140,11 @@ class BehaviorCollection extends ObjectCollection {
 		foreach ($methods as $m) {
 			if (!isset($parentMethods[$m])) {
 				$methodAllowed = (
-					$m[0] != '_' && !array_key_exists($m, $this->__methods) &&
+					$m[0] != '_' && !array_key_exists($m, $this->_methods) &&
 					!in_array($m, $callbacks)
 				);
 				if ($methodAllowed) {
-					$this->__methods[$m] = array($name, $m);
+					$this->_methods[$m] = array($name, $m);
 				}
 			}
 		}
@@ -170,9 +170,9 @@ class BehaviorCollection extends ObjectCollection {
 			$this->_loaded[$name]->cleanup(ClassRegistry::getObject($this->modelName));
 			unset($this->_loaded[$name]);
 		}
-		foreach ($this->__methods as $m => $callback) {
+		foreach ($this->_methods as $m => $callback) {
 			if (is_array($callback) && $callback[0] == $name) {
-				unset($this->__methods[$m]);
+				unset($this->_methods[$m]);
 			}
 		}
 		$this->_enabled = array_values(array_diff($this->_enabled, (array)$name));
@@ -221,7 +221,7 @@ class BehaviorCollection extends ObjectCollection {
  * @return array All public methods for all behaviors attached to this collection
  */
 	public function methods() {
-		return $this->__methods;
+		return $this->_methods;
 	}
 
 /**
@@ -234,10 +234,10 @@ class BehaviorCollection extends ObjectCollection {
  *   containing callback information will be returnned.  For mapped methods the array will have 3 elements.
  */
 	public function hasMethod($method, $callback = false) {
-		if (isset($this->__methods[$method])) {
-			return $callback ? $this->__methods[$method] : true;
+		if (isset($this->_methods[$method])) {
+			return $callback ? $this->_methods[$method] : true;
 		}
-		foreach ($this->__mappedMethods as $pattern => $target) {
+		foreach ($this->_mappedMethods as $pattern => $target) {
 			if (preg_match($pattern . 'i', $method)) {
 				if ($callback) {
 					$target[] = $method;

From 3022e2d785268731ae0a7830c1fa93a6c9b24bef Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 17:21:49 -0500
Subject: [PATCH 66/90] Adding documentation.

---
 cake/libs/model/behavior_collection.php |  9 ++++++++-
 cake/libs/model/model_behavior.php      | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php
index e4823bb11..965c315f4 100644
--- a/cake/libs/model/behavior_collection.php
+++ b/cake/libs/model/behavior_collection.php
@@ -190,8 +190,15 @@ class BehaviorCollection extends ObjectCollection {
 	}
 
 /**
- * Dispatches a behavior method
+ * Dispatches a behavior method.  Will call either normal methods or mapped methods.
  *
+ * If a method is not handeled by the BehaviorCollection, and $strict is false, a 
+ * special return of `array('unhandled')` will be returned to signal the method was not found.
+ *
+ * @param Model $model The model the method was originally called on.
+ * @param string $method The method called.
+ * @param array $params Parameters for the called method.
+ * @param boolean $strict If methods are not found, trigger an error.
  * @return array All methods for all behaviors attached to this object
  */
 	public function dispatchMethod($model, $method, $params = array(), $strict = false) {
diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
index 482bd2e1e..7ff613b71 100644
--- a/cake/libs/model/model_behavior.php
+++ b/cake/libs/model/model_behavior.php
@@ -39,6 +39,25 @@
  * 
  * Would be called like `$this->Model->doSomething($arg1, $arg2);`.
  *
+ * ### Mapped methods
+ *
+ * Behaviors can also define mapped methods.  Mapped methods use pattern matching for method invocation. This
+ * allows you to create methods similar to Model::findAllByXXX methods on your behaviors.  Mapped methods need to 
+ * be declared in your behaviors `$mapMethods` array.  The method signature for a mapped method is slightly different
+ * than a normal behavior mixin method.
+ *
+ * {{{
+ * var $mapMethods = array('/do(\w+)/' => 'doSomething');
+ *
+ * function doSomething($model, $method, $arg1, $arg2) {
+ *		//do something
+ * }
+ * }}}
+ *
+ * The above will map every doXXX() method call to the behavior.  As you can see, the model is
+ * still the first parameter, but the called method name will be the 2nd parameter.  This allows
+ * you to munge the method name for additional information, much like Model::findAllByXX.
+ *
  * @package    cake.libs.model
  * @see Model::$actsAs
  * @see BehaviorCollection::load()

From c5fa93b0fb81141b1fcf51d8bc6bbe3436fed54c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 17:26:18 -0500
Subject: [PATCH 67/90] Removing test that is testing methods covered in
 ObjectCollection test case.

---
 .../libs/model/behavior_collection.test.php   | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/cake/tests/cases/libs/model/behavior_collection.test.php b/cake/tests/cases/libs/model/behavior_collection.test.php
index b7f547d99..6fa7756b7 100644
--- a/cake/tests/cases/libs/model/behavior_collection.test.php
+++ b/cake/tests/cases/libs/model/behavior_collection.test.php
@@ -1035,34 +1035,6 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$this->assertTrue($Apple->testData('one', 'two', 'three', 'four', 'five', 'six'));
 	}
 
-/**
- * testBehaviorTrigger method
- *
- * @access public
- * @return void
- */
-	function testBehaviorTrigger() {
-		$Apple = new Apple();
-		$Apple->Behaviors->attach('Test');
-		$Apple->Behaviors->attach('Test2');
-		$Apple->Behaviors->attach('Test3');
-
-		$Apple->beforeTestResult = array();
-		$Apple->Behaviors->trigger('beforeTest', array(&$Apple));
-		$expected = array('testbehavior', 'test2behavior', 'test3behavior');
-		$this->assertIdentical($Apple->beforeTestResult, $expected);
-
-		$Apple->beforeTestResult = array();
-		$Apple->Behaviors->trigger('beforeTest', array(&$Apple), array('break' => true, 'breakOn' => 'test2behavior'));
-		$expected = array('testbehavior', 'test2behavior');
-		$this->assertIdentical($Apple->beforeTestResult, $expected);
-
-		$Apple->beforeTestResult = array();
-		$Apple->Behaviors->trigger('beforeTest', array($Apple), array('break' => true, 'breakOn' => array('test2behavior', 'test3behavior')));
-		$expected = array('testbehavior', 'test2behavior');
-		$this->assertIdentical($Apple->beforeTestResult, $expected);
-	}
-
 /**
  * undocumented function
  *

From fd3b4b2cd51ed5f2356156e8fa7d7cdd5d052564 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 17:35:22 -0500
Subject: [PATCH 68/90] Adding Model::hasMethod() and tests.

---
 cake/libs/model/model.php                     | 17 ++++++++++++++
 .../libs/model/model_integration.test.php     | 23 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index b55616028..396da7d4e 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1066,6 +1066,23 @@ class Model extends Object {
 		return false;
 	}
 
+/**
+ * Check that a method is callable on a model.  This will check both the model's own methods, its 
+ * inherited methods and methods that could be callable through behaviors.
+ *
+ * @param string $method The method to be called.
+ * @return boolean True on method being callable.
+ */
+	public function hasMethod($method) {
+		if (method_exists($this, $method)) {
+			return true;
+		}
+		if ($this->Behaviors->hasMethod($method)) {
+			return true;
+		}
+		return false;
+	}
+
 /**
  * Returns true if the supplied field is a model Virtual Field
  *
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index fdd410bde..94714a276 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -2008,4 +2008,27 @@ class ModelIntegrationTest extends BaseModelTest {
 		$expected = $db->name('Domain.DomainHandle');
 		$this->assertEqual($result, $expected);
 	}
+
+/**
+ * test that model->hasMethod checks self and behaviors.
+ *
+ * @return void
+ */
+	function testHasMethod() {
+		$Article = new Article();
+		$Article->Behaviors = $this->getMock('BehaviorCollection');
+
+		$Article->Behaviors->expects($this->at(0))
+			->method('hasMethod')
+			->will($this->returnValue(true));
+
+		$Article->Behaviors->expects($this->at(1))
+			->method('hasMethod')
+			->will($this->returnValue(false));
+
+		$this->assertTrue($Article->hasMethod('find'));
+
+		$this->assertTrue($Article->hasMethod('pass'));
+		$this->assertFalse($Article->hasMethod('fail'));
+	}
 }

From f62a067d7cfffb6e711a25abe02287235a36034b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 17:40:34 -0500
Subject: [PATCH 69/90] Making it possible for behaviors to define paginate and
 paginateCount.  Updated test to ensure the component calls the correct
 methods. Fixes #1373

---
 cake/libs/controller/components/paginator.php        |  4 ++--
 .../libs/controller/components/paginator.test.php    | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 086de0584..7fbae137a 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -152,7 +152,7 @@ class PaginatorComponent extends Component {
 			$extra['type'] = $type;
 		}
 
-		if (method_exists($object, 'paginateCount')) {
+		if ($object->hasMethod('paginateCount')) {
 			$count = $object->paginateCount($conditions, $recursive, $extra);
 		} else {
 			$parameters = compact('conditions');
@@ -170,7 +170,7 @@ class PaginatorComponent extends Component {
 		}
 		$page = $options['page'] = (int)$page;
 
-		if (method_exists($object, 'paginate')) {
+		if ($object->hasMethod('paginate')) {
 			$results = $object->paginate(
 				$conditions, $fields, $order, $limit, $page, $recursive, $extra
 			);
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 6a337eb44..e8c925fc4 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -313,10 +313,20 @@ class PaginatorTest extends CakeTestCase {
  */
 	function testPageParamCasting() {
 		$this->Controller->Post->expects($this->at(0))
+			->method('hasMethod')
+			->with('paginateCount')
+			->will($this->returnValue(false));
+	
+		$this->Controller->Post->expects($this->at(1))
 			->method('find')
 			->will($this->returnValue(2));
 		
-		$this->Controller->Post->expects($this->at(1))
+		$this->Controller->Post->expects($this->at(2))
+			->method('hasMethod')
+			->with('paginate')
+			->will($this->returnValue(false));
+		
+		$this->Controller->Post->expects($this->at(3))
 			->method('find')
 			->will($this->returnValue(array('stuff')));
 	

From 6f1eca79ac80f469a68389d2af3cc8d451130194 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 18 Dec 2010 15:52:23 -0500
Subject: [PATCH 70/90] Fixing calltime pass by reference deprecation warnings.

---
 cake/libs/http_socket.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index c4b36f1ff..84a4e84f3 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -537,7 +537,7 @@ class HttpSocket extends CakeSocket {
 		if (!method_exists($authClass, 'authentication')) {
 			throw new SocketException(sprintf(__('The %s do not support authentication.'), $authClass));
 		}
-		call_user_func("$authClass::authentication", $this, &$this->_auth[$method]);
+		call_user_func("$authClass::authentication", $this, $this->_auth[$method]);
 	}
 
 /**
@@ -563,7 +563,7 @@ class HttpSocket extends CakeSocket {
 		if (!method_exists($authClass, 'proxyAuthentication')) {
 			throw new SocketException(sprintf(__('The %s do not support proxy authentication.'), $authClass));
 		}
-		call_user_func("$authClass::proxyAuthentication", $this, &$this->_proxy);
+		call_user_func("$authClass::proxyAuthentication", $this, $this->_proxy);
 	}
 
 /**

From be963385dc6e7bb9e812d0acab6d0d0e27b795df Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 20:16:48 -0500
Subject: [PATCH 71/90] Updating version numbers for 2.0.0-dev

---
 cake/VERSION.txt       | 3 ++-
 cake/config/config.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cake/VERSION.txt b/cake/VERSION.txt
index 90bd8f82d..3157f1e00 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -17,7 +17,8 @@
 // @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-1.3.6
+2.0.0-dev
+
 
 
 
diff --git a/cake/config/config.php b/cake/config/config.php
index 30b6e24d1..906fa844a 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -16,4 +16,4 @@
  * @since         CakePHP(tm) v 1.1.11.4062
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-return $config['Cake.version'] = '1.3.6';
+return $config['Cake.version'] = '2.0.0-dev';

From 5ce66d3031a0d0f4ab14ddeef9128d136b1fcaf3 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 26 Dec 2010 21:30:43 -0500
Subject: [PATCH 72/90] Changing how PaginatorComponent::paginate()'s
 $whitelist param works.  It now serves as the whitelist for fields ordering
 can be done on.  It previously allowed you to whitelist things you passed
 into paginate(), which was kind of useless. Updated tests. Fixes #430

---
 cake/libs/controller/components/paginator.php | 31 ++++++++++---------
 .../controller/components/paginator.test.php  | 19 +++++++++++-
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index 7fbae137a..c857b573e 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -74,7 +74,7 @@ class PaginatorComponent extends Component {
 	);
 
 /**
- * A list of request parameters users are allowed to set.  Modifying
+ * A list of parameters users are allowed to set using request parameters.  Modifying
  * this list will allow users to have more influence over pagination,
  * be careful with what you permit.
  *
@@ -101,7 +101,8 @@ class PaginatorComponent extends Component {
  *
  * @param mixed $object Model to paginate (e.g: model instance, or 'Model', or 'Model.InnerModel')
  * @param mixed $scope Additional find conditions to use while paginating
- * @param array $whitelist List of allowed options for paging
+ * @param array $whitelist List of allowed fields for ordering.  This allows you to prevent ordering 
+ *   on non-indexed, or undesirable columns.
  * @return array Model query results
  */
 	public function paginate($object = null, $scope = array(), $whitelist = array()) {
@@ -117,8 +118,8 @@ class PaginatorComponent extends Component {
 			throw new MissingModelException($object);
 		}
 
-		$options = $this->mergeOptions($object->alias, $whitelist);
-		$options = $this->validateSort($object, $options);
+		$options = $this->mergeOptions($object->alias);
+		$options = $this->validateSort($object, $options, $whitelist);
 		$options = $this->checkLimit($options);
 
 		$conditions = $fields = $order = $limit = $page = $recursive = null;
@@ -272,11 +273,9 @@ class PaginatorComponent extends Component {
  *
  * @param string $alias Model alias being paginated, if the general settings has a key with this value
  *   that key's settings will be used for pagination instead of the general ones.
- * @param string $whitelist A whitelist of options that are allowed from the request parameters.  Modifying
- *   this array will allow you to permit more or less input from the user.
  * @return array Array of merged options.
  */
-	public function mergeOptions($alias, $whitelist = array()) {
+	public function mergeOptions($alias) {
 		$defaults = $this->getDefaults($alias);
 		switch ($defaults['paramType']) {
 			case 'named':
@@ -285,14 +284,8 @@ class PaginatorComponent extends Component {
 			case 'querystring':
 				$request = $this->Controller->request->query;
 				break;
-			case 'route':
-				$request = $this->Controller->request->params;
-				unset($request['pass'], $request['named']);
 		}
-
-		$whitelist = array_flip(array_merge($this->whitelist, $whitelist));
-		$request = array_intersect_key($request, $whitelist);
-
+		$request = array_intersect_key($request, array_flip($this->whitelist));
 		return array_merge($defaults, $request);
 	}
 
@@ -322,9 +315,10 @@ class PaginatorComponent extends Component {
  *
  * @param Model $object The model being paginated.
  * @param array $options The pagination options being used for this request.
+ * @param array $whitelist The list of columns that can be used for sorting.  If empty all keys are allowed.
  * @return array An array of options with sort + direction removed and replaced with order if possible.
  */
-	public function validateSort($object, $options) {
+	public function validateSort($object, $options, $whitelist = array()) {
 		if (isset($options['sort'])) {
 			$direction = null;
 			if (isset($options['direction'])) {
@@ -335,6 +329,13 @@ class PaginatorComponent extends Component {
 			}
 			$options['order'] = array($options['sort'] => $direction);
 		}
+		
+		if (!empty($whitelist)) {
+			$field = key($options['order']);
+			if (!in_array($field, $whitelist)) {
+				$options['order'] = null;
+			}
+		}
 	
 		if (!empty($options['order']) && is_array($options['order'])) {
 			$alias = $object->alias ;
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index e8c925fc4..cbaecb2b9 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -635,7 +635,8 @@ class PaginatorTest extends CakeTestCase {
 			'maxLimit' => 100,
 			'paramType' => 'named',
 		);
-		$result = $this->Paginator->mergeOptions('Post', array('fields'));
+		$this->Paginator->whitelist[] = 'fields';
+		$result = $this->Paginator->mergeOptions('Post');
 		$expected = array(
 			'page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named', 'fields' => array('bad.stuff')
 		);
@@ -658,6 +659,22 @@ class PaginatorTest extends CakeTestCase {
 		$this->assertEquals('asc', $result['order']['model.something']);
 	}
 
+/**
+ * test that fields not in whitelist won't be part of order conditions.
+ *
+ * @return void
+ */
+	function testValidateSortWhitelistFailure() {
+		$model = $this->getMock('Model');
+		$model->alias = 'model';
+		$model->expects($this->any())->method('hasField')->will($this->returnValue(true));
+
+		$options = array('sort' => 'body', 'direction' => 'asc');
+		$result = $this->Paginator->validateSort($model, $options, array('title', 'id'));
+
+		$this->assertNull($result['order']);
+	}
+
 /**
  * test that virtual fields work.
  *

From 3d966be1e839ec74829b19fbe03b8f996807a13c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 00:06:07 -0500
Subject: [PATCH 73/90] Fixing fatal error caused by Debugger not being loaded
 when viewing the default home page.

---
 cake/console/templates/default/views/home.ctp | 1 +
 cake/libs/view/pages/home.ctp                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cake/console/templates/default/views/home.ctp b/cake/console/templates/default/views/home.ctp
index 2dd42a698..22217b2fb 100644
--- a/cake/console/templates/default/views/home.ctp
+++ b/cake/console/templates/default/views/home.ctp
@@ -2,6 +2,7 @@
 $output = "<h2>Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!</h2>\n";
 $output .="
 <?php
+App::import('Core', 'Debugger');
 if (Configure::read() > 0):
 	Debugger::checkSecurityKeys();
 endif;
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index 5fddec45c..9951a08c0 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -18,6 +18,7 @@
 if (Configure::read() == 0):
 	throw new NotFoundException();
 endif;
+App::import('Core', 'Debugger');
 ?>
 <h2><?php echo __('Release Notes for CakePHP %s.', Configure::version()); ?></h2>
 <a href="http://cakephp.org/changelogs/1.3.6"><?php __('Read the changelog'); ?> </a>

From b82ad15c5eb40f6e9cee539a1c0b63a1fbf49f16 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 00:19:59 -0500
Subject: [PATCH 74/90] Fixing issue in console when baking a new project, from
 outside the installation directory you would get an error because
 database.php could not be found.  Fixes #1406

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

diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 9581431fc..f8916877e 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -19,7 +19,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php';
-include_once CONFIGS . 'database.php';
+config('database');
 
 /**
  * Manages loaded instances of DataSource objects

From 65394604a751ccfdc8124f1f29b85a33a3d1b217 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@kangaroot.net>
Date: Fri, 19 Feb 2010 10:27:16 +0100
Subject: [PATCH 75/90] Give PaginatorHelper's next/prev links the correct
 'rel' attribute

It's a good idea to give links such as next/prev the 'rel' attribute.
See the following pages for more information:
http://www.w3.org/TR/html4/struct/links.html#edef-A
http://www.w3.org/TR/html4/types.html#type-links

Signed-off-by: mark_story <mark@mark-story.com>
---
 cake/libs/view/helpers/paginator.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 59acc1f49..c7377e13e 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -252,6 +252,10 @@ class PaginatorHelper extends AppHelper {
  * @return string A "previous" link or $disabledTitle text if the link is disabled.
  */
 	public function prev($title = '<< Previous', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
+		$defaults = array(
+			'rel' => 'prev'
+		);
+		$options = array_merge($defaults, (array)$options);
 		return $this->__pagingLink('Prev', $title, $options, $disabledTitle, $disabledOptions);
 	}
 
@@ -271,6 +275,10 @@ class PaginatorHelper extends AppHelper {
  * @return string A "next" link or or $disabledTitle text if the link is disabled.
  */
 	public function next($title = 'Next >>', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
+		$defaults = array(
+			'rel' => 'next'
+		);
+		$options = array_merge($defaults, (array)$options);
 		return $this->__pagingLink('Next', $title, $options, $disabledTitle, $disabledOptions);
 	}
 

From af608f68ef70ed17e0663cd37ae2f18bc85fb032 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 10:38:30 -0500
Subject: [PATCH 76/90] Updating test cases for the addition of rel attributes
 to links generated by PaginatorHelper.  Also removed rel attributes for
 disabled elements, as they are probably not link tags.  Fixes #370

---
 cake/libs/view/helpers/paginator.php          |  1 +
 .../libs/view/helpers/paginator.test.php      | 48 ++++++++++++-------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index c7377e13e..fc4ba0862 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -454,6 +454,7 @@ class PaginatorHelper extends AppHelper {
 		if ($this->{$check}($model)) {
 			return $this->Html->tag($tag, $this->link($title, $url, array_merge($options, compact('escape', 'class'))));
 		} else {
+			unset($options['rel']);
 			return $this->Html->tag($tag, $title, array_merge($options, compact('escape', 'class')));
 		}
 	}
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 5176b3340..671c4f46a 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -460,7 +460,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/admin/users/index/page:2', 'class' => 'next'),
+			'a' => array('href' => '/admin/users/index/page:2', 'class' => 'next', 'rel' => 'next'),
 			'Next',
 			'/a',
 			'/span'
@@ -563,7 +563,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('next', array('url' => $options));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/members/posts/index/page:3', 'class' => 'next'),
+			'a' => array('href' => '/members/posts/index/page:3', 'class' => 'next', 'rel' => 'next'),
 			'next',
 			'/a',
 			'/span'
@@ -573,7 +573,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('prev', array('url' => $options));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/members/posts/index/page:1', 'class' => 'prev'),
+			'a' => array('href' => '/members/posts/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
 			'prev',
 			'/a',
 			'/span'
@@ -700,7 +700,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/articles/index/2/page:2/foo:bar', 'class' => 'next'),
+			'a' => array('href' => '/articles/index/2/page:2/foo:bar', 'class' => 'next', 'rel' => 'next'),
 			'Next',
 			'/a',
 			'/span'
@@ -750,7 +750,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:1', 'class' => 'prev'),
+			'a' => array('href' => '/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
 			'&lt;&lt; Previous',
 			'/a',
 			'/span'
@@ -760,7 +760,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:3', 'class' => 'next'),
+			'a' => array('href' => '/index/page:3', 'class' => 'next', 'rel' => 'next'),
 			'Next',
 			'/a',
 			'/span'
@@ -770,7 +770,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next', array('tag' => 'li'));
 		$expected = array(
 			'<li',
-			'a' => array('href' => '/index/page:3', 'class' => 'next'),
+			'a' => array('href' => '/index/page:3', 'class' => 'next', 'rel' => 'next'),
 			'Next',
 			'/a',
 			'/li'
@@ -780,7 +780,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('<< Previous', array('escape' => true));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:1', 'class' => 'prev'),
+			'a' => array('href' => '/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
 			'&lt;&lt; Previous',
 			'/a',
 			'/span'
@@ -790,7 +790,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('<< Previous', array('escape' => false));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:1', 'class' => 'prev'),
+			'a' => array('href' => '/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
 			'preg:/<< Previous/',
 			'/a',
 			'/span'
@@ -858,7 +858,11 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:1/limit:3/sort:Client.name/direction:DESC', 'class' => 'prev'),
+			'a' => array(
+				'href' => '/index/page:1/limit:3/sort:Client.name/direction:DESC',
+				'class' => 'prev',
+				'rel' => 'prev'
+			),
 			'&lt;&lt; Previous',
 			'/a',
 			'/span'
@@ -868,7 +872,11 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:3/limit:3/sort:Client.name/direction:DESC', 'class' => 'next'),
+			'a' => array(
+				'href' => '/index/page:3/limit:3/sort:Client.name/direction:DESC',
+				'class' => 'next',
+				'rel' => 'next'
+			),
 			'Next',
 			'/a',
 			'/span'
@@ -895,7 +903,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('Prev');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:1/limit:10', 'class' => 'prev'),
+			'a' => array('href' => '/index/page:1/limit:10', 'class' => 'prev', 'rel' => 'prev'),
 			'Prev',
 			'/a',
 			'/span'
@@ -917,7 +925,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('Prev', array('url' => array('foo' => 'bar')));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/12/page:1/limit:10/foo:bar', 'class' => 'prev'),
+			'a' => array('href' => '/index/12/page:1/limit:10/foo:bar', 'class' => 'prev', 'rel' => 'prev'),
 			'Prev',
 			'/a',
 			'/span'
@@ -957,7 +965,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next >>', array('escape' => false));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:2', 'class' => 'next'),
+			'a' => array('href' => '/index/page:2', 'class' => 'next', 'rel' => 'next'),
 			'preg:/Next >>/',
 			'/a',
 			'/span'
@@ -1004,7 +1012,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next', array('model' => 'Client'));
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:2', 'class' => 'next'),
+			'a' => array('href' => '/index/page:2', 'class' => 'next', 'rel' => 'next'),
 			'Next',
 			'/a',
 			'/span'
@@ -2130,7 +2138,11 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/officespace/accounts/index/page:2/sort:Article.title/direction:asc', 'class' => 'next'),
+			'a' => array(
+				'href' => '/officespace/accounts/index/page:2/sort:Article.title/direction:asc',
+				'class' => 'next',
+				'rel' => 'next'
+			),
 			'Next',
 			'/a',
 			'/span',
@@ -2224,7 +2236,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->next('Next');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/?page=3', 'class' => 'next'),
+			'a' => array('href' => '/?page=3', 'class' => 'next', 'rel' => 'next'),
 			'Next',
 			'/a',
 			'/span'
@@ -2234,7 +2246,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->prev('Prev');
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/?page=1', 'class' => 'prev'),
+			'a' => array('href' => '/?page=1', 'class' => 'prev', 'rel' => 'prev'),
 			'Prev',
 			'/a',
 			'/span'

From fd88d575130787dc10e0ccd4c4ba337cfc767c7e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 10:40:21 -0500
Subject: [PATCH 77/90] Fixing option documentation.

---
 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 fc4ba0862..f217d8fae 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -730,7 +730,7 @@ class PaginatorHelper extends AppHelper {
  * ### Options:
  *
  * - `tag` The tag wrapping tag you want to use, defaults to 'span'
- * - `before` Content to insert before the link/tag
+ * - `after` Content to insert after the link/tag
  * - `model` The model to use defaults to PaginatorHelper::defaultModel()
  * - `separator` Content between the generated links, defaults to ' | '
  * - `ellipsis` Content for ellipsis, defaults to '...'

From e003bd6ea9a74c52b35595cdd859e1546d2e0577 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 10:48:38 -0500
Subject: [PATCH 78/90] Adding rel attributes for first and last links.  These
 attribute values are part of the html5 spec, and fit with the intention of
 #370

---
 cake/libs/view/helpers/paginator.php          |  8 +++++---
 .../libs/view/helpers/paginator.test.php      | 20 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index f217d8fae..5966d11c0 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -743,14 +743,14 @@ class PaginatorHelper extends AppHelper {
 		$options = array_merge(
 			array(
 				'tag' => 'span',
-				'after'=> null,
+				'after' => null,
 				'model' => $this->defaultModel(),
 				'separator' => ' | ',
-				'ellipsis' => '...',
+				'ellipsis' => '...'
 			),
 		(array)$options);
 
-		$params = array_merge(array('page'=> 1), (array)$this->params($options['model']));
+		$params = array_merge(array('page' => 1), (array)$this->params($options['model']));
 		unset($options['model']);
 
 		if ($params['pageCount'] <= 1) {
@@ -773,6 +773,7 @@ class PaginatorHelper extends AppHelper {
 			}
 			$out .= $after;
 		} elseif ($params['page'] > 1) {
+			$options += array('rel' => 'first');
 			$out = $this->Html->tag($tag, $this->link($first, array('page' => 1), $options))
 				. $after;
 		}
@@ -830,6 +831,7 @@ class PaginatorHelper extends AppHelper {
 			}
 			$out = $before . $out;
 		} elseif ($params['page'] < $params['pageCount']) {
+			$options += array('rel' => 'last');
 			$out = $before . $this->Html->tag(
 				$tag, $this->link($last, array('page' => $params['pageCount']), $options
 			));
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 671c4f46a..7b600819f 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -1179,7 +1179,7 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		$result = $this->Paginator->numbers(true);
 		$expected = array(
-			array('span' => array()), array('a' => array('href' => '/index/page:1')), 'first', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/index/page:1', 'rel' => 'first')), 'first', '/a', '/span',
 			' | ',
 			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
 			' | ',
@@ -1199,7 +1199,7 @@ class PaginatorHelperTest extends CakeTestCase {
 			' | ',
 			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/index/page:15')), 'last', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/index/page:15', 'rel' => 'last')), 'last', '/a', '/span',
 		);
 		$this->assertTags($result, $expected);
 
@@ -1779,7 +1779,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->first('<<', array('tag' => 'li'));
 		$expected = array(
 			'<li',
-			'a' => array('href' => '/index/page:1'),
+			'a' => array('href' => '/index/page:1', 'rel' => 'first'),
 			'&lt;&lt;',
 			'/a',
 			'/li'
@@ -1841,7 +1841,9 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->first();
 		$expected = array(
 			'<span',
-			array('a' => array('href' => FULL_BASE_URL . '/index/page:1/sort:Article.title/direction:DESC')), 
+			array('a' => array(
+				'href' => FULL_BASE_URL . '/index/page:1/sort:Article.title/direction:DESC', 'rel' => 'first'
+			)), 
 			'&lt;&lt; first', 
 			'/a',
 			'/span',
@@ -1858,7 +1860,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->first();
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:1'),
+			'a' => array('href' => '/index/page:1', 'rel' => 'first'),
 			'&lt;&lt; first',
 			'/a',
 			'/span'
@@ -1888,7 +1890,7 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->last();
 		$expected = array(
 			'<span',
-			'a' => array('href' => '/index/page:7'),
+			'a' => array('href' => '/index/page:7', 'rel' => 'last'),
 			'last &gt;&gt;',
 			'/a',
 			'/span'
@@ -1947,7 +1949,11 @@ class PaginatorHelperTest extends CakeTestCase {
 		$result = $this->Paginator->last();
 		$expected = array(
 			'<span',
-			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), 'last &gt;&gt;', '/a',
+			array('a' => array(
+				'href' => '/index/page:15/sort:Client.name/direction:DESC',
+				'rel' => 'last'
+			)), 
+				'last &gt;&gt;', '/a',
 			'/span',
 		);
 		$this->assertTags($result, $expected);

From b6b4f4a3df8cfc6571cb392d9ae1e674187675db Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 15:34:56 -0500
Subject: [PATCH 79/90] Fixing deprecated access to $this->data.

---
 cake/console/templates/default/actions/controller_actions.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/console/templates/default/actions/controller_actions.ctp b/cake/console/templates/default/actions/controller_actions.ctp
index f80d3d374..e6f0f8e83 100644
--- a/cake/console/templates/default/actions/controller_actions.ctp
+++ b/cake/console/templates/default/actions/controller_actions.ctp
@@ -85,7 +85,7 @@
 <?php endif; ?>
 			}
 		} else {
-			$this->data = $this-><?php echo $currentModelName; ?>->read(null, $id);
+			$this->request->data = $this-><?php echo $currentModelName; ?>->read(null, $id);
 		}
 <?php
 		foreach (array('belongsTo', 'hasAndBelongsToMany') as $assoc):

From 85baa180d9d458cf1f2ccce7a008249bfd824ca9 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 23:30:10 -0500
Subject: [PATCH 80/90] Adding usage and expanding doc blocks for
 PaginatorHelper.

---
 cake/libs/view/helpers/paginator.php | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 5966d11c0..b83561d24 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -725,7 +725,16 @@ class PaginatorHelper extends AppHelper {
 	}
 
 /**
- * Returns a first or set of numbers for the first pages
+ * Returns a first or set of numbers for the first pages.
+ *
+ * `echo $this->Paginator->first('< first');`
+ *
+ * Creates a single link for the first page.  Will output nothing if you are on the first page.
+ *
+ * `echo $this->Paginator->first(3);`
+ *
+ * Will create links for the first 3 pages, once you get to the third or greater page. Prior to that
+ * nothing will be output.
  *
  * ### Options:
  *
@@ -735,8 +744,9 @@ class PaginatorHelper extends AppHelper {
  * - `separator` Content between the generated links, defaults to ' | '
  * - `ellipsis` Content for ellipsis, defaults to '...'
  *
- * @param mixed $first if string use as label for the link, if numeric print page numbers
- * @param mixed $options
+ * @param mixed $first if string use as label for the link. If numeric, the number of page links
+ *   you want at the beginning of the range.
+ * @param mixed $options An array of options.
  * @return string numbers string.
  */
 	public function first($first = '<< first', $options = array()) {
@@ -781,7 +791,15 @@ class PaginatorHelper extends AppHelper {
 	}
 
 /**
- * Returns a last or set of numbers for the last pages
+ * Returns a last or set of numbers for the last pages.
+ *
+ * `echo $this->Paginator->last('last >');`
+ *
+ * Creates a single link for the last page.  Will output nothing if you are on the last page.
+ *
+ * `echo $this->Paginator->last(3);`
+ *
+ * Will create links for the last 3 pages.  Once you enter the page range, no output will be created.
  *
  * ### Options:
  *

From eb38b8b60c34d9db2585052a40cf34c89eca89a3 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 27 Dec 2010 23:40:10 -0500
Subject: [PATCH 81/90] Fixing more boundary issues with first() and last().
 When you entered a first/last range a wonky page link would be generated.
 Tests added.

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

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index b83561d24..a28767364 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -782,7 +782,7 @@ class PaginatorHelper extends AppHelper {
 				}
 			}
 			$out .= $after;
-		} elseif ($params['page'] > 1) {
+		} elseif ($params['page'] > 1 && is_string($first)) {
 			$options += array('rel' => 'first');
 			$out = $this->Html->tag($tag, $this->link($first, array('page' => 1), $options))
 				. $after;
@@ -848,7 +848,7 @@ class PaginatorHelper extends AppHelper {
 				}
 			}
 			$out = $before . $out;
-		} elseif ($params['page'] < $params['pageCount']) {
+		} elseif ($params['page'] < $params['pageCount'] && is_string($last)) {
 			$options += array('rel' => 'last');
 			$out = $before . $this->Html->tag(
 				$tag, $this->link($last, array('page' => $params['pageCount']), $options
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 7b600819f..ce4497536 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -1878,6 +1878,10 @@ class PaginatorHelperTest extends CakeTestCase {
 			'/span'
 		);
 		$this->assertTags($result, $expected);
+		
+		$this->Paginator->request->params['paging']['Article']['page'] = 2;
+		$result = $this->Paginator->first(3);
+		$this->assertEquals('', $result, 'When inside the first links range, no links should be made');
 	}
 
 /**
@@ -1922,6 +1926,9 @@ class PaginatorHelperTest extends CakeTestCase {
 			'/span',
 		);
 		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last(3);
+		$this->assertEquals('', $result, 'When inside the last links range, no links should be made');
 	}
 	
 /**

From ab552c22a1a26eeaceb7fe33bc1835885accf4af Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 28 Dec 2010 00:09:47 -0500
Subject: [PATCH 82/90] Adding a usage sample to Paginator->numbers()

---
 cake/libs/view/helpers/paginator.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index a28767364..aaba58297 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -602,7 +602,12 @@ 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)
+ * uses a modulus to decide how many numbers to show on each side of the current page (default: 8). 
+ *
+ * `$this->Paginator->numbers(array('first' => 2, 'last' => 2));`
+ *
+ * Using the first and last options you can create links to the beginning and end of the page set.
+ * 
  *
  * ### Options
  *
@@ -613,9 +618,9 @@ class PaginatorHelper extends AppHelper {
  * - `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
+ *    links to generate.
  * - `last` Whether you want last links generated, set to an integer to define the number of 'last'
- *    links to generate
+ *    links to generate.
  * - `ellipsis` Ellipsis content, defaults to '...'
  *
  * @param mixed $options Options for the numbers, (before, after, model, modulus, separator)

From 7dd1eea28562344a7504fe4b4572ee5e11a3693f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 28 Dec 2010 22:18:31 -0500
Subject: [PATCH 83/90] Updating documentation for paginator helper, and
 component.

---
 cake/libs/controller/components/paginator.php |  9 ++++---
 cake/libs/view/helpers/paginator.php          | 25 ++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
index c857b573e..5c0c4b940 100644
--- a/cake/libs/controller/components/paginator.php
+++ b/cake/libs/controller/components/paginator.php
@@ -267,9 +267,9 @@ class PaginatorComponent extends Component {
  * - General pagination settings
  * - Model specific settings.
  * - Request parameters
- * - $options argument.
  *
- * The result of this method is the aggregate of all the option sets combined together.
+ * The result of this method is the aggregate of all the option sets combined together.  You can change
+ * PaginatorComponent::$whitelist to modify which options/values can be set using request parameters.
  *
  * @param string $alias Model alias being paginated, if the general settings has a key with this value
  *   that key's settings will be used for pagination instead of the general ones.
@@ -294,7 +294,7 @@ class PaginatorComponent extends Component {
  * will be used.
  *
  * @param string $alias Model name to get default settings for.
- * @return array
+ * @return array An array of pagination defaults for a model, or the general settings.
  */
 	public function getDefaults($alias) {
 		if (isset($this->settings[$alias])) {
@@ -313,6 +313,9 @@ class PaginatorComponent extends Component {
  * virtualFields can be sorted on.  The direction param will also be sanitized.  Lastly
  * sort + direction keys will be converted into the model friendly order key.
  *
+ * You can use the whitelist parameter to control which columns/fields are available for sorting.
+ * This helps prevent users from ordering large result sets on un-indexed values.
+ *
  * @param Model $object The model being paginated.
  * @param array $options The pagination options being used for this request.
  * @param array $whitelist The list of columns that can be used for sorting.  If empty all keys are allowed.
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index aaba58297..8fe9e40ec 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -42,7 +42,8 @@ class PaginatorHelper extends AppHelper {
 	private $__defaultModel = null;
 
 /**
- * The class used for 'Ajax' pagination links.
+ * The class used for 'Ajax' pagination links. Defaults to JsHelper.  You should make sure
+ * that JsHelper is defined as a helper before PaginatorHelper, if you want to customize the JsHelper.
  *
  * @var string
  */
@@ -53,20 +54,20 @@ class PaginatorHelper extends AppHelper {
  *
  * The values that may be specified are:
  *
- * - `$options['format']` Format of the counter. Supported formats are 'range' and 'pages'
+ * - `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.
+ *    placeholders: %page%, %pages%, %current%, %count%, %start%, %end% .
+ * - `separator` The separator of the actual page and number of pages (default: ' of ').
+ * - `url` Url of the action. See Router::url()
+ * - `url['sort']`  the key that the recordset is sorted.
+ * - `url['direction']` Direction of the sorting (default: 'asc').
+ * - `url['page']` Page number to use in links.
+ * - `model` The name of the model.
+ * - `escape` Defines if the title field for the link should be escaped (default: true).
+ * - `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['paging']['paramType']` The type of parameters to use when creating links.  Valid options are 
+ * - `paging['paramType']` The type of parameters to use when creating links.  Valid options are 
  *     'querystring', 'named', and 'route'.  See PaginatorComponent::$settings for more information.
  * - `convertKeys` - A list of keys in url arrays that should be converted to querysting params
  *    if paramType == 'querystring'.

From 2e0f2c75f48695b4685891be8336843da636522f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 29 Dec 2010 10:44:15 -0500
Subject: [PATCH 84/90] Fixing issue where ClassRegistry would not be loaded
 when using Models in shells.  Fixes #1417

---
 cake/console/shells/shell.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/console/shells/shell.php b/cake/console/shells/shell.php
index 797b88f96..dd59dbb2c 100644
--- a/cake/console/shells/shell.php
+++ b/cake/console/shells/shell.php
@@ -218,6 +218,7 @@ class Shell extends Object {
 		if ($this->uses === null || $this->uses === false) {
 			return;
 		}
+		App::import('Core', 'ClassRegistry');
 
 		if ($this->uses !== true && !empty($this->uses)) {
 			$uses = is_array($this->uses) ? $this->uses : array($this->uses);

From 1f6fba9d9ed2d1503e2f6027aa845dcb81f7e12b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 31 Dec 2010 16:35:44 -0500
Subject: [PATCH 85/90] Fixing failing test caused by missing space.

---
 cake/tests/cases/libs/view/helpers/time.test.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index 67481f5a4..d71c6cd90 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -337,14 +337,14 @@ class TimeHelperTest extends CakeTestCase {
 		if (date('Y', $time) == date('Y')) {
 			$this->assertEqual(date('M jS, H:i', $time), $this->Time->niceShort($time));
 		} else {
-			$this->assertEqual(date('M jSY, H:i', $time), $this->Time->niceShort($time));
+			$this->assertEqual(date('M jS Y, H:i', $time), $this->Time->niceShort($time));
 		}
 
 		$time = time();
-		$this->assertEqual('Today, '.date('H:i', $time), $this->Time->niceShort($time));
+		$this->assertEqual('Today, ' . date('H:i', $time), $this->Time->niceShort($time));
 
 		$time = time() - DAY;
-		$this->assertEqual('Yesterday, '.date('H:i', $time), $this->Time->niceShort($time));
+		$this->assertEqual('Yesterday, ' . date('H:i', $time), $this->Time->niceShort($time));
 	}
 
 /**

From 04c602e3d0dd8d71612415a421c16096d5fc8851 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 31 Dec 2010 16:37:16 -0500
Subject: [PATCH 86/90] Fixing issues with isThisWeek() when the year ends
 midweek.

---
 cake/libs/view/helpers/time.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index f65b62de0..32e9e3050 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -282,7 +282,8 @@ class TimeHelper extends AppHelper {
 	}
 
 /**
- * Returns true if given datetime string is within this week
+ * Returns true if given datetime string is within this week.
+ *
  * @param string $dateString
  * @param int $userOffset User's offset from GMT (in hours)
  * @return boolean True if datetime string is within current week
@@ -291,7 +292,7 @@ class TimeHelper extends AppHelper {
  */
 	public function isThisWeek($dateString, $userOffset = null) {
 		$date = $this->fromString($dateString, $userOffset);
-		return date('W Y', $date) == date('W Y', time());
+		return date('W o', $date) == date('W o', time());
 	}
 
 /**

From da152e0e82052bc8a44fead2f854cc60b7889a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Sat, 1 Jan 2011 22:07:27 -0430
Subject: [PATCH 87/90] Changes to make mysql cast boolean vaules to the native
 php boolean datatype

---
 cake/libs/model/datasources/dbo/dbo_mysql.php | 16 ++++++++++----
 cake/libs/model/datasources/dbo_source.php    | 19 ++++++----------
 .../libs/model/model_integration.test.php     | 22 +++++++++----------
 .../cases/libs/model/model_read.test.php      | 21 +++++++++++++-----
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 1d6052f6a..98e2cf5d2 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -213,10 +213,15 @@ class DboMysql extends DboSource {
 
 		while ($j < $numFields) {
 			$column = $results->getColumnMeta($j);
-			if (!empty($column['table']) && strpos($column['name'], $this->virtualFieldSeparator) === false) {
-				$this->map[$index++] = array($column['table'], $column['name']);
+			if (!empty($column['native_type'])) {
+				$type = $column['native_type'];
 			} else {
-				$this->map[$index++] = array(0, $column['name']);
+				$type = ($column['len'] == 1) ? 'boolean' : 'string';
+			}
+			if (!empty($column['table']) && strpos($column['name'], $this->virtualFieldSeparator) === false) {
+				$this->map[$index++] = array($column['table'], $column['name'], $type);
+			} else {
+				$this->map[$index++] = array(0, $column['name'], $type);
 			}
 			$j++;
 		}
@@ -231,8 +236,11 @@ class DboMysql extends DboSource {
 		if ($row = $this->_result->fetch()) {
 			$resultRow = array();
 			foreach ($this->map as $col => $meta) {
-				list($table, $column) = $meta;
+				list($table, $column, $type) = $meta;
 				$resultRow[$table][$column] = $row[$col];
+				if ($type == 'boolean') {
+					$resultRow[$table][$column] = $this->boolean($resultRow[$table][$column]);
+				}
 			}
 			return $resultRow;
 		} else {
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 717e5ca92..d9423399b 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -194,14 +194,13 @@ class DboSource extends DataSource {
  *
  * @param string $data String to be prepared for use in an SQL statement
  * @param string $column The column into which this data will be inserted
- * @param boolean $safe Whether or not numeric data should be handled automagically if no column data is provided
  * @return string Quoted and escaped data
  */
-	function value($data, $column = null, $safe = false) {
+	function value($data, $column = null) {
 		if (is_array($data) && !empty($data)) {
 			return array_map(
 				array(&$this, 'value'),
-				$data, array_fill(0, count($data), $column), array_fill(0, count($data), $safe)
+				$data, array_fill(0, count($data), $column)
 			);
 		} elseif (is_object($data) && isset($data->type)) {
 			if ($data->type == 'identifier') {
@@ -226,7 +225,7 @@ class DboSource extends DataSource {
 				return $this->_connection->quote($data, PDO::PARAM_LOB);
 			break;
 			case 'boolean':
-				return $this->_connection->quote($this->boolean($data), PDO::PARAM_BOOL);
+				return $this->_connection->quote($this->boolean($data, true), PDO::PARAM_BOOL);
 			break;
 			case 'string':
 			case 'text':
@@ -2698,15 +2697,11 @@ class DboSource extends DataSource {
  * @param mixed $data Value to be translated
  * @return int Converted boolean value
  */
-	public function boolean($data) {
-		if ($data === true || $data === false) {
-			if ($data === true) {
-				return 1;
-			}
-			return 0;
-		} else {
-			return (int) !empty($data);
+	public function boolean($data, $quote = false) {
+		if ($quote) {
+			return !empty($data) ? '1' : '0';
 		}
+		return !empty($data);
 	}
 
 /**
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index 94714a276..776ce8467 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -1421,7 +1421,7 @@ class ModelIntegrationTest extends BaseModelTest {
 							'id' => '3',
 							'something_id' => '3',
 							'something_else_id' => '1',
-							'doomed' => '1',
+							'doomed' => true,
 							'created' => '2007-03-18 10:43:23',
 							'updated' => '2007-03-18 10:45:31'
 			)))),
@@ -1446,7 +1446,7 @@ class ModelIntegrationTest extends BaseModelTest {
 							'id' => '1',
 							'something_id' => '1',
 							'something_else_id' => '2',
-							'doomed' => '1',
+							'doomed' => true,
 							'created' => '2007-03-18 10:39:23',
 							'updated' => '2007-03-18 10:41:31'
 			)))),
@@ -1471,7 +1471,7 @@ class ModelIntegrationTest extends BaseModelTest {
 							'id' => '2',
 							'something_id' => '2',
 							'something_else_id' => '3',
-							'doomed' => '0',
+							'doomed' => false,
 							'created' => '2007-03-18 10:41:23',
 							'updated' => '2007-03-18 10:43:31'
 		)))));
@@ -1497,7 +1497,7 @@ class ModelIntegrationTest extends BaseModelTest {
 						'created' => '2007-03-18 10:41:23',
 						'updated' => '2007-03-18 10:43:31',
 						'JoinThing' => array(
-							'doomed' => '1',
+							'doomed' => true,
 							'something_id' => '1',
 							'something_else_id' => '2'
 			)))),
@@ -1519,7 +1519,7 @@ class ModelIntegrationTest extends BaseModelTest {
 						'created' => '2007-03-18 10:43:23',
 						'updated' => '2007-03-18 10:45:31',
 						'JoinThing' => array(
-							'doomed' => '0',
+							'doomed' => false,
 							'something_id' => '2',
 							'something_else_id' => '3'
 			)))),
@@ -1541,7 +1541,7 @@ class ModelIntegrationTest extends BaseModelTest {
 						'created' => '2007-03-18 10:39:23',
 						'updated' => '2007-03-18 10:41:31',
 						'JoinThing' => array(
-							'doomed' => '1',
+							'doomed' => true,
 							'something_id' => '3',
 							'something_else_id' => '1'
 		)))));
@@ -1566,7 +1566,7 @@ class ModelIntegrationTest extends BaseModelTest {
 					'created' => '2007-03-18 10:41:23',
 					'updated' => '2007-03-18 10:43:31',
 					'JoinThing' => array(
-						'doomed' => '1',
+						'doomed' => true,
 						'something_id' => '1',
 						'something_else_id' => '2'
 		))));
@@ -1583,7 +1583,7 @@ class ModelIntegrationTest extends BaseModelTest {
 			'Something' => array('id' => 1),
 			'SomethingElse' => array(3, array(
 				'something_else_id' => 1,
-				'doomed' => '1'
+				'doomed' => true
 		))));
 
 		$ts = date('Y-m-d H:i:s');
@@ -1608,7 +1608,7 @@ class ModelIntegrationTest extends BaseModelTest {
 						'created' => '2007-03-18 10:39:23',
 						'updated' => '2007-03-18 10:41:31',
 						'JoinThing' => array(
-							'doomed' => '1',
+							'doomed' => true,
 							'something_id' => '1',
 							'something_else_id' => '1'
 					)),
@@ -1620,7 +1620,7 @@ class ModelIntegrationTest extends BaseModelTest {
 						'created' => '2007-03-18 10:41:23',
 						'updated' => '2007-03-18 10:43:31',
 						'JoinThing' => array(
-							'doomed' => '1',
+							'doomed' => true,
 							'something_id' => '1',
 							'something_else_id' => '2'
 					)),
@@ -1632,7 +1632,7 @@ class ModelIntegrationTest extends BaseModelTest {
 						'created' => '2007-03-18 10:43:23',
 						'updated' => '2007-03-18 10:45:31',
 						'JoinThing' => array(
-							'doomed' => '0',
+							'doomed' => false,
 							'something_id' => '1',
 							'something_else_id' => '3'
 		))));
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 5be36aaf3..29ef9e929 100755
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -56,8 +56,8 @@ class ModelReadTest extends BaseModelTest {
 
 		$result = $Something->JoinThing->find('all', array('conditions' => array('something_else_id' => 2)));
 
-		$this->assertEqual((bool)$result[0]['JoinThing']['doomed'], true);
-		$this->assertEqual((bool)$result[1]['JoinThing']['doomed'], false);
+		$this->assertEqual($result[0]['JoinThing']['doomed'], true);
+		$this->assertEqual($result[1]['JoinThing']['doomed'], false);
 
 		$result = $Something->find('first');
 
@@ -5100,7 +5100,7 @@ class ModelReadTest extends BaseModelTest {
 				array(
 					'id' => 2,
 					'syfile_id' => 2,
-					'published' => 0,
+					'published' => false,
 					'name' => 'Item 2',
 					'ItemsPortfolio' => array(
 						'id' => 2,
@@ -5120,7 +5120,7 @@ class ModelReadTest extends BaseModelTest {
 				array(
 					'id' => 6,
 					'syfile_id' => 6,
-					'published' => 0,
+					'published' => false,
 					'name' => 'Item 6',
 					'ItemsPortfolio' => array(
 						'id' => 6,
@@ -7403,7 +7403,7 @@ class ModelReadTest extends BaseModelTest {
 		$Post->Author->virtualFields = array('false' => '1 = 2');
 		$result = $Post->find('first');
 		$this->assertEqual($result['Post']['two'], 2);
-		$this->assertEqual($result['Author']['false'], '0');
+		$this->assertFalse((bool)$result['Author']['false']);
 
 		$result = $Post->find('first',array('fields' => array('author_id')));
 		$this->assertFalse(isset($result['Post']['two']));
@@ -7462,11 +7462,20 @@ class ModelReadTest extends BaseModelTest {
 		$Post->virtualFields = array('other_field' => 'COUNT(Post.id) + 1');
 		$result = $Post->field('other_field');
 		$this->assertEqual($result, 4);
+	}
 
+/**
+ * testVirtualFieldsMysql()
+ *
+ * Test correct fetching of virtual fields
+ * currently is not possible to do Relation.virtualField
+ *
+ */
+	public function testVirtualFieldsMysql() {
 		if ($this->skipIf($this->db->config['driver'] != 'mysql', 'The rest of virtualFieds test is not compatible with Postgres')) {
 			return;
 		}
-		ClassRegistry::flush();
+		$this->loadFixtures('Post', 'Author');
 		$Post = ClassRegistry::init('Post');
 
 		$Post->create();

From 1d530db39bd41bb823bc40f2f15b81475244160f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Sat, 1 Jan 2011 22:09:22 -0430
Subject: [PATCH 88/90] Changing a bit how postgres driver treats booleans so
 it correcty casts them

---
 cake/libs/model/datasources/dbo/dbo_postgres.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index e5e12d2bc..540ec0944 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -162,7 +162,6 @@ class DboPostgres extends DboSource {
 		$result = $this->_execute($sql, array($schema));
 
 		if (!$result) {
-			$result->closeCursor();
 			return array();
 		} else {
 			$tables = array();
@@ -248,7 +247,9 @@ class DboPostgres extends DboSource {
 			$this->_sequenceMap[$table][$model->primaryKey] = $model->sequence;
 		}
 
-		$cols->closeCursor();
+		if ($cols) {
+			$cols->closeCursor();	
+		}
 		return $fields;
 	}
 
@@ -706,7 +707,7 @@ class DboPostgres extends DboSource {
 
 				switch ($type) {
 					case 'bool':
-						$resultRow[$table][$column] = $this->boolean($row[$index], false);
+						$resultRow[$table][$column] = $this->boolean($row[$index]);
 					break;
 					case 'binary':
 					case 'bytea':
@@ -731,7 +732,7 @@ class DboPostgres extends DboSource {
  * @param boolean $quote true to quote a boolean to be used in a query, flase to return the boolean value
  * @return boolean Converted boolean value
  */
-	function boolean($data, $quote = true) {
+	function boolean($data, $quote = false) {
 		switch (true) {
 			case ($data === true || $data === false):
 				$result = $data;
@@ -753,7 +754,7 @@ class DboPostgres extends DboSource {
 		if ($quote) {
 			return ($result) ? 'TRUE' : 'FALSE';
 		}
-		return (int) $result;
+		return (bool) $result;
 	}
 
 /**

From fe18e31b79736f6d29b0165615972ed2f571f87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Sat, 1 Jan 2011 22:11:28 -0430
Subject: [PATCH 89/90] Changes to make sqlite recognize boolean columns
 declared as "boolean", so they can be casted to native php type

---
 cake/libs/model/datasources/dbo/dbo_sqlite.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 66859261e..d52cb6b15 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -308,11 +308,19 @@ class DboSqlite extends DboSource {
 				$columnName = str_ireplace('DISTINCT', '', $columnName);
 			}
 
+			$metaType = false;
+			try {
+				$metaData = (array)$results->getColumnMeta($j);
+				if (!empty($metaData['sqlite:decl_type'])) {
+					$metaType = trim($metaData['sqlite:decl_type']);
+				}
+			} catch (Exception $e) {}
+
 			if (strpos($columnName, '.')) {
 				$parts = explode('.', $columnName);
-				$this->map[$index++] = array(trim($parts[0]), trim($parts[1]));
+				$this->map[$index++] = array(trim($parts[0]), trim($parts[1]), $metaType);
 			} else {
-				$this->map[$index++] = array(0, $columnName);
+				$this->map[$index++] = array(0, $columnName, $metaType);
 			}
 			$j++;
 		}

From 5a75d1d91acccff8c36f89bb95bf361260941a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Sun, 2 Jan 2011 01:26:57 -0430
Subject: [PATCH 90/90] Adding boolean casts for sqlite

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

diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index d52cb6b15..c09b175e2 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -335,8 +335,11 @@ class DboSqlite extends DboSource {
 		if ($row = $this->_result->fetch()) {
 			$resultRow = array();
 			foreach ($this->map as $col => $meta) {
-				list($table, $column) = $meta;
+				list($table, $column, $tpye) = $meta;
 				$resultRow[$table][$column] = $row[$col];
+				if ($type === 'boolean') {
+					$resultRow[$table][$column] = $this->boolean($resultRow[$table][$column]);
+				}
 			}
 			return $resultRow;
 		} else {