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 6a91ffc98..ef5e26816 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 d011f3939..047ab17de 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 94c7f8784..86a1e613b 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..3157f1e00 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -12,13 +12,13 @@
//
// @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)
// +--------------------------------------------------------------------------------------------+ //
////////////////////////////////////////////////////////////////////////////////////////////////////
-1.3.6
+2.0.0-dev
+
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index 20abfd8da..cbaecb2b9 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/cake/tests/cases/libs/controller/components/paginator.test.php
@@ -14,19 +14,18 @@
*
* @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)
*/
App::import('Controller', 'Controller', false);
+App::import('Component', 'Paginator');
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 +56,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 +124,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 +167,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 {
@@ -210,6 +206,22 @@ 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;
+ $this->Controller->Post = $this->getMock('Model');
+ $this->Controller->Post->alias = 'Post';
+ }
+
/**
* testPaginate method
*
@@ -217,13 +229,10 @@ 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();
+ $Controller->request->params['pass'] = array('1');
+ $Controller->request->query = array();
$Controller->constructClasses();
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
@@ -238,67 +247,95 @@ 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->Paginator->settings = array('limit' => 1);
- $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->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);
$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
- $Controller->passedArgs = array();
- $Controller->Paginator->settings = array('limit' => 'garbage!');
+ $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);
$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
- $Controller->passedArgs = array();
- $Controller->Paginator->settings = array('limit' => '-1');
+ $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);
$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('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(2))
+ ->method('hasMethod')
+ ->with('paginate')
+ ->will($this->returnValue(false));
+
+ $this->Controller->Post->expects($this->at(3))
+ ->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
*
@@ -306,120 +343,118 @@ 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';
+ $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->Paginator->settings = array('PaginatorControllerPost' => array('contain' => array('PaginatorControllerComment')));
+ $Controller->request->params['named'] = array('page' => '-1');
+ $Controller->Paginator->settings = array(
+ 'PaginatorControllerPost' => array(
+ 'contain' => array('PaginatorControllerComment'),
+ 'maxLimit' => 10,
+ 'paramType' => 'named'
+ ),
+ );
$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, '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);
+ $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'];
$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->request->query = 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,
+ 'paramType' => 'named'
+ )
);
$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,
+ 'paramType' => 'named'
+ );
$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,
+ 'paramType' => 'named'
+ )
);
$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,
+ 'paramType' => 'named'
+ );
$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
}
-/**
- * testPaginatePassedArgs method
- *
- * @return void
- */
- public function testPaginatePassedArgs() {
- $request = new CakeRequest('controller_posts/index');
- $request->params['pass'] = $request->params['named'] = array();
-
- $Controller = new PaginatorTestController($request);
- $Controller->uses = array('PaginatorControllerPost');
- $Controller->passedArgs[] = array('1', '2', '3');
- $Controller->params['url'] = array();
- $Controller->constructClasses();
-
- $Controller->Paginator->settings = array(
- 'fields' => array(),
- 'order' => '',
- 'limit' => 5,
- 'page' => 1,
- 'recursive' => -1
- );
- $conditions = array();
- $Controller->Paginator->paginate('PaginatorControllerPost',$conditions);
-
- $expected = array(
- 'fields' => array(),
- 'order' => '',
- 'limit' => 5,
- 'page' => 1,
- 'recursive' => -1,
- 'conditions' => array()
- );
- $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.
*
* @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();
$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,
+ '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->assertFalse(isset($Controller->params['paging']['PaginatorControllerPost']['defaults'][0]));
+ $this->assertEqual(
+ $Controller->PaginatorControllerPost->lastQuery['conditions'],
+ array('PaginatorControllerPost.id > ' => '1')
+ );
$this->assertFalse(isset($Controller->params['paging']['PaginatorControllerPost']['options'][0]));
}
@@ -430,17 +465,17 @@ 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();
- $Controller->Paginator->settings = array('order' => 'PaginatorControllerPost.id DESC');
+ $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');
+ $this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['order'], 'PaginatorControllerPost.id DESC');
$this->assertEqual($results, array(3, 2, 1));
}
@@ -450,10 +485,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();
@@ -463,12 +495,14 @@ 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,
+ 'paramType' => 'named'
);
$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));
}
@@ -479,11 +513,252 @@ 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');
+ $Controller->Paginator->paginate('MissingModel');
+ }
+
+/**
+ * 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');
+ $this->assertEquals($this->Paginator->settings, $result);
+
+ $result = $this->Paginator->mergeOptions('Post');
+ $expected = array('page' => 1, 'limit' => 10, 'paramType' => 'named', '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');
+ $expected = array('page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named');
+ $this->assertEquals($expected, $result);
+ }
+
+/**
+ * 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');
+ $expected = array('page' => 99, 'limit' => 75, 'maxLimit' => 100, 'paramType' => 'querystring');
+ $this->assertEquals($expected, $result);
+ }
+
+/**
+ * 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');
+ $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',
+ );
+ $this->Paginator->whitelist[] = 'fields';
+ $result = $this->Paginator->mergeOptions('Post');
+ $expected = array(
+ 'page' => 10, 'limit' => 10, 'maxLimit' => 100, 'paramType' => 'named', 'fields' => array('bad.stuff')
+ );
+ $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 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.
+ *
+ * @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']);
+ }
+
+/**
+ * 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']);
+ }
+
+/**
+ * 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
diff --git a/cake/tests/cases/libs/controller_test_case.test.php b/cake/tests/cases/libs/controller_test_case.test.php
index 0ec621ccb..685168b06 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 {
@@ -171,7 +167,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 +194,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 +250,7 @@ class ControllerTestCaseTest extends CakeTestCase {
include LIBS . '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/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/lib/controller_test_case.php b/cake/tests/lib/controller_test_case.php
index 63188b059..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 {
@@ -65,10 +63,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();
}
@@ -78,8 +75,7 @@ class ControllerTestDispatcher extends Dispatcher {
/**
* InterceptContentHelper class
*
- * @package cake
- * @subpackage cake.cake.tests.lib
+ * @package cake.tests.lib
*/
class InterceptContentHelper extends Helper {
@@ -97,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/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)
*/
diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php
index 23da5b56e..9f84ac997 100644
--- a/lib/Cake/Cache/Cache.php
+++ b/lib/Cake/Cache/Cache.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.4933
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -22,10 +21,27 @@
App::uses('Inflector', 'Utility');
/**
- * 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 {
@@ -439,8 +455,7 @@ class Cache {
/**
* Storage engine for CakePHP caching
*
- * @package cake
- * @subpackage cake.cake.libs
+ * @package cake.libs
*/
abstract class CacheEngine {
diff --git a/lib/Cake/Cache/Engine/ApcEngine.php b/lib/Cake/Cache/Engine/ApcEngine.php
index dbc4df8cc..544a0c908 100644
--- a/lib/Cake/Cache/Engine/ApcEngine.php
+++ b/lib/Cake/Cache/Engine/ApcEngine.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/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php
index 7560d8113..46ff892a3 100644
--- a/lib/Cake/Cache/Engine/FileEngine.php
+++ b/lib/Cake/Cache/Engine/FileEngine.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/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php
index d4a1dbfa8..79d98376e 100644
--- a/lib/Cake/Cache/Engine/MemcacheEngine.php
+++ b/lib/Cake/Cache/Engine/MemcacheEngine.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/lib/Cake/Cache/Engine/XcacheEngine.php b/lib/Cake/Cache/Engine/XcacheEngine.php
index be8f53c22..53b0d08b9 100644
--- a/lib/Cake/Cache/Engine/XcacheEngine.php
+++ b/lib/Cake/Cache/Engine/XcacheEngine.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/lib/Cake/Configure/IniReader.php b/lib/Cake/Configure/IniReader.php
index e901d4e18..915bf9498 100644
--- a/lib/Cake/Configure/IniReader.php
+++ b/lib/Cake/Configure/IniReader.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/lib/Cake/Configure/PhpReader.php b/lib/Cake/Configure/PhpReader.php
index 1e2734d12..c122f0808 100644
--- a/lib/Cake/Configure/PhpReader.php
+++ b/lib/Cake/Configure/PhpReader.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/lib/Cake/Console/AppShell.php b/lib/Cake/Console/AppShell.php
index 59fcc2a09..a624a31ad 100644
--- a/lib/Cake/Console/AppShell.php
+++ b/lib/Cake/Console/AppShell.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/lib/Cake/Console/Command/AclShell.php b/lib/Cake/Console/Command/AclShell.php
index 04aaa4936..7d715e579 100644
--- a/lib/Cake/Console/Command/AclShell.php
+++ b/lib/Cake/Console/Command/AclShell.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.shells
* @since CakePHP(tm) v 1.2.0.5012
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -24,8 +23,7 @@ App::uses('DbAcl', 'Model');
* 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/lib/Cake/Console/Command/ApiShell.php b/lib/Cake/Console/Command/ApiShell.php
index a9a436a29..20de1d097 100644
--- a/lib/Cake/Console/Command/ApiShell.php
+++ b/lib/Cake/Console/Command/ApiShell.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.shells
* @since CakePHP(tm) v 1.2.0.5012
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -24,8 +23,7 @@ App::uses('File', 'Utility');
/**
* 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/lib/Cake/Console/Command/BakeShell.php b/lib/Cake/Console/Command/BakeShell.php
index 8d3b40e3a..64bd045f7 100644
--- a/lib/Cake/Console/Command/BakeShell.php
+++ b/lib/Cake/Console/Command/BakeShell.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.shells
* @since CakePHP(tm) v 1.2.0.5012
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -27,8 +26,7 @@ App::uses('Model', 'Model');
/**
* 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/lib/Cake/Console/Command/CommandListShell.php b/lib/Cake/Console/Command/CommandListShell.php
index 65a576b48..81d16a22f 100644
--- a/lib/Cake/Console/Command/CommandListShell.php
+++ b/lib/Cake/Console/Command/CommandListShell.php
@@ -12,8 +12,6 @@
*
* @copyright Copyright 2006-2010, Cake Software Foundation, Inc.
* @link http://cakephp.org CakePHP Project
- * @package cake
- * @subpackage cake.tests.cases.console.libs
* @since CakePHP v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -21,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/lib/Cake/Console/Command/ConsoleShell.php b/lib/Cake/Console/Command/ConsoleShell.php
index 5cedf5a97..1e00d7dd7 100644
--- a/lib/Cake/Console/Command/ConsoleShell.php
+++ b/lib/Cake/Console/Command/ConsoleShell.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.shells
* @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.shells
*/
class ConsoleShell extends Shell {
diff --git a/lib/Cake/Console/Command/I18nShell.php b/lib/Cake/Console/Command/I18nShell.php
index c40160e54..0a2bdeef6 100644
--- a/lib/Cake/Console/Command/I18nShell.php
+++ b/lib/Cake/Console/Command/I18nShell.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.shells
* @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.shells
*/
class I18nShell extends Shell {
diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php
index 280a86c69..a311fc927 100644
--- a/lib/Cake/Console/Command/SchemaShell.php
+++ b/lib/Cake/Console/Command/SchemaShell.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.shells
* @since CakePHP(tm) v 1.2.0.5550
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -26,8 +25,7 @@ App::uses('CakeSchema', 'Model');
/**
* Schema is a command-line database management utility for automating programmer chores.
*
- * @package cake
- * @subpackage cake.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/lib/Cake/Console/Command/Task/BakeTask.php b/lib/Cake/Console/Command/Task/BakeTask.php
index 6a89e187c..bd7f59e69 100644
--- a/lib/Cake/Console/Command/Task/BakeTask.php
+++ b/lib/Cake/Console/Command/Task/BakeTask.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.shells.tasks
* @since CakePHP(tm) v 1.3
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
diff --git a/lib/Cake/Console/Command/Task/ControllerTask.php b/lib/Cake/Console/Command/Task/ControllerTask.php
index 449a3aa84..bdfd6060d 100644
--- a/lib/Cake/Console/Command/Task/ControllerTask.php
+++ b/lib/Cake/Console/Command/Task/ControllerTask.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.shells.tasks
* @since CakePHP(tm) v 1.2
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -23,8 +22,7 @@ App::uses('BakeTask', 'Console/Command/Task');
/**
* Task class for creating and updating controller files.
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class ControllerTask extends BakeTask {
diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
index 9f866b1c1..1d88b3a61 100644
--- a/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ b/lib/Cake/Console/Command/Task/DbConfigTask.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.shells.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.shells.tasks
*/
class DbConfigTask extends Shell {
diff --git a/lib/Cake/Console/Command/Task/ExtractTask.php b/lib/Cake/Console/Command/Task/ExtractTask.php
index e79df6b8d..a5ece60c7 100644
--- a/lib/Cake/Console/Command/Task/ExtractTask.php
+++ b/lib/Cake/Console/Command/Task/ExtractTask.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.shells.tasks
* @since CakePHP(tm) v 1.2.0.5012
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -21,8 +20,7 @@ App::uses('File', 'Utility');
/**
* Language string extractor
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class ExtractTask extends Shell {
diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php
index 2e0a4c31e..1658dcad8 100644
--- a/lib/Cake/Console/Command/Task/FixtureTask.php
+++ b/lib/Cake/Console/Command/Task/FixtureTask.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.shells.tasks
* @since CakePHP(tm) v 1.3
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -24,8 +23,7 @@ App::uses('Model', 'Model');
/**
* Task class for creating and updating fixtures files.
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class FixtureTask extends BakeTask {
diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php
index a33cf0dfc..fc184c54b 100644
--- a/lib/Cake/Console/Command/Task/ModelTask.php
+++ b/lib/Cake/Console/Command/Task/ModelTask.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.shells.tasks
* @since CakePHP(tm) v 1.2
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -25,8 +24,7 @@ App::uses('Model', 'Model');
/**
* Task class for creating and updating model files.
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class ModelTask extends BakeTask {
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
index 84c296623..37ea34f67 100644
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/lib/Cake/Console/Command/Task/PluginTask.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.shells.tasks
* @since CakePHP(tm) v 1.2
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -23,8 +22,7 @@ App::uses('File', 'Utility');
/**
* Task class for creating a plugin
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class PluginTask extends Shell {
diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php
index 4a5538220..958f8e383 100644
--- a/lib/Cake/Console/Command/Task/ProjectTask.php
+++ b/lib/Cake/Console/Command/Task/ProjectTask.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.shells.tasks
* @since CakePHP(tm) v 1.2
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -24,8 +23,7 @@ App::uses('File', 'Utility');
/**
* Task class for creating new project apps and plugins
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class ProjectTask extends Shell {
diff --git a/lib/Cake/Console/Command/Task/TemplateTask.php b/lib/Cake/Console/Command/Task/TemplateTask.php
index b30881581..a2d0fa7bb 100644
--- a/lib/Cake/Console/Command/Task/TemplateTask.php
+++ b/lib/Cake/Console/Command/Task/TemplateTask.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.shells.tasks
* @since CakePHP(tm) v 1.3
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php
index 3a52b6569..09378cf62 100644
--- a/lib/Cake/Console/Command/Task/TestTask.php
+++ b/lib/Cake/Console/Command/Task/TestTask.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.shells.tasks
* @since CakePHP(tm) v 1.3
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -24,8 +23,7 @@ App::uses('ClassRegistry', 'Utility');
/**
* Task class for creating and updating test files.
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class TestTask extends BakeTask {
diff --git a/lib/Cake/Console/Command/Task/ViewTask.php b/lib/Cake/Console/Command/Task/ViewTask.php
index 106ba864a..6483312fd 100644
--- a/lib/Cake/Console/Command/Task/ViewTask.php
+++ b/lib/Cake/Console/Command/Task/ViewTask.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)
*/
@@ -24,8 +23,7 @@ App::uses('BakeTask', 'Console/Command/Task');
/**
* Task class for creating and updating view files.
*
- * @package cake
- * @subpackage cake.cake.console.libs.tasks
+ * @package cake.console.shells.tasks
*/
class ViewTask extends BakeTask {
diff --git a/lib/Cake/Console/Command/TestSuiteShell.php b/lib/Cake/Console/Command/TestSuiteShell.php
index c62205162..83359c8c3 100644
--- a/lib/Cake/Console/Command/TestSuiteShell.php
+++ b/lib/Cake/Console/Command/TestSuiteShell.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.shells
* @since CakePHP(tm) v 1.2.0.4433
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
diff --git a/lib/Cake/Console/ConsoleErrorHandler.php b/lib/Cake/Console/ConsoleErrorHandler.php
index dbd84aa99..6fe08ca55 100644
--- a/lib/Cake/Console/ConsoleErrorHandler.php
+++ b/lib/Cake/Console/ConsoleErrorHandler.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.libs
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -25,8 +24,7 @@ App::uses('CakeLog', 'Log');
* 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.libs
*/
class ConsoleErrorHandler extends ErrorHandler {
@@ -52,8 +50,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) {
@@ -68,6 +67,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 +88,4 @@ class ConsoleErrorHandler extends ErrorHandler {
}
}
-/**
- * undocumented function
- *
- * @return void
- */
- public function render() {
- $this->stderr->write(sprintf(
- __("Error: %s\n%s"),
- $this->error->getMessage(),
- $this->error->getTraceAsString()
- ));
- }
-
}
diff --git a/lib/Cake/Console/ConsoleInput.php b/lib/Cake/Console/ConsoleInput.php
index 33127ae9b..8378b2e85 100644
--- a/lib/Cake/Console/ConsoleInput.php
+++ b/lib/Cake/Console/ConsoleInput.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.console
+ * @package cake.console.libs
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
/**
* Object wrapper for interacting with stdin
*
- * @package cake.console
+ * @package cake.console.libs
*/
class ConsoleInput {
/**
@@ -33,7 +32,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/lib/Cake/Console/ConsoleInputArgument.php b/lib/Cake/Console/ConsoleInputArgument.php
index 200582353..263475e9d 100644
--- a/lib/Cake/Console/ConsoleInputArgument.php
+++ b/lib/Cake/Console/ConsoleInputArgument.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.libs
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -22,11 +21,36 @@
* ConsoleOptionParser creates these when you use addArgument()
*
* @see ConsoleOptionParser::addArgument()
- * @package cake.console
+ * @package cake.console.libs
*/
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 +58,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 +83,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 +148,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/lib/Cake/Console/ConsoleInputOption.php b/lib/Cake/Console/ConsoleInputOption.php
index 56b01d448..3c9049248 100644
--- a/lib/Cake/Console/ConsoleInputOption.php
+++ b/lib/Cake/Console/ConsoleInputOption.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.libs
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -23,11 +22,50 @@
* ConsoleOptionParser creates these when you use addOption()
*
* @see ConsoleOptionParser::addOption()
- * @package cake.console
+ * @package cake.console.libs
*/
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 +75,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 +154,7 @@ class ConsoleInputOption {
/**
* Get the default value for this option
*
- * @return void
+ * @return mixed
*/
public function defaultValue() {
return $this->_default;
diff --git a/lib/Cake/Console/ConsoleInputSubcommand.php b/lib/Cake/Console/ConsoleInputSubcommand.php
index 76bd19d2f..b2903aec2 100644
--- a/lib/Cake/Console/ConsoleInputSubcommand.php
+++ b/lib/Cake/Console/ConsoleInputSubcommand.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.libs
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -23,19 +22,38 @@
* ConsoleOptionParser creates these when you use addSubcommand()
*
* @see ConsoleOptionParser::addSubcommand()
- * @package cake.console
+ * @package cake.console.libs
*/
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/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php
index cbfec1cd4..82e49d1d0 100644
--- a/lib/Cake/Console/ConsoleOptionParser.php
+++ b/lib/Cake/Console/ConsoleOptionParser.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.libs
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -30,8 +29,7 @@ App::uses('HelpFormatter', 'Console');
* for GetOpt compatible option definition. Provides a builder pattern implementation
* for creating shell option parsers.
*
- * @package cake
- * @subpackage cake.cake.console
+ * @package cake.console.libs
*/
class ConsoleOptionParser {
@@ -91,7 +89,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
@@ -198,7 +196,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
@@ -212,7 +210,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
@@ -250,7 +248,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.
@@ -263,11 +261,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();
@@ -280,7 +279,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;
@@ -303,7 +302,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.
*/
@@ -360,21 +359,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();
@@ -384,7 +382,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/lib/Cake/Console/ConsoleOutput.php b/lib/Cake/Console/ConsoleOutput.php
index ef47266f0..7d41da4d7 100644
--- a/lib/Cake/Console/ConsoleOutput.php
+++ b/lib/Cake/Console/ConsoleOutput.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.libs
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -21,7 +20,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.
@@ -42,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 {
/**
@@ -143,8 +142,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 +155,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 +215,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/lib/Cake/Console/HelpFormatter.php b/lib/Cake/Console/HelpFormatter.php
index 40f3b3cc8..c3cc45f2e 100644
--- a/lib/Cake/Console/HelpFormatter.php
+++ b/lib/Cake/Console/HelpFormatter.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::uses('String', 'Utility');
@@ -28,12 +25,14 @@ App::uses('String', 'Utility');
*
* Xml output is useful for intergration with other tools like IDE's or other build tools.
*
+ * @package cake.console.libs
+ * @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;
diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
index ff671ef34..02c11759b 100644
--- a/lib/Cake/Console/Shell.php
+++ b/lib/Cake/Console/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.shells
* @since CakePHP(tm) v 1.2.0.5012
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -27,8 +26,7 @@ App::uses('ConsoleOptionParser', 'Console');
/**
* Base class for command-line utilities for automating programmer chores.
*
- * @package cake
- * @subpackage cake.cake.console.libs
+ * @package cake.console.shells
*/
class Shell extends Object {
@@ -222,6 +220,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);
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
index 046e5baf3..ae34456f2 100644
--- a/lib/Cake/Console/ShellDispatcher.php
+++ b/lib/Cake/Console/ShellDispatcher.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/lib/Cake/Console/TaskCollection.php b/lib/Cake/Console/TaskCollection.php
index b681d571d..bf64b496f 100644
--- a/lib/Cake/Console/TaskCollection.php
+++ b/lib/Cake/Console/TaskCollection.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/lib/Cake/Console/cake b/lib/Cake/Console/cake
index d0bdb5cc0..81df781da 100755
--- a/lib/Cake/Console/cake
+++ b/lib/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/lib/Cake/Console/cake.bat b/lib/Cake/Console/cake.bat
index cb1831d94..40a271425 100644
--- a/lib/Cake/Console/cake.bat
+++ b/lib/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/lib/Cake/Console/cake.php b/lib/Cake/Console/cake.php
index fc0c0b484..d21afb15c 100644
--- a/lib/Cake/Console/cake.php
+++ b/lib/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/lib/Cake/Console/templates/default/actions/controller_actions.ctp b/lib/Cake/Console/templates/default/actions/controller_actions.ctp
index 0a4c9d311..e6f0f8e83 100644
--- a/lib/Cake/Console/templates/default/actions/controller_actions.ctp
+++ b/lib/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)
*/
@@ -86,7 +85,7 @@
}
} else {
- $this->data = $this->->read(null, $id);
+ $this->request->data = $this->->read(null, $id);
}
form">
Form->create('{$modelClass}');?>\n";?>
tags) for the layout
*
* @var array
- * @access protected
*/
protected $_scripts = array();
@@ -273,7 +249,6 @@ class View extends Object {
* Holds an array of paths.
*
* @var array
- * @access private
*/
private $__paths = array();
@@ -304,9 +279,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 +355,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 +567,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 +633,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;
}
diff --git a/lib/Cake/View/elements/email/html/default.ctp b/lib/Cake/View/elements/email/html/default.ctp
index 45a84c9e0..3ab3f4cc6 100644
--- a/lib/Cake/View/elements/email/html/default.ctp
+++ b/lib/Cake/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/lib/Cake/View/elements/email/text/default.ctp b/lib/Cake/View/elements/email/text/default.ctp
index 9d384e3f8..7655f1430 100644
--- a/lib/Cake/View/elements/email/text/default.ctp
+++ b/lib/Cake/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/lib/Cake/View/elements/exception_stack_trace.ctp b/lib/Cake/View/elements/exception_stack_trace.ctp
index 9219e21ae..247c45169 100644
--- a/lib/Cake/View/elements/exception_stack_trace.ctp
+++ b/lib/Cake/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/lib/Cake/View/elements/sql_dump.ctp b/lib/Cake/View/elements/sql_dump.ctp
index 025d5ae93..b770dfbaa 100644
--- a/lib/Cake/View/elements/sql_dump.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/error400.ctp b/lib/Cake/View/errors/error400.ctp
index 4d1660517..b6487ee91 100644
--- a/lib/Cake/View/errors/error400.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/error500.ctp b/lib/Cake/View/errors/error500.ctp
index b5bdcfde0..e032b9eed 100644
--- a/lib/Cake/View/errors/error500.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_action.ctp b/lib/Cake/View/errors/missing_action.ctp
index 19cfe6222..5b6fdb970 100644
--- a/lib/Cake/View/errors/missing_action.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_behavior_class.ctp b/lib/Cake/View/errors/missing_behavior_class.ctp
index eb19034b8..e7c454069 100644
--- a/lib/Cake/View/errors/missing_behavior_class.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_behavior_file.ctp b/lib/Cake/View/errors/missing_behavior_file.ctp
index 6f90206c1..09e90b350 100644
--- a/lib/Cake/View/errors/missing_behavior_file.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_component_class.ctp b/lib/Cake/View/errors/missing_component_class.ctp
index ccb0497ef..cf06671dc 100644
--- a/lib/Cake/View/errors/missing_component_class.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_component_file.ctp b/lib/Cake/View/errors/missing_component_file.ctp
index 592238fb4..527afc9c3 100644
--- a/lib/Cake/View/errors/missing_component_file.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_connection.ctp b/lib/Cake/View/errors/missing_connection.ctp
index 2f11f4f5f..dfda66e3a 100644
--- a/lib/Cake/View/errors/missing_connection.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_controller.ctp b/lib/Cake/View/errors/missing_controller.ctp
index d45d8d31c..7f9e7d27f 100644
--- a/lib/Cake/View/errors/missing_controller.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_database.ctp b/lib/Cake/View/errors/missing_database.ctp
index d3e4944f6..7aa2d5e80 100644
--- a/lib/Cake/View/errors/missing_database.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_helper_class.ctp b/lib/Cake/View/errors/missing_helper_class.ctp
index 9742a1563..842ded905 100644
--- a/lib/Cake/View/errors/missing_helper_class.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_helper_file.ctp b/lib/Cake/View/errors/missing_helper_file.ctp
index 69bf38e30..6ba0e9b6f 100644
--- a/lib/Cake/View/errors/missing_helper_file.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_layout.ctp b/lib/Cake/View/errors/missing_layout.ctp
index 28445cc77..011e59a64 100644
--- a/lib/Cake/View/errors/missing_layout.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_table.ctp b/lib/Cake/View/errors/missing_table.ctp
index b639856fe..1288dd06a 100644
--- a/lib/Cake/View/errors/missing_table.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/missing_view.ctp b/lib/Cake/View/errors/missing_view.ctp
index 658f4d1ce..9d8c7cb91 100644
--- a/lib/Cake/View/errors/missing_view.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/private_action.ctp b/lib/Cake/View/errors/private_action.ctp
index c91062ba2..833f42112 100644
--- a/lib/Cake/View/errors/private_action.ctp
+++ b/lib/Cake/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/lib/Cake/View/errors/scaffold_error.ctp b/lib/Cake/View/errors/scaffold_error.ctp
index 931cbdca5..40f09c90a 100644
--- a/lib/Cake/View/errors/scaffold_error.ctp
+++ b/lib/Cake/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/lib/Cake/View/layouts/ajax.ctp b/lib/Cake/View/layouts/ajax.ctp
index dadf156ed..93371552b 100644
--- a/lib/Cake/View/layouts/ajax.ctp
+++ b/lib/Cake/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/lib/Cake/View/layouts/default.ctp b/lib/Cake/View/layouts/default.ctp
index 30ec1a7dc..f247f3c35 100644
--- a/lib/Cake/View/layouts/default.ctp
+++ b/lib/Cake/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/lib/Cake/View/layouts/email/html/default.ctp b/lib/Cake/View/layouts/email/html/default.ctp
index 41ce9a42d..7a8a1e7df 100644
--- a/lib/Cake/View/layouts/email/html/default.ctp
+++ b/lib/Cake/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/lib/Cake/View/layouts/email/text/default.ctp b/lib/Cake/View/layouts/email/text/default.ctp
index 979535832..236b8ebb3 100644
--- a/lib/Cake/View/layouts/email/text/default.ctp
+++ b/lib/Cake/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/lib/Cake/View/layouts/flash.ctp b/lib/Cake/View/layouts/flash.ctp
index 970589df0..cbe4c5abc 100644
--- a/lib/Cake/View/layouts/flash.ctp
+++ b/lib/Cake/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/lib/Cake/View/pages/home.ctp b/lib/Cake/View/pages/home.ctp
index 9beb7b0d0..bdc5bd97a 100644
--- a/lib/Cake/View/pages/home.ctp
+++ b/lib/Cake/View/pages/home.ctp
@@ -11,14 +11,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.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)
*/
if (Configure::read('debug') == 0):
throw new NotFoundException();
endif;
+App::import('Core', 'Debugger');
?>
diff --git a/lib/Cake/View/scaffolds/form.ctp b/lib/Cake/View/scaffolds/form.ctp
index 7fb2c4c8b..1a3992e38 100644
--- a/lib/Cake/View/scaffolds/form.ctp
+++ b/lib/Cake/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/lib/Cake/View/scaffolds/index.ctp b/lib/Cake/View/scaffolds/index.ctp
index d92b88320..c3da1d4d8 100644
--- a/lib/Cake/View/scaffolds/index.ctp
+++ b/lib/Cake/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/lib/Cake/View/scaffolds/view.ctp b/lib/Cake/View/scaffolds/view.ctp
index 963c59acc..c31b7397f 100644
--- a/lib/Cake/View/scaffolds/view.ctp
+++ b/lib/Cake/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/lib/Cake/basics.php b/lib/Cake/basics.php
index 3234e1caa..a4d132ca4 100644
--- a/lib/Cake/basics.php
+++ b/lib/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/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index 97f38c04a..2ec1d4e0d 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.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
+ * @package cake.config
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -246,4 +245,4 @@ if (!defined('FULL_BASE_URL')) {
define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost);
}
unset($httpHost, $s);
-}
\ No newline at end of file
+}
diff --git a/lib/Cake/config/config.php b/lib/Cake/config/config.php
index 071441c21..906fa844a 100644
--- a/lib/Cake/config/config.php
+++ b/lib/Cake/config/config.php
@@ -12,9 +12,8 @@
*
* @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)
*/
-return $config['Cake.version'] = '1.3.6';
+return $config['Cake.version'] = '2.0.0-dev';
diff --git a/lib/Cake/config/unicode/casefolding/0080_00ff.php b/lib/Cake/config/unicode/casefolding/0080_00ff.php
index 0d2fa16be..ef01fe904 100644
--- a/lib/Cake/config/unicode/casefolding/0080_00ff.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/0100_017f.php b/lib/Cake/config/unicode/casefolding/0100_017f.php
index 64ab7d393..1f7f1449c 100644
--- a/lib/Cake/config/unicode/casefolding/0100_017f.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/0180_024F.php b/lib/Cake/config/unicode/casefolding/0180_024F.php
index 23c692632..f2a5a849b 100644
--- a/lib/Cake/config/unicode/casefolding/0180_024F.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/0250_02af.php b/lib/Cake/config/unicode/casefolding/0250_02af.php
index 1ef96c6af..3140c1312 100644
--- a/lib/Cake/config/unicode/casefolding/0250_02af.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/0370_03ff.php b/lib/Cake/config/unicode/casefolding/0370_03ff.php
index 50618afb8..7609089da 100644
--- a/lib/Cake/config/unicode/casefolding/0370_03ff.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/0400_04ff.php b/lib/Cake/config/unicode/casefolding/0400_04ff.php
index a04d3df66..3b12b059e 100644
--- a/lib/Cake/config/unicode/casefolding/0400_04ff.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/0500_052f.php b/lib/Cake/config/unicode/casefolding/0500_052f.php
index 661f66d63..453b9b7df 100644
--- a/lib/Cake/config/unicode/casefolding/0500_052f.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/0530_058f.php b/lib/Cake/config/unicode/casefolding/0530_058f.php
index 232649ec4..3181438ec 100644
--- a/lib/Cake/config/unicode/casefolding/0530_058f.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/1e00_1eff.php b/lib/Cake/config/unicode/casefolding/1e00_1eff.php
index 3a8378691..ed49211a9 100644
--- a/lib/Cake/config/unicode/casefolding/1e00_1eff.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/1f00_1fff.php b/lib/Cake/config/unicode/casefolding/1f00_1fff.php
index a4040b852..2b0d24bf2 100644
--- a/lib/Cake/config/unicode/casefolding/1f00_1fff.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/2100_214f.php b/lib/Cake/config/unicode/casefolding/2100_214f.php
index 1685ebb71..a10d613f4 100644
--- a/lib/Cake/config/unicode/casefolding/2100_214f.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/2150_218f.php b/lib/Cake/config/unicode/casefolding/2150_218f.php
index 44bf3ff89..6ccd3de8c 100644
--- a/lib/Cake/config/unicode/casefolding/2150_218f.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/2460_24ff.php b/lib/Cake/config/unicode/casefolding/2460_24ff.php
index 4376e2b71..2e7a85321 100644
--- a/lib/Cake/config/unicode/casefolding/2460_24ff.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/2c00_2c5f.php b/lib/Cake/config/unicode/casefolding/2c00_2c5f.php
index e8a70bc32..797cf964d 100644
--- a/lib/Cake/config/unicode/casefolding/2c00_2c5f.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/2c60_2c7f.php b/lib/Cake/config/unicode/casefolding/2c60_2c7f.php
index dabdb88a2..058193ca6 100644
--- a/lib/Cake/config/unicode/casefolding/2c60_2c7f.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/2c80_2cff.php b/lib/Cake/config/unicode/casefolding/2c80_2cff.php
index c0245fa16..d439bc2e7 100644
--- a/lib/Cake/config/unicode/casefolding/2c80_2cff.php
+++ b/lib/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/lib/Cake/config/unicode/casefolding/ff00_ffef.php b/lib/Cake/config/unicode/casefolding/ff00_ffef.php
index 74a2b5c4a..0b8106532 100644
--- a/lib/Cake/config/unicode/casefolding/ff00_ffef.php
+++ b/lib/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/lib/Cake/tests/cases/basics.test.php b/lib/Cake/tests/cases/basics.test.php
index 255158a88..50f0d0878 100644
--- a/lib/Cake/tests/cases/basics.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('Folder', 'Utility');
/**
* BasicsTest class
*
- * @package cake
- * @subpackage cake.tests.cases
+ * @package cake.tests.cases
*/
class BasicsTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/console/all_console.test.php b/lib/Cake/tests/cases/console/all_console.test.php
index 101a8faba..305ebbfc3 100644
--- a/lib/Cake/tests/cases/console/all_console.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/all_console_libs.test.php b/lib/Cake/tests/cases/console/all_console_libs.test.php
index 70fb8746d..ad1f60fbd 100644
--- a/lib/Cake/tests/cases/console/all_console_libs.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/all_shells.test.php b/lib/Cake/tests/cases/console/all_shells.test.php
index 7f657af82..e8ca96ac5 100644
--- a/lib/Cake/tests/cases/console/all_shells.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/all_tasks.test.php b/lib/Cake/tests/cases/console/all_tasks.test.php
index 51decf3d1..91ca6abdc 100644
--- a/lib/Cake/tests/cases/console/all_tasks.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/libs/console_error_handler.test.php b/lib/Cake/tests/cases/console/libs/console_error_handler.test.php
index f00232bfb..51d16ab0f 100644
--- a/lib/Cake/tests/cases/console/libs/console_error_handler.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/libs/console_option_parser.test.php b/lib/Cake/tests/cases/console/libs/console_option_parser.test.php
index e010bbaf4..fac420ecd 100644
--- a/lib/Cake/tests/cases/console/libs/console_option_parser.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/libs/console_output.test.php b/lib/Cake/tests/cases/console/libs/console_output.test.php
index 9e9c8710d..d2af99d04 100644
--- a/lib/Cake/tests/cases/console/libs/console_output.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/libs/help_formatter.test.php b/lib/Cake/tests/cases/console/libs/help_formatter.test.php
index a957843b1..5caae1490 100644
--- a/lib/Cake/tests/cases/console/libs/help_formatter.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/libs/task_collection.test.php b/lib/Cake/tests/cases/console/libs/task_collection.test.php
index ac22f2ac2..908efb445 100644
--- a/lib/Cake/tests/cases/console/libs/task_collection.test.php
+++ b/lib/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)
*/
@@ -49,8 +48,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 +64,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 +93,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/lib/Cake/tests/cases/console/shell_dispatcher.test.php b/lib/Cake/tests/cases/console/shell_dispatcher.test.php
index f0e342f51..5438efdfb 100644
--- a/lib/Cake/tests/cases/console/shell_dispatcher.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/shells/acl.test.php b/lib/Cake/tests/cases/console/shells/acl.test.php
index 7a0270084..cd41387c1 100644
--- a/lib/Cake/tests/cases/console/shells/acl.test.php
+++ b/lib/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 @@ App::uses('AclShell', 'Console/Command');
/**
* 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/lib/Cake/tests/cases/console/shells/api.test.php b/lib/Cake/tests/cases/console/shells/api.test.php
index 21a7b6ebb..4edac48da 100644
--- a/lib/Cake/tests/cases/console/shells/api.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('ApiShell', 'Console/Command');
/**
* 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/lib/Cake/tests/cases/console/shells/bake.test.php b/lib/Cake/tests/cases/console/shells/bake.test.php
index 1e3083c27..a4c90203f 100644
--- a/lib/Cake/tests/cases/console/shells/bake.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/shells/command_list.test.php b/lib/Cake/tests/cases/console/shells/command_list.test.php
index 602037cf3..d9cb3fd6a 100644
--- a/lib/Cake/tests/cases/console/shells/command_list.test.php
+++ b/lib/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/lib/Cake/tests/cases/console/shells/schema.test.php b/lib/Cake/tests/cases/console/shells/schema.test.php
index ae95a52df..1c11998c7 100644
--- a/lib/Cake/tests/cases/console/shells/schema.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('CakeSchema', 'Model');
/**
* Test for Schema database management
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class SchemaShellTestSchema extends CakeSchema {
@@ -86,8 +84,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/lib/Cake/tests/cases/console/shells/shell.test.php b/lib/Cake/tests/cases/console/shells/shell.test.php
index 457af05d5..fbbab30b1 100644
--- a/lib/Cake/tests/cases/console/shells/shell.test.php
+++ b/lib/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 @@ App::uses('Folder', 'Utility');
/**
* 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 {
@@ -143,9 +138,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/lib/Cake/tests/cases/console/shells/tasks/controller.test.php b/lib/Cake/tests/cases/console/shells/tasks/controller.test.php
index c3d95fbbb..cd92ba2c8 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/controller.test.php
+++ b/lib/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)
*/
@@ -43,8 +42,7 @@ if (class_exists('BakeArticle')) {
/**
* 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/lib/Cake/tests/cases/console/shells/tasks/db_config.test.php b/lib/Cake/tests/cases/console/shells/tasks/db_config.test.php
index 50aa43873..2f6b76796 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/db_config.test.php
+++ b/lib/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)
*/
@@ -47,8 +46,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/lib/Cake/tests/cases/console/shells/tasks/extract.test.php b/lib/Cake/tests/cases/console/shells/tasks/extract.test.php
index e4c81e182..333aae290 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/extract.test.php
+++ b/lib/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 @@ App::uses('ExtractTask', 'Console/Command/Task');
/**
* 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/lib/Cake/tests/cases/console/shells/tasks/fixture.test.php b/lib/Cake/tests/cases/console/shells/tasks/fixture.test.php
index c00b4fb94..fc18f87eb 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/fixture.test.php
+++ b/lib/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)
*/
@@ -27,8 +26,7 @@ App::uses('DbConfigTask', 'Console/Command/Task');
/**
* 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/lib/Cake/tests/cases/console/shells/tasks/model.test.php b/lib/Cake/tests/cases/console/shells/tasks/model.test.php
index fa48d5921..8546f62bf 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/model.test.php
+++ b/lib/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)
*/
@@ -29,8 +28,7 @@ App::uses('ModelTask', 'Console/Command/Task');
/**
* 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/lib/Cake/tests/cases/console/shells/tasks/plugin.test.php b/lib/Cake/tests/cases/console/shells/tasks/plugin.test.php
index ad86a6a50..89922043f 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/plugin.test.php
+++ b/lib/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)
*/
@@ -29,8 +28,7 @@ App::uses('File', 'Utility');
/**
* 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/lib/Cake/tests/cases/console/shells/tasks/project.test.php b/lib/Cake/tests/cases/console/shells/tasks/project.test.php
index cdd27e451..c3f349524 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/project.test.php
+++ b/lib/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)
*/
@@ -28,8 +27,7 @@ App::uses('File', 'Utility');
/**
* 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/lib/Cake/tests/cases/console/shells/tasks/template.test.php b/lib/Cake/tests/cases/console/shells/tasks/template.test.php
index 273beb968..ef2c305e3 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/template.test.php
+++ b/lib/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)
*/
@@ -27,8 +26,7 @@ App::uses('TemplateTask', 'Console/Command/Task');
/**
* 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/lib/Cake/tests/cases/console/shells/tasks/test.test.php b/lib/Cake/tests/cases/console/shells/tasks/test.test.php
index 4a77aaeab..308af1578 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/test.test.php
+++ b/lib/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)
*/
@@ -31,7 +30,7 @@ App::uses('Model', 'Model');
* Test Article model
*
* @package cake
- * @subpackage cake.tests.cases.console.libs.tasks
+ * @package cake.tests.cases.console.libs.tasks
*/
class TestTaskArticle extends Model {
@@ -108,7 +107,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 {
@@ -148,7 +147,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 {
}
@@ -157,7 +156,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 {
@@ -195,7 +194,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 {
@@ -219,8 +218,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/lib/Cake/tests/cases/console/shells/tasks/view.test.php b/lib/Cake/tests/cases/console/shells/tasks/view.test.php
index e742bff64..56fb5c977 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/view.test.php
+++ b/lib/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)
*/
@@ -32,7 +31,7 @@ App::uses('DbConfigTask', 'Console/Command/Task');
* 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 {
@@ -70,7 +69,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 {
@@ -95,7 +94,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 {
@@ -128,7 +127,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 {
@@ -200,8 +199,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/lib/Cake/tests/cases/console/shells/testsuite.test.php b/lib/Cake/tests/cases/console/shells/testsuite.test.php
index 80bd9873a..0fc852520 100644
--- a/lib/Cake/tests/cases/console/shells/testsuite.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_behaviors.test.php b/lib/Cake/tests/cases/libs/all_behaviors.test.php
index b27a1cfe4..88720d386 100644
--- a/lib/Cake/tests/cases/libs/all_behaviors.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_cache_engines.test.php b/lib/Cake/tests/cases/libs/all_cache_engines.test.php
index 64d2da93c..5c03437cd 100644
--- a/lib/Cake/tests/cases/libs/all_cache_engines.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_components.test.php b/lib/Cake/tests/cases/libs/all_components.test.php
index 6724303ca..28e59aadf 100644
--- a/lib/Cake/tests/cases/libs/all_components.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_configure.test.php b/lib/Cake/tests/cases/libs/all_configure.test.php
index 6b1b23fc8..6e35aef74 100644
--- a/lib/Cake/tests/cases/libs/all_configure.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_controllers.test.php b/lib/Cake/tests/cases/libs/all_controllers.test.php
index ab3cf5581..8164896d9 100644
--- a/lib/Cake/tests/cases/libs/all_controllers.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_database.test.php b/lib/Cake/tests/cases/libs/all_database.test.php
index 8c4fc024a..21cef27b6 100644
--- a/lib/Cake/tests/cases/libs/all_database.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_error.test.php b/lib/Cake/tests/cases/libs/all_error.test.php
index e37176908..b64c87542 100644
--- a/lib/Cake/tests/cases/libs/all_error.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_helpers.test.php b/lib/Cake/tests/cases/libs/all_helpers.test.php
index 389290d27..247a10deb 100644
--- a/lib/Cake/tests/cases/libs/all_helpers.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_js_helpers.test.php b/lib/Cake/tests/cases/libs/all_js_helpers.test.php
index b17e6b4fc..9dd0ab750 100644
--- a/lib/Cake/tests/cases/libs/all_js_helpers.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_libs.test.php b/lib/Cake/tests/cases/libs/all_libs.test.php
index b0a070b49..ba0388850 100644
--- a/lib/Cake/tests/cases/libs/all_libs.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_localization.test.php b/lib/Cake/tests/cases/libs/all_localization.test.php
index ce7d0cc95..d30ab86b0 100644
--- a/lib/Cake/tests/cases/libs/all_localization.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_model.test.php b/lib/Cake/tests/cases/libs/all_model.test.php
index fb99184c0..bf968b0c3 100644
--- a/lib/Cake/tests/cases/libs/all_model.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_routing.test.php b/lib/Cake/tests/cases/libs/all_routing.test.php
index cf1ff215e..68f0520f9 100644
--- a/lib/Cake/tests/cases/libs/all_routing.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_socket.test.php b/lib/Cake/tests/cases/libs/all_socket.test.php
index 01af39255..811822f9e 100644
--- a/lib/Cake/tests/cases/libs/all_socket.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_test_suite.test.php b/lib/Cake/tests/cases/libs/all_test_suite.test.php
index f1d52c2dc..b85ea0a19 100644
--- a/lib/Cake/tests/cases/libs/all_test_suite.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_tests.test.php b/lib/Cake/tests/cases/libs/all_tests.test.php
index b3c94cb82..f7bdc72d3 100644
--- a/lib/Cake/tests/cases/libs/all_tests.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_views.test.php b/lib/Cake/tests/cases/libs/all_views.test.php
index a84cd0c6d..0201426e4 100644
--- a/lib/Cake/tests/cases/libs/all_views.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/all_xml.test.php b/lib/Cake/tests/cases/libs/all_xml.test.php
index aed5b21d1..e56714ab0 100644
--- a/lib/Cake/tests/cases/libs/all_xml.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/app.test.php b/lib/Cake/tests/cases/libs/app.test.php
index 4a70fdf8a..fb3dfe29f 100644
--- a/lib/Cake/tests/cases/libs/app.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/cache.test.php b/lib/Cake/tests/cases/libs/cache.test.php
index 5edbe94fc..82c8a7c10 100644
--- a/lib/Cake/tests/cases/libs/cache.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/cache/apc.test.php b/lib/Cake/tests/cases/libs/cache/apc.test.php
index bfdcea470..0abd07778 100644
--- a/lib/Cake/tests/cases/libs/cache/apc.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/cache/file.test.php b/lib/Cake/tests/cases/libs/cache/file.test.php
index 33361f040..fb6741a7a 100644
--- a/lib/Cake/tests/cases/libs/cache/file.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/cache/memcache.test.php b/lib/Cake/tests/cases/libs/cache/memcache.test.php
index e69e243a2..42324a8bc 100644
--- a/lib/Cake/tests/cases/libs/cache/memcache.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/cache/xcache.test.php b/lib/Cake/tests/cases/libs/cache/xcache.test.php
index d889d713c..eea1c4b2c 100644
--- a/lib/Cake/tests/cases/libs/cache/xcache.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/cake_log.test.php b/lib/Cake/tests/cases/libs/cake_log.test.php
index a6a3115cf..3b3abf2e0 100644
--- a/lib/Cake/tests/cases/libs/cake_log.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('FileLog', 'Log/Engine');
/**
* CakeLogTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class CakeLogTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/cake_request.test.php b/lib/Cake/tests/cases/libs/cake_request.test.php
index a65186733..e42376485 100644
--- a/lib/Cake/tests/cases/libs/cake_request.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/cake_session.test.php b/lib/Cake/tests/cases/libs/cake_session.test.php
index d0e96aba5..2da0f25a0 100644
--- a/lib/Cake/tests/cases/libs/cake_session.test.php
+++ b/lib/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)
*/
@@ -33,8 +32,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/lib/Cake/tests/cases/libs/cake_socket.test.php b/lib/Cake/tests/cases/libs/cake_socket.test.php
index c4ff6457f..e84bc4eb1 100644
--- a/lib/Cake/tests/cases/libs/cake_socket.test.php
+++ b/lib/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)
*/
@@ -23,8 +22,7 @@ App::uses('CakeSocket', 'Network');
/**
* SocketTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class CakeSocketTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/cake_test_case.test.php b/lib/Cake/tests/cases/libs/cake_test_case.test.php
index 34d8a4a9b..589c72bf4 100644
--- a/lib/Cake/tests/cases/libs/cake_test_case.test.php
+++ b/lib/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)
*/
@@ -32,8 +31,7 @@ if (!class_exists('AppController', false)) {
/**
* CakeTestCaseTest
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class CakeTestCaseTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/cake_test_fixture.test.php b/lib/Cake/tests/cases/libs/cake_test_fixture.test.php
index fa851e52e..fc0dad82c 100644
--- a/lib/Cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/lib/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)
*/
@@ -23,8 +22,7 @@ App::uses('Model', 'Model');
/**
* CakeTestFixtureTestFixture class
*
- * @package cake
- * @subpackage cake.cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class CakeTestFixtureTestFixture extends CakeTestFixture {
@@ -68,8 +66,7 @@ class CakeTestFixtureTestFixture extends CakeTestFixture {
/**
* CakeTestFixtureImportFixture class
*
- * @package cake
- * @subpackage cake.cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class CakeTestFixtureImportFixture extends CakeTestFixture {
@@ -91,8 +88,7 @@ class CakeTestFixtureImportFixture extends CakeTestFixture {
/**
* CakeTestFixtureDefaultImportFixture class
*
- * @package cake
- * @subpackage cake.cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
@@ -108,7 +104,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';
@@ -126,8 +122,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/lib/Cake/tests/cases/libs/class_registry.test.php b/lib/Cake/tests/cases/libs/class_registry.test.php
index 1b44970b2..7f6e4d54e 100644
--- a/lib/Cake/tests/cases/libs/class_registry.test.php
+++ b/lib/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::uses('ClassRegistry', 'Utility');
/**
* 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/lib/Cake/tests/cases/libs/config/ini_reader.test.php b/lib/Cake/tests/cases/libs/config/ini_reader.test.php
index 8022ca69e..f62ec9cf2 100644
--- a/lib/Cake/tests/cases/libs/config/ini_reader.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/config/php_reader.test.php b/lib/Cake/tests/cases/libs/config/php_reader.test.php
index 29d47ff89..30f2c8fb7 100644
--- a/lib/Cake/tests/cases/libs/config/php_reader.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/configure.test.php b/lib/Cake/tests/cases/libs/configure.test.php
index 16717b39a..5a9708cd5 100644
--- a/lib/Cake/tests/cases/libs/configure.test.php
+++ b/lib/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::uses('PhpReader', 'Configure');
/**
* ConfigureTest
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class ConfigureTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/controller/component.test.php b/lib/Cake/tests/cases/libs/controller/component.test.php
index 1d1464d6d..e1685c25e 100644
--- a/lib/Cake/tests/cases/libs/controller/component.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('Component', 'Controller');
/**
* ParamTestComponent
*
- * @package cake
- * @subpackage cake.tests.cases.libs.controller
+ * @package cake.tests.cases.libs.controller
*/
class ParamTestComponent extends Component {
@@ -67,8 +65,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 {
@@ -93,8 +90,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 {
@@ -129,8 +125,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 {
@@ -168,8 +163,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 {
@@ -195,8 +189,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 {
@@ -212,8 +205,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 {
@@ -229,8 +221,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 {
@@ -247,8 +238,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 {
@@ -285,7 +275,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');
}
/**
@@ -297,8 +287,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));
}
@@ -312,7 +302,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.');
}
@@ -347,9 +337,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/lib/Cake/tests/cases/libs/controller/component_collection.test.php b/lib/Cake/tests/cases/libs/controller/component_collection.test.php
index ab0ea91de..b5481c13b 100644
--- a/lib/Cake/tests/cases/libs/controller/component_collection.test.php
+++ b/lib/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)
*/
@@ -48,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.');
@@ -67,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');
}
@@ -92,8 +91,8 @@ class ComponentCollectionTest extends CakeTestCase {
'plugins' => array(LIBS . '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/lib/Cake/tests/cases/libs/controller/components/acl.test.php b/lib/Cake/tests/cases/libs/controller/components/acl.test.php
index e2415797c..c7a4ecd70 100644
--- a/lib/Cake/tests/cases/libs/controller/components/acl.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('DbAcl', 'Model');
/**
* AclNodeTwoTestBase class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.controller.components
+ * @package cake.tests.cases.libs.controller.components
*/
class AclNodeTwoTestBase extends AclNode {
@@ -49,8 +47,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 {
@@ -82,8 +79,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 {
@@ -115,8 +111,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 {
@@ -164,8 +159,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 {
@@ -186,8 +180,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/lib/Cake/tests/cases/libs/controller/components/auth.test.php b/lib/Cake/tests/cases/libs/controller/components/auth.test.php
index dda510668..804b773bc 100644
--- a/lib/Cake/tests/cases/libs/controller/components/auth.test.php
+++ b/lib/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)
*/
@@ -27,7 +26,7 @@ App::uses('Xml', 'Utility');
* TestAuthComponent class
*
* @package cake
-* @subpackage cake.tests.cases.libs.controller.components
+* @package cake.tests.cases.libs.controller.components
*/
class TestAuthComponent extends AuthComponent {
@@ -62,7 +61,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 {
@@ -123,8 +122,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 {
@@ -141,7 +139,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 {
@@ -211,7 +209,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 {
@@ -365,8 +363,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 {
@@ -445,7 +442,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/lib/Cake/tests/cases/libs/controller/components/cookie.test.php b/lib/Cake/tests/cases/libs/controller/components/cookie.test.php
index 36b0f3bb3..9254ef94c 100644
--- a/lib/Cake/tests/cases/libs/controller/components/cookie.test.php
+++ b/lib/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)
*/
@@ -26,8 +25,7 @@ App::uses('CookieComponent', 'Controller/Component');
/**
* CookieComponentTestController class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.controller.components
+ * @package cake.tests.cases.libs.controller.components
*/
class CookieComponentTestController extends Controller {
@@ -58,8 +56,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/lib/Cake/tests/cases/libs/controller/components/email.test.php b/lib/Cake/tests/cases/libs/controller/components/email.test.php
index 36db895a7..7cc9ad2cd 100755
--- a/lib/Cake/tests/cases/libs/controller/components/email.test.php
+++ b/lib/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::uses('CakeSocket', 'Network');
/**
* 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/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php b/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
index 112ffa472..91a39da37 100644
--- a/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('CakeResponse', 'Network');
/**
* RequestHandlerTestController class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.controller.components
+ * @package cake.tests.cases.libs.controller.components
*/
class RequestHandlerTestController extends Controller {
@@ -81,8 +79,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 {
@@ -107,8 +104,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/lib/Cake/tests/cases/libs/controller/components/security.test.php b/lib/Cake/tests/cases/libs/controller/components/security.test.php
index d5947f1cc..d40372c3d 100644
--- a/lib/Cake/tests/cases/libs/controller/components/security.test.php
+++ b/lib/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::uses('SecurityComponent', 'Component');
* 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/lib/Cake/tests/cases/libs/controller/components/session.test.php b/lib/Cake/tests/cases/libs/controller/components/session.test.php
index 695538d8c..d0af41057 100644
--- a/lib/Cake/tests/cases/libs/controller/components/session.test.php
+++ b/lib/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::uses('SessionComponent', 'Controller/Component');
/**
* 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/lib/Cake/tests/cases/libs/controller/controller.test.php b/lib/Cake/tests/cases/libs/controller/controller.test.php
index 97003eb8d..9d0b590db 100644
--- a/lib/Cake/tests/cases/libs/controller/controller.test.php
+++ b/lib/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)
*/
@@ -23,6 +22,11 @@ App::uses('CakeResponse', 'Network');
App::uses('SecurityComponent', 'Controller/Component');
App::uses('CookieComponent', 'Controller/Component');
+/**
+ * AppController class
+ *
+ * @package cake.tests.cases.libs.controller
+ */
class ControllerTestAppController extends Controller {
/**
* helpers property
@@ -51,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 {
@@ -120,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 {
@@ -139,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 {
@@ -180,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 {
@@ -213,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 {
@@ -244,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 {
@@ -301,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 {
@@ -354,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 {
@@ -379,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 {
@@ -456,7 +451,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();
@@ -1242,8 +1237,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);
}
/**
@@ -1260,7 +1255,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/lib/Cake/tests/cases/libs/controller/controller_merge_vars.test.php b/lib/Cake/tests/cases/libs/controller/controller_merge_vars.test.php
index c46f23aaa..dc4fb6130 100644
--- a/lib/Cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/lib/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::uses('Controller', '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/lib/Cake/tests/cases/libs/controller/pages_controller.test.php b/lib/Cake/tests/cases/libs/controller/pages_controller.test.php
index be422e227..d03a14d97 100644
--- a/lib/Cake/tests/cases/libs/controller/pages_controller.test.php
+++ b/lib/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)
*/
@@ -23,8 +22,7 @@ App::uses('PagesController', 'Controller');
/**
* PagesControllerTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.controller
+ * @package cake.tests.cases.libs.controller
*/
class PagesControllerTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/controller/scaffold.test.php b/lib/Cake/tests/cases/libs/controller/scaffold.test.php
index 67ec7e9f2..658bc720b 100644
--- a/lib/Cake/tests/cases/libs/controller/scaffold.test.php
+++ b/lib/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::uses('Controller', 'Controller');
/**
* 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/lib/Cake/tests/cases/libs/debugger.test.php b/lib/Cake/tests/cases/libs/debugger.test.php
index c6638abb7..2c47107eb 100644
--- a/lib/Cake/tests/cases/libs/debugger.test.php
+++ b/lib/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::uses('Debugger', 'Utility');
/**
* 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 {
// !!!
@@ -232,7 +229,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 +246,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/lib/Cake/tests/cases/libs/dispatcher.test.php b/lib/Cake/tests/cases/libs/dispatcher.test.php
index 008a286cf..7b5233b6f 100644
--- a/lib/Cake/tests/cases/libs/dispatcher.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/error/error_handler.test.php b/lib/Cake/tests/cases/libs/error/error_handler.test.php
index ece3a77ec..fd76ac7d1 100644
--- a/lib/Cake/tests/cases/libs/error/error_handler.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('Router', 'Routing');
/**
* ErrorHandlerTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class ErrorHandlerTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/error/exception_renderer.test.php b/lib/Cake/tests/cases/libs/error/exception_renderer.test.php
index 4d130f62d..7e949c801 100644
--- a/lib/Cake/tests/cases/libs/error/exception_renderer.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('Component', 'Controller');
/**
* Short description for class.
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class AuthBlueberryUser extends CakeTestModel {
@@ -50,8 +48,7 @@ class AuthBlueberryUser extends CakeTestModel {
/**
* BlueberryComponent class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class BlueberryComponent extends Component {
@@ -77,8 +74,7 @@ class BlueberryComponent extends Component {
/**
* TestErrorController class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class TestErrorController extends Controller {
@@ -123,8 +119,7 @@ class TestErrorController extends Controller {
/**
* MyCustomExceptionRenderer class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class MyCustomExceptionRenderer extends ExceptionRenderer {
@@ -148,8 +143,7 @@ class MissingWidgetThingException extends NotFoundException { }
/**
* ExceptionRendererTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class ExceptionRendererTest extends CakeTestCase {
@@ -267,7 +261,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);
}
@@ -282,7 +276,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/lib/Cake/tests/cases/libs/file.test.php b/lib/Cake/tests/cases/libs/file.test.php
index ebaa2062b..02110a285 100644
--- a/lib/Cake/tests/cases/libs/file.test.php
+++ b/lib/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::uses('File', 'Utility');
/**
* FileTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class FileTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/folder.test.php b/lib/Cake/tests/cases/libs/folder.test.php
index d8b220700..5b063800f 100644
--- a/lib/Cake/tests/cases/libs/folder.test.php
+++ b/lib/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)
*/
@@ -23,8 +22,7 @@ App::uses('File', 'Utility');
/**
* FolderTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class FolderTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/html_coverage_report.test.php b/lib/Cake/tests/cases/libs/html_coverage_report.test.php
index d07aeb29a..a8d6ae7db 100644
--- a/lib/Cake/tests/cases/libs/html_coverage_report.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/http_socket.test.php b/lib/Cake/tests/cases/libs/http_socket.test.php
index 04551a70c..3ed0b32d4 100644
--- a/lib/Cake/tests/cases/libs/http_socket.test.php
+++ b/lib/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)
*/
@@ -24,7 +23,7 @@ App::uses('HttpSocket', 'Network');
* TestAuthentication class
*
* @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class TestAuthentication {
@@ -169,8 +168,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/lib/Cake/tests/cases/libs/i18n.test.php b/lib/Cake/tests/cases/libs/i18n.test.php
index f481835e3..a5de7dd49 100644
--- a/lib/Cake/tests/cases/libs/i18n.test.php
+++ b/lib/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::uses('I18n', 'I18n');
/**
* I18nTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class I18nTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/inflector.test.php b/lib/Cake/tests/cases/libs/inflector.test.php
index 1535f82fa..33be79e94 100644
--- a/lib/Cake/tests/cases/libs/inflector.test.php
+++ b/lib/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::uses('Inflector', 'Utility');
* Short description for class.
*
* @package cake.tests
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class InflectorTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/l10n.test.php b/lib/Cake/tests/cases/libs/l10n.test.php
index d685f3ed1..85a01f64a 100644
--- a/lib/Cake/tests/cases/libs/l10n.test.php
+++ b/lib/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::uses('L10n', 'I18n');
/**
* L10nTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class L10nTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/log/file_log.test.php b/lib/Cake/tests/cases/libs/log/file_log.test.php
index 623b66d88..9dab415ea 100644
--- a/lib/Cake/tests/cases/libs/log/file_log.test.php
+++ b/lib/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::uses('FileLog', 'Log/Engine');
/**
* CakeLogTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class FileLogTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/magic_db.test.php b/lib/Cake/tests/cases/libs/magic_db.test.php
index e871a541d..80586925b 100644
--- a/lib/Cake/tests/cases/libs/magic_db.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/model/behavior_collection.test.php b/lib/Cake/tests/cases/libs/model/behavior_collection.test.php
index 7d9314968..631eb3955 100644
--- a/lib/Cake/tests/cases/libs/model/behavior_collection.test.php
+++ b/lib/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)
*/
@@ -26,8 +25,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 {
@@ -341,17 +339,24 @@ class TestBehavior extends ModelBehavior {
/**
* Test2Behavior class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.model
+ * @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) {
+
+ }
}
/**
* Test3Behavior class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.model
+ * @package cake.tests.cases.libs.model
*/
class Test3Behavior extends TestBehavior{
}
@@ -359,8 +364,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) {
@@ -373,8 +377,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) {
@@ -387,8 +390,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) {
@@ -401,8 +403,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) {
@@ -415,8 +416,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 {
@@ -1036,34 +1036,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
*
@@ -1126,4 +1098,59 @@ 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'));
+ }
+
+/**
+ * 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);
+ }
+
+
}
diff --git a/lib/Cake/tests/cases/libs/model/behaviors/acl.test.php b/lib/Cake/tests/cases/libs/model/behaviors/acl.test.php
index d644b8381..fc97b74c1 100644
--- a/lib/Cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/lib/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::uses('DbAcl', 'Model');
* 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/lib/Cake/tests/cases/libs/model/behaviors/containable.test.php b/lib/Cake/tests/cases/libs/model/behaviors/containable.test.php
index 79ef6a693..0b60115ef 100644
--- a/lib/Cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,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 {
@@ -3193,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
*
diff --git a/lib/Cake/tests/cases/libs/model/behaviors/translate.test.php b/lib/Cake/tests/cases/libs/model/behaviors/translate.test.php
index 50f2ff3ab..bf83b6bff 100644
--- a/lib/Cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/lib/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)
*/
@@ -28,8 +27,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/lib/Cake/tests/cases/libs/model/behaviors/tree.test.php b/lib/Cake/tests/cases/libs/model/behaviors/tree.test.php
index fd56daa12..b22cee8ad 100644
--- a/lib/Cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/lib/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)
*/
@@ -27,8 +26,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 {
@@ -1281,8 +1279,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 {
@@ -1582,8 +1579,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 {
@@ -1638,8 +1634,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/lib/Cake/tests/cases/libs/model/cake_schema.test.php b/lib/Cake/tests/cases/libs/model/cake_schema.test.php
index b62e96ecb..30bb9badd 100644
--- a/lib/Cake/tests/cases/libs/model/cake_schema.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('CakeSchema', 'Model');
/**
* Test for Schema database management
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class MyAppSchema extends CakeSchema {
@@ -126,8 +124,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 {
@@ -240,8 +237,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 {
@@ -281,8 +277,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 {
@@ -314,8 +309,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 {
@@ -347,8 +341,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 {
@@ -378,7 +371,7 @@ class SchemaDatatype extends CakeTestModel {
*
* @uses CakeTestModel
* @package
- * @subpackage cake.tests.cases.libs.model
+ * @package cake.tests.cases.libs.model
*/
class Testdescribe extends CakeTestModel {
@@ -394,8 +387,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 {
@@ -427,8 +419,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 {
@@ -473,8 +464,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 {
/**
@@ -500,8 +490,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/lib/Cake/tests/cases/libs/model/connection_manager.test.php b/lib/Cake/tests/cases/libs/model/connection_manager.test.php
index c121cee07..8e9156063 100644
--- a/lib/Cake/tests/cases/libs/model/connection_manager.test.php
+++ b/lib/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::uses('ConnectionManager', 'Model');
/**
* ConnectionManagerTest
*
- * @package cake
- * @subpackage cake.tests.cases.models
+ * @package cake.tests.cases.models
*/
class ConnectionManagerTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index 8ea86d221..1b25e9435 100644
--- a/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 30cecc0a3..819e41dd5 100644
--- a/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/lib/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)
*/
@@ -27,8 +26,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/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
index 3efa451bd..592b1eac0 100644
--- a/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index ebb803c92..4a4489bd5 100644
--- a/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/lib/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)
*/
@@ -27,8 +26,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 {
@@ -66,8 +64,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 {
@@ -160,8 +157,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 {
@@ -201,8 +197,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/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index 8bed2d63a..9bd875d2c 100644
--- a/lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('Sqlite', 'Model/Datasource/Database');
/**
* DboSqliteTestDb class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.model.datasources
+ * @package cake.tests.cases.libs.model.datasources
*/
class DboSqliteTestDb extends Sqlite {
@@ -63,8 +61,7 @@ class DboSqliteTestDb extends Sqlite {
/**
* 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/lib/Cake/tests/cases/libs/model/datasources/dbo_source.test.php b/lib/Cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 577529783..e835f8813 100644
--- a/lib/Cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/lib/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)
*/
@@ -31,8 +30,7 @@ class MockDataSource extends DataSource {
/**
* 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/lib/Cake/tests/cases/libs/model/db_acl.test.php b/lib/Cake/tests/cases/libs/model/db_acl.test.php
index ce27fc927..0d1263c4a 100644
--- a/lib/Cake/tests/cases/libs/model/db_acl.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ class_exists('AclComponent');
/**
* 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 {
@@ -50,8 +48,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 {
@@ -83,8 +80,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 {
@@ -116,8 +112,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 {
@@ -157,8 +152,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 {
@@ -190,8 +184,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 {
@@ -229,8 +222,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 {
@@ -251,8 +243,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/lib/Cake/tests/cases/libs/model/model.test.php b/lib/Cake/tests/cases/libs/model/model.test.php
index 4e1411ea2..9a069d74f 100644
--- a/lib/Cake/tests/cases/libs/model/model.test.php
+++ b/lib/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)
*/
@@ -27,8 +26,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/lib/Cake/tests/cases/libs/model/model_delete.test.php b/lib/Cake/tests/cases/libs/model/model_delete.test.php
index e61865e57..ae4045743 100644
--- a/lib/Cake/tests/cases/libs/model/model_delete.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/model/model_integration.test.php b/lib/Cake/tests/cases/libs/model/model_integration.test.php
index 33ac6654d..b897046e0 100644
--- a/lib/Cake/tests/cases/libs/model/model_integration.test.php
+++ b/lib/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)
*/
@@ -46,8 +45,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 {
@@ -62,27 +60,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');
}
@@ -98,10 +96,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']));
@@ -111,7 +109,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);
}
/**
@@ -130,7 +128,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);
}
/**
@@ -1424,7 +1422,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'
)))),
@@ -1449,7 +1447,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'
)))),
@@ -1474,7 +1472,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'
)))));
@@ -1500,7 +1498,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'
)))),
@@ -1522,7 +1520,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'
)))),
@@ -1544,7 +1542,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'
)))));
@@ -1569,7 +1567,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'
))));
@@ -1586,7 +1584,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');
@@ -1611,7 +1609,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'
)),
@@ -1623,7 +1621,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'
)),
@@ -1635,7 +1633,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'
))));
@@ -2011,4 +2009,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'));
+ }
}
diff --git a/lib/Cake/tests/cases/libs/model/model_read.test.php b/lib/Cake/tests/cases/libs/model/model_read.test.php
index 93808578c..29ef9e929 100755
--- a/lib/Cake/tests/cases/libs/model/model_read.test.php
+++ b/lib/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 {
@@ -58,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');
@@ -5102,7 +5100,7 @@ class ModelReadTest extends BaseModelTest {
array(
'id' => 2,
'syfile_id' => 2,
- 'published' => 0,
+ 'published' => false,
'name' => 'Item 2',
'ItemsPortfolio' => array(
'id' => 2,
@@ -5122,7 +5120,7 @@ class ModelReadTest extends BaseModelTest {
array(
'id' => 6,
'syfile_id' => 6,
- 'published' => 0,
+ 'published' => false,
'name' => 'Item 6',
'ItemsPortfolio' => array(
'id' => 6,
@@ -7405,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']));
@@ -7464,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();
diff --git a/lib/Cake/tests/cases/libs/model/model_validation.test.php b/lib/Cake/tests/cases/libs/model/model_validation.test.php
index d921618c0..0da3c18e9 100644
--- a/lib/Cake/tests/cases/libs/model/model_validation.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/model/model_write.test.php b/lib/Cake/tests/cases/libs/model/model_write.test.php
index bf72dbf2a..6c76dfce7 100644
--- a/lib/Cake/tests/cases/libs/model/model_write.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/model/models.php b/lib/Cake/tests/cases/libs/model/models.php
index b116962b0..6c61254fb 100644
--- a/lib/Cake/tests/cases/libs/model/models.php
+++ b/lib/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/lib/Cake/tests/cases/libs/multibyte.test.php b/lib/Cake/tests/cases/libs/multibyte.test.php
index 6eb0068b5..692dd85bd 100644
--- a/lib/Cake/tests/cases/libs/multibyte.test.php
+++ b/lib/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::uses('Multibyte', 'I18n');
/**
* MultibyteTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class MultibyteTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/object.test.php b/lib/Cake/tests/cases/libs/object.test.php
index cc10aa86b..0c959065e 100644
--- a/lib/Cake/tests/cases/libs/object.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('Model', 'Model');
/**
* RequestActionPost class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.object
+ * @package cake.tests.cases.libs.object
*/
class RequestActionPost extends CakeTestModel {
@@ -50,8 +48,7 @@ class RequestActionPost extends CakeTestModel {
/**
* RequestActionController class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class RequestActionController extends Controller {
@@ -137,8 +134,7 @@ class RequestActionController extends Controller {
/**
* RequestActionPersistentController class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class RequestActionPersistentController extends Controller {
@@ -171,8 +167,7 @@ class RequestActionPersistentController extends Controller {
/**
* TestObject class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class TestObject extends Object {
@@ -322,8 +317,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;
@@ -333,8 +327,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/lib/Cake/tests/cases/libs/object_collection.test.php b/lib/Cake/tests/cases/libs/object_collection.test.php
index de2c16e02..7e6f446db 100644
--- a/lib/Cake/tests/cases/libs/object_collection.test.php
+++ b/lib/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)
*/
@@ -98,8 +97,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/lib/Cake/tests/cases/libs/route/cake_route.test.php b/lib/Cake/tests/cases/libs/route/cake_route.test.php
index 904a1ca88..c1dece995 100644
--- a/lib/Cake/tests/cases/libs/route/cake_route.test.php
+++ b/lib/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);
@@ -289,6 +288,45 @@ 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.
+ *
+ * @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.
*
@@ -304,6 +342,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');
@@ -319,6 +363,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/*');
+ $result = $route->match(array('controller' => 'posts', 'action' => 'index', 'page' => null, 'sort' => false));
+ $this->assertEquals('/posts/index/', $result);
+ }
+
/**
* test that match with patterns works.
*
@@ -417,4 +472,5 @@ class CakeRouteTestCase extends CakeTestCase {
$result = $route->parse('/blog/foobar');
$this->assertFalse($result);
}
+
}
\ No newline at end of file
diff --git a/lib/Cake/tests/cases/libs/router.test.php b/lib/Cake/tests/cases/libs/router.test.php
index 8b58b521b..9506219e1 100644
--- a/lib/Cake/tests/cases/libs/router.test.php
+++ b/lib/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)
*/
@@ -28,8 +27,7 @@ if (!defined('FULL_BASE_URL')) {
/**
* RouterTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class RouterTest extends CakeTestCase {
@@ -651,7 +649,7 @@ class RouterTest extends CakeTestCase {
$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'));
@@ -1336,14 +1334,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);
@@ -1351,7 +1349,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']));
}
@@ -1517,7 +1515,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';
diff --git a/lib/Cake/tests/cases/libs/sanitize.test.php b/lib/Cake/tests/cases/libs/sanitize.test.php
index afa9e2de8..3bff7768d 100644
--- a/lib/Cake/tests/cases/libs/sanitize.test.php
+++ b/lib/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::uses('Sanitize', 'Utility');
/**
* 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/lib/Cake/tests/cases/libs/security.test.php b/lib/Cake/tests/cases/libs/security.test.php
index e8b820ff6..944cc7f37 100644
--- a/lib/Cake/tests/cases/libs/security.test.php
+++ b/lib/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::uses('Security', 'Utility');
/**
* SecurityTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class SecurityTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/session/cache_session.test.php b/lib/Cake/tests/cases/libs/session/cache_session.test.php
index 30f4808a7..0cb111929 100644
--- a/lib/Cake/tests/cases/libs/session/cache_session.test.php
+++ b/lib/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/lib/Cake/tests/cases/libs/session/database_session.test.php b/lib/Cake/tests/cases/libs/session/database_session.test.php
index 568dc7a9b..767c987e1 100644
--- a/lib/Cake/tests/cases/libs/session/database_session.test.php
+++ b/lib/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)
*/
@@ -97,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/lib/Cake/tests/cases/libs/set.test.php b/lib/Cake/tests/cases/libs/set.test.php
index 297ebefe1..0455f0b69 100644
--- a/lib/Cake/tests/cases/libs/set.test.php
+++ b/lib/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)
*/
@@ -23,8 +22,7 @@ App::uses('Model', 'Model');
/**
* SetTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class SetTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/string.test.php b/lib/Cake/tests/cases/libs/string.test.php
index 434d3f5a8..4c7da882e 100644
--- a/lib/Cake/tests/cases/libs/string.test.php
+++ b/lib/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::uses('String', 'Utility');
/**
* StringTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class StringTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/test_manager.test.php b/lib/Cake/tests/cases/libs/test_manager.test.php
index ae4c90dc1..524e77fc3 100644
--- a/lib/Cake/tests/cases/libs/test_manager.test.php
+++ b/lib/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 {
@@ -106,7 +104,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/lib/Cake/tests/cases/libs/validation.test.php b/lib/Cake/tests/cases/libs/validation.test.php
index e7f24e953..60b6dc1a2 100644
--- a/lib/Cake/tests/cases/libs/validation.test.php
+++ b/lib/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::uses('Validation', 'Utility');
/**
* 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/lib/Cake/tests/cases/libs/view/helper.test.php b/lib/Cake/tests/cases/libs/view/helper.test.php
index 77baabf25..271dc15e5 100644
--- a/lib/Cake/tests/cases/libs/view/helper.test.php
+++ b/lib/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)
*/
@@ -26,8 +25,7 @@ App::uses('Router', 'Routing');
/**
* HelperTestPost class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.view
+ * @package cake.tests.cases.libs.view
*/
class HelperTestPost extends Model {
@@ -70,8 +68,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 {
@@ -105,8 +102,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 {
@@ -138,8 +134,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 {
@@ -191,8 +186,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 {
@@ -221,8 +215,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 {
@@ -862,8 +855,8 @@ class HelperTest extends CakeTestCase {
'plugins' => array(LIBS . '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/lib/Cake/tests/cases/libs/view/helper_collection.test.php b/lib/Cake/tests/cases/libs/view/helper_collection.test.php
index 6ca842e7f..c789a6d0b 100644
--- a/lib/Cake/tests/cases/libs/view/helper_collection.test.php
+++ b/lib/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)
*/
@@ -48,8 +47,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 +63,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 +89,8 @@ class HelperCollectionTest extends CakeTestCase {
'plugins' => array(LIBS . '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/lib/Cake/tests/cases/libs/view/helpers/cache.test.php b/lib/Cake/tests/cases/libs/view/helpers/cache.test.php
index db4b03f02..017eb4415 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/lib/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)
*/
@@ -26,8 +25,7 @@ App::uses('CacheHelper', 'View/Helper');
/**
* CacheTestController class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.view.helpers
+ * @package cake.tests.cases.libs.view.helpers
*/
class CacheTestController extends Controller {
@@ -58,8 +56,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/lib/Cake/tests/cases/libs/view/helpers/form.test.php b/lib/Cake/tests/cases/libs/view/helpers/form.test.php
index a6a6c7b46..3c95bb511 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/form.test.php
+++ b/lib/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)
*/
@@ -31,7 +30,7 @@ App::uses('Router', 'Routing');
* ContactTestController class
*
* @package cake
- * @subpackage cake.tests.cases.libs.view.helpers
+ * @package cake.tests.cases.libs.view.helpers
*/
class ContactTestController extends Controller {
@@ -56,7 +55,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 {
@@ -153,7 +152,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 {
@@ -201,7 +200,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 {
@@ -239,7 +238,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 {
@@ -269,7 +268,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 {
@@ -329,7 +328,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 {
@@ -405,7 +404,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 {
@@ -474,7 +473,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 {
@@ -554,7 +553,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 {
@@ -623,7 +622,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 {
@@ -656,7 +655,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/lib/Cake/tests/cases/libs/view/helpers/html.test.php b/lib/Cake/tests/cases/libs/view/helpers/html.test.php
index a8fb606b6..65653ffaa 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/html.test.php
+++ b/lib/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)
*/
@@ -33,8 +32,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 {
@@ -58,8 +56,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/lib/Cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/lib/Cake/tests/cases/libs/view/helpers/jquery_engine.test.php
index ecbff4bb8..c60f87513 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/jquery_engine.test.php
+++ b/lib/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)
*/
diff --git a/lib/Cake/tests/cases/libs/view/helpers/js.test.php b/lib/Cake/tests/cases/libs/view/helpers/js.test.php
index 3a848886b..8486fa147 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/js.test.php
+++ b/lib/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)
*/
@@ -68,8 +67,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/lib/Cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/lib/Cake/tests/cases/libs/view/helpers/mootools_engine.test.php
index 7d84300b1..b5a359ded 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/mootools_engine.test.php
+++ b/lib/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)
*/
diff --git a/lib/Cake/tests/cases/libs/view/helpers/number.test.php b/lib/Cake/tests/cases/libs/view/helpers/number.test.php
index bf6f0fe31..d25e59a21 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/number.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('NumberHelper', 'View/Helper');
/**
* 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/lib/Cake/tests/cases/libs/view/helpers/paginator.test.php b/lib/Cake/tests/cases/libs/view/helpers/paginator.test.php
index ef720ccc8..2987dfc7d 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/lib/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)
*/
@@ -30,8 +29,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 {
@@ -50,22 +48,17 @@ class PaginatorHelperTest extends CakeTestCase {
$this->Paginator->request->addParams(array(
'paging' => array(
'Article' => array(
+ 'page' => 2,
'current' => 9,
'count' => 62,
'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,
'page' => 1,
'conditions' => array()
- )
+ ),
+ 'paramType' => 'named'
)
)
));
@@ -142,10 +135,26 @@ 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')));
+ $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()
+ ),
+ 'paramType' => 'named'
+ )
+ );
+
$result = $this->Paginator->sort('title');
$expected = array(
'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
@@ -282,9 +291,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')));
@@ -316,7 +324,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');
@@ -447,7 +455,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');
@@ -455,7 +463,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('Next');
$expected = array(
' array('href' => '/admin/users/index/page:2', 'class' => 'next'),
+ 'a' => array('href' => '/admin/users/index/page:2', 'class' => 'next', 'rel' => 'next'),
'Next',
'/a',
'/span'
@@ -464,8 +472,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')));
@@ -535,7 +543,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;
@@ -558,7 +566,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('next', array('url' => $options));
$expected = array(
' array('href' => '/members/posts/index/page:3', 'class' => 'next'),
+ 'a' => array('href' => '/members/posts/index/page:3', 'class' => 'next', 'rel' => 'next'),
'next',
'/a',
'/span'
@@ -568,7 +576,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->prev('prev', array('url' => $options));
$expected = array(
' array('href' => '/members/posts/index/page:1', 'class' => 'prev'),
+ 'a' => array('href' => '/members/posts/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
'prev',
'/a',
'/span'
@@ -646,19 +654,19 @@ 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' => '/')
));
$this->Paginator->request->params['paging'] = array(
'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()
- )
+ 'page' => 1,
+ 'order' => array(),
+ 'conditions' => array()
+ ),
+ 'paramType' => 'named'
)
);
@@ -695,7 +703,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('Next');
$expected = array(
' 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'
@@ -710,10 +718,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
$expected = array(
@@ -736,7 +753,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
$expected = array(
' array('href' => '/index/page:1', 'class' => 'prev'),
+ 'a' => array('href' => '/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
'<< Previous',
'/a',
'/span'
@@ -746,7 +763,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('Next');
$expected = array(
' array('href' => '/index/page:3', 'class' => 'next'),
+ 'a' => array('href' => '/index/page:3', 'class' => 'next', 'rel' => 'next'),
'Next',
'/a',
'/span'
@@ -756,7 +773,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('Next', array('tag' => 'li'));
$expected = array(
' array('href' => '/index/page:3', 'class' => 'next'),
+ 'a' => array('href' => '/index/page:3', 'class' => 'next', 'rel' => 'next'),
'Next',
'/a',
'/li'
@@ -766,7 +783,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->prev('<< Previous', array('escape' => true));
$expected = array(
' array('href' => '/index/page:1', 'class' => 'prev'),
+ 'a' => array('href' => '/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
'<< Previous',
'/a',
'/span'
@@ -776,17 +793,26 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->prev('<< Previous', array('escape' => false));
$expected = array(
' array('href' => '/index/page:1', 'class' => 'prev'),
+ 'a' => array('href' => '/index/page:1', 'class' => 'prev', 'rel' => 'prev'),
'preg:/<< Previous/',
'/a',
'/span'
);
$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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->prev('<< Previous', null, 'Disabled');
@@ -813,10 +839,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'),
+ ),
+ 'paramType' => 'named'
+ )
);
$this->Paginator->request->params['paging']['Client']['page'] = 2;
@@ -824,7 +861,11 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
$expected = array(
' 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'
+ ),
'<< Previous',
'/a',
'/span'
@@ -834,22 +875,38 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('Next');
$expected = array(
' 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'
);
$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()
+ ),
+ 'paramType' => 'named'
+ )
+ );
$result = $this->Paginator->prev('Prev');
$expected = array(
' array('href' => '/index/page:1/limit:10', 'class' => 'prev'),
+ 'a' => array('href' => '/index/page:1/limit:10', 'class' => 'prev', 'rel' => 'prev'),
'Prev',
'/a',
'/span'
@@ -863,14 +920,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')));
$expected = array(
' 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'
@@ -887,14 +945,16 @@ 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()
- )
+ 'page' => 1,
+ ),
+ 'paramType' => 'named'
)
);
$result = $this->Paginator->prev('<< Previous', array('escape' => false));
@@ -908,7 +968,7 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('Next >>', array('escape' => false));
$expected = array(
' array('href' => '/index/page:2', 'class' => 'next'),
+ 'a' => array('href' => '/index/page:2', 'class' => 'next', 'rel' => 'next'),
'preg:/Next >>/',
'/a',
'/span'
@@ -928,20 +988,34 @@ 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,
+ ),
+ 'paramType' => 'named'
),
'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,
+ ),
+ 'paramType' => 'named'
)
);
$result = $this->Paginator->next('Next', array('model' => 'Client'));
$expected = array(
' array('href' => '/index/page:2', 'class' => 'next'),
+ 'a' => array('href' => '/index/page:2', 'class' => 'next', 'rel' => 'next'),
'Next',
'/a',
'/span'
@@ -1034,10 +1108,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers();
$expected = array(
@@ -1099,7 +1182,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',
' | ',
@@ -1119,14 +1202,23 @@ 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);
- $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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers();
$expected = array(
@@ -1151,10 +1243,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers();
$expected = array(
@@ -1178,10 +1279,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers(array('first' => 1));
@@ -1228,10 +1338,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers(array('first' => 1));
@@ -1259,10 +1378,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
@@ -1291,10 +1419,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
@@ -1323,10 +1460,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
@@ -1363,18 +1509,10 @@ 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()
- )
+ ),
+ 'paramType' => 'named'
)
);
$options = array('modulus' => 10);
@@ -1388,10 +1526,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'),
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers();
$expected = array(
@@ -1406,10 +1554,19 @@ 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,
+ ),
+ 'paramType' => 'named'
+ )
);
$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2));
@@ -1617,52 +1774,130 @@ class PaginatorHelperTest extends CakeTestCase {
}
/**
- * testFirstAndLast method
+ * test first() and last() with tag options
*
- * @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,
- '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()))
- );
-
- $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()))
- );
-
- $result = $this->Paginator->first();
- $expected = array(
- ' array('href' => '/index/page:1'),
- '<< first',
- '/a',
- '/span'
- );
- $this->assertTags($result, $expected);
-
+ function testFirstAndLastTag() {
$result = $this->Paginator->first('<<', array('tag' => 'li'));
$expected = array(
' array('href' => '/index/page:1'),
+ 'a' => array('href' => '/index/page:1', 'rel' => 'first'),
'<<',
'/a',
'/li'
);
$this->assertTags($result, $expected);
+ $result = $this->Paginator->last(2, array('tag' => 'li'));
+
+ $expected = array(
+ '...',
+ ' array('href' => '/index/page:6')), '6', '/a',
+ '/li',
+ ' | ',
+ ' 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);
+ }
+
+/**
+ * test first() on the first page.
+ *
+ * @return void
+ */
+ function testFirstEmpty() {
+ $this->Paginator->request->params['paging']['Article']['page'] = 1;
+
+ $result = $this->Paginator->first();
+ $expected = '';
+ $this->assertEqual($result, $expected);
+ }
+
+/**
+ * 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(
+ ' array(
+ 'href' => FULL_BASE_URL . '/index/page:1/sort:Article.title/direction:DESC', 'rel' => 'first'
+ )),
+ '<< first',
+ '/a',
+ '/span',
+ );
+ $this->assertTags($result, $expected);
+ }
+
+/**
+ * test first() on the fence-post
+ *
+ * @return void
+ */
+ function testFirstBoundaries() {
+ $result = $this->Paginator->first();
+ $expected = array(
+ ' array('href' => '/index/page:1', 'rel' => 'first'),
+ '<< first',
+ '/a',
+ '/span'
+ );
+ $this->assertTags($result, $expected);
+
+ $result = $this->Paginator->first(2);
+ $expected = array(
+ ' array('href' => '/index/page:1')), '1', '/a',
+ '/span',
+ ' | ',
+ ' array('href' => '/index/page:2')), '2', '/a',
+ '/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');
+ }
+
+/**
+ * test Last method
+ *
+ * @access public
+ * @return void
+ */
+ function testLast() {
$result = $this->Paginator->last();
$expected = array(
' array('href' => '/index/page:15'),
+ 'a' => array('href' => '/index/page:7', 'rel' => 'last'),
'last >>',
'/a',
'/span'
@@ -1673,70 +1908,66 @@ class PaginatorHelperTest extends CakeTestCase {
$expected = array(
'...',
' 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(
'...',
' array('href' => '/index/page:14')), '14', '/a',
+ array('a' => array('href' => '/index/page:6')), '6', '/a',
'/span',
' | ',
' array('href' => '/index/page:15')), '15', '/a',
+ array('a' => array('href' => '/index/page:7')), '7', '/a',
'/span',
);
$this->assertTags($result, $expected);
- $result = $this->Paginator->last(2, array('tag' => 'li'));
- $expected = array(
- '...',
- ' array('href' => '/index/page:14')), '14', '/a',
- '/li',
- ' | ',
- ' array('href' => '/index/page:15')), '15', '/a',
- '/li',
+ $result = $this->Paginator->last(3);
+ $this->assertEquals('', $result, 'When inside the last links range, no links should be made');
+ }
+
+/**
+ * undocumented function
+ *
+ * @return void
+ */
+ function testLastOptions() {
+ $this->Paginator->request->params['paging'] = array(
+ 'Client' => array(
+ 'page' => 4,
+ 'current' => 3,
+ 'count' => 30,
+ 'prevPage' => false,
+ 'nextPage' => 2,
+ 'pageCount' => 15,
+ 'options' => array(
+ 'page' => 1,
+ 'order' => array('Client.name' => 'DESC'),
+ ),
+ 'paramType' => 'named'
+ )
);
- $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()))
- );
- $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()))
- );
-
- $result = $this->Paginator->first();
- $expected = array(
- ' array('href' => '/index/page:1/sort:Client.name/direction:DESC')), '<< first', '/a',
- '/span',
- );
- $this->assertTags($result, $expected);
$result = $this->Paginator->last();
$expected = array(
' array('href' => '/index/page:15/sort:Client.name/direction:DESC')), 'last >>', '/a',
+ array('a' => array(
+ 'href' => '/index/page:15/sort:Client.name/direction:DESC',
+ 'rel' => 'last'
+ )),
+ 'last >>', '/a',
'/span',
);
$this->assertTags($result, $expected);
-
+
$result = $this->Paginator->last(1);
$expected = array(
'...',
@@ -1759,19 +1990,6 @@ class PaginatorHelperTest extends CakeTestCase {
);
$this->assertTags($result, $expected);
- $result = $this->Paginator->last(2, array('ellipsis' => '~~~'));
- $expected = array(
- '~~~',
- ' array('href' => '/index/page:14/sort:Client.name/direction:DESC')), '14', '/a',
- '/span',
- ' | ',
- ' array('href' => '/index/page:15/sort:Client.name/direction:DESC')), '15', '/a',
- '/span',
- );
- $this->assertTags($result, $expected);
-
$result = $this->Paginator->last(2, array('ellipsis' => '...'));
$expected = array(
array('span' => array('class' => 'ellipsis')), '...', '/span',
@@ -1784,15 +2002,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(
- ' array('href' => FULL_BASE_URL . '/index/page:1/sort:Client.name/direction:DESC')), '<< first', '/a',
- '/span',
- );
- $this->assertTags($result, $expected);
}
/**
@@ -1810,19 +2019,12 @@ 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'
),
+ 'paramType' => 'named'
)
);
$input = 'Page %page% of %pages%, showing %current% records out of %count% total, ';
@@ -1935,8 +2137,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/')),
+ array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
));
$this->Paginator->request->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
@@ -1952,7 +2154,11 @@ class PaginatorHelperTest extends CakeTestCase {
$result = $this->Paginator->next('Next');
$expected = array(
' 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',
@@ -2004,7 +2210,8 @@ class PaginatorHelperTest extends CakeTestCase {
'nextPage' => true,
'pageCount' => 7,
'defaults' => array(),
- 'options' => array()
+ 'options' => array(),
+ 'paramType' => 'named'
)
);
$Paginator->PaginatorMockJs = $mock;
@@ -2014,4 +2221,82 @@ class PaginatorHelperTest extends CakeTestCase {
$this->expectException();
$Paginator = new PaginatorHelper($this->View, array('ajax' => 'Form'));
}
+
+/**
+ * test that querystring urls can be generated.
+ *
+ * @return void
+ */
+ 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&limit=10';
+ $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(
+ ' array('href' => '/?page=3', 'class' => 'next', 'rel' => 'next'),
+ 'Next',
+ '/a',
+ '/span'
+ );
+ $this->assertTags($result, $expected);
+
+ $result = $this->Paginator->prev('Prev');
+ $expected = array(
+ ' array('href' => '/?page=1', 'class' => 'prev', 'rel' => 'prev'),
+ 'Prev',
+ '/a',
+ '/span'
+ );
+ $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&something=bar';
+ $this->assertEquals($expected, $result);
+ }
+
+
+/**
+ * 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);
+ }
+
}
diff --git a/lib/Cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/lib/Cake/tests/cases/libs/view/helpers/prototype_engine.test.php
index 77c2b1b87..59fe22cf4 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/prototype_engine.test.php
+++ b/lib/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)
*/
diff --git a/lib/Cake/tests/cases/libs/view/helpers/rss.test.php b/lib/Cake/tests/cases/libs/view/helpers/rss.test.php
index 13b8aaf9e..1a4ba25e0 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/rss.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('TimeHelper', 'View/Helper');
/**
* 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/lib/Cake/tests/cases/libs/view/helpers/session.test.php b/lib/Cake/tests/cases/libs/view/helpers/session.test.php
index 63be0cba0..53d0ce03c 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/session.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('SessionHelper', 'View/Helper');
/**
* 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/lib/Cake/tests/cases/libs/view/helpers/text.test.php b/lib/Cake/tests/cases/libs/view/helpers/text.test.php
index b867c988a..e696f09d6 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/text.test.php
+++ b/lib/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)
*/
@@ -24,8 +23,7 @@ App::uses('TextHelper', 'View/Helper');
/**
* 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/lib/Cake/tests/cases/libs/view/helpers/time.test.php b/lib/Cake/tests/cases/libs/view/helpers/time.test.php
index 885e17674..2d14479e9 100644
--- a/lib/Cake/tests/cases/libs/view/helpers/time.test.php
+++ b/lib/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::uses('View', 'View');
/**
* TimeHelperTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.view.helpers
+ * @package cake.tests.cases.libs.view.helpers
*/
class TimeHelperTest extends CakeTestCase {
@@ -339,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));
}
/**
diff --git a/lib/Cake/tests/cases/libs/view/media.test.php b/lib/Cake/tests/cases/libs/view/media.test.php
index 22d633d02..c893a45a8 100644
--- a/lib/Cake/tests/cases/libs/view/media.test.php
+++ b/lib/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)
*/
@@ -25,8 +24,7 @@ App::uses('CakeResponse', 'Network');
/**
* MediaViewTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class MediaViewTest extends CakeTestCase {
diff --git a/lib/Cake/tests/cases/libs/view/theme.test.php b/lib/Cake/tests/cases/libs/view/theme.test.php
index 19004383f..446ea5226 100644
--- a/lib/Cake/tests/cases/libs/view/theme.test.php
+++ b/lib/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::uses('Controller', '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/lib/Cake/tests/cases/libs/view/view.test.php b/lib/Cake/tests/cases/libs/view/view.test.php
index 8b90213cc..ccd6d53e3 100644
--- a/lib/Cake/tests/cases/libs/view/view.test.php
+++ b/lib/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)
*/
@@ -28,8 +27,7 @@ App::uses('ErrorHandler', 'Error');
/**
* ViewPostsController class
*
- * @package cake
- * @subpackage cake.tests.cases.libs.view
+ * @package cake.tests.cases.libs.view
*/
class ViewPostsController extends Controller {
@@ -77,8 +75,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 {
@@ -124,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);
@@ -143,8 +139,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 {
@@ -180,8 +175,7 @@ class TestAfterHelper extends Helper {
/**
* ViewTest class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class ViewTest extends CakeTestCase {
@@ -550,7 +544,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);
}
/**
@@ -565,8 +559,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/lib/Cake/tests/cases/libs/xml.test.php b/lib/Cake/tests/cases/libs/xml.test.php
index 6a61d6cab..deda75584 100644
--- a/lib/Cake/tests/cases/libs/xml.test.php
+++ b/lib/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)
*/
@@ -23,8 +22,7 @@ App::uses('CakeTestModel', 'TestSuite/Fixture');
/**
* Article class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class XmlArticle extends CakeTestModel {
@@ -51,8 +49,7 @@ class XmlArticle extends CakeTestModel {
/**
* User class
*
- * @package cake
- * @subpackage cake.tests.cases.libs
+ * @package cake.tests.cases.libs
*/
class XmlUser extends CakeTestModel {
@@ -74,8 +71,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/lib/Cake/tests/fixtures/account_fixture.php b/lib/Cake/tests/fixtures/account_fixture.php
index f4f948dfa..756d92355 100644
--- a/lib/Cake/tests/fixtures/account_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/aco_action_fixture.php b/lib/Cake/tests/fixtures/aco_action_fixture.php
index e95de48e8..93fc08664 100644
--- a/lib/Cake/tests/fixtures/aco_action_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/aco_fixture.php b/lib/Cake/tests/fixtures/aco_fixture.php
index be296aaf8..77c625781 100644
--- a/lib/Cake/tests/fixtures/aco_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/aco_two_fixture.php b/lib/Cake/tests/fixtures/aco_two_fixture.php
index d277beea1..a45c2dc6e 100644
--- a/lib/Cake/tests/fixtures/aco_two_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/ad_fixture.php b/lib/Cake/tests/fixtures/ad_fixture.php
index c6f955da4..56989b072 100644
--- a/lib/Cake/tests/fixtures/ad_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/advertisement_fixture.php b/lib/Cake/tests/fixtures/advertisement_fixture.php
index 8c1e8b629..32c7bca5e 100644
--- a/lib/Cake/tests/fixtures/advertisement_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/after_tree_fixture.php b/lib/Cake/tests/fixtures/after_tree_fixture.php
index 098863888..1c5fa8e9c 100644
--- a/lib/Cake/tests/fixtures/after_tree_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/another_article_fixture.php b/lib/Cake/tests/fixtures/another_article_fixture.php
index d0807c788..a62287a06 100644
--- a/lib/Cake/tests/fixtures/another_article_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/apple_fixture.php b/lib/Cake/tests/fixtures/apple_fixture.php
index 0de5f3bea..e0e9d3e88 100644
--- a/lib/Cake/tests/fixtures/apple_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/aro_fixture.php b/lib/Cake/tests/fixtures/aro_fixture.php
index f224dfc97..f0f5adceb 100644
--- a/lib/Cake/tests/fixtures/aro_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/aro_two_fixture.php b/lib/Cake/tests/fixtures/aro_two_fixture.php
index 86b774720..409be3489 100644
--- a/lib/Cake/tests/fixtures/aro_two_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/aros_aco_fixture.php b/lib/Cake/tests/fixtures/aros_aco_fixture.php
index 6c204fc49..4265bf011 100644
--- a/lib/Cake/tests/fixtures/aros_aco_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/aros_aco_two_fixture.php b/lib/Cake/tests/fixtures/aros_aco_two_fixture.php
index 9c3251d64..e62e48306 100644
--- a/lib/Cake/tests/fixtures/aros_aco_two_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/article_featured_fixture.php b/lib/Cake/tests/fixtures/article_featured_fixture.php
index 64c4bc38c..062813621 100644
--- a/lib/Cake/tests/fixtures/article_featured_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/article_featureds_tags_fixture.php b/lib/Cake/tests/fixtures/article_featureds_tags_fixture.php
index e84b863d5..60c8c7096 100644
--- a/lib/Cake/tests/fixtures/article_featureds_tags_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/article_fixture.php b/lib/Cake/tests/fixtures/article_fixture.php
index b6f21e7b3..41b256da1 100644
--- a/lib/Cake/tests/fixtures/article_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/articles_tag_fixture.php b/lib/Cake/tests/fixtures/articles_tag_fixture.php
index 1091901a6..c475d87a4 100644
--- a/lib/Cake/tests/fixtures/articles_tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/assert_tags_test_case.php b/lib/Cake/tests/fixtures/assert_tags_test_case.php
index 27cc08d19..1cef87aea 100644
--- a/lib/Cake/tests/fixtures/assert_tags_test_case.php
+++ b/lib/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/lib/Cake/tests/fixtures/attachment_fixture.php b/lib/Cake/tests/fixtures/attachment_fixture.php
index d43defa4f..748c10d78 100644
--- a/lib/Cake/tests/fixtures/attachment_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/auth_user_custom_field_fixture.php b/lib/Cake/tests/fixtures/auth_user_custom_field_fixture.php
index fb727e6a7..8c82b6717 100644
--- a/lib/Cake/tests/fixtures/auth_user_custom_field_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/auth_user_fixture.php b/lib/Cake/tests/fixtures/auth_user_fixture.php
index 2613b3d64..5efc6be2e 100644
--- a/lib/Cake/tests/fixtures/auth_user_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/author_fixture.php b/lib/Cake/tests/fixtures/author_fixture.php
index 2f9381621..8f705f4fe 100644
--- a/lib/Cake/tests/fixtures/author_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/bake_article_fixture.php b/lib/Cake/tests/fixtures/bake_article_fixture.php
index 304bd6b3c..8543ee6ba 100644
--- a/lib/Cake/tests/fixtures/bake_article_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/bake_articles_bake_tag_fixture.php b/lib/Cake/tests/fixtures/bake_articles_bake_tag_fixture.php
index d1f6ef5d8..d046718b3 100644
--- a/lib/Cake/tests/fixtures/bake_articles_bake_tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/bake_comment_fixture.php b/lib/Cake/tests/fixtures/bake_comment_fixture.php
index 8de6696be..b75d0821b 100644
--- a/lib/Cake/tests/fixtures/bake_comment_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/bake_tag_fixture.php b/lib/Cake/tests/fixtures/bake_tag_fixture.php
index e5057385e..74dfa473b 100644
--- a/lib/Cake/tests/fixtures/bake_tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/basket_fixture.php b/lib/Cake/tests/fixtures/basket_fixture.php
index 7ad9f8d0d..3984c65b1 100644
--- a/lib/Cake/tests/fixtures/basket_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/bid_fixture.php b/lib/Cake/tests/fixtures/bid_fixture.php
index dd1b4c130..df915dc71 100644
--- a/lib/Cake/tests/fixtures/bid_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/binary_test_fixture.php b/lib/Cake/tests/fixtures/binary_test_fixture.php
index f1cd03351..868ee4c5c 100644
--- a/lib/Cake/tests/fixtures/binary_test_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/book_fixture.php b/lib/Cake/tests/fixtures/book_fixture.php
index 83e1b6f09..bf85000af 100644
--- a/lib/Cake/tests/fixtures/book_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/cache_test_model_fixture.php b/lib/Cake/tests/fixtures/cache_test_model_fixture.php
index ace714d5b..84b1a64b1 100644
--- a/lib/Cake/tests/fixtures/cache_test_model_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/callback_fixture.php b/lib/Cake/tests/fixtures/callback_fixture.php
index 6d6103ca0..f28c6277f 100644
--- a/lib/Cake/tests/fixtures/callback_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/campaign_fixture.php b/lib/Cake/tests/fixtures/campaign_fixture.php
index 1d4fb7edb..ec0411b76 100644
--- a/lib/Cake/tests/fixtures/campaign_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/category_fixture.php b/lib/Cake/tests/fixtures/category_fixture.php
index 419699773..7ea0fba2d 100644
--- a/lib/Cake/tests/fixtures/category_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/category_thread_fixture.php b/lib/Cake/tests/fixtures/category_thread_fixture.php
index 65b840cbc..92563dd7b 100644
--- a/lib/Cake/tests/fixtures/category_thread_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/cd_fixture.php b/lib/Cake/tests/fixtures/cd_fixture.php
index 59b4952cf..c2e668c0a 100644
--- a/lib/Cake/tests/fixtures/cd_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/comment_fixture.php b/lib/Cake/tests/fixtures/comment_fixture.php
index 559c78e00..2f5cfaa26 100644
--- a/lib/Cake/tests/fixtures/comment_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/content_account_fixture.php b/lib/Cake/tests/fixtures/content_account_fixture.php
index b765fc403..4cf803a22 100644
--- a/lib/Cake/tests/fixtures/content_account_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/content_fixture.php b/lib/Cake/tests/fixtures/content_fixture.php
index a7e9eb5ca..067410fbf 100644
--- a/lib/Cake/tests/fixtures/content_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/counter_cache_post_fixture.php b/lib/Cake/tests/fixtures/counter_cache_post_fixture.php
index 9aa3f2ce1..ea7ec7b9b 100644
--- a/lib/Cake/tests/fixtures/counter_cache_post_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/lib/Cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
index efa9c553c..cdb05f0da 100644
--- a/lib/Cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/counter_cache_user_fixture.php b/lib/Cake/tests/fixtures/counter_cache_user_fixture.php
index 9ebc2e3ac..4d47c33cd 100644
--- a/lib/Cake/tests/fixtures/counter_cache_user_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/lib/Cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
index 3134f4650..3fe938bc6 100644
--- a/lib/Cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/data_test_fixture.php b/lib/Cake/tests/fixtures/data_test_fixture.php
index 43c4fd7d3..273777c2f 100644
--- a/lib/Cake/tests/fixtures/data_test_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/datatype_fixture.php b/lib/Cake/tests/fixtures/datatype_fixture.php
index 9bfaad3d7..39055a018 100644
--- a/lib/Cake/tests/fixtures/datatype_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/dependency_fixture.php b/lib/Cake/tests/fixtures/dependency_fixture.php
index 5514e696e..d9765317a 100644
--- a/lib/Cake/tests/fixtures/dependency_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/device_fixture.php b/lib/Cake/tests/fixtures/device_fixture.php
index c927feeda..8371cbe21 100644
--- a/lib/Cake/tests/fixtures/device_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/device_type_category_fixture.php b/lib/Cake/tests/fixtures/device_type_category_fixture.php
index 6750ac7ed..7feb7b97c 100644
--- a/lib/Cake/tests/fixtures/device_type_category_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/device_type_fixture.php b/lib/Cake/tests/fixtures/device_type_fixture.php
index ecbdb2091..ddd82adc1 100644
--- a/lib/Cake/tests/fixtures/device_type_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/document_directory_fixture.php b/lib/Cake/tests/fixtures/document_directory_fixture.php
index 485cdeca4..732eae1f2 100644
--- a/lib/Cake/tests/fixtures/document_directory_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/document_fixture.php b/lib/Cake/tests/fixtures/document_fixture.php
index 5d9f438bf..93c1ec4ae 100644
--- a/lib/Cake/tests/fixtures/document_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/exterior_type_category_fixture.php b/lib/Cake/tests/fixtures/exterior_type_category_fixture.php
index f7b609ed7..cbc27668c 100644
--- a/lib/Cake/tests/fixtures/exterior_type_category_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/feature_set_fixture.php b/lib/Cake/tests/fixtures/feature_set_fixture.php
index 3e26310ff..a42084973 100644
--- a/lib/Cake/tests/fixtures/feature_set_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/featured_fixture.php b/lib/Cake/tests/fixtures/featured_fixture.php
index 4777e2d36..1070e2732 100644
--- a/lib/Cake/tests/fixtures/featured_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/film_file_fixture.php b/lib/Cake/tests/fixtures/film_file_fixture.php
index fa9fe736b..9a07df3cd 100644
--- a/lib/Cake/tests/fixtures/film_file_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/fixturized_test_case.php b/lib/Cake/tests/fixtures/fixturized_test_case.php
index c9b932b3e..810a2089f 100644
--- a/lib/Cake/tests/fixtures/fixturized_test_case.php
+++ b/lib/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 {
@@ -22,7 +21,7 @@ class FixturizedTestCase extends CakeTestCase {
* @return void
*/
public function testFixturePresent() {
- $this->assertType('CakeFixtureManager', $this->fixtureManager);
+ $this->assertInstanceOf('CakeFixtureManager', $this->fixtureManager);
}
/**
diff --git a/lib/Cake/tests/fixtures/flag_tree_fixture.php b/lib/Cake/tests/fixtures/flag_tree_fixture.php
index 31c39e1a6..229ad81eb 100644
--- a/lib/Cake/tests/fixtures/flag_tree_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/fruit_fixture.php b/lib/Cake/tests/fixtures/fruit_fixture.php
index 484b99478..abd9eeaa4 100644
--- a/lib/Cake/tests/fixtures/fruit_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/fruits_uuid_tag_fixture.php b/lib/Cake/tests/fixtures/fruits_uuid_tag_fixture.php
index 8d7cff938..afa328b38 100644
--- a/lib/Cake/tests/fixtures/fruits_uuid_tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/group_update_all_fixture.php b/lib/Cake/tests/fixtures/group_update_all_fixture.php
index e1dd56bcc..ebd320b99 100644
--- a/lib/Cake/tests/fixtures/group_update_all_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/home_fixture.php b/lib/Cake/tests/fixtures/home_fixture.php
index e3988bcc4..2f90ea64a 100644
--- a/lib/Cake/tests/fixtures/home_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/image_fixture.php b/lib/Cake/tests/fixtures/image_fixture.php
index 369b877b9..1eaaae118 100644
--- a/lib/Cake/tests/fixtures/image_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/item_fixture.php b/lib/Cake/tests/fixtures/item_fixture.php
index fdca77fcb..8aa2487a1 100644
--- a/lib/Cake/tests/fixtures/item_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/items_portfolio_fixture.php b/lib/Cake/tests/fixtures/items_portfolio_fixture.php
index 88029e048..fd128a1eb 100644
--- a/lib/Cake/tests/fixtures/items_portfolio_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/join_a_b_fixture.php b/lib/Cake/tests/fixtures/join_a_b_fixture.php
index f9d9776a3..d979f30c4 100644
--- a/lib/Cake/tests/fixtures/join_a_b_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/join_a_c_fixture.php b/lib/Cake/tests/fixtures/join_a_c_fixture.php
index b8c9786ca..f66fa499f 100644
--- a/lib/Cake/tests/fixtures/join_a_c_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/join_a_fixture.php b/lib/Cake/tests/fixtures/join_a_fixture.php
index 0910b132d..891697321 100644
--- a/lib/Cake/tests/fixtures/join_a_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/join_b_fixture.php b/lib/Cake/tests/fixtures/join_b_fixture.php
index e9f5a9019..a636e7243 100644
--- a/lib/Cake/tests/fixtures/join_b_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/join_c_fixture.php b/lib/Cake/tests/fixtures/join_c_fixture.php
index c50a606e8..d858a5e11 100644
--- a/lib/Cake/tests/fixtures/join_c_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/join_thing_fixture.php b/lib/Cake/tests/fixtures/join_thing_fixture.php
index 75c009f28..13b8dc8f6 100644
--- a/lib/Cake/tests/fixtures/join_thing_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/message_fixture.php b/lib/Cake/tests/fixtures/message_fixture.php
index 0c62b85f9..e491f031f 100644
--- a/lib/Cake/tests/fixtures/message_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/my_categories_my_products_fixture.php b/lib/Cake/tests/fixtures/my_categories_my_products_fixture.php
index a20ad3daa..d33fafa86 100644
--- a/lib/Cake/tests/fixtures/my_categories_my_products_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/my_categories_my_users_fixture.php b/lib/Cake/tests/fixtures/my_categories_my_users_fixture.php
index 0366794dd..c6c557e0f 100644
--- a/lib/Cake/tests/fixtures/my_categories_my_users_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/my_category_fixture.php b/lib/Cake/tests/fixtures/my_category_fixture.php
index ba1225a1c..954a2d429 100644
--- a/lib/Cake/tests/fixtures/my_category_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/my_product_fixture.php b/lib/Cake/tests/fixtures/my_product_fixture.php
index e934e4447..424c820c9 100644
--- a/lib/Cake/tests/fixtures/my_product_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/my_user_fixture.php b/lib/Cake/tests/fixtures/my_user_fixture.php
index fb2d0c236..09922a594 100644
--- a/lib/Cake/tests/fixtures/my_user_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/node_fixture.php b/lib/Cake/tests/fixtures/node_fixture.php
index e5f88c49d..3e527eb0e 100644
--- a/lib/Cake/tests/fixtures/node_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/number_tree_fixture.php b/lib/Cake/tests/fixtures/number_tree_fixture.php
index 80ce2970e..84ea86fce 100644
--- a/lib/Cake/tests/fixtures/number_tree_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/number_tree_two_fixture.php b/lib/Cake/tests/fixtures/number_tree_two_fixture.php
index 20f154844..2414acb60 100644
--- a/lib/Cake/tests/fixtures/number_tree_two_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/numeric_article_fixture.php b/lib/Cake/tests/fixtures/numeric_article_fixture.php
index dc5b3b45f..06f86e289 100644
--- a/lib/Cake/tests/fixtures/numeric_article_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/overall_favorite_fixture.php b/lib/Cake/tests/fixtures/overall_favorite_fixture.php
index ddb555496..fb46f74d1 100644
--- a/lib/Cake/tests/fixtures/overall_favorite_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/person_fixture.php b/lib/Cake/tests/fixtures/person_fixture.php
index ae8b9391d..652b1dc31 100644
--- a/lib/Cake/tests/fixtures/person_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/portfolio_fixture.php b/lib/Cake/tests/fixtures/portfolio_fixture.php
index 40a18c7b7..a3c9c3985 100644
--- a/lib/Cake/tests/fixtures/portfolio_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/post_fixture.php b/lib/Cake/tests/fixtures/post_fixture.php
index 98264bd68..dcc808a60 100644
--- a/lib/Cake/tests/fixtures/post_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/posts_tag_fixture.php b/lib/Cake/tests/fixtures/posts_tag_fixture.php
index cddf3e4ee..9a1217569 100644
--- a/lib/Cake/tests/fixtures/posts_tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/primary_model_fixture.php b/lib/Cake/tests/fixtures/primary_model_fixture.php
index 4194f97a7..058489f58 100644
--- a/lib/Cake/tests/fixtures/primary_model_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/product_fixture.php b/lib/Cake/tests/fixtures/product_fixture.php
index 207ae2073..effee768a 100644
--- a/lib/Cake/tests/fixtures/product_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/product_update_all_fixture.php b/lib/Cake/tests/fixtures/product_update_all_fixture.php
index 6ca5377f9..80d11cb2f 100644
--- a/lib/Cake/tests/fixtures/product_update_all_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/project_fixture.php b/lib/Cake/tests/fixtures/project_fixture.php
index d28aa1578..961cf532a 100644
--- a/lib/Cake/tests/fixtures/project_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/sample_fixture.php b/lib/Cake/tests/fixtures/sample_fixture.php
index f5e915765..fa150a748 100644
--- a/lib/Cake/tests/fixtures/sample_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/secondary_model_fixture.php b/lib/Cake/tests/fixtures/secondary_model_fixture.php
index c273850d5..0fcf88699 100644
--- a/lib/Cake/tests/fixtures/secondary_model_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/session_fixture.php b/lib/Cake/tests/fixtures/session_fixture.php
index d517730b1..cbbc89d5c 100644
--- a/lib/Cake/tests/fixtures/session_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/something_else_fixture.php b/lib/Cake/tests/fixtures/something_else_fixture.php
index 5b57d72b1..b6d965298 100644
--- a/lib/Cake/tests/fixtures/something_else_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/something_fixture.php b/lib/Cake/tests/fixtures/something_fixture.php
index c0dfccd6f..356b533ca 100644
--- a/lib/Cake/tests/fixtures/something_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/stories_tag_fixture.php b/lib/Cake/tests/fixtures/stories_tag_fixture.php
index cc2bcf619..4e441b64f 100644
--- a/lib/Cake/tests/fixtures/stories_tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/story_fixture.php b/lib/Cake/tests/fixtures/story_fixture.php
index 4604a202f..3a8cdfa6a 100644
--- a/lib/Cake/tests/fixtures/story_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/syfile_fixture.php b/lib/Cake/tests/fixtures/syfile_fixture.php
index 59fb672f9..f143adc33 100644
--- a/lib/Cake/tests/fixtures/syfile_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/tag_fixture.php b/lib/Cake/tests/fixtures/tag_fixture.php
index a56e4c485..fb792236c 100644
--- a/lib/Cake/tests/fixtures/tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/test_plugin_article_fixture.php b/lib/Cake/tests/fixtures/test_plugin_article_fixture.php
index af5dfd8ea..79c3c36ff 100644
--- a/lib/Cake/tests/fixtures/test_plugin_article_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/test_plugin_comment_fixture.php b/lib/Cake/tests/fixtures/test_plugin_comment_fixture.php
index 854e098bf..d70038e32 100644
--- a/lib/Cake/tests/fixtures/test_plugin_comment_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/the_paper_monkies_fixture.php b/lib/Cake/tests/fixtures/the_paper_monkies_fixture.php
index 24060d815..4d64767ce 100644
--- a/lib/Cake/tests/fixtures/the_paper_monkies_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/thread_fixture.php b/lib/Cake/tests/fixtures/thread_fixture.php
index 76bb1d28b..ed24b6b82 100644
--- a/lib/Cake/tests/fixtures/thread_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/translate_article_fixture.php b/lib/Cake/tests/fixtures/translate_article_fixture.php
index 756153814..d28417539 100644
--- a/lib/Cake/tests/fixtures/translate_article_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/translate_fixture.php b/lib/Cake/tests/fixtures/translate_fixture.php
index bc7926a4d..730dfad64 100644
--- a/lib/Cake/tests/fixtures/translate_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/translate_table_fixture.php b/lib/Cake/tests/fixtures/translate_table_fixture.php
index bae466c86..08a0a3d9a 100644
--- a/lib/Cake/tests/fixtures/translate_table_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/translate_with_prefix_fixture.php b/lib/Cake/tests/fixtures/translate_with_prefix_fixture.php
index 04549b02e..87045605f 100644
--- a/lib/Cake/tests/fixtures/translate_with_prefix_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/translated_article_fixture.php b/lib/Cake/tests/fixtures/translated_article_fixture.php
index 978a8b5f3..b5238baae 100644
--- a/lib/Cake/tests/fixtures/translated_article_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/translated_item_fixture.php b/lib/Cake/tests/fixtures/translated_item_fixture.php
index 91a0571eb..95eede406 100644
--- a/lib/Cake/tests/fixtures/translated_item_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/unconventional_tree_fixture.php b/lib/Cake/tests/fixtures/unconventional_tree_fixture.php
index 7d1b39838..ea57f6f06 100644
--- a/lib/Cake/tests/fixtures/unconventional_tree_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/underscore_field_fixture.php b/lib/Cake/tests/fixtures/underscore_field_fixture.php
index 3322284b1..1962e403d 100644
--- a/lib/Cake/tests/fixtures/underscore_field_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/user_fixture.php b/lib/Cake/tests/fixtures/user_fixture.php
index 86683d2e9..2adb7841f 100644
--- a/lib/Cake/tests/fixtures/user_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/uuid_fixture.php b/lib/Cake/tests/fixtures/uuid_fixture.php
index 559dc810b..50f735ceb 100644
--- a/lib/Cake/tests/fixtures/uuid_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/uuid_tag_fixture.php b/lib/Cake/tests/fixtures/uuid_tag_fixture.php
index a126903e8..94e1ba7bc 100644
--- a/lib/Cake/tests/fixtures/uuid_tag_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/uuid_tree_fixture.php b/lib/Cake/tests/fixtures/uuid_tree_fixture.php
index c34bc2c3c..5828533e2 100644
--- a/lib/Cake/tests/fixtures/uuid_tree_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/uuiditem_fixture.php b/lib/Cake/tests/fixtures/uuiditem_fixture.php
index 1e70eb287..5b6e15e8e 100644
--- a/lib/Cake/tests/fixtures/uuiditem_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/lib/Cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
index 94a5a2e49..eeafb752d 100644
--- a/lib/Cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/lib/Cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
index c4ae9c768..f8f6baedc 100644
--- a/lib/Cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
+++ b/lib/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/lib/Cake/tests/fixtures/uuidportfolio_fixture.php b/lib/Cake/tests/fixtures/uuidportfolio_fixture.php
index fb3745d3b..3c6b86f28 100644
--- a/lib/Cake/tests/fixtures/uuidportfolio_fixture.php
+++ b/lib/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/lib/Cake/tests/test_app/config/acl.ini.php b/lib/Cake/tests/test_app/config/acl.ini.php
index 3c53bfde1..d2f06fc4d 100644
--- a/lib/Cake/tests/test_app/config/acl.ini.php
+++ b/lib/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/lib/Cake/tests/test_app/config/routes.php b/lib/Cake/tests/test_app/config/routes.php
index 17fdccf25..8d401d581 100644
--- a/lib/Cake/tests/test_app/config/routes.php
+++ b/lib/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/lib/Cake/tests/test_app/console/shells/sample.php b/lib/Cake/tests/test_app/console/shells/sample.php
index 8994803e8..aa892b1ec 100644
--- a/lib/Cake/tests/test_app/console/shells/sample.php
+++ b/lib/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/lib/Cake/tests/test_app/controllers/tests_apps_controller.php b/lib/Cake/tests/test_app/controllers/tests_apps_controller.php
index f7f2faf9f..24f193b48 100644
--- a/lib/Cake/tests/test_app/controllers/tests_apps_controller.php
+++ b/lib/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/lib/Cake/tests/test_app/controllers/tests_apps_posts_controller.php b/lib/Cake/tests/test_app/controllers/tests_apps_posts_controller.php
index 0b11bd068..af28f42c4 100644
--- a/lib/Cake/tests/test_app/controllers/tests_apps_posts_controller.php
+++ b/lib/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/lib/Cake/tests/test_app/libs/cache/test_app_cache.php b/lib/Cake/tests/test_app/libs/cache/test_app_cache.php
index d138764d3..1a8a47ac0 100644
--- a/lib/Cake/tests/test_app/libs/cache/test_app_cache.php
+++ b/lib/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/lib/Cake/tests/test_app/libs/library.php b/lib/Cake/tests/test_app/libs/library.php
index 5047e0868..10fc5f10f 100644
--- a/lib/Cake/tests/test_app/libs/library.php
+++ b/lib/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/lib/Cake/tests/test_app/libs/log/test_app_log.php b/lib/Cake/tests/test_app/libs/log/test_app_log.php
index bd65581dc..129e1b65d 100644
--- a/lib/Cake/tests/test_app/libs/log/test_app_log.php
+++ b/lib/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/lib/Cake/tests/test_app/models/behaviors/persister_one_behavior.php b/lib/Cake/tests/test_app/models/behaviors/persister_one_behavior.php
index eebe0ba5d..8ef3cf6af 100644
--- a/lib/Cake/tests/test_app/models/behaviors/persister_one_behavior.php
+++ b/lib/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/lib/Cake/tests/test_app/models/behaviors/persister_two_behavior.php b/lib/Cake/tests/test_app/models/behaviors/persister_two_behavior.php
index e17180e24..6cbd0483b 100644
--- a/lib/Cake/tests/test_app/models/behaviors/persister_two_behavior.php
+++ b/lib/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/lib/Cake/tests/test_app/models/comment.php b/lib/Cake/tests/test_app/models/comment.php
index 9ded58dde..0f0b142d8 100644
--- a/lib/Cake/tests/test_app/models/comment.php
+++ b/lib/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/lib/Cake/tests/test_app/models/persister_one.php b/lib/Cake/tests/test_app/models/persister_one.php
index a13bc3c65..26e1b1dd6 100644
--- a/lib/Cake/tests/test_app/models/persister_one.php
+++ b/lib/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/lib/Cake/tests/test_app/models/persister_two.php b/lib/Cake/tests/test_app/models/persister_two.php
index b157e7850..68313cd6e 100644
--- a/lib/Cake/tests/test_app/models/persister_two.php
+++ b/lib/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/lib/Cake/tests/test_app/models/post.php b/lib/Cake/tests/test_app/models/post.php
index 2155d970d..5a1c15370 100644
--- a/lib/Cake/tests/test_app/models/post.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/config/load.php b/lib/Cake/tests/test_app/plugins/test_plugin/config/load.php
index 709468c0a..07576e051 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/config/load.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/config/more.load.php b/lib/Cake/tests/test_app/plugins/test_plugin/config/more.load.php
index bedf5cff0..f0c9744f8 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/config/more.load.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/lib/Cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
index fd3a283c8..9f9bd3571 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/example.php b/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/example.php
index 8380eb901..76e750913 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/example.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php b/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php
index 4c4dc2823..ca6668b2f 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
index 08168bb27..cff9b4a0d 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
index b3bd6f25f..8c478bba6 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
index 78e87ce56..c09948394 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
index 3b2bb344d..28acded03 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
index 87fd60dc7..2ad779059 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
index ea74c447e..36d67e950 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/lib/Cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
index 3342755dc..a1afa5d46 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/lib/Cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
index 3ce8c9837..3072ca08e 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/lib/Cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
index decf3ef66..647e33177 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
index 4a54e3554..669ac584c 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
index 90ba761e0..162078e51 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
index 430d5c446..74519a19d 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
index ac9782643..0edd39cf1 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
index 781841fa2..afef031a3 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
index 0c6090a76..b0441191f 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
index 89b70da0d..f8c2265d5 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/lib/Cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
index 5f6162fcc..6dc24ad8b 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/lib/Cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
index 2566444f9..435b67a84 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/lib/Cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
index 50dbe616f..41d62cbd0 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
index b8f53ee5a..c6fe5359b 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
index fee89f004..d92752535 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php b/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php
index dea25fd74..290188779 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php
+++ b/lib/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/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php b/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php
index 7c091ea92..7c7da0c3a 100644
--- a/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php
+++ b/lib/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/lib/Cake/tests/test_app/vendors/Test/MyTest.php b/lib/Cake/tests/test_app/vendors/Test/MyTest.php
index 888c9395d..d1a94d55b 100644
--- a/lib/Cake/tests/test_app/vendors/Test/MyTest.php
+++ b/lib/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/lib/Cake/tests/test_app/vendors/Test/hello.php b/lib/Cake/tests/test_app/vendors/Test/hello.php
index e6cd3fbba..7f886aef0 100644
--- a/lib/Cake/tests/test_app/vendors/Test/hello.php
+++ b/lib/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/lib/Cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/lib/Cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
index 16ba606ba..58e797165 100644
--- a/lib/Cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
+++ b/lib/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/lib/Cake/tests/test_app/vendors/somename/some.name.php b/lib/Cake/tests/test_app/vendors/somename/some.name.php
index 54c144fe3..1394bf894 100644
--- a/lib/Cake/tests/test_app/vendors/somename/some.name.php
+++ b/lib/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/lib/Cake/tests/test_app/vendors/welcome.php b/lib/Cake/tests/test_app/vendors/welcome.php
index dedd3e196..6b36caf0c 100644
--- a/lib/Cake/tests/test_app/vendors/welcome.php
+++ b/lib/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/lib/Cake/tests/test_app/views/elements/email/html/custom.ctp b/lib/Cake/tests/test_app/views/elements/email/html/custom.ctp
index 6b46d7c65..6d1b5702a 100644
--- a/lib/Cake/tests/test_app/views/elements/email/html/custom.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/elements/email/html/default.ctp b/lib/Cake/tests/test_app/views/elements/email/html/default.ctp
index de87b4eb8..8efbaa94d 100644
--- a/lib/Cake/tests/test_app/views/elements/email/html/default.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/elements/email/text/custom.ctp b/lib/Cake/tests/test_app/views/elements/email/text/custom.ctp
index 623dba240..601023b74 100644
--- a/lib/Cake/tests/test_app/views/elements/email/text/custom.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/elements/email/text/default.ctp b/lib/Cake/tests/test_app/views/elements/email/text/default.ctp
index 9d384e3f8..7655f1430 100644
--- a/lib/Cake/tests/test_app/views/elements/email/text/default.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/elements/email/text/wide.ctp b/lib/Cake/tests/test_app/views/elements/email/text/wide.ctp
index 67b03b057..1e476fbee 100644
--- a/lib/Cake/tests/test_app/views/elements/email/text/wide.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/helpers/banana.php b/lib/Cake/tests/test_app/views/helpers/banana.php
index 0489d80f2..f57db5219 100644
--- a/lib/Cake/tests/test_app/views/helpers/banana.php
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/ajax.ctp b/lib/Cake/tests/test_app/views/layouts/ajax.ctp
index dadf156ed..93371552b 100644
--- a/lib/Cake/tests/test_app/views/layouts/ajax.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/ajax2.ctp b/lib/Cake/tests/test_app/views/layouts/ajax2.ctp
index 0fa4fbacb..673abbaab 100644
--- a/lib/Cake/tests/test_app/views/layouts/ajax2.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/cache_layout.ctp b/lib/Cake/tests/test_app/views/layouts/cache_layout.ctp
index 1fd6ff624..d76c26936 100644
--- a/lib/Cake/tests/test_app/views/layouts/cache_layout.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/default.ctp b/lib/Cake/tests/test_app/views/layouts/default.ctp
index f75592f05..21dacb2d9 100644
--- a/lib/Cake/tests/test_app/views/layouts/default.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/email/html/default.ctp b/lib/Cake/tests/test_app/views/layouts/email/html/default.ctp
index 8b5a339f8..cc4364bb1 100644
--- a/lib/Cake/tests/test_app/views/layouts/email/html/default.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/email/html/thin.ctp b/lib/Cake/tests/test_app/views/layouts/email/html/thin.ctp
index 21ef3747f..87ece8384 100644
--- a/lib/Cake/tests/test_app/views/layouts/email/html/thin.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/email/text/default.ctp b/lib/Cake/tests/test_app/views/layouts/email/text/default.ctp
index eb9a46daa..ad1aee411 100644
--- a/lib/Cake/tests/test_app/views/layouts/email/text/default.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/flash.ctp b/lib/Cake/tests/test_app/views/layouts/flash.ctp
index 1b7745cf2..bed0624c4 100644
--- a/lib/Cake/tests/test_app/views/layouts/flash.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/layouts/multi_cache.ctp b/lib/Cake/tests/test_app/views/layouts/multi_cache.ctp
index d3bb46503..d14ce36de 100644
--- a/lib/Cake/tests/test_app/views/layouts/multi_cache.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/posts/sequencial_nocache.ctp b/lib/Cake/tests/test_app/views/posts/sequencial_nocache.ctp
index 7fa93fa5c..c6aa3eb09 100644
--- a/lib/Cake/tests/test_app/views/posts/sequencial_nocache.ctp
+++ b/lib/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/lib/Cake/tests/test_app/views/posts/test_nocache_tags.ctp b/lib/Cake/tests/test_app/views/posts/test_nocache_tags.ctp
index 4946f1bc8..af036738e 100644
--- a/lib/Cake/tests/test_app/views/posts/test_nocache_tags.ctp
+++ b/lib/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)
*/