diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php index c3e055341..3245634aa 100644 --- a/app/config/acl.ini.php +++ b/app/config/acl.ini.php @@ -14,8 +14,7 @@ ; * ; * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) ; * @link http://cakephp.org CakePHP(tm) Project -; * @package cake -; * @subpackage cake.app.config +; * @package app.config ; * @since CakePHP(tm) v 0.10.0.1076 ; * @license MIT License (http://www.opensource.org/licenses/mit-license.php) ; */ diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php index b0c33554b..ceeb85670 100644 --- a/app/config/bootstrap.php +++ b/app/config/bootstrap.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config + * @package app.config * @since CakePHP(tm) v 0.10.8.2117 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/config/core.php b/app/config/core.php index c9560d15a..9744da06c 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config + * @package app.config * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/config/database.php.default b/app/config/database.php.default index f85b56922..2078240ea 100644 --- a/app/config/database.php.default +++ b/app/config/database.php.default @@ -14,16 +14,14 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config + * @package app.config * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ /** * In this file you set up your database connection details. * - * @package cake - * @subpackage cake.config + * @package cake.config */ /** * Database configuration class. diff --git a/app/config/routes.php b/app/config/routes.php index 4e470c363..cbb816e18 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -16,8 +16,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config + * @package app.config * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/config/schema/db_acl.php b/app/config/schema/db_acl.php index d13a20609..25b6ee6df 100644 --- a/app/config/schema/db_acl.php +++ b/app/config/schema/db_acl.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config.sql + * @package app.config.sql * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/config/schema/i18n.php b/app/config/schema/i18n.php index 13db98f12..f57bbce7f 100644 --- a/app/config/schema/i18n.php +++ b/app/config/schema/i18n.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config.sql + * @package app.config.sql * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/config/schema/sessions.php b/app/config/schema/sessions.php index 584d0002b..e5ae37dc1 100644 --- a/app/config/schema/sessions.php +++ b/app/config/schema/sessions.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config.sql + * @package app.config.sql * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/console/cake b/app/console/cake index d4d067d59..bd1b6da06 100755 --- a/app/console/cake +++ b/app/console/cake @@ -12,8 +12,7 @@ # # @copyright Copyright 2005-2010, Cake Software Foundation, Inc. # @link http://cakephp.org CakePHP(tm) Project -# @package cake -# @subpackage cake.app.console +# @package app.console # @since CakePHP(tm) v 2.0 # @license MIT License (http://www.opensource.org/licenses/mit-license.php) # diff --git a/app/console/cake.bat b/app/console/cake.bat index 6499c2f22..ed04546c9 100644 --- a/app/console/cake.bat +++ b/app/console/cake.bat @@ -10,9 +10,8 @@ :: Redistributions of files must retain the above copyright notice. :: :: @copyright Copyright 2005-2010, Cake Software Foundation, Inc. -:: @link http://cakephp.org CakePHP(tm) Project -:: @package cake -:: @subpackage cake.app.console +:: @link http://cakephp.org CakePHP(tm) Project +:: @package app.console :: @since CakePHP(tm) v 2.0 :: @license MIT License (http://www.opensource.org/licenses/mit-license.php) :: diff --git a/app/console/cake.php b/app/console/cake.php index af02ae4ff..9200fd36b 100755 --- a/app/console/cake.php +++ b/app/console/cake.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package app.console * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/index.php b/app/index.php index a9e0270cb..ac4fde167 100644 --- a/app/index.php +++ b/app/index.php @@ -10,8 +10,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app + * @package app * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/webroot/css.php b/app/webroot/css.php index 26cddcb14..19ba84dc2 100644 --- a/app/webroot/css.php +++ b/app/webroot/css.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.webroot + * @package app.webroot * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css index 4f6f5a2cd..3559401dc 100644 --- a/app/webroot/css/cake.generic.css +++ b/app/webroot/css/cake.generic.css @@ -10,8 +10,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.webroot.css + * @package app.webroot.css * @since CakePHP(tm) * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/webroot/index.php b/app/webroot/index.php index 719f172c4..5955688f6 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.webroot + * @package app.webroot * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/webroot/test.php b/app/webroot/test.php index 7a27e8e29..eddcc437f 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing - * @package cake - * @subpackage cake.app.webroot + * @package app.webroot * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/VERSION.txt b/cake/VERSION.txt index e5c64475c..90bd8f82d 100644 --- a/cake/VERSION.txt +++ b/cake/VERSION.txt @@ -12,8 +12,7 @@ // // @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) // @link http://cakephp.org -// @package cake -// @subpackage cake.cake.libs +// @package cake.libs // @since CakePHP(tm) v 0.2.9 // @license MIT License (http://www.opensource.org/licenses/mit-license.php) // +--------------------------------------------------------------------------------------------+ // diff --git a/cake/basics.php b/cake/basics.php index a5ee633dd..5a968cdeb 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -15,7 +15,6 @@ * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project * @package cake - * @subpackage cake.cake * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/bootstrap.php b/cake/bootstrap.php index acfc7bb2f..65931eb39 100644 --- a/cake/bootstrap.php +++ b/cake/bootstrap.php @@ -15,7 +15,6 @@ * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project * @package cake - * @subpackage cake.cake * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/config.php b/cake/config/config.php index 071441c21..30b6e24d1 100644 --- a/cake/config/config.php +++ b/cake/config/config.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config + * @package cake.config * @since CakePHP(tm) v 1.1.11.4062 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/paths.php b/cake/config/paths.php index e8ac21c49..365cdb4c1 100644 --- a/cake/config/paths.php +++ b/cake/config/paths.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.app.config + * @package cake.config * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0080_00ff.php b/cake/config/unicode/casefolding/0080_00ff.php index 0d2fa16be..ef01fe904 100644 --- a/cake/config/unicode/casefolding/0080_00ff.php +++ b/cake/config/unicode/casefolding/0080_00ff.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0100_017f.php b/cake/config/unicode/casefolding/0100_017f.php index 64ab7d393..1f7f1449c 100644 --- a/cake/config/unicode/casefolding/0100_017f.php +++ b/cake/config/unicode/casefolding/0100_017f.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0180_024F.php b/cake/config/unicode/casefolding/0180_024F.php index 23c692632..f2a5a849b 100644 --- a/cake/config/unicode/casefolding/0180_024F.php +++ b/cake/config/unicode/casefolding/0180_024F.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0250_02af.php b/cake/config/unicode/casefolding/0250_02af.php index 1ef96c6af..3140c1312 100644 --- a/cake/config/unicode/casefolding/0250_02af.php +++ b/cake/config/unicode/casefolding/0250_02af.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.6833 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0370_03ff.php b/cake/config/unicode/casefolding/0370_03ff.php index 50618afb8..7609089da 100644 --- a/cake/config/unicode/casefolding/0370_03ff.php +++ b/cake/config/unicode/casefolding/0370_03ff.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0400_04ff.php b/cake/config/unicode/casefolding/0400_04ff.php index a04d3df66..3b12b059e 100644 --- a/cake/config/unicode/casefolding/0400_04ff.php +++ b/cake/config/unicode/casefolding/0400_04ff.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0500_052f.php b/cake/config/unicode/casefolding/0500_052f.php index 661f66d63..453b9b7df 100644 --- a/cake/config/unicode/casefolding/0500_052f.php +++ b/cake/config/unicode/casefolding/0500_052f.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/0530_058f.php b/cake/config/unicode/casefolding/0530_058f.php index 232649ec4..3181438ec 100644 --- a/cake/config/unicode/casefolding/0530_058f.php +++ b/cake/config/unicode/casefolding/0530_058f.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/1e00_1eff.php b/cake/config/unicode/casefolding/1e00_1eff.php index 3a8378691..ed49211a9 100644 --- a/cake/config/unicode/casefolding/1e00_1eff.php +++ b/cake/config/unicode/casefolding/1e00_1eff.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/1f00_1fff.php b/cake/config/unicode/casefolding/1f00_1fff.php index a4040b852..2b0d24bf2 100644 --- a/cake/config/unicode/casefolding/1f00_1fff.php +++ b/cake/config/unicode/casefolding/1f00_1fff.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/2100_214f.php b/cake/config/unicode/casefolding/2100_214f.php index 1685ebb71..a10d613f4 100644 --- a/cake/config/unicode/casefolding/2100_214f.php +++ b/cake/config/unicode/casefolding/2100_214f.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/2150_218f.php b/cake/config/unicode/casefolding/2150_218f.php index 44bf3ff89..6ccd3de8c 100644 --- a/cake/config/unicode/casefolding/2150_218f.php +++ b/cake/config/unicode/casefolding/2150_218f.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/2460_24ff.php b/cake/config/unicode/casefolding/2460_24ff.php index 4376e2b71..2e7a85321 100644 --- a/cake/config/unicode/casefolding/2460_24ff.php +++ b/cake/config/unicode/casefolding/2460_24ff.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/2c00_2c5f.php b/cake/config/unicode/casefolding/2c00_2c5f.php index e8a70bc32..797cf964d 100644 --- a/cake/config/unicode/casefolding/2c00_2c5f.php +++ b/cake/config/unicode/casefolding/2c00_2c5f.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/2c60_2c7f.php b/cake/config/unicode/casefolding/2c60_2c7f.php index dabdb88a2..058193ca6 100644 --- a/cake/config/unicode/casefolding/2c60_2c7f.php +++ b/cake/config/unicode/casefolding/2c60_2c7f.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/2c80_2cff.php b/cake/config/unicode/casefolding/2c80_2cff.php index c0245fa16..d439bc2e7 100644 --- a/cake/config/unicode/casefolding/2c80_2cff.php +++ b/cake/config/unicode/casefolding/2c80_2cff.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/config/unicode/casefolding/ff00_ffef.php b/cake/config/unicode/casefolding/ff00_ffef.php index 74a2b5c4a..0b8106532 100644 --- a/cake/config/unicode/casefolding/ff00_ffef.php +++ b/cake/config/unicode/casefolding/ff00_ffef.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.config.unicode.casefolding + * @package cake.config.unicode.casefolding * @since CakePHP(tm) v 1.2.0.5691 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/cake b/cake/console/cake index d0bdb5cc0..81df781da 100755 --- a/cake/console/cake +++ b/cake/console/cake @@ -12,9 +12,8 @@ # # @copyright Copyright 2005-2010, Cake Software Foundation, Inc. # @link http://cakephp.org CakePHP(tm) Project -# @package cake -# @subpackage cake.cake.console -# @since CakePHP(tm) v 1.2.0.5012 +# @package cake.console +# @since CakePHP(tm) v 1.2.0.5012 # @license MIT License (http://www.opensource.org/licenses/mit-license.php) # ################################################################################ diff --git a/cake/console/cake.bat b/cake/console/cake.bat index cb1831d94..40a271425 100644 --- a/cake/console/cake.bat +++ b/cake/console/cake.bat @@ -10,9 +10,8 @@ :: Redistributions of files must retain the above copyright notice. :: :: @copyright Copyright 2005-2010, Cake Software Foundation, Inc. -:: @link http://cakephp.org CakePHP(tm) Project -:: @package cake -:: @subpackage cake.cake.console +:: @link http://cakephp.org CakePHP(tm) Project +:: @package cake.console :: @since CakePHP(tm) v 1.2.0.5012 :: @license MIT License (http://www.opensource.org/licenses/mit-license.php) :: diff --git a/cake/console/cake.php b/cake/console/cake.php index 02468c38f..c9bce3193 100644 --- a/cake/console/cake.php +++ b/cake/console/cake.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/libs/console_error_handler.php b/cake/console/libs/console_error_handler.php index 120c09d74..80136bbcf 100644 --- a/cake/console/libs/console_error_handler.php +++ b/cake/console/libs/console_error_handler.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ require_once 'console_output.php'; * Error Handler for Cake console. Does simple printing of the * exception that occurred and the stack trace of the error. * - * @package cake - * @subpackage cake.cake.console + * @package cake.console.libs */ class ConsoleErrorHandler extends ErrorHandler { @@ -51,8 +49,9 @@ class ConsoleErrorHandler extends ErrorHandler { } /** - * Handle a exception in the console environment. + * Handle a exception in the console environment. Prints a message to stderr. * + * @param Exception $exception The exception to handle * @return void */ public static function handleException(Exception $exception) { @@ -67,6 +66,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/cake/console/libs/console_input.php b/cake/console/libs/console_input.php index 33127ae9b..8378b2e85 100644 --- a/cake/console/libs/console_input.php +++ b/cake/console/libs/console_input.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/cake/console/libs/console_input_argument.php b/cake/console/libs/console_input_argument.php index 200582353..263475e9d 100644 --- a/cake/console/libs/console_input_argument.php +++ b/cake/console/libs/console_input_argument.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console.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/cake/console/libs/console_input_option.php b/cake/console/libs/console_input_option.php index 56b01d448..3c9049248 100644 --- a/cake/console/libs/console_input_option.php +++ b/cake/console/libs/console_input_option.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console.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/cake/console/libs/console_input_subcommand.php b/cake/console/libs/console_input_subcommand.php index 76bd19d2f..b2903aec2 100644 --- a/cake/console/libs/console_input_subcommand.php +++ b/cake/console/libs/console_input_subcommand.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console.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/cake/console/libs/console_option_parser.php b/cake/console/libs/console_option_parser.php index 5af733e2d..a96a0759a 100644 --- a/cake/console/libs/console_option_parser.php +++ b/cake/console/libs/console_option_parser.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ require_once CONSOLE_LIBS . 'help_formatter.php'; * for GetOpt compatible option definition. Provides a builder pattern implementation * for creating shell option parsers. * - * @package cake - * @subpackage cake.cake.console + * @package cake.console.libs */ class ConsoleOptionParser { @@ -88,7 +86,7 @@ class ConsoleOptionParser { * preceeded by one - and are only one character long. They usually match with a long option, * and provide a more terse alternative. * - * #### Using Options + * ### Using Options * * Options can be defined with both long and short forms. By using `$parser->addOption()` * you can define new options. The name of the option is used as its long form, and you @@ -195,7 +193,7 @@ class ConsoleOptionParser { } /** - * Get or set the command name for shell/task + * Get or set the command name for shell/task. * * @param string $text The text to set, or null if you want to read * @return mixed If reading, the value of the command. If setting $this will be returned @@ -209,7 +207,7 @@ class ConsoleOptionParser { } /** - * Get or set the description text for shell/task + * Get or set the description text for shell/task. * * @param mixed $text The text to set, or null if you want to read. . If an array the text will be imploded with "\n" * @return mixed If reading, the value of the description. If setting $this will be returned @@ -247,7 +245,7 @@ class ConsoleOptionParser { * Add an option to the option parser. Options allow you to define optional or required * parameters for your console application. Options are defined by the parameters they use. * - * ### Params + * ### Options * * - `short` - The single letter variant for this option, leave undefined for none. * - `help` - Help text for this option. Used when generating help for the option. @@ -260,11 +258,12 @@ class ConsoleOptionParser { * - `choices` A list of valid choices for this option. If left empty all values are valid.. * An exception will be raised when parse() encounters an invalid value. * - * @param string $name The long name you want to the value to be parsed out as when options are parsed. + * @param mixed $name The long name you want to the value to be parsed out as when options are parsed. + * Will also accept an instance of ConsoleInputOption * @param array $params An array of parameters that define the behavior of the option * @return returns $this. */ - public function addOption($name, $params = array()) { + public function addOption($name, $options = array()) { if (is_object($name) && $name instanceof ConsoleInputOption) { $option = $name; $name = $option->name(); @@ -277,7 +276,7 @@ class ConsoleOptionParser { 'boolean' => false, 'choices' => array() ); - $options = array_merge($defaults, $params); + $options = array_merge($defaults, $options); $option = new ConsoleInputOption($options); } $this->_options[$name] = $option; @@ -300,7 +299,7 @@ class ConsoleOptionParser { * - `choices` A list of valid choices for this argument. If left empty all values are valid.. * An exception will be raised when parse() encounters an invalid value. * - * @param string $name The name of the argument. + * @param mixed $name The name of the argument. Will also accept an instance of ConsoleInputArgument * @param array $params Parameters for the argument, see above. * @return $this. */ @@ -357,21 +356,20 @@ class ConsoleOptionParser { /** * Append a subcommand to the subcommand list. - * Subcommands are usually methods on your Shell, but can also be used to document - * Tasks + * Subcommands are usually methods on your Shell, but can also be used to document Tasks. * - * ### Params + * ### Options * * - `help` - Help text for the subcommand. * - `parser` - A ConsoleOptionParser for the subcommand. This allows you to create method * specific option parsers. When help is generated for a subcommand, if a parser is present * it will be used. * - * @param string $name Name of the subcommand + * @param mixed $name Name of the subcommand. Will also accept an instance of ConsoleInputSubcommand * @param array $params Array of params, see above. * @return $this. */ - public function addSubcommand($name, $params = array()) { + public function addSubcommand($name, $options = array()) { if (is_object($name) && $name instanceof ConsoleInputSubcommand) { $command = $name; $name = $command->name(); @@ -381,7 +379,7 @@ class ConsoleOptionParser { 'help' => '', 'parser' => null ); - $options = array_merge($defaults, $params); + $options = array_merge($defaults, $options); $command = new ConsoleInputSubcommand($options); } $this->_subcommands[$name] = $command; diff --git a/cake/console/libs/console_output.php b/cake/console/libs/console_output.php index ef47266f0..7d41da4d7 100644 --- a/cake/console/libs/console_output.php +++ b/cake/console/libs/console_output.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console.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/cake/console/libs/help_formatter.php b/cake/console/libs/help_formatter.php index 002689899..f454fa8b2 100644 --- a/cake/console/libs/help_formatter.php +++ b/cake/console/libs/help_formatter.php @@ -12,9 +12,6 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console - * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ App::import('Core', 'String', false); @@ -28,12 +25,14 @@ App::import('Core', 'String', false); * * Xml output is useful for intergration with other tools like IDE's or other build tools. * + * @package cake.console.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/cake/console/libs/task_collection.php b/cake/console/libs/task_collection.php index d28b13b6d..32f0b31a4 100644 --- a/cake/console/libs/task_collection.php +++ b/cake/console/libs/task_collection.php @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/shell_dispatcher.php b/cake/console/shell_dispatcher.php index 029a91442..1b520500b 100644 --- a/cake/console/shell_dispatcher.php +++ b/cake/console/shell_dispatcher.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console + * @package cake.console * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Shell dispatcher handles dispatching cli commands. * - * @package cake - * @subpackage cake.cake.console + * @package cake.console */ class ShellDispatcher { diff --git a/cake/console/shells/acl.php b/cake/console/shells/acl.php index e29e4f4ef..b4d458ba7 100644 --- a/cake/console/shells/acl.php +++ b/cake/console/shells/acl.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.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::import('Model', 'DbAcl'); * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode * being enabled. Be sure to turn it off when using this shell. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs */ class AclShell extends Shell { diff --git a/cake/console/shells/api.php b/cake/console/shells/api.php index 0c036d09d..05cf326b8 100644 --- a/cake/console/shells/api.php +++ b/cake/console/shells/api.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.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::import('Core', 'File'); /** * API shell to show method signatures of CakePHP core classes. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs */ class ApiShell extends Shell { diff --git a/cake/console/shells/app_shell.php b/cake/console/shells/app_shell.php index 59fcc2a09..a624a31ad 100644 --- a/cake/console/shells/app_shell.php +++ b/cake/console/shells/app_shell.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.console.shells + * @package cake.console.shells * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ * Add your application-wide methods in the class below, your shells * will inherit them. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs */ class AppShell extends Shell { diff --git a/cake/console/shells/bake.php b/cake/console/shells/bake.php index 7e4dbb016..ec741ed3a 100644 --- a/cake/console/shells/bake.php +++ b/cake/console/shells/bake.php @@ -16,8 +16,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.shells * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ /** * Bake is a command-line code generation utility for automating programmer chores. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs * @link http://book.cakephp.org/view/1522/Code-Generation-with-Bake */ class BakeShell extends Shell { diff --git a/cake/console/shells/command_list.php b/cake/console/shells/command_list.php index cd05af4ba..e9323c6f7 100644 --- a/cake/console/shells/command_list.php +++ b/cake/console/shells/command_list.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/cake/console/shells/console.php b/cake/console/shells/console.php index 20ab1615d..44cc13d45 100644 --- a/cake/console/shells/console.php +++ b/cake/console/shells/console.php @@ -12,15 +12,13 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.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/cake/console/shells/i18n.php b/cake/console/shells/i18n.php index c40160e54..0a2bdeef6 100644 --- a/cake/console/shells/i18n.php +++ b/cake/console/shells/i18n.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.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/cake/console/shells/schema.php b/cake/console/shells/schema.php index 969fad12a..c0fe44751 100644 --- a/cake/console/shells/schema.php +++ b/cake/console/shells/schema.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.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::import('Model', 'CakeSchema', false); /** * Schema is a command-line database management utility for automating programmer chores. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.shells * @link http://book.cakephp.org/view/1523/Schema-management-and-migrations */ class SchemaShell extends Shell { diff --git a/cake/console/shells/shell.php b/cake/console/shells/shell.php index 55c81f94d..797b88f96 100644 --- a/cake/console/shells/shell.php +++ b/cake/console/shells/shell.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.shells * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ require_once CONSOLE_LIBS . 'console_option_parser.php'; /** * Base class for command-line utilities for automating programmer chores. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.shells */ class Shell extends Object { diff --git a/cake/console/shells/tasks/bake.php b/cake/console/shells/tasks/bake.php index 6a89e187c..bd7f59e69 100644 --- a/cake/console/shells/tasks/bake.php +++ b/cake/console/shells/tasks/bake.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/shells/tasks/controller.php b/cake/console/shells/tasks/controller.php index 6ec3c4371..f1cac43eb 100644 --- a/cake/console/shells/tasks/controller.php +++ b/cake/console/shells/tasks/controller.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php'; /** * Task class for creating and updating controller files. * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class ControllerTask extends BakeTask { diff --git a/cake/console/shells/tasks/db_config.php b/cake/console/shells/tasks/db_config.php index a98b6b053..c3c2b36e1 100644 --- a/cake/console/shells/tasks/db_config.php +++ b/cake/console/shells/tasks/db_config.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.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/cake/console/shells/tasks/extract.php b/cake/console/shells/tasks/extract.php index 34c24314e..9965876e2 100644 --- a/cake/console/shells/tasks/extract.php +++ b/cake/console/shells/tasks/extract.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.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::import('Core', 'File'); /** * Language string extractor * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class ExtractTask extends Shell { diff --git a/cake/console/shells/tasks/fixture.php b/cake/console/shells/tasks/fixture.php index 3bf60f3ae..8fd60782b 100644 --- a/cake/console/shells/tasks/fixture.php +++ b/cake/console/shells/tasks/fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ include_once dirname(__FILE__) . DS . 'bake.php'; /** * Task class for creating and updating fixtures files. * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class FixtureTask extends BakeTask { diff --git a/cake/console/shells/tasks/model.php b/cake/console/shells/tasks/model.php index ffa06640a..5ac132dd1 100644 --- a/cake/console/shells/tasks/model.php +++ b/cake/console/shells/tasks/model.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php'; /** * Task class for creating and updating model files. * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class ModelTask extends BakeTask { diff --git a/cake/console/shells/tasks/plugin.php b/cake/console/shells/tasks/plugin.php index 6ae7bd5cb..118273d45 100644 --- a/cake/console/shells/tasks/plugin.php +++ b/cake/console/shells/tasks/plugin.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'File'); /** * Task class for creating a plugin * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class PluginTask extends Shell { diff --git a/cake/console/shells/tasks/project.php b/cake/console/shells/tasks/project.php index bb2a8f34b..433ce9616 100644 --- a/cake/console/shells/tasks/project.php +++ b/cake/console/shells/tasks/project.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.bake + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'File'); /** * Task class for creating new project apps and plugins * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class ProjectTask extends Shell { diff --git a/cake/console/shells/tasks/template.php b/cake/console/shells/tasks/template.php index 85eed96c6..108ffa8a4 100644 --- a/cake/console/shells/tasks/template.php +++ b/cake/console/shells/tasks/template.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.console.libs.tasks + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/shells/tasks/test.php b/cake/console/shells/tasks/test.php index 093457421..0fe453040 100644 --- a/cake/console/shells/tasks/test.php +++ b/cake/console/shells/tasks/test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ App::import('Model', 'ClassRegistry'); /** * Task class for creating and updating test files. * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class TestTask extends BakeTask { diff --git a/cake/console/shells/tasks/view.php b/cake/console/shells/tasks/view.php index bf8777238..51c84f2f3 100644 --- a/cake/console/shells/tasks/view.php +++ b/cake/console/shells/tasks/view.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.libs.tasks * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ include_once dirname(__FILE__) . DS . 'bake.php'; /** * Task class for creating and updating view files. * - * @package cake - * @subpackage cake.cake.console.libs.tasks + * @package cake.console.shells.tasks */ class ViewTask extends BakeTask { diff --git a/cake/console/shells/testsuite.php b/cake/console/shells/testsuite.php index 8814242a2..b8eb079b8 100644 --- a/cake/console/shells/testsuite.php +++ b/cake/console/shells/testsuite.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.shells * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/templates/default/actions/controller_actions.ctp b/cake/console/templates/default/actions/controller_actions.ctp index 0a4c9d311..f80d3d374 100644 --- a/cake/console/templates/default/actions/controller_actions.ctp +++ b/cake/console/templates/default/actions/controller_actions.ctp @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.console.libs.template.objects + * @package cake.console.libs.template.objects * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/templates/default/classes/controller.ctp b/cake/console/templates/default/classes/controller.ctp index a66e0faa5..52f968824 100644 --- a/cake/console/templates/default/classes/controller.ctp +++ b/cake/console/templates/default/classes/controller.ctp @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake. + * @package cake. * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/templates/default/classes/fixture.ctp b/cake/console/templates/default/classes/fixture.ctp index a8d1bbfb2..dd1b5b478 100644 --- a/cake/console/templates/default/classes/fixture.ctp +++ b/cake/console/templates/default/classes/fixture.ctp @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake. + * @package cake. * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/templates/default/classes/model.ctp b/cake/console/templates/default/classes/model.ctp index 222dd0da8..ece196dba 100644 --- a/cake/console/templates/default/classes/model.ctp +++ b/cake/console/templates/default/classes/model.ctp @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.console.libs.templates.objects + * @package cake.console.libs.templates.objects * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/templates/default/classes/test.ctp b/cake/console/templates/default/classes/test.ctp index 5811e8446..f9dd98b0b 100644 --- a/cake/console/templates/default/classes/test.ctp +++ b/cake/console/templates/default/classes/test.ctp @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.console.libs.templates.objects + * @package cake.console.libs.templates.objects * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/console/templates/default/views/form.ctp b/cake/console/templates/default/views/form.ctp index 455648ed7..ce2b525f9 100644 --- a/cake/console/templates/default/views/form.ctp +++ b/cake/console/templates/default/views/form.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.templates.views + * @package cake.console.libs.templates.views * @since CakePHP(tm) v 1.2.0.5234 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -20,7 +19,7 @@
Form->create('{$modelClass}');?>\n";?>
- ", Inflector::humanize($action), $singularHumanName); ?> + ", Inflector::humanize($action), $singularHumanName); ?> '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 { @@ -456,8 +472,7 @@ class Cache { /** * Storage engine for CakePHP caching * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ abstract class CacheEngine { diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php index dbc4df8cc..544a0c908 100644 --- a/cake/libs/cache/apc.php +++ b/cake/libs/cache/apc.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache * @since CakePHP(tm) v 1.2.0.4933 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ /** * APC storage engine for cache * - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache */ class ApcEngine extends CacheEngine { diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php index 7560d8113..46ff892a3 100644 --- a/cake/libs/cache/file.php +++ b/cake/libs/cache/file.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache * @since CakePHP(tm) v 1.2.0.4933 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * File Storage engine for cache * * @todo use the File and Folder classes (if it's not a too big performance hit) - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache */ class FileEngine extends CacheEngine { diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php index d4a1dbfa8..79d98376e 100644 --- a/cake/libs/cache/memcache.php +++ b/cake/libs/cache/memcache.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache * @since CakePHP(tm) v 1.2.0.4933 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ * control you have over expire times far in the future. See MemcacheEngine::write() for * more information. * - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache */ class MemcacheEngine extends CacheEngine { diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php index be8f53c22..53b0d08b9 100644 --- a/cake/libs/cache/xcache.php +++ b/cake/libs/cache/xcache.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache * @since CakePHP(tm) v 1.2.0.4947 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * Xcache storage engine for cache * * @link http://trac.lighttpd.net/xcache/ Xcache - * @package cake - * @subpackage cake.cake.libs.cache + * @package cake.libs.cache */ class XcacheEngine extends CacheEngine { diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php index afc8df033..e632c2898 100644 --- a/cake/libs/cake_log.php +++ b/cake/libs/cake_log.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -50,7 +49,6 @@ interface CakeLogInterface { * @param string $type * @param string $message * @return void - * @author Mark Story */ public function write($type, $message); } @@ -60,8 +58,7 @@ interface CakeLogInterface { * using CakeLogs's methods. If you don't configure any adapters, and write to the logs * a default FileLog will be autoconfigured for you. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class CakeLog { diff --git a/cake/libs/cake_request.php b/cake/libs/cake_request.php index 580f51296..b7a10058e 100644 --- a/cake/libs/cake_request.php +++ b/cake/libs/cake_request.php @@ -12,7 +12,6 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -519,7 +518,8 @@ class CakeRequest implements ArrayAccess { } /** - * Add parameters to the request's parsed parameter set. This will overwrite any existing parameters + * Add parameters to the request's parsed parameter set. This will overwrite any existing parameters. + * This modifies the parameters available through `$request->params`. * * @param array $params Array of parameters to merge in * @return The current object, you can chain this method. @@ -531,6 +531,7 @@ class CakeRequest implements ArrayAccess { /** * Add paths to the requests' paths vars. This will overwrite any existing paths. + * Provides an easy way to modify, here, webroot and base. * * @param array $paths Array of paths to merge in * @return the current object, you can chain this method. @@ -605,11 +606,11 @@ class CakeRequest implements ArrayAccess { * * #### Get all types: * - * `$request->accepts();` + * `$this->request->accepts();` * * #### Check for a single type: * - * `$request->accepts('json');` + * `$this->request->accepts('json');` * * @param string $type The content type to check for. Leave null to get all types a client accepts. * @return mixed Either an array of all the types the client accepts or a boolean if they accept the @@ -632,6 +633,14 @@ class CakeRequest implements ArrayAccess { /** * Get the lanaguages accepted by the client, or check if a specific language is accepted. * + * Get the list of accepted languages: + * + * {{{ CakeRequest::acceptLanguage(); }}} + * + * Check if a specific language is accepted: + * + * {{{ CakeRequest::acceptLanguage('es-es'); }}} + * * @param string $language The language to test. * @return If a $language is provided, a boolean. Otherwise the array of accepted languages. */ diff --git a/cake/libs/cake_response.php b/cake/libs/cake_response.php index 6c3d751c2..9c200cbcb 100644 --- a/cake/libs/cake_response.php +++ b/cake/libs/cake_response.php @@ -1,9 +1,6 @@ 'application/keynote'));` * * ### Replacing a content type definition + * * e.g `type(array('jpg' => 'text/plain'));` * * @param string $contentType @@ -624,7 +632,8 @@ class CakeResponse { } /** - * Sets the correct output buffering handler to send a compressed response + * Sets the correct output buffering handler to send a compressed response. Responses will + * be compressed with zlib, if the extension is available. * * @return boolean false if client does not accept compressed responses or no handler is available, true otherwise */ @@ -636,7 +645,7 @@ class CakeResponse { } /** - * Sets the correct headers to instruct the browser to dowload the response as a file + * Sets the correct headers to instruct the browser to dowload the response as a file. * * @param string $filename the name of the file as the browser will download the response * @return void diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index 2d201f81d..a08fd49c3 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -17,8 +17,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v .0.10.0.1222 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -32,8 +31,7 @@ if (!class_exists('Security')) { * Cake abstracts the handling of sessions. There are several convenient methods to access session information. * This class is the implementation of those methods. They are mostly used by the Session Component. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class CakeSession { diff --git a/cake/libs/cake_socket.php b/cake/libs/cake_socket.php index e6f51ee54..82610ff92 100644 --- a/cake/libs/cake_socket.php +++ b/cake/libs/cake_socket.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ App::import('Core', 'Validation'); * * Core base class for network communication. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class CakeSocket { diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php index 4e7b22c38..25659089f 100644 --- a/cake/libs/class_registry.php +++ b/cake/libs/class_registry.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.9.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ * If you try to add an object with the same key twice, nothing will come of it. * If you need a second instance of an object, give it another key. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class ClassRegistry { diff --git a/cake/libs/config/ini_reader.php b/cake/libs/config/ini_reader.php index e901d4e18..915bf9498 100644 --- a/cake/libs/config/ini_reader.php +++ b/cake/libs/config/ini_reader.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.libs.config + * @package cake.libs.config * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/config/php_reader.php b/cake/libs/config/php_reader.php index 1e2734d12..c122f0808 100644 --- a/cake/libs/config/php_reader.php +++ b/cake/libs/config/php_reader.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.libs.config * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/configure.php b/cake/libs/configure.php index ce05b018e..1546ae087 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.0.0.2363 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ * as methods for loading additional configuration files or storing runtime configuration * for future use. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @link http://book.cakephp.org/view/924/The-Configuration-Class */ class Configure { diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php index c8423a41b..07c117dff 100644 --- a/cake/libs/controller/app_controller.php +++ b/cake/libs/controller/app_controller.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ * Add your application-wide methods in the class below, your controllers * will inherit them. * - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @link http://book.cakephp.org/view/957/The-App-Controller */ class AppController extends Controller { diff --git a/cake/libs/controller/cake_error_controller.php b/cake/libs/controller/cake_error_controller.php index 443024840..f55649672 100644 --- a/cake/libs/controller/cake_error_controller.php +++ b/cake/libs/controller/cake_error_controller.php @@ -4,8 +4,7 @@ * * Controller used by ErrorHandler to render error views. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class CakeErrorController extends AppController { public $name = 'CakeError'; diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php index 95ceb00b8..f55840d1f 100644 --- a/cake/libs/controller/component.php +++ b/cake/libs/controller/component.php @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -35,8 +34,7 @@ App::import('Controller', 'ComponentCollection', false); * but before Controller::afterFilter(). * - `beforeRedirect()` - Fired before a redirect() is done. * - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @link http://book.cakephp.org/view/993/Components * @see Controller::$components */ diff --git a/cake/libs/controller/component_collection.php b/cake/libs/controller/component_collection.php index b644902a9..3d9e23c47 100644 --- a/cake/libs/controller/component_collection.php +++ b/cake/libs/controller/component_collection.php @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.libs.controller + * @package cake.libs.controller * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php index 1b7b31486..6795ab335 100644 --- a/cake/libs/controller/components/acl.php +++ b/cake/libs/controller/components/acl.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ * You can define by changing `Configure::write('Acl.classname', 'DbAcl');` in your core.php. Concrete ACL * implementations should extend `AclBase` and implement the methods it defines. * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @link http://book.cakephp.org/view/1242/Access-Control-Lists */ class AclComponent extends Component { @@ -186,8 +184,7 @@ class AclComponent extends Component { * Access Control List interface. * Implementing classes are used by AclComponent to perform ACL checks in Cake. * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components */ interface AclInterface { @@ -255,8 +252,7 @@ interface AclInterface { * edit * }}} * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class DbAcl extends Object implements AclInterface { @@ -525,8 +521,7 @@ class DbAcl extends Object implements AclInterface { * IniAcl implements an access control system using an INI file. An example * of the ini file used can be found in /config/acl.ini.php. * - * @package cake - * @subpackage cake.cake.libs.model.iniacl + * @package cake.libs.model.iniacl */ class IniAcl extends Object implements AclInterface { diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php index f8e74f3a1..063960f91 100644 --- a/cake/libs/controller/components/auth.php +++ b/cake/libs/controller/components/auth.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ App::import('Core', 'Security', false); * * Binds access control with user authentication and session management. * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @link http://book.cakephp.org/view/1250/Authentication */ class AuthComponent extends Component { diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php index f8aac83a0..87fb4a802 100644 --- a/cake/libs/controller/components/cookie.php +++ b/cake/libs/controller/components/cookie.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 1.2.0.4213 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ App::import('Core', 'Security'); * * Cookie handling for the controller. * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @link http://book.cakephp.org/view/1280/Cookies * */ diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index bcb854be3..031ef8543 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 1.2.0.3467 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ App::import('Core', 'Multibyte'); * This component is used for handling Internet Message Format based * based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @link http://book.cakephp.org/view/1283/Email * */ diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php index b69f75a2b..086de0584 100644 --- a/cake/libs/controller/components/paginator.php +++ b/cake/libs/controller/components/paginator.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -50,8 +49,7 @@ * * This would allow you to have different pagination settings for `Comment` and `Post` models. * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components */ class PaginatorComponent extends Component { diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php index b688c755d..3889f716c 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/cake/libs/controller/components/request_handler.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 0.10.4.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ /** * Request object for handling HTTP requests * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @link http://book.cakephp.org/view/1291/Request-Handling * */ diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php index b3ae711d8..daf0bc8bb 100644 --- a/cake/libs/controller/components/security.php +++ b/cake/libs/controller/components/security.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 0.10.8.2156 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'Security', false); /** * SecurityComponent * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @link http://book.cakephp.org/view/1296/Security-Component */ class SecurityComponent extends Component { @@ -319,7 +317,6 @@ class SecurityComponent extends Component { } $this->loginOptions = array_merge($base, $this->loginOptions); $this->_requireMethod('Login', $args); - if (isset($this->loginOptions['users'])) { $this->loginUsers =& $this->loginOptions['users']; } @@ -555,9 +552,9 @@ class SecurityComponent extends Component { */ protected function _loginRequired($controller) { if (is_array($this->requireLogin) && !empty($this->requireLogin)) { - $requireLogin = array_map('strtolower', $this->requireLogin); + $requireLogin = $this->requireLogin; - if (in_array($this->_action, $requireLogin) || $this->requireLogin == array('*')) { + if (in_array($this->_action, $this->requireLogin) || $this->requireLogin == array('*')) { $login = $this->loginCredentials($this->loginOptions['type']); if ($login == null) { diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php index af4474c6c..09a9f6da6 100644 --- a/cake/libs/controller/components/session.php +++ b/cake/libs/controller/components/session.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @since CakePHP(tm) v 0.10.0.1232 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ if (!class_exists('cakesession')) { * * Session handling from the controller. * - * @package cake - * @subpackage cake.cake.libs.controller.components + * @package cake.libs.controller.components * @link http://book.cakephp.org/view/1310/Sessions * */ diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index de0553b01..758d41225 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,15 +26,28 @@ App::import('Controller', 'Component', false); App::import('View', 'View', false); /** - * Controller - * * Application controller class for organization of business logic. * Provides basic functionality, such as rendering views inside layouts, * automatic model availability, redirection, callbacks, and more. * - * @package cake - * @subpackage cake.cake.libs.controller - * @link http://book.cakephp.org/view/956/Introduction + * Controllers should provide a number of 'action' methods. These are public methods on the controller + * that are not prefixed with a '_' and not part of Controller. Each action serves as an endpoint for + * performing a specific action on a resource or collection of resources. For example adding or editing a new + * object, or listing a set of objects. + * + * You can access request parameters, using `$this->request`. The request object contains all the POST, GET and FILES + * that were part of the request. + * + * After performing the required actions, controllers are responsible for creating a response. This usually + * takes the form of a generated View, or possibly a redirection to another controller action. In either case + * `$this->response` allows you to manipulate all aspects of the response. + * + * Controllers are created by Dispatcher based on request parameters and routing. By default controllers and actions + * use conventional names. For example `/posts/index` maps to `PostsController::index()`. You can re-map urls + * using Router::connect(). + * + * @package cake.libs.controller + * @link http://book.cakephp.org/view/956/Introduction */ class Controller extends Object { @@ -148,7 +160,7 @@ class Controller extends Object { public $autoLayout = true; /** - * Instance of Component used to handle callbacks. + * Instance of ComponentCollection used to handle callbacks. * * @var string */ @@ -240,7 +252,8 @@ class Controller extends Object { public $scaffold = false; /** - * Holds current methods of the controller + * Holds current methods of the controller. This is a list of all the methods reachable + * via url. Modifying this array, will allow you to change which methods can be reached. * * @var array */ @@ -550,7 +563,7 @@ class Controller extends Object { * * @return mixed Associative array of the HTTP codes as keys, and the message * strings as values, or null of the given $code does not exist. - * @deprecated + * @deprecated Use CakeResponse::httpCodes(); */ public function httpCodes($code = null) { return $this->response->httpCodes($code); @@ -671,7 +684,7 @@ class Controller extends Object { * * @param string $status The header message that is being set. * @return void - * @deprecated + * @deprecated Use CakeResponse::header() */ public function header($status) { $this->response->header($status); @@ -859,7 +872,7 @@ class Controller extends Object { * * @return void * @link http://book.cakephp.org/view/988/disableCache - * @deprecated + * @deprecated Use CakeResponse::disableCache() */ public function disableCache() { $this->response->disableCache(); @@ -960,7 +973,8 @@ class Controller extends Object { } /** - * Called before the controller action. + * Called before the controller action. You can use this method to configure and customize components + * or perform logic that needs to happen before each controller action. * * @link http://book.cakephp.org/view/984/Callbacks */ @@ -968,7 +982,8 @@ class Controller extends Object { } /** - * Called after the controller action is run, but before the view is rendered. + * Called after the controller action is run, but before the view is rendered. You can use this method + * to perform logic or set view variables that are required on every request. * * @link http://book.cakephp.org/view/984/Callbacks */ diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php index bc7a380e7..65e8b0465 100644 --- a/cake/libs/controller/pages_controller.php +++ b/cake/libs/controller/pages_controller.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ * * Override this controller by placing a copy in controllers directory of an application * - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @link http://book.cakephp.org/view/958/The-Pages-Controller */ class PagesController extends AppController { diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index c58fba7d1..97a2533d7 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller * @since Cake v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +28,7 @@ App::import('View', 'Scaffold'); * and afford the web developer an early look at the data, and the possibility to over-ride * scaffolded actions with custom-made ones. * - * @package cake - * @subpackage cake.cake.libs.controller + * @package cake.libs.controller */ class Scaffold { diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php index 33f665a2c..942aa1c63 100644 --- a/cake/libs/debugger.php +++ b/cake/libs/debugger.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.4560 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -36,8 +35,7 @@ if (!class_exists('String')) { * * Debugger overrides PHP's default error handling to provide stack traces and enhanced logging * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @link http://book.cakephp.org/view/1191/Using-the-Debugger-Class */ class Debugger { diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php index 0b498b5b2..f8c833bc9 100644 --- a/cake/libs/dispatcher.php +++ b/cake/libs/dispatcher.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake + * @package cake.libs * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -35,7 +34,6 @@ App::import('Controller', 'Controller', false); * the controller. * * @package cake - * @subpackage cake.cake */ class Dispatcher { @@ -195,10 +193,10 @@ class Dispatcher { * @return CakeRequest The request object with routing params set. */ public function parseParams(CakeRequest $request, $additionalParams = array()) { - if (count(Router::$routes) > 0) { + if (count(Router::$routes) == 0) { $namedExpressions = Router::getNamedExpressions(); extract($namedExpressions); - $this->__loadRoutes(); + $this->_loadRoutes(); } $params = Router::parse($request->url); @@ -254,9 +252,8 @@ class Dispatcher { * Loads route configuration * * @return void - * @access protected */ - protected function __loadRoutes() { + protected function _loadRoutes() { include CONFIGS . 'routes.php'; } diff --git a/cake/libs/error/error_handler.php b/cake/libs/error/error_handler.php index b25582fac..775bd8d43 100644 --- a/cake/libs/error/error_handler.php +++ b/cake/libs/error/error_handler.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs.error * @since CakePHP(tm) v 0.10.5.1732 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -88,8 +87,7 @@ * * Would enable handling for all non Notice errors. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs.error * @see ExceptionRenderer for more information on how to customize exception rendering. */ class ErrorHandler { diff --git a/cake/libs/error/exception_renderer.php b/cake/libs/error/exception_renderer.php index 6666f4414..5745564df 100644 --- a/cake/libs/error/exception_renderer.php +++ b/cake/libs/error/exception_renderer.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs.error * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -45,8 +44,7 @@ * can configure your class in your core.php, with `Configure::write('Exception.renderer', 'MyClass');` * You should place any custom exception renderers in `app/libs`. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs.error */ class ExceptionRenderer { diff --git a/cake/libs/error/exceptions.php b/cake/libs/error/exceptions.php index dc8538334..75224c557 100644 --- a/cake/libs/error/exceptions.php +++ b/cake/libs/error/exceptions.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.libs + * @package cake.libs.error * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/file.php b/cake/libs/file.php index 47f922d9d..49d030e4d 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +28,7 @@ if (!class_exists('Folder')) { /** * Convenience class for reading, writing and appending to files. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class File { diff --git a/cake/libs/folder.php b/cake/libs/folder.php index 733315a1a..02b097227 100644 --- a/cake/libs/folder.php +++ b/cake/libs/folder.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * Folder structure browser, lists folders and files. * Provides an Object interface for Common directory related tasks. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class Folder { diff --git a/cake/libs/http/basic_authentication.php b/cake/libs/http/basic_authentication.php index 111246210..49b12fc5f 100644 --- a/cake/libs/http/basic_authentication.php +++ b/cake/libs/http/basic_authentication.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.http + * @package cake.libs.http * @since CakePHP(tm) v 2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Basic authentication * - * @package cake - * @subpackage cake.cake.libs.http + * @package cake.libs.http */ class BasicAuthentication { diff --git a/cake/libs/http/digest_authentication.php b/cake/libs/http/digest_authentication.php index 21f7ea8e6..14275f4e5 100644 --- a/cake/libs/http/digest_authentication.php +++ b/cake/libs/http/digest_authentication.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.http + * @package cake.libs.http * @since CakePHP(tm) v 2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Digest authentication * - * @package cake - * @subpackage cake.cake.libs.http + * @package cake.libs.http */ class DigestAuthentication { diff --git a/cake/libs/http_response.php b/cake/libs/http_response.php index ade1b14f4..51aff7a78 100644 --- a/cake/libs/http_response.php +++ b/cake/libs/http_response.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php index 1a486742c..9e820f921 100644 --- a/cake/libs/http_socket.php +++ b/cake/libs/http_socket.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ App::import('Core', 'Router'); * Core base class for HTTP network communication. HttpSocket can be used as an * Object Oriented replacement for cURL in many places. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class HttpSocket extends CakeSocket { diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php index 05ec9c9e8..63cc47b19 100644 --- a/cake/libs/i18n.php +++ b/cake/libs/i18n.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0.4116 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ App::import('Core', 'Multibyte'); /** * I18n handles translation of Text and time format strings. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class I18n { diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php index d1bf78cfa..0e3eb0278 100644 --- a/cake/libs/inflector.php +++ b/cake/libs/inflector.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ * Inflector pluralizes and singularizes English nouns. * Used by Cake's naming conventions throughout the framework. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @link http://book.cakephp.org/view/1478/Inflector */ class Inflector { diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php index 4f5868412..2da41af34 100644 --- a/cake/libs/l10n.php +++ b/cake/libs/l10n.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0.4116 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'CakeRequest'); /** * Localization * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class L10n { diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php index fbd4cff3e..c7adb306d 100644 --- a/cake/libs/log/file_log.php +++ b/cake/libs/log/file_log.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.log + * @package cake.libs.log * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * File Storage stream for Logging. Writes logs to different files * based on the type of log it is. * - * @package cake - * @subpackage cake.cake.libs.log + * @package cake.libs.log */ class FileLog implements CakeLogInterface { diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php index 1a3143b4e..86a91d82d 100644 --- a/cake/libs/magic_db.php +++ b/cake/libs/magic_db.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ if (!class_exists('File')) { /** * A class to parse and use the MagicDb for file type analysis * - * @package cake.tests - * @subpackage cake.tests.cases.libs + * @package cake.libs */ class MagicDb extends Object { @@ -172,8 +170,7 @@ class MagicDb extends Object { /** * undocumented class * - * @package cake.tests - * @subpackage cake.tests.cases.libs + * @package cake.libs */ class MagicFileResource extends Object{ diff --git a/cake/libs/model/app_model.php b/cake/libs/model/app_model.php index e18dca1c1..4af1eb2e5 100644 --- a/cake/libs/model/app_model.php +++ b/cake/libs/model/app_model.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ * Create the same file in app/app_model.php * Add your application-wide methods to the class, your models will inherit them. * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class AppModel extends Model { } diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php index c2f397b82..da9970560 100644 --- a/cake/libs/model/behavior_collection.php +++ b/cake/libs/model/behavior_collection.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @since CakePHP(tm) v 1.2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ App::import('Core', 'ObjectCollection'); * * Defines the Behavior interface, and contains common model interaction functionality. * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class BehaviorCollection extends ObjectCollection { diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php index fc2893bfa..b03586657 100644 --- a/cake/libs/model/behaviors/acl.php +++ b/cake/libs/model/behaviors/acl.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs.model.behaviors + * @package cake.libs.model.behaviors * @since CakePHP v 1.2.0.4487 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ /** * ACL behavior * - * @package cake - * @subpackage cake.cake.libs.model.behaviors + * @package cake.libs.model.behaviors * @link http://book.cakephp.org/view/1320/ACL */ class AclBehavior extends ModelBehavior { diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php index 508dcf87f..03963a723 100644 --- a/cake/libs/model/behaviors/containable.php +++ b/cake/libs/model/behaviors/containable.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting * the amount of associations and data returned. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs * @link http://book.cakephp.org/view/1323/Containable */ class ContainableBehavior extends ModelBehavior { diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php index e480a720f..3f0c462d5 100644 --- a/cake/libs/model/behaviors/translate.php +++ b/cake/libs/model/behaviors/translate.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.behaviors + * @package cake.libs.model.behaviors * @since CakePHP(tm) v 1.2.0.4525 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Translate behavior * - * @package cake - * @subpackage cake.cake.libs.model.behaviors + * @package cake.libs.model.behaviors * @link http://book.cakephp.org/view/1328/Translate */ class TranslateBehavior extends ModelBehavior { @@ -501,8 +499,7 @@ class TranslateBehavior extends ModelBehavior { } /** - * @package cake - * @subpackage cake.cake.libs.model.behaviors + * @package cake.libs.model.behaviors */ class I18nModel extends AppModel { public $name = 'I18nModel'; diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php index 9bec6f0ae..032d9e1a9 100644 --- a/cake/libs/model/behaviors/tree.php +++ b/cake/libs/model/behaviors/tree.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs.model.behaviors + * @package cake.libs.model.behaviors * @since CakePHP v 1.2.0.4487 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ * Enables a model object to act as a node-based tree. Using Modified Preorder Tree Traversal * * @see http://en.wikipedia.org/wiki/Tree_traversal - * @package cake - * @subpackage cake.cake.libs.model.behaviors + * @package cake.libs.model.behaviors * @link http://book.cakephp.org/view/1339/Tree */ class TreeBehavior extends ModelBehavior { diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php index fc4e32d28..a38e0ed7b 100644 --- a/cake/libs/model/cake_schema.php +++ b/cake/libs/model/cake_schema.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @since CakePHP(tm) v 1.2.0.5550 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'ConnectionManager'); /** * Base Class for Schema management * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class CakeSchema extends Object { diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php index 42b2c5003..9581431fc 100644 --- a/cake/libs/model/connection_manager.php +++ b/cake/libs/model/connection_manager.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @since CakePHP(tm) v 0.10.x.1402 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ include_once CONFIGS . 'database.php'; /** * Manages loaded instances of DataSource objects * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class ConnectionManager { diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php index 166c5362c..d38e8bf10 100644 --- a/cake/libs/model/datasources/datasource.php +++ b/cake/libs/model/datasources/datasource.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.datasources + * @package cake.libs.model.datasources * @since CakePHP(tm) v 0.10.5.1790 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * DataSource base class * - * @package cake - * @subpackage cake.cake.libs.model.datasources + * @package cake.libs.model.datasources */ class DataSource extends Object { diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php index 4fa73bf8e..91db76c5f 100644 --- a/cake/libs/model/datasources/dbo/dbo_mssql.php +++ b/cake/libs/model/datasources/dbo/dbo_mssql.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo * @since CakePHP(tm) v 0.10.5.1790 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * Long description for class * - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo */ class DboMssql extends DboSource { diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index f39b50420..1d6052f6a 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo * @since CakePHP(tm) v 0.10.5.1790 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * Provides connection and SQL generation for MySQL RDMS * - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo */ class DboMysql extends DboSource { diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php index fb5df6806..4b4444211 100644 --- a/cake/libs/model/datasources/dbo/dbo_oracle.php +++ b/cake/libs/model/datasources/dbo/dbo_oracle.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo * @since CakePHP v 1.2.0.4041 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * Long description for class * - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo */ class DboOracle extends DboSource { diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php index 7e001344d..e5e12d2bc 100644 --- a/cake/libs/model/datasources/dbo/dbo_postgres.php +++ b/cake/libs/model/datasources/dbo/dbo_postgres.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo * @since CakePHP(tm) v 0.9.1.114 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * Long description for class * - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo */ class DboPostgres extends DboSource { diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php index e4a50b4c2..66859261e 100644 --- a/cake/libs/model/datasources/dbo/dbo_sqlite.php +++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo * @since CakePHP(tm) v 0.9.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * A DboSource adapter for SQLite 3 using PDO * - * @package datasources - * @subpackage cake.cake.libs.model.datasources.dbo + * @package cake.libs.model.datasources.dbo */ class DboSqlite extends DboSource { diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 52be136e9..717e5ca92 100755 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model.datasources + * @package cake.libs.model.datasources * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ App::import('Core', 'String'); * * Creates DBO-descendant objects from a given db connection configuration * - * @package cake - * @subpackage cake.cake.libs.model.datasources + * @package cake.libs.model.datasources */ class DboSource extends DataSource { @@ -253,9 +251,10 @@ class DboSource extends DataSource { /** - * Returns an object to represent a database identifier in a query + * Returns an object to represent a database identifier in a query. Expression objects + * are not sanitized or esacped. * - * @param string $identifier + * @param string $identifier A SQL expression to be used as an identifier * @return object An object representing a database identifier to be used in a query */ public function identifier($identifier) { @@ -266,9 +265,10 @@ class DboSource extends DataSource { } /** - * Returns an object to represent a database expression in a query + * Returns an object to represent a database expression in a query. Expression objects + * are not sanitized or esacped. * - * @param string $expression + * @param string $expression An arbitrary SQL expression to be inserted into a query. * @return object An object representing a database expression to be used in a query */ public function expression($expression) { @@ -282,6 +282,7 @@ class DboSource extends DataSource { * Executes given SQL statement. * * @param string $sql SQL statement + * @param array $params Additional options for the query. * @return boolean */ public function rawQuery($sql, $params = array()) { @@ -381,6 +382,7 @@ class DboSource extends DataSource { * Returns number of affected rows in previous database operation. If no previous operation exists, * this returns false. * + * @param string $source * @return integer Number of affected rows */ function lastAffected($source = null) { @@ -394,6 +396,7 @@ class DboSource extends DataSource { * Returns number of rows in previous resultset. If no previous resultset exists, * this returns false. * + * @param string $source * @return integer Number of rows in resultset */ function lastNumRows($source = null) { @@ -498,6 +501,7 @@ class DboSource extends DataSource { /** * Returns a row from current resultset as an array * + * @param string $sql Some SQL to be executed. * @return array The fetched row as an array */ public function fetchRow($sql = null) { @@ -575,7 +579,7 @@ class DboSource extends DataSource { /** * Modifies $result array to place virtual fields in model entry where they belongs to * - * @param array $resut REference to the fetched row + * @param array $resut Reference to the fetched row * @return void */ public function fetchVirtualField(&$result) { @@ -736,6 +740,7 @@ class DboSource extends DataSource { * Get the query log as an array. * * @param boolean $sorted Get the queries sorted by time taken, defaults to false. + * @param boolean $clear If True the existing log will cleared. * @return array Array of queries run as an array */ public function getLog($sorted = false, $clear = true) { diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php index 70826bdb7..e8a31cef7 100644 --- a/cake/libs/model/db_acl.php +++ b/cake/libs/model/db_acl.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +28,7 @@ App::import('Model', 'App'); * ACL Node * * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class AclNode extends AppModel { @@ -193,8 +191,7 @@ class AclNode extends AppModel { /** * Access Control Object * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class Aco extends AclNode { @@ -218,8 +215,7 @@ class Aco extends AclNode { /** * Action for Access Control Object * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class AcoAction extends AppModel { @@ -243,8 +239,7 @@ class AcoAction extends AppModel { /** * Access Request Object * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class Aro extends AclNode { @@ -268,8 +263,7 @@ class Aro extends AclNode { /** * Permissions linking AROs with ACOs * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model */ class Permission extends AppModel { diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 7c8b5f2e6..b55616028 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @since CakePHP(tm) v 0.10.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -38,8 +37,7 @@ App::import('Model', 'ConnectionManager', false); * (i.e. class 'User' => table 'users'; class 'Man' => table 'men') * The table is required to have at least 'id auto_increment' primary key. * - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @link http://book.cakephp.org/view/1000/Models */ class Model extends Object { diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php index d0093e95e..482bd2e1e 100644 --- a/cake/libs/model/model_behavior.php +++ b/cake/libs/model/model_behavior.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.model + * @package cake.libs.model * @since CakePHP(tm) v 1.2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,10 +22,26 @@ /** * Model behavior base class. * - * Defines the Behavior interface, and contains common model interaction functionality. + * Defines the Behavior interface, and contains common model interaction functionality. Behaviors + * allow you to simulate mixins, and create resuable blocks of application logic, that can be reused across + * several models. Behaviors also provide a way to hook into model callbacks and augment their behavior. * - * @package cake - * @subpackage cake.cake.libs.model + * ### Mixin methods + * + * Behaviors can provide mixin like features by declaring public methods. These methods should expect + * the model instance to be shifted onto the parameter list. + * + * {{{ + * function doSomething($model, $arg1, $arg2) { + * //do something + * } + * }}} + * + * Would be called like `$this->Model->doSomething($arg1, $arg2);`. + * + * @package cake.libs.model + * @see Model::$actsAs + * @see BehaviorCollection::load() */ class ModelBehavior extends Object { @@ -37,7 +52,6 @@ class ModelBehavior extends Object { * associative array, keyed off of the model name. * * @var array - * @access public * @see Model::$alias */ public $settings = array(); @@ -49,7 +63,6 @@ class ModelBehavior extends Object { * the findBy* / findAllBy* magic methods. * * @var array - * @access public */ public $mapMethods = array(); @@ -66,7 +79,6 @@ class ModelBehavior extends Object { * detached from a model using Model::detach(). * * @param object $model Model using this behavior - * @access public * @see BehaviorCollection::detach() */ function cleanup($model) { @@ -76,31 +88,33 @@ class ModelBehavior extends Object { } /** - * Before find callback + * beforeFind can be used to cancel find operations, or modify the query that will be executed. + * By returning null/false you can abort a find. By returning an array you can modify/replace the query + * that is going to be run. * * @param object $model Model using this behavior * @param array $queryData Data used to execute this query, i.e. conditions, order, etc. * @return mixed False or null will abort the operation. You can return an array to replace the * $query that will be eventually run. - * @access public */ public function beforeFind($model, $query) { return true; } /** - * After find callback. Can be used to modify any results returned by find and findAll. + * After find callback. Can be used to modify any results returned by find. * * @param object $model Model using this behavior * @param mixed $results The results of the find operation * @param boolean $primary Whether this model is being queried directly (vs. being queried as an association) * @return mixed An array value will replace the value of $results - any other value will be ignored. - * @access public */ public function afterFind($model, $results, $primary) { } /** - * Before validate callback + * beforeValidate is called before a model is validated, you can use this callback to + * add behavior validation rules into a models validate array. Returning false + * will allow you to make the validation fail. * * @param object $model Model using this behavior * @return mixed False or null will abort the operation. Any other result will continue. @@ -111,18 +125,18 @@ class ModelBehavior extends Object { } /** - * Before save callback + * beforeSave is called before a model is saved. Returning false from a beforeSave callback + * will abort the save operation. * * @param object $model Model using this behavior * @return mixed False if the operation should abort. Any other result will continue. - * @access public */ public function beforeSave($model) { return true; } /** - * After save callback + * afterSave is called after a model is saved. * * @param object $model Model using this behavior * @param boolean $created True if this save created a new record @@ -132,7 +146,8 @@ class ModelBehavior extends Object { } /** - * Before delete callback + * Before delete is called before any delete occurs on the attached model, but after the model's + * beforeDelete is called. Returning false from a beforeDelete will abort the delete. * * @param object $model Model using this behavior * @param boolean $cascade If true records that depend on this record will also be deleted @@ -144,7 +159,7 @@ class ModelBehavior extends Object { } /** - * After delete callback + * After delete is called after any delete occurs on the attached model. * * @param object $model Model using this behavior */ @@ -166,7 +181,6 @@ class ModelBehavior extends Object { * * @param object $model Model using this behavior * @param string $field Field to be added to $model's whitelist - * @access protected * @return void */ function _addToWhitelist($model, $field) { diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php index 69c23188f..123d3d11b 100644 --- a/cake/libs/multibyte.php +++ b/cake/libs/multibyte.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0.6833 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -256,8 +255,7 @@ if (!function_exists('mb_encode_mimeheader')) { * Multibyte handling methods. * * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class Multibyte { diff --git a/cake/libs/object.php b/cake/libs/object.php index 0f1d49030..9096ae121 100644 --- a/cake/libs/object.php +++ b/cake/libs/object.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ * Also includes methods for logging and the special method RequestAction, * to call other Controllers' Actions from anywhere. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class Object { diff --git a/cake/libs/route/cake_route.php b/cake/libs/route/cake_route.php index a3a9413e9..be944951f 100644 --- a/cake/libs/route/cake_route.php +++ b/cake/libs/route/cake_route.php @@ -16,8 +16,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs.route * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/route/plugin_short_route.php b/cake/libs/route/plugin_short_route.php index 1c1c4330b..9509c5d32 100644 --- a/cake/libs/route/plugin_short_route.php +++ b/cake/libs/route/plugin_short_route.php @@ -14,8 +14,7 @@ App::import('Core', 'route/CakeRoute'); * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs.route * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/route/redirect_route.php b/cake/libs/route/redirect_route.php index d9beaa42d..8b9a63fe2 100644 --- a/cake/libs/route/redirect_route.php +++ b/cake/libs/route/redirect_route.php @@ -16,8 +16,7 @@ App::import('Core', 'route/CakeRoute'); * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.route + * @package cake.libs.route * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/router.php b/cake/libs/router.php index 7e9157fde..c0737ae25 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,10 +21,23 @@ App::import('Core', 'CakeRequest'); App::import('Core', 'route/CakeRoute'); /** - * Parses the request URL into controller, action, and parameters. + * Parses the request URL into controller, action, and parameters. Uses the connected routes + * to match the incoming url string to parameters that will allow the request to be dispatched. Also + * handles converting parameter lists into url strings, using the connected routes. Routing allows you to decouple + * the way the world interacts with your application (urls) and the implementation (controllers and actions). * - * @package cake - * @subpackage cake.cake.libs + * ### Connecting routes + * + * Connecting routes is done using Router::connect(). When parsing incoming requests or reverse matching + * parameters, routes are enumerated in the order they were connected. You can modify the order of connected + * routes using Router::promote(). For more information on routes and how to connect them see Router::connect(). + * + * ### Named parameters + * + * Named parameters allow you to embed key:value pairs into path segments. This allows you create hash + * structures using urls. You can define how named parameters work in your application using Router::connectNamed() + * + * @package cake.libs */ class Router { @@ -703,6 +715,7 @@ class Router { public static function reload() { if (empty(self::$_initialState)) { self::$_initialState = get_class_vars('Router'); + self::_setPrefixes(); return; } foreach (self::$_initialState as $key => $val) { diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php index 34ed32e79..d538b46bd 100644 --- a/cake/libs/sanitize.php +++ b/cake/libs/sanitize.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ * Removal of alpahnumeric characters, SQL-safe slash-added strings, HTML-friendly strings, * and all of the above on arrays. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class Sanitize { diff --git a/cake/libs/security.php b/cake/libs/security.php index 348402de2..e8b01e2b8 100644 --- a/cake/libs/security.php +++ b/cake/libs/security.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v .0.10.0.1233 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Security Library contains utility methods related to security * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class Security { diff --git a/cake/libs/session/cache_session.php b/cake/libs/session/cache_session.php index 5c8f2eae5..9b1b4ded0 100644 --- a/cake/libs/session/cache_session.php +++ b/cake/libs/session/cache_session.php @@ -12,15 +12,15 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ /** * CacheSession provides method for saving sessions into a Cache engine. Used with CakeSession * - * @package cake.libs + * @package cake.libs.session + * @see CakeSession for configuration information. */ class CacheSession implements CakeSessionHandlerInterface { /** diff --git a/cake/libs/session/database_session.php b/cake/libs/session/database_session.php index e10fe5a93..574d1f5c0 100644 --- a/cake/libs/session/database_session.php +++ b/cake/libs/session/database_session.php @@ -12,15 +12,14 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ /** * DatabaseSession provides methods to be used with CakeSession. * - * @package cake.libs + * @package cake.libs.session */ class DatabaseSession implements CakeSessionHandlerInterface { diff --git a/cake/libs/set.php b/cake/libs/set.php index 294b8ac7d..14282682d 100644 --- a/cake/libs/set.php +++ b/cake/libs/set.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Class used for manipulation of arrays. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class Set { diff --git a/cake/libs/string.php b/cake/libs/string.php index affcc263b..8fc0a2ddf 100644 --- a/cake/libs/string.php +++ b/cake/libs/string.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0.5551 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * String handling methods. * * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs */ class String { diff --git a/cake/libs/validation.php b/cake/libs/validation.php index adda137c0..aefa47756 100644 --- a/cake/libs/validation.php +++ b/cake/libs/validation.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0.3830 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ if (!class_exists('Multibyte')) { /** * Offers different validation methods. * - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP v 1.2.0.3830 */ class Validation { diff --git a/cake/libs/view/elements/email/html/default.ctp b/cake/libs/view/elements/email/html/default.ctp index 45a84c9e0..3ab3f4cc6 100644 --- a/cake/libs/view/elements/email/html/default.ctp +++ b/cake/libs/view/elements/email/html/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements.email.html + * @package cake.libs.view.templates.elements.email.html * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/elements/email/text/default.ctp b/cake/libs/view/elements/email/text/default.ctp index 9d384e3f8..7655f1430 100644 --- a/cake/libs/view/elements/email/text/default.ctp +++ b/cake/libs/view/elements/email/text/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements.email.text + * @package cake.libs.view.templates.elements.email.text * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/elements/exception_stack_trace.ctp b/cake/libs/view/elements/exception_stack_trace.ctp index 9219e21ae..247c45169 100644 --- a/cake/libs/view/elements/exception_stack_trace.ctp +++ b/cake/libs/view/elements/exception_stack_trace.ctp @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements + * @package cake.libs.view.templates.elements * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/elements/sql_dump.ctp b/cake/libs/view/elements/sql_dump.ctp index 025d5ae93..b770dfbaa 100644 --- a/cake/libs/view/elements/sql_dump.ctp +++ b/cake/libs/view/elements/sql_dump.ctp @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements + * @package cake.libs.view.templates.elements * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/error400.ctp b/cake/libs/view/errors/error400.ctp index 4d1660517..b6487ee91 100644 --- a/cake/libs/view/errors/error400.ctp +++ b/cake/libs/view/errors/error400.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/error500.ctp b/cake/libs/view/errors/error500.ctp index b5bdcfde0..e032b9eed 100644 --- a/cake/libs/view/errors/error500.ctp +++ b/cake/libs/view/errors/error500.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp index 19cfe6222..5b6fdb970 100644 --- a/cake/libs/view/errors/missing_action.ctp +++ b/cake/libs/view/errors/missing_action.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_behavior_class.ctp b/cake/libs/view/errors/missing_behavior_class.ctp index eb19034b8..e7c454069 100644 --- a/cake/libs/view/errors/missing_behavior_class.ctp +++ b/cake/libs/view/errors/missing_behavior_class.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_behavior_file.ctp b/cake/libs/view/errors/missing_behavior_file.ctp index 6f90206c1..09e90b350 100644 --- a/cake/libs/view/errors/missing_behavior_file.ctp +++ b/cake/libs/view/errors/missing_behavior_file.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp index ccb0497ef..cf06671dc 100644 --- a/cake/libs/view/errors/missing_component_class.ctp +++ b/cake/libs/view/errors/missing_component_class.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp index 592238fb4..527afc9c3 100644 --- a/cake/libs/view/errors/missing_component_file.ctp +++ b/cake/libs/view/errors/missing_component_file.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_connection.ctp b/cake/libs/view/errors/missing_connection.ctp index 2f11f4f5f..dfda66e3a 100644 --- a/cake/libs/view/errors/missing_connection.ctp +++ b/cake/libs/view/errors/missing_connection.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp index d45d8d31c..7f9e7d27f 100644 --- a/cake/libs/view/errors/missing_controller.ctp +++ b/cake/libs/view/errors/missing_controller.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_database.ctp b/cake/libs/view/errors/missing_database.ctp index d3e4944f6..7aa2d5e80 100644 --- a/cake/libs/view/errors/missing_database.ctp +++ b/cake/libs/view/errors/missing_database.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp index 9742a1563..842ded905 100644 --- a/cake/libs/view/errors/missing_helper_class.ctp +++ b/cake/libs/view/errors/missing_helper_class.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp index 69bf38e30..6ba0e9b6f 100644 --- a/cake/libs/view/errors/missing_helper_file.ctp +++ b/cake/libs/view/errors/missing_helper_file.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp index 28445cc77..011e59a64 100644 --- a/cake/libs/view/errors/missing_layout.ctp +++ b/cake/libs/view/errors/missing_layout.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp index b639856fe..1288dd06a 100644 --- a/cake/libs/view/errors/missing_table.ctp +++ b/cake/libs/view/errors/missing_table.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp index 658f4d1ce..9d8c7cb91 100644 --- a/cake/libs/view/errors/missing_view.ctp +++ b/cake/libs/view/errors/missing_view.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp index c91062ba2..833f42112 100644 --- a/cake/libs/view/errors/private_action.ctp +++ b/cake/libs/view/errors/private_action.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp index 931cbdca5..40f09c90a 100644 --- a/cake/libs/view/errors/scaffold_error.ctp +++ b/cake/libs/view/errors/scaffold_error.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors + * @package cake.libs.view.templates.errors * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index 6397cf722..c83dd9b03 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ if (!class_exists('Router')) { * Abstract base class for all other Helpers in CakePHP. * Provides common methods and features. * - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view */ class Helper extends Object { diff --git a/cake/libs/view/helper_collection.php b/cake/libs/view/helper_collection.php index 18b700812..9d5fcbf17 100644 --- a/cake/libs/view/helper_collection.php +++ b/cake/libs/view/helper_collection.php @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php index d09503bb0..9ded31b9c 100644 --- a/cake/libs/view/helpers/app_helper.php +++ b/cake/libs/view/helpers/app_helper.php @@ -15,8 +15,6 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +27,7 @@ App::import('View', 'Helper', false); * Add your application-wide methods in the class below, your helpers * will inherit them. * - * @package cake - * @subpackage cake.cake + * @package cake.libs.view.helpers */ class AppHelper extends Helper { } diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php index 6a1c430ea..34f1c9ef3 100644 --- a/cake/libs/view/helpers/cache.php +++ b/cake/libs/view/helpers/cache.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 1.0.0.2277 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ * When using CacheHelper you don't call any of its methods, they are all automatically * called by View, and use the $cacheAction settings set in the controller. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1376/Cache */ class CacheHelper extends AppHelper { diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index 06a465e84..dd1c7d85f 100644 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -12,12 +12,11 @@ * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers - * @since CakePHP(tm) v 0.10.0.1076 - * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org CakePHP(tm) Project + * @package cake.libs.view.helpers + * @since CakePHP(tm) v 0.10.0.1076 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ /** @@ -25,8 +24,7 @@ * * Automatic generation of HTML FORMs from given data. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1383/Form */ class FormHelper extends AppHelper { @@ -210,11 +208,13 @@ class FormHelper extends AppHelper { } } - $object = $this->_introspectModel($model); - $this->setEntity($model . '.', true); + if ($model !== false) { + $object = $this->_introspectModel($model); + $this->setEntity($model . '.', true); + } $modelEntity = $this->model(); - if (isset($this->fieldset[$modelEntity]['key'])) { + if ($model !== false && isset($this->fieldset[$modelEntity]['key'])) { $data = $this->fieldset[$modelEntity]; $recordExists = ( isset($this->request->data[$model]) && @@ -1322,6 +1322,7 @@ class FormHelper extends AppHelper { unset($options['confirm']); } + $url = $this->url($url); $formName = uniqid('post_'); $out = $this->create(false, array('url' => $url, 'name' => $formName, 'id' => $formName, 'style' => 'display:none;')); if (isset($options['data']) && is_array($options['data'])) { diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php index b0965c449..c5165515f 100644 --- a/cake/libs/view/helpers/html.php +++ b/cake/libs/view/helpers/html.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 0.9.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * * HtmlHelper encloses all methods needed while working with HTML pages. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1434/HTML */ class HtmlHelper extends AppHelper { diff --git a/cake/libs/view/helpers/jquery_engine.php b/cake/libs/view/helpers/jquery_engine.php index f09c70c33..b0864fba1 100644 --- a/cake/libs/view/helpers/jquery_engine.php +++ b/cake/libs/view/helpers/jquery_engine.php @@ -18,8 +18,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.view.helpers + * @package cake.libs.view.helpers * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ App::import('Helper', 'Js'); diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php index 41f0ffbd5..e285481ad 100644 --- a/cake/libs/view/helpers/js.php +++ b/cake/libs/view/helpers/js.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ * JsHelper provides an abstract interface for authoring JavaScript with a * given client-side library. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers */ class JsHelper extends AppHelper { /** diff --git a/cake/libs/view/helpers/mootools_engine.php b/cake/libs/view/helpers/mootools_engine.php index bd0b676dd..5064db644 100644 --- a/cake/libs/view/helpers/mootools_engine.php +++ b/cake/libs/view/helpers/mootools_engine.php @@ -20,8 +20,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php index 03e01eea2..c88cd8ff2 100644 --- a/cake/libs/view/helpers/number.php +++ b/cake/libs/view/helpers/number.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ * * Methods to make numbers more readable. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1452/Number */ class NumberHelper extends AppHelper { diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php index f7369e408..90f80baa7 100644 --- a/cake/libs/view/helpers/paginator.php +++ b/cake/libs/view/helpers/paginator.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * PaginationHelper encloses all methods needed when working with pagination. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1458/Paginator */ class PaginatorHelper extends AppHelper { diff --git a/cake/libs/view/helpers/prototype_engine.php b/cake/libs/view/helpers/prototype_engine.php index 7f3e230b4..69a088f79 100644 --- a/cake/libs/view/helpers/prototype_engine.php +++ b/cake/libs/view/helpers/prototype_engine.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php index ae1ab6239..c1b7d219d 100644 --- a/cake/libs/view/helpers/rss.php +++ b/cake/libs/view/helpers/rss.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Xml'); /** * RSS Helper class for easy output RSS structures. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1460/RSS */ class RssHelper extends AppHelper { diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php index b12fa3190..fb26c91c7 100644 --- a/cake/libs/view/helpers/session.php +++ b/cake/libs/view/helpers/session.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 1.1.7.3328 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ if (!class_exists('CakeSession')) { * * Session reading from the view. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1465/Session */ class SessionHelper extends AppHelper { diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php index 3f6933bbd..12eff3893 100644 --- a/cake/libs/view/helpers/text.php +++ b/cake/libs/view/helpers/text.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -36,8 +35,7 @@ if (!class_exists('Multibyte')) { * * Text manipulations: Highlight, excerpt, truncate, strip of links, convert email addresses to mailto: links... * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1469/Text */ class TextHelper extends AppHelper { diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php index 31093a556..f65b62de0 100644 --- a/cake/libs/view/helpers/time.php +++ b/cake/libs/view/helpers/time.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * Manipulation of time data. * - * @package cake - * @subpackage cake.cake.libs.view.helpers + * @package cake.libs.view.helpers * @link http://book.cakephp.org/view/1470/Time */ class TimeHelper extends AppHelper { diff --git a/cake/libs/view/layouts/ajax.ctp b/cake/libs/view/layouts/ajax.ctp index dadf156ed..93371552b 100644 --- a/cake/libs/view/layouts/ajax.ctp +++ b/cake/libs/view/layouts/ajax.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp index 30ec1a7dc..f247f3c35 100644 --- a/cake/libs/view/layouts/default.ctp +++ b/cake/libs/view/layouts/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/layouts/email/html/default.ctp b/cake/libs/view/layouts/email/html/default.ctp index 41ce9a42d..7a8a1e7df 100644 --- a/cake/libs/view/layouts/email/html/default.ctp +++ b/cake/libs/view/layouts/email/html/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts.email.html + * @package cake.libs.view.templates.layouts.email.html * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/layouts/email/text/default.ctp b/cake/libs/view/layouts/email/text/default.ctp index 979535832..236b8ebb3 100644 --- a/cake/libs/view/layouts/email/text/default.ctp +++ b/cake/libs/view/layouts/email/text/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts.email.text + * @package cake.libs.view.templates.layouts.email.text * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/layouts/flash.ctp b/cake/libs/view/layouts/flash.ctp index 970589df0..cbe4c5abc 100644 --- a/cake/libs/view/layouts/flash.ctp +++ b/cake/libs/view/layouts/flash.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php index 5bc0d179e..880383b30 100644 --- a/cake/libs/view/media.php +++ b/cake/libs/view/media.php @@ -12,13 +12,47 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view * @since CakePHP(tm) v 1.2.0.5714 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ App::import('View', 'View', false); +/** + * Media View provides a custom view implementation for sending files to visitors. Its great + * for making the response of a controller action be a file that is saved somewhere on the filesystem. + * + * An example use comes from the CakePHP internals. MediaView is used to serve plugin and theme assets, + * as they are not normally accessible from an application's webroot. Unlike other views, MediaView + * uses several viewVars that have special meaning: + * + * - `id` The filename on the server's filesystem, including extension. + * - `name` The filename that will be sent to the user, specified without the extension. + * - `download` Set to true to set a `Content-Disposition` header. This is ideal for file downloads. + * - `extension` The extension of the file being served. This is used to set the mimetype + * - `path` The absolute path, including the trailing / on the server's filesystem to `id`. + * - `mimeType` The mime type of the file if CakeResponse doesn't know about it. + * + * ### Usage + * + * {{{ + * class ExampleController extends AppController { + * function download () { + * $this->view = 'Media'; + * $params = array( + * 'id' => 'example.zip', + * 'name' => 'example', + * 'download' => true, + * 'extension' => 'zip', + * 'path' => APP . 'files' . DS + * ); + * $this->set($params); + * } + * } + * }}} + * + * @package cake.libs.view + */ class MediaView extends View { /** * Indicates whether response gzip compression was enabled for this class @@ -34,11 +68,10 @@ class MediaView extends View { */ public $response = null; - /** * Constructor * - * @param object $controller + * @param object $controller The controller with viewVars */ function __construct($controller = null) { parent::__construct($controller); @@ -53,7 +86,7 @@ class MediaView extends View { /** * Display or download the given file * - * @return unknown + * @return mixed */ function render() { $name = $download = $extension = $id = $modified = $path = $size = $cache = $mimeType = $compress = null; @@ -160,6 +193,12 @@ class MediaView extends View { return false; } +/** + * Reads out a file handle, and echos the content to the client. + * + * @param resource $handle A file handle or stream + * @return void + */ protected function _sendFile($handle) { $chunkSize = 8192; $buffer = ''; @@ -180,6 +219,7 @@ class MediaView extends View { /** * Returns true if connection is still active + * * @return boolean */ protected function _isActive() { @@ -188,6 +228,7 @@ class MediaView extends View { /** * Clears the contents of the topmost output buffer and discards them + * * @return boolean */ protected function _clearBuffer() { @@ -196,6 +237,8 @@ class MediaView extends View { /** * Flushes the contents of the output buffer + * + * @return void */ protected function _flushBuffer() { @flush(); diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp index 95ead2a18..5fddec45c 100644 --- a/cake/libs/view/pages/home.ctp +++ b/cake/libs/view/pages/home.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.pages + * @package cake.libs.view.templates.pages * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/scaffold.php b/cake/libs/view/scaffold.php index ed8daa358..6f051a211 100644 --- a/cake/libs/view/scaffold.php +++ b/cake/libs/view/scaffold.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view * @since Cake v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/scaffolds/form.ctp b/cake/libs/view/scaffolds/form.ctp index 7fb2c4c8b..1a3992e38 100644 --- a/cake/libs/view/scaffolds/form.ctp +++ b/cake/libs/view/scaffolds/form.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.scaffolds + * @package cake.libs.view.templates.scaffolds * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp index d92b88320..c3da1d4d8 100644 --- a/cake/libs/view/scaffolds/index.ctp +++ b/cake/libs/view/scaffolds/index.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.console.libs.templates.views + * @package cake.console.libs.templates.views * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp index 963c59acc..c31b7397f 100644 --- a/cake/libs/view/scaffolds/view.ctp +++ b/cake/libs/view/scaffolds/view.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.scaffolds + * @package cake.libs.view.templates.scaffolds * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php index 80e56ae42..24e06e29b 100644 --- a/cake/libs/view/theme.php +++ b/cake/libs/view/theme.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +28,7 @@ App::import('View', 'View'); * * Example of theme path with `$this->theme = 'super_hot';` Would be `app/views/themed/super_hot/posts` * - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view */ class ThemeView extends View { /** diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php index af035292f..ef1d46b9f 100644 --- a/cake/libs/view/view.php +++ b/cake/libs/view/view.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,12 +24,16 @@ App::import('View', 'HelperCollection', false); App::import('View', 'Helper', false); /** - * View, the V in the MVC triad. + * View, the V in the MVC triad. View interacts with Helpers and view variables passed + * in from the controller to render the results of the controller action. Often this is HTML, + * but can also take the form of JSON, XML, PDF's or streaming files. * - * Class holding methods for displaying presentation data. + * CakePHP uses a two-step-view pattern. This means that the view content is rendered first, + * and then inserted into the selected layout. A special `$content_for_layout` variable is available + * in the layout, and it contains the rendered view. This also means you can pass data from the view to the + * layout using `$this->set()` * - * @package cake - * @subpackage cake.cake.libs.view + * @package cake.libs.view */ class View extends Object { @@ -53,7 +56,6 @@ class View extends Object { * Name of the controller. * * @var string Name of controller - * @access public */ public $name = null; @@ -68,7 +70,6 @@ class View extends Object { * An array of names of built-in helpers to include. * * @var mixed A single name as a string or a list of names as an array. - * @access public */ public $helpers = array('Html'); @@ -83,7 +84,6 @@ class View extends Object { * Variables for the view * * @var array - * @access public */ public $viewVars = array(); @@ -91,7 +91,6 @@ class View extends Object { * Name of layout to use with this View. * * @var string - * @access public */ public $layout = 'default'; @@ -103,18 +102,10 @@ class View extends Object { public $layoutPath = null; /** - * Turns on or off Cake's conventional mode of rendering views. On by default. + * Turns on or off Cake's conventional mode of applying layout files. On by default. + * Setting to off means that layouts will not be automatically applied to rendered views. * * @var boolean - * @access public - */ - public $autoRender = true; - -/** - * Turns on or off Cake's conventional mode of finding layout files. On by default. - * - * @var boolean - * @access public */ public $autoLayout = true; @@ -122,23 +113,21 @@ class View extends Object { * File extension. Defaults to Cake's template ".ctp". * * @var string - * @access public */ public $ext = '.ctp'; /** - * Sub-directory for this view file. + * Sub-directory for this view file. This is often used for extension based routing. + * for example with an `xml` extension, $subDir would be `xml/` * * @var string - * @access public */ public $subDir = null; /** - * Theme name. + * Theme name. If you are using themes, you should remember to use ThemeView as well. * * @var string - * @access public */ public $theme = null; @@ -147,7 +136,6 @@ class View extends Object { * * @see Controller::$cacheAction * @var mixed - * @access public */ public $cacheAction = false; @@ -155,7 +143,6 @@ class View extends Object { * holds current errors for the model validation * * @var array - * @access public */ public $validationErrors = array(); @@ -163,7 +150,6 @@ class View extends Object { * True when the view has been rendered. * * @var boolean - * @access public */ public $hasRendered = false; @@ -171,7 +157,6 @@ class View extends Object { * True if in scope of model-specific region * * @var boolean - * @access public */ public $modelScope = false; @@ -179,7 +164,6 @@ class View extends Object { * Name of current model this view context is attached to * * @var string - * @access public */ public $model = null; @@ -187,7 +171,6 @@ class View extends Object { * Name of association model this view context is attached to * * @var string - * @access public */ public $association = null; @@ -195,7 +178,6 @@ class View extends Object { * Name of current model field this view context is attached to * * @var string - * @access public */ public $field = null; @@ -203,7 +185,6 @@ class View extends Object { * Suffix of current field this view context is attached to * * @var string - * @access public */ public $fieldSuffix = null; @@ -211,7 +192,6 @@ class View extends Object { * The current model ID this view context is attached to * * @var mixed - * @access public */ public $modelId = null; @@ -219,7 +199,6 @@ class View extends Object { * List of generated DOM UUIDs * * @var array - * @access public */ public $uuids = array(); @@ -227,7 +206,6 @@ class View extends Object { * Holds View output. * * @var string - * @access public */ public $output = false; @@ -254,10 +232,9 @@ class View extends Object { * List of variables to collect from the associated controller * * @var array - * @access protected */ private $__passedVars = array( - 'viewVars', 'autoLayout', 'autoRender', 'ext', 'helpers', 'layout', 'name', + 'viewVars', 'autoLayout', 'ext', 'helpers', 'layout', 'name', 'layoutPath', 'viewPath', 'request', 'plugin', 'passedArgs', 'cacheAction' ); @@ -265,7 +242,6 @@ class View extends Object { * Scripts (and/or other 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/cake/libs/xml.php b/cake/libs/xml.php index 0027d1631..1a90ddf94 100644 --- a/cake/libs/xml.php +++ b/cake/libs/xml.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP v .0.10.3.1400 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php index 524c8857a..c5f4c3ca3 100644 --- a/cake/tests/cases/basics.test.php +++ b/cake/tests/cases/basics.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'Folder'); /** * BasicsTest class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class BasicsTest extends CakeTestCase { diff --git a/cake/tests/cases/console/all_console.test.php b/cake/tests/cases/console/all_console.test.php index 101a8faba..305ebbfc3 100644 --- a/cake/tests/cases/console/all_console.test.php +++ b/cake/tests/cases/console/all_console.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run all console classes. * - * @package cake - * @subpackage cake.tests.cases.console + * @package cake.tests.cases.console */ class AllConsoleTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/console/all_console_libs.test.php b/cake/tests/cases/console/all_console_libs.test.php index 70fb8746d..ad1f60fbd 100644 --- a/cake/tests/cases/console/all_console_libs.test.php +++ b/cake/tests/cases/console/all_console_libs.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run all console lib classes. * - * @package cake - * @subpackage cake.tests.cases.console + * @package cake.tests.cases.console */ class AllConsoleLibsTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/console/all_shells.test.php b/cake/tests/cases/console/all_shells.test.php index 7f657af82..e8ca96ac5 100644 --- a/cake/tests/cases/console/all_shells.test.php +++ b/cake/tests/cases/console/all_shells.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run all top level shell classes. * - * @package cake - * @subpackage cake.tests.cases.console + * @package cake.tests.cases.console */ class AllShellsTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/console/all_tasks.test.php b/cake/tests/cases/console/all_tasks.test.php index 51decf3d1..91ca6abdc 100644 --- a/cake/tests/cases/console/all_tasks.test.php +++ b/cake/tests/cases/console/all_tasks.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run all the task tests. * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllTasksTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/console/libs/console_error_handler.test.php b/cake/tests/cases/console/libs/console_error_handler.test.php index f00232bfb..51d16ab0f 100644 --- a/cake/tests/cases/console/libs/console_error_handler.test.php +++ b/cake/tests/cases/console/libs/console_error_handler.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.tests.cases.console + * @package cake.tests.cases.console * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/console/libs/console_option_parser.test.php b/cake/tests/cases/console/libs/console_option_parser.test.php index e010bbaf4..fac420ecd 100644 --- a/cake/tests/cases/console/libs/console_option_parser.test.php +++ b/cake/tests/cases/console/libs/console_option_parser.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.console + * @package cake.tests.cases.console * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/console/libs/console_output.test.php b/cake/tests/cases/console/libs/console_output.test.php index 9e9c8710d..d2af99d04 100644 --- a/cake/tests/cases/console/libs/console_output.test.php +++ b/cake/tests/cases/console/libs/console_output.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.console + * @package cake.tests.cases.console * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/console/libs/help_formatter.test.php b/cake/tests/cases/console/libs/help_formatter.test.php index a957843b1..5caae1490 100644 --- a/cake/tests/cases/console/libs/help_formatter.test.php +++ b/cake/tests/cases/console/libs/help_formatter.test.php @@ -435,6 +435,6 @@ TEXT; $formatter = new HelpFormatter($parser); $result = $formatter->xml(false); - $this->assertType('SimpleXmlElement', $result); + $this->assertInstanceOf('SimpleXmlElement', $result); } } diff --git a/cake/tests/cases/console/libs/task_collection.test.php b/cake/tests/cases/console/libs/task_collection.test.php index b89de158c..27a43e619 100644 --- a/cake/tests/cases/console/libs/task_collection.test.php +++ b/cake/tests/cases/console/libs/task_collection.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -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/cake/tests/cases/console/shell_dispatcher.test.php b/cake/tests/cases/console/shell_dispatcher.test.php index 2da5bbe81..eb6fd2bd6 100644 --- a/cake/tests/cases/console/shell_dispatcher.test.php +++ b/cake/tests/cases/console/shell_dispatcher.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.console + * @package cake.tests.cases.console * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * TestShellDispatcher class * - * @package cake - * @subpackage cake.tests.cases.console + * @package cake.tests.cases.console */ class TestShellDispatcher extends ShellDispatcher { @@ -105,8 +103,7 @@ class TestShellDispatcher extends ShellDispatcher { /** * ShellDispatcherTest * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ShellDispatcherTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/acl.test.php b/cake/tests/cases/console/shells/acl.test.php index 0bb6489b1..b13d593b4 100644 --- a/cake/tests/cases/console/shells/acl.test.php +++ b/cake/tests/cases/console/shells/acl.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * AclShellTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class AclShellTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/api.test.php b/cake/tests/cases/console/shells/api.test.php index 7ed9b85a3..e43c55d33 100644 --- a/cake/tests/cases/console/shells/api.test.php +++ b/cake/tests/cases/console/shells/api.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * ApiShellTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ApiShellTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/bake.test.php b/cake/tests/cases/console/shells/bake.test.php index 89383b1ff..7b2767389 100644 --- a/cake/tests/cases/console/shells/bake.test.php +++ b/cake/tests/cases/console/shells/bake.test.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/console/shells/command_list.test.php b/cake/tests/cases/console/shells/command_list.test.php index bdabc2230..7b518730a 100644 --- a/cake/tests/cases/console/shells/command_list.test.php +++ b/cake/tests/cases/console/shells/command_list.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs + * @package cake.tests.cases.console.libs * @since CakePHP v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/console/shells/schema.test.php b/cake/tests/cases/console/shells/schema.test.php index 6a7a619a1..d18b7a478 100644 --- a/cake/tests/cases/console/shells/schema.test.php +++ b/cake/tests/cases/console/shells/schema.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.Shells + * @package cake.tests.cases.console.libs.Shells * @since CakePHP v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * Test for Schema database management * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class SchemaShellTestSchema extends CakeSchema { @@ -89,8 +87,7 @@ class SchemaShellTestSchema extends CakeSchema { /** * SchemaShellTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.Shells + * @package cake.tests.cases.console.libs.Shells */ class SchemaShellTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/shell.test.php b/cake/tests/cases/console/shells/shell.test.php index 91c623cda..ac5d77faf 100644 --- a/cake/tests/cases/console/shells/shell.test.php +++ b/cake/tests/cases/console/shells/shell.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs + * @package cake.tests.cases.console.libs * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * ShellTestShell class * - * @package cake - * @subpackage cake.tests.cases.console.libs + * @package cake.tests.cases.console.libs */ class ShellTestShell extends Shell { @@ -88,8 +86,7 @@ class TestMergeShell extends Shell { /** * TestAppleTask class * - * @package cake - * @subpackage cake.tests.cases.console.libs + * @package cake.tests.cases.console.libs */ class TestAppleTask extends Shell { } @@ -97,8 +94,7 @@ class TestAppleTask extends Shell { /** * TestBananaTask class * - * @package cake - * @subpackage cake.tests.cases.console.libs + * @package cake.tests.cases.console.libs */ class TestBananaTask extends Shell { } @@ -106,8 +102,7 @@ class TestBananaTask extends Shell { /** * ShellTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs + * @package cake.tests.cases.console.libs */ class ShellTest extends CakeTestCase { @@ -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/cake/tests/cases/console/shells/tasks/controller.test.php b/cake/tests/cases/console/shells/tasks/controller.test.php index 86ff8fb77..5abda16c9 100644 --- a/cake/tests/cases/console/shells/tasks/controller.test.php +++ b/cake/tests/cases/console/shells/tasks/controller.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -49,8 +48,7 @@ if (!$imported) { /** * ControllerTaskTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ControllerTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/db_config.test.php b/cake/tests/cases/console/shells/tasks/db_config.test.php index aca87ac94..6d37ffbb8 100644 --- a/cake/tests/cases/console/shells/tasks/db_config.test.php +++ b/cake/tests/cases/console/shells/tasks/db_config.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -48,8 +47,7 @@ class TEST_DATABASE_CONFIG { /** * DbConfigTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class DbConfigTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/extract.test.php b/cake/tests/cases/console/shells/tasks/extract.test.php index 21993e0d4..0b2fbf4bc 100644 --- a/cake/tests/cases/console/shells/tasks/extract.test.php +++ b/cake/tests/cases/console/shells/tasks/extract.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * ExtractTaskTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ExtractTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/fixture.test.php b/cake/tests/cases/console/shells/tasks/fixture.test.php index 7121f7fd1..9265fdfb6 100644 --- a/cake/tests/cases/console/shells/tasks/fixture.test.php +++ b/cake/tests/cases/console/shells/tasks/fixture.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +28,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * FixtureTaskTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class FixtureTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/model.test.php b/cake/tests/cases/console/shells/tasks/model.test.php index ac2a2c7fc..98ad033cd 100644 --- a/cake/tests/cases/console/shells/tasks/model.test.php +++ b/cake/tests/cases/console/shells/tasks/model.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.2.6 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -31,8 +30,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * ModelTaskTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ModelTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/plugin.test.php b/cake/tests/cases/console/shells/tasks/plugin.test.php index 327b258c2..22131744e 100644 --- a/cake/tests/cases/console/shells/tasks/plugin.test.php +++ b/cake/tests/cases/console/shells/tasks/plugin.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2009, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.3.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -32,8 +31,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * PluginTaskPlugin class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class PluginTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/project.test.php b/cake/tests/cases/console/shells/tasks/project.test.php index 8e92b7949..65a5b4a52 100644 --- a/cake/tests/cases/console/shells/tasks/project.test.php +++ b/cake/tests/cases/console/shells/tasks/project.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.3.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +28,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * ProjectTask Test class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ProjectTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/template.test.php b/cake/tests/cases/console/shells/tasks/template.test.php index bbd81404d..0085d4f75 100644 --- a/cake/tests/cases/console/shells/tasks/template.test.php +++ b/cake/tests/cases/console/shells/tasks/template.test.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -28,8 +27,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; /** * TemplateTaskTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class TemplateTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/test.test.php b/cake/tests/cases/console/shells/tasks/test.test.php index 14b603e54..394098a38 100644 --- a/cake/tests/cases/console/shells/tasks/test.test.php +++ b/cake/tests/cases/console/shells/tasks/test.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -34,7 +33,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; * Test Article model * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class TestTaskArticle extends Model { @@ -111,7 +110,7 @@ class TestTaskArticle extends Model { * Tag Testing Model * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class TestTaskTag extends Model { @@ -151,7 +150,7 @@ class TestTaskTag extends Model { * Simulated plugin * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class TestTaskAppModel extends Model { } @@ -160,7 +159,7 @@ class TestTaskAppModel extends Model { * Testing AppMode (TaskComment) * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class TestTaskComment extends TestTaskAppModel { @@ -198,7 +197,7 @@ class TestTaskComment extends TestTaskAppModel { * Test Task Comments Controller * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class TestTaskCommentsController extends Controller { @@ -222,8 +221,7 @@ class TestTaskCommentsController extends Controller { /** * TestTaskTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class TestTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/tasks/view.test.php b/cake/tests/cases/console/shells/tasks/view.test.php index 5a2dfcce5..99f1afdf9 100644 --- a/cake/tests/cases/console/shells/tasks/view.test.php +++ b/cake/tests/cases/console/shells/tasks/view.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -34,7 +33,7 @@ require_once CAKE . 'console' . DS . 'shell_dispatcher.php'; * Test View Task Comment Model * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ViewTaskComment extends Model { @@ -72,7 +71,7 @@ class ViewTaskComment extends Model { * Test View Task Article Model * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ViewTaskArticle extends Model { @@ -97,7 +96,7 @@ class ViewTaskArticle extends Model { * Test View Task Comments Controller * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ViewTaskCommentsController extends Controller { @@ -130,7 +129,7 @@ class ViewTaskCommentsController extends Controller { * Test View Task Articles Controller * * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ViewTaskArticlesController extends Controller { @@ -202,8 +201,7 @@ class ViewTaskArticlesController extends Controller { /** * ViewTaskTest class * - * @package cake - * @subpackage cake.tests.cases.console.libs.tasks + * @package cake.tests.cases.console.libs.tasks */ class ViewTaskTest extends CakeTestCase { diff --git a/cake/tests/cases/console/shells/testsuite.test.php b/cake/tests/cases/console/shells/testsuite.test.php index bfe463dbf..c57d1573b 100644 --- a/cake/tests/cases/console/shells/testsuite.test.php +++ b/cake/tests/cases/console/shells/testsuite.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/libs/all_behaviors.test.php b/cake/tests/cases/libs/all_behaviors.test.php index b27a1cfe4..88720d386 100644 --- a/cake/tests/cases/libs/all_behaviors.test.php +++ b/cake/tests/cases/libs/all_behaviors.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * * This test group will run all test in the cases/libs/models/behaviors directory * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllBehaviorsTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_cache_engines.test.php b/cake/tests/cases/libs/all_cache_engines.test.php index 64d2da93c..5c03437cd 100644 --- a/cake/tests/cases/libs/all_cache_engines.test.php +++ b/cake/tests/cases/libs/all_cache_engines.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run cache engine tests. * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllCacheEnginesTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_components.test.php b/cake/tests/cases/libs/all_components.test.php index 6724303ca..28e59aadf 100644 --- a/cake/tests/cases/libs/all_components.test.php +++ b/cake/tests/cases/libs/all_components.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run component class tests * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class AllComponentsTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_configure.test.php b/cake/tests/cases/libs/all_configure.test.php index 6b1b23fc8..6e35aef74 100644 --- a/cake/tests/cases/libs/all_configure.test.php +++ b/cake/tests/cases/libs/all_configure.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run cache engine tests. * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllConfigureTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_controllers.test.php b/cake/tests/cases/libs/all_controllers.test.php index ab3cf5581..8164896d9 100644 --- a/cake/tests/cases/libs/all_controllers.test.php +++ b/cake/tests/cases/libs/all_controllers.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run cache engine tests. * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllControllersTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_database.test.php b/cake/tests/cases/libs/all_database.test.php index 8c4fc024a..21cef27b6 100644 --- a/cake/tests/cases/libs/all_database.test.php +++ b/cake/tests/cases/libs/all_database.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run database tests not in model or behavior group. * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllDatabaseTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_error.test.php b/cake/tests/cases/libs/all_error.test.php index e37176908..b64c87542 100644 --- a/cake/tests/cases/libs/all_error.test.php +++ b/cake/tests/cases/libs/all_error.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run error handling related tests. * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllErrorTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_helpers.test.php b/cake/tests/cases/libs/all_helpers.test.php index 389290d27..247a10deb 100644 --- a/cake/tests/cases/libs/all_helpers.test.php +++ b/cake/tests/cases/libs/all_helpers.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run all test in the cases/libs/view/helpers directory. * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllHelpersTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_js_helpers.test.php b/cake/tests/cases/libs/all_js_helpers.test.php index b17e6b4fc..9dd0ab750 100644 --- a/cake/tests/cases/libs/all_js_helpers.test.php +++ b/cake/tests/cases/libs/all_js_helpers.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * This test group will run all test in the cases/libs/view/helpers directory related * to Js helper and its engines * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllJavascriptHelpersTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_libs.test.php b/cake/tests/cases/libs/all_libs.test.php index b0a070b49..ba0388850 100644 --- a/cake/tests/cases/libs/all_libs.test.php +++ b/cake/tests/cases/libs/all_libs.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run all non mvc related lib class tests * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class AllLibsTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_localization.test.php b/cake/tests/cases/libs/all_localization.test.php index ce7d0cc95..d30ab86b0 100644 --- a/cake/tests/cases/libs/all_localization.test.php +++ b/cake/tests/cases/libs/all_localization.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run i18n/l10n tests * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class AllLocalizationTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_model.test.php b/cake/tests/cases/libs/all_model.test.php index fb99184c0..bf968b0c3 100644 --- a/cake/tests/cases/libs/all_model.test.php +++ b/cake/tests/cases/libs/all_model.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run model class tests * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllModelTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_routing.test.php b/cake/tests/cases/libs/all_routing.test.php index cf1ff215e..68f0520f9 100644 --- a/cake/tests/cases/libs/all_routing.test.php +++ b/cake/tests/cases/libs/all_routing.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run view class tests (view, theme) * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllRoutingTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_socket.test.php b/cake/tests/cases/libs/all_socket.test.php index 01af39255..811822f9e 100644 --- a/cake/tests/cases/libs/all_socket.test.php +++ b/cake/tests/cases/libs/all_socket.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run socket class tests * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllSocketTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_test_suite.test.php b/cake/tests/cases/libs/all_test_suite.test.php index f1d52c2dc..b85ea0a19 100644 --- a/cake/tests/cases/libs/all_test_suite.test.php +++ b/cake/tests/cases/libs/all_test_suite.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run socket class tests * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllTestSuiteTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_tests.test.php b/cake/tests/cases/libs/all_tests.test.php index b3c94cb82..f7bdc72d3 100644 --- a/cake/tests/cases/libs/all_tests.test.php +++ b/cake/tests/cases/libs/all_tests.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * * This test group will run all test in the cases/libs/models/behaviors directory * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllTests extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_views.test.php b/cake/tests/cases/libs/all_views.test.php index a84cd0c6d..0201426e4 100644 --- a/cake/tests/cases/libs/all_views.test.php +++ b/cake/tests/cases/libs/all_views.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run view class tests (view, theme) * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllViewsTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/all_xml.test.php b/cake/tests/cases/libs/all_xml.test.php index aed5b21d1..e56714ab0 100644 --- a/cake/tests/cases/libs/all_xml.test.php +++ b/cake/tests/cases/libs/all_xml.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ * * This test group will run xml class tests * - * @package cake - * @subpackage cake.tests.groups + * @package cake.tests.groups */ class AllXmlTest extends PHPUnit_Framework_TestSuite { diff --git a/cake/tests/cases/libs/app.test.php b/cake/tests/cases/libs/app.test.php index cbebd4bf3..6e7793072 100644 --- a/cake/tests/cases/libs/app.test.php +++ b/cake/tests/cases/libs/app.test.php @@ -3,8 +3,7 @@ /** * AppImportTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class AppImportTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php index ad24b70d3..0a35c9794 100644 --- a/cake/tests/cases/libs/cache.test.php +++ b/cake/tests/cases/libs/cache.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ if (!class_exists('Cache')) { /** * CacheTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CacheTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php index bfdcea470..0abd07778 100644 --- a/cake/tests/cases/libs/cache/apc.test.php +++ b/cake/tests/cases/libs/cache/apc.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ if (!class_exists('Cache')) { /** * ApcEngineTest class * - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache */ class ApcEngineTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php index 33361f040..fb6741a7a 100644 --- a/cake/tests/cases/libs/cache/file.test.php +++ b/cake/tests/cases/libs/cache/file.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ if (!class_exists('Cache')) { /** * FileEngineTest class * - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache */ class FileEngineTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php index e69e243a2..42324a8bc 100644 --- a/cake/tests/cases/libs/cache/memcache.test.php +++ b/cake/tests/cases/libs/cache/memcache.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -37,8 +36,7 @@ class TestMemcacheEngine extends MemcacheEngine { /** * MemcacheEngineTest class * - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache */ class MemcacheEngineTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php index d889d713c..eea1c4b2c 100644 --- a/cake/tests/cases/libs/cache/xcache.test.php +++ b/cake/tests/cases/libs/cache/xcache.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ if (!class_exists('Cache')) { /** * XcacheEngineTest class * - * @package cake - * @subpackage cake.tests.cases.libs.cache + * @package cake.tests.cases.libs.cache */ class XcacheEngineTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php index 72fe1e8e8..0d21cb5b2 100644 --- a/cake/tests/cases/libs/cake_log.test.php +++ b/cake/tests/cases/libs/cake_log.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'log/FileLog'); /** * CakeLogTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeLogTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cake_request.test.php b/cake/tests/cases/libs/cake_request.test.php index f423ac19d..58cc50631 100644 --- a/cake/tests/cases/libs/cake_request.test.php +++ b/cake/tests/cases/libs/cake_request.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php index e25c9416d..3673121fd 100644 --- a/cake/tests/cases/libs/cake_session.test.php +++ b/cake/tests/cases/libs/cake_session.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -34,8 +33,7 @@ class TestCakeSession extends CakeSession { /** * CakeSessionTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeSessionTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cake_socket.test.php b/cake/tests/cases/libs/cake_socket.test.php index ce84dedfb..ac12b4553 100644 --- a/cake/tests/cases/libs/cake_socket.test.php +++ b/cake/tests/cases/libs/cake_socket.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'CakeSocket'); /** * SocketTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeSocketTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php index f9e5e8410..505dd8a08 100644 --- a/cake/tests/cases/libs/cake_test_case.test.php +++ b/cake/tests/cases/libs/cake_test_case.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs. + * @package cake.libs. * @since CakePHP v 1.2.0.4487 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -31,8 +30,7 @@ if (!class_exists('AppController')) { /** * CakeTestCaseTest * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeTestCaseTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php index 2042eb922..82c08be98 100644 --- a/cake/tests/cases/libs/cake_test_fixture.test.php +++ b/cake/tests/cases/libs/cake_test_fixture.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Datasource', 'DboSource', false); /** * CakeTestFixtureTestFixture class * - * @package cake - * @subpackage cake.cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeTestFixtureTestFixture extends CakeTestFixture { @@ -67,8 +65,7 @@ class CakeTestFixtureTestFixture extends CakeTestFixture { /** * CakeTestFixtureImportFixture class * - * @package cake - * @subpackage cake.cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeTestFixtureImportFixture extends CakeTestFixture { @@ -90,8 +87,7 @@ class CakeTestFixtureImportFixture extends CakeTestFixture { /** * CakeTestFixtureDefaultImportFixture class * - * @package cake - * @subpackage cake.cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeTestFixtureDefaultImportFixture extends CakeTestFixture { @@ -107,7 +103,7 @@ class CakeTestFixtureDefaultImportFixture extends CakeTestFixture { * FixtureImportTestModel class * * @package default - * @subpackage cake.cake.tests.cases.libs. + * @package cake.tests.cases.libs. */ class FixtureImportTestModel extends Model { public $name = 'FixtureImport'; @@ -125,8 +121,7 @@ class FixturePrefixTest extends Model { /** * Test case for CakeTestFixture * - * @package cake - * @subpackage cake.cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeTestFixtureTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/class_registry.test.php b/cake/tests/cases/libs/class_registry.test.php index 7c0c14b23..21aa081b1 100644 --- a/cake/tests/cases/libs/class_registry.test.php +++ b/cake/tests/cases/libs/class_registry.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'ClassRegistry'); /** * ClassRegisterModel class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ClassRegisterModel extends CakeTestModel { @@ -39,8 +37,7 @@ class ClassRegisterModel extends CakeTestModel { /** * RegisterArticle class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RegisterArticle extends ClassRegisterModel { @@ -56,8 +53,7 @@ class RegisterArticle extends ClassRegisterModel { /** * RegisterArticleFeatured class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RegisterArticleFeatured extends ClassRegisterModel { @@ -73,8 +69,7 @@ class RegisterArticleFeatured extends ClassRegisterModel { /** * RegisterArticleTag class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RegisterArticleTag extends ClassRegisterModel { @@ -90,8 +85,7 @@ class RegisterArticleTag extends ClassRegisterModel { /** * RegistryPluginAppModel class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RegistryPluginAppModel extends ClassRegisterModel { @@ -107,8 +101,7 @@ class RegistryPluginAppModel extends ClassRegisterModel { /** * TestRegistryPluginModel class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class TestRegistryPluginModel extends RegistryPluginAppModel { @@ -124,8 +117,7 @@ class TestRegistryPluginModel extends RegistryPluginAppModel { /** * RegisterCategory class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RegisterCategory extends ClassRegisterModel { @@ -141,8 +133,7 @@ class RegisterCategory extends ClassRegisterModel { /** * ClassRegistryTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ClassRegistryTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/config/ini_reader.test.php b/cake/tests/cases/libs/config/ini_reader.test.php index b0bd31ee0..2fb8eb2dd 100644 --- a/cake/tests/cases/libs/config/ini_reader.test.php +++ b/cake/tests/cases/libs/config/ini_reader.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/libs/config/php_reader.test.php b/cake/tests/cases/libs/config/php_reader.test.php index 539f56666..63957ea62 100644 --- a/cake/tests/cases/libs/config/php_reader.test.php +++ b/cake/tests/cases/libs/config/php_reader.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php index eb9cb63b5..e58874e21 100644 --- a/cake/tests/cases/libs/configure.test.php +++ b/cake/tests/cases/libs/configure.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ App::import('Core', 'config/PhpReader'); /** * ConfigureTest * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ConfigureTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php index 3c8dc99c6..eb01dae61 100644 --- a/cake/tests/cases/libs/controller/component.test.php +++ b/cake/tests/cases/libs/controller/component.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.0.5436 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Controller', 'Component', false); /** * ParamTestComponent * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ParamTestComponent extends Component { @@ -66,8 +64,7 @@ class ParamTestComponent extends Component { /** * ComponentTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ComponentTestController extends Controller { @@ -92,8 +89,7 @@ class ComponentTestController extends Controller { /** * AppleComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class AppleComponent extends Component { @@ -128,8 +124,7 @@ class AppleComponent extends Component { /** * OrangeComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class OrangeComponent extends Component { @@ -167,8 +162,7 @@ class OrangeComponent extends Component { /** * BananaComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class BananaComponent extends Component { @@ -194,8 +188,7 @@ class BananaComponent extends Component { /** * MutuallyReferencingOneComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class MutuallyReferencingOneComponent extends Component { @@ -211,8 +204,7 @@ class MutuallyReferencingOneComponent extends Component { /** * MutuallyReferencingTwoComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class MutuallyReferencingTwoComponent extends Component { @@ -228,8 +220,7 @@ class MutuallyReferencingTwoComponent extends Component { /** * SomethingWithEmailComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class SomethingWithEmailComponent extends Component { @@ -246,8 +237,7 @@ class SomethingWithEmailComponent extends Component { /** * ComponentTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ComponentTest extends CakeTestCase { @@ -284,7 +274,7 @@ class ComponentTest extends CakeTestCase { $Collection = new ComponentCollection(); $Component = new AppleComponent($Collection); - $this->assertType('OrangeComponent', $Component->Orange, 'class is wrong'); + $this->assertInstanceOf('OrangeComponent', $Component->Orange, 'class is wrong'); } /** @@ -296,8 +286,8 @@ class ComponentTest extends CakeTestCase { $Collection = new ComponentCollection(); $Apple = new AppleComponent($Collection); - $this->assertType('OrangeComponent', $Apple->Orange, 'class is wrong'); - $this->assertType('BananaComponent', $Apple->Orange->Banana, 'class is wrong'); + $this->assertInstanceOf('OrangeComponent', $Apple->Orange, 'class is wrong'); + $this->assertInstanceOf('BananaComponent', $Apple->Orange->Banana, 'class is wrong'); $this->assertTrue(empty($Apple->Session)); $this->assertTrue(empty($Apple->Orange->Session)); } @@ -311,7 +301,7 @@ class ComponentTest extends CakeTestCase { $Collection = new ComponentCollection(); $Apple = $Collection->load('Apple'); - $this->assertType('OrangeComponent', $Apple->Orange, 'class is wrong'); + $this->assertInstanceOf('OrangeComponent', $Apple->Orange, 'class is wrong'); $result = $Collection->enabled(); $this->assertEquals(array('Apple'), $result, 'Too many components enabled.'); } @@ -346,9 +336,9 @@ class ComponentTest extends CakeTestCase { $Controller->beforeFilter(); $Controller->Components->trigger('startup', array(&$Controller)); - $this->assertType('SomethingWithEmailComponent', $Controller->SomethingWithEmail); - $this->assertType('EmailComponent', $Controller->SomethingWithEmail->Email); - $this->assertType('ComponentTestController', $Controller->SomethingWithEmail->Email->Controller); + $this->assertInstanceOf('SomethingWithEmailComponent', $Controller->SomethingWithEmail); + $this->assertInstanceOf('EmailComponent', $Controller->SomethingWithEmail->Email); + $this->assertInstanceOf('ComponentTestController', $Controller->SomethingWithEmail->Email->Controller); } } diff --git a/cake/tests/cases/libs/controller/component_collection.test.php b/cake/tests/cases/libs/controller/component_collection.test.php index ecdac7775..3d84142d2 100644 --- a/cake/tests/cases/libs/controller/component_collection.test.php +++ b/cake/tests/cases/libs/controller/component_collection.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -47,8 +46,8 @@ class ComponentCollectionTest extends CakeTestCase { */ function testLoad() { $result = $this->Components->load('Cookie'); - $this->assertType('CookieComponent', $result); - $this->assertType('CookieComponent', $this->Components->Cookie); + $this->assertInstanceOf('CookieComponent', $result); + $this->assertInstanceOf('CookieComponent', $this->Components->Cookie); $result = $this->Components->attached(); $this->assertEquals(array('Cookie'), $result, 'attached() results are wrong.'); @@ -66,8 +65,8 @@ class ComponentCollectionTest extends CakeTestCase { */ function testLoadWithEnableFalse() { $result = $this->Components->load('Cookie', array('enabled' => false)); - $this->assertType('CookieComponent', $result); - $this->assertType('CookieComponent', $this->Components->Cookie); + $this->assertInstanceOf('CookieComponent', $result); + $this->assertInstanceOf('CookieComponent', $this->Components->Cookie); $this->assertFalse($this->Components->enabled('Cookie'), 'Cookie should be disabled'); } @@ -91,8 +90,8 @@ class ComponentCollectionTest extends CakeTestCase { 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), )); $result = $this->Components->load('TestPlugin.OtherComponent'); - $this->assertType('OtherComponentComponent', $result, 'Component class is wrong.'); - $this->assertType('OtherComponentComponent', $this->Components->OtherComponent, 'Class is wrong'); + $this->assertInstanceOf('OtherComponentComponent', $result, 'Component class is wrong.'); + $this->assertInstanceOf('OtherComponentComponent', $this->Components->OtherComponent, 'Class is wrong'); App::build(); } diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php index 544ff44b1..4e10cce48 100644 --- a/cake/tests/cases/libs/controller/components/acl.test.php +++ b/cake/tests/cases/libs/controller/components/acl.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('model' . DS . 'db_acl'); /** * AclNodeTwoTestBase class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class AclNodeTwoTestBase extends AclNode { @@ -48,8 +46,7 @@ class AclNodeTwoTestBase extends AclNode { /** * AroTwoTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class AroTwoTest extends AclNodeTwoTestBase { @@ -81,8 +78,7 @@ class AroTwoTest extends AclNodeTwoTestBase { /** * AcoTwoTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class AcoTwoTest extends AclNodeTwoTestBase { @@ -114,8 +110,7 @@ class AcoTwoTest extends AclNodeTwoTestBase { /** * PermissionTwoTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class PermissionTwoTest extends CakeTestModel { @@ -163,8 +158,7 @@ class PermissionTwoTest extends CakeTestModel { /** * DbAclTwoTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class DbAclTwoTest extends DbAcl { @@ -185,8 +179,7 @@ class DbAclTwoTest extends DbAcl { /** * Short description for class. * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class AclComponentTest extends CakeTestCase { /** diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php index 5b6f7262e..371edd2ed 100644 --- a/cake/tests/cases/libs/controller/components/auth.test.php +++ b/cake/tests/cases/libs/controller/components/auth.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5347 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,7 +25,7 @@ App::import('Core', 'Xml'); * TestAuthComponent class * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class TestAuthComponent extends AuthComponent { @@ -61,7 +60,7 @@ class TestAuthComponent extends AuthComponent { * AuthUser class * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class AuthUser extends CakeTestModel { @@ -122,8 +121,7 @@ class AuthUser extends CakeTestModel { /** * AuthUserCustomField class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class AuthUserCustomField extends AuthUser { @@ -140,7 +138,7 @@ class AuthUserCustomField extends AuthUser { * UuidUser class * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class UuidUser extends CakeTestModel { @@ -210,7 +208,7 @@ class UuidUser extends CakeTestModel { * AuthTestController class * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class AuthTestController extends Controller { @@ -364,8 +362,7 @@ class AuthTestController extends Controller { /** * AjaxAuthController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class AjaxAuthController extends Controller { @@ -444,7 +441,7 @@ class AjaxAuthController extends Controller { * AuthTest class * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class AuthTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php index 7d441e4c2..0dc3ccd38 100644 --- a/cake/tests/cases/libs/controller/components/cookie.test.php +++ b/cake/tests/cases/libs/controller/components/cookie.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Component', 'Cookie'); /** * CookieComponentTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class CookieComponentTestController extends Controller { @@ -55,8 +53,7 @@ class CookieComponentTestController extends Controller { /** * CookieComponentTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class CookieComponentTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php index 9ce4602e1..411a93c09 100755 --- a/cake/tests/cases/libs/controller/components/email.test.php +++ b/cake/tests/cases/libs/controller/components/email.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5347 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ App::import('Core', 'CakeSocket'); /** * EmailTestComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class EmailTestComponent extends EmailComponent { @@ -153,8 +151,7 @@ class EmailTestComponent extends EmailComponent { /** * EmailTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class EmailTestController extends Controller { @@ -194,8 +191,7 @@ class EmailTestController extends Controller { /** * EmailTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class EmailComponentTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php index df3779f1e..6a337eb44 100644 --- a/cake/tests/cases/libs/controller/components/paginator.test.php +++ b/cake/tests/cases/libs/controller/components/paginator.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ App::import('Core', array('CakeRequest', 'CakeResponse')); /** * PaginatorTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class PaginatorTestController extends Controller { /** @@ -58,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 { @@ -127,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 { @@ -171,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 { diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php index a9fe81d81..3ce9ccc4e 100644 --- a/cake/tests/cases/libs/controller/components/request_handler.test.php +++ b/cake/tests/cases/libs/controller/components/request_handler.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ App::import('Core', array('CakeRequest', 'CakeResponse')); /** * RequestHandlerTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class RequestHandlerTestController extends Controller { @@ -80,8 +78,7 @@ class RequestHandlerTestController extends Controller { /** * RequestHandlerTestDisabledController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class RequestHandlerTestDisabledController extends Controller { @@ -106,8 +103,7 @@ class RequestHandlerTestDisabledController extends Controller { /** * RequestHandlerComponentTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class RequestHandlerComponentTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php index 33548c70e..cb7197392 100644 --- a/cake/tests/cases/libs/controller/components/security.test.php +++ b/cake/tests/cases/libs/controller/components/security.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,7 +23,7 @@ App::import('Component', 'Security'); * TestSecurityComponent * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class TestSecurityComponent extends SecurityComponent { @@ -43,7 +42,7 @@ class TestSecurityComponent extends SecurityComponent { * SecurityTestController * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class SecurityTestController extends Controller { @@ -116,8 +115,7 @@ class SecurityTestController extends Controller { /** * SecurityComponentTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class SecurityComponentTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php index a2fa96410..938d8dd00 100644 --- a/cake/tests/cases/libs/controller/components/session.test.php +++ b/cake/tests/cases/libs/controller/components/session.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5436 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Component', 'Session'); /** * SessionTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class SessionTestController extends Controller { @@ -49,8 +47,7 @@ class SessionTestController extends Controller { /** * OrangeSessionTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class OrangeSessionTestController extends Controller { @@ -75,8 +72,7 @@ class OrangeSessionTestController extends Controller { /** * SessionComponentTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class SessionComponentTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php index 91165cd22..675fcb100 100644 --- a/cake/tests/cases/libs/controller/controller.test.php +++ b/cake/tests/cases/libs/controller/controller.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.0.5436 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ App::import('Component', 'Cookie'); /** * AppController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ControllerTestAppController extends Controller { /** @@ -57,8 +55,7 @@ class ControllerTestAppController extends Controller { /** * ControllerPost class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ControllerPost extends CakeTestModel { @@ -126,8 +123,7 @@ class ControllerPost extends CakeTestModel { /** * ControllerPostsController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ControllerCommentsController extends ControllerTestAppController { @@ -145,8 +141,7 @@ class ControllerCommentsController extends ControllerTestAppController { /** * ControllerComment class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ControllerComment extends CakeTestModel { @@ -186,8 +181,7 @@ class ControllerComment extends CakeTestModel { /** * ControllerAlias class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ControllerAlias extends CakeTestModel { @@ -219,8 +213,7 @@ class ControllerAlias extends CakeTestModel { /** * NameTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class NameTest extends CakeTestModel { @@ -250,8 +243,7 @@ class NameTest extends CakeTestModel { /** * TestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class TestController extends ControllerTestAppController { @@ -307,8 +299,7 @@ class TestController extends ControllerTestAppController { /** * TestComponent class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class TestComponent extends Object { @@ -360,8 +351,7 @@ class TestComponent extends Object { /** * AnotherTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class AnotherTestController extends ControllerTestAppController { @@ -385,8 +375,7 @@ class AnotherTestController extends ControllerTestAppController { /** * ControllerTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ControllerTest extends CakeTestCase { @@ -462,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(); @@ -1248,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); } /** diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php index b90a6b6e9..80e12d88c 100644 --- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php +++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,7 +24,7 @@ App::import('Core', 'Controller'); * Test case AppController * * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class MergeVarsAppController extends Controller { diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/cake/tests/cases/libs/controller/pages_controller.test.php index 3d3084719..1d9d3febc 100644 --- a/cake/tests/cases/libs/controller/pages_controller.test.php +++ b/cake/tests/cases/libs/controller/pages_controller.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.0.5436 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Controller', 'Pages'); /** * PagesControllerTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class PagesControllerTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php index a68e7ad2b..031d8a0c5 100644 --- a/cake/tests/cases/libs/controller/scaffold.test.php +++ b/cake/tests/cases/libs/controller/scaffold.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.0.5436 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'Controller', false); /** * ScaffoldMockController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldMockController extends Controller { @@ -48,8 +46,7 @@ class ScaffoldMockController extends Controller { /** * ScaffoldMockControllerWithFields class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldMockControllerWithFields extends Controller { @@ -83,8 +80,7 @@ class ScaffoldMockControllerWithFields extends Controller { /** * TestScaffoldMock class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class TestScaffoldMock extends Scaffold { @@ -110,8 +106,7 @@ class TestScaffoldMock extends Scaffold { /** * ScaffoldMock class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldMock extends CakeTestModel { @@ -166,8 +161,7 @@ class ScaffoldMock extends CakeTestModel { /** * ScaffoldUser class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldUser extends CakeTestModel { @@ -196,8 +190,7 @@ class ScaffoldUser extends CakeTestModel { /** * ScaffoldComment class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldComment extends CakeTestModel { @@ -226,8 +219,7 @@ class ScaffoldComment extends CakeTestModel { /** * ScaffoldTag class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldTag extends CakeTestModel { /** @@ -241,8 +233,7 @@ class ScaffoldTag extends CakeTestModel { /** * TestScaffoldView class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class TestScaffoldView extends ScaffoldView { @@ -261,8 +252,7 @@ class TestScaffoldView extends ScaffoldView { /** * ScaffoldViewTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldViewTest extends CakeTestCase { @@ -661,8 +651,7 @@ class ScaffoldViewTest extends CakeTestCase { /** * Scaffold Test class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class ScaffoldTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/controller_test_case.test.php b/cake/tests/cases/libs/controller_test_case.test.php index c457da428..72bb959cb 100644 --- a/cake/tests/cases/libs/controller_test_case.test.php +++ b/cake/tests/cases/libs/controller_test_case.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs. + * @package cake.libs. * @since CakePHP v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,15 +26,13 @@ require_once dirname(__FILE__) . DS . 'model' . DS . 'models.php'; /** * AppController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ if (!class_exists('AppController')) { /** * AppController class * - * @package cake - * @subpackage cake.tests.cases.libs.controller + * @package cake.tests.cases.libs.controller */ class AppController extends Controller { /** @@ -87,8 +84,7 @@ if (!class_exists('PostsController')) { /** * ControllerTestCaseTest * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ControllerTestCaseTest extends CakeTestCase { @@ -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 TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php'; $this->Case->loadRoutes = false; - - $result = $this->Case->testAction('/tests_apps/index.json', array('return' => 'view')); + $result = $this->Case->testAction('/tests_apps/missing_action.json', array('return' => 'view')); } /** diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php index d6ea5ac8e..a76945566 100644 --- a/cake/tests/cases/libs/debugger.test.php +++ b/cake/tests/cases/libs/debugger.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Debugger'); /** * DebugggerTestCaseDebuggger class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class DebuggerTestCaseDebugger extends Debugger { } @@ -31,8 +29,7 @@ class DebuggerTestCaseDebugger extends Debugger { /** * DebuggerTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class DebuggerTest extends CakeTestCase { // !!! @@ -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/cake/tests/cases/libs/dispatcher.test.php b/cake/tests/cases/libs/dispatcher.test.php index 0192e6740..20fab006b 100644 --- a/cake/tests/cases/libs/dispatcher.test.php +++ b/cake/tests/cases/libs/dispatcher.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -40,8 +39,7 @@ class DispatcherMockCakeResponse extends CakeResponse { /** * TestDispatcher class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class TestDispatcher extends Dispatcher { @@ -75,8 +73,7 @@ class TestDispatcher extends Dispatcher { /** * MyPluginAppController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class MyPluginAppController extends AppController { } @@ -84,8 +81,7 @@ class MyPluginAppController extends AppController { /** * MyPluginController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class MyPluginController extends MyPluginAppController { @@ -137,8 +133,7 @@ class MyPluginController extends MyPluginAppController { /** * SomePagesController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class SomePagesController extends AppController { @@ -199,8 +194,7 @@ class SomePagesController extends AppController { /** * OtherPagesController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class OtherPagesController extends MyPluginAppController { @@ -243,8 +237,7 @@ class OtherPagesController extends MyPluginAppController { /** * TestDispatchPagesController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class TestDispatchPagesController extends AppController { @@ -286,8 +279,7 @@ class TestDispatchPagesController extends AppController { /** * ArticlesTestAppController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class ArticlesTestAppController extends AppController { } @@ -295,8 +287,7 @@ class ArticlesTestAppController extends AppController { /** * ArticlesTestController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class ArticlesTestController extends ArticlesTestAppController { @@ -337,8 +328,7 @@ class ArticlesTestController extends ArticlesTestAppController { /** * SomePostsController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class SomePostsController extends AppController { @@ -402,8 +392,7 @@ class SomePostsController extends AppController { /** * TestCachedPagesController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class TestCachedPagesController extends Controller { @@ -498,8 +487,7 @@ class TestCachedPagesController extends Controller { /** * TimesheetsController class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class TimesheetsController extends Controller { @@ -532,8 +520,7 @@ class TimesheetsController extends Controller { /** * DispatcherTest class * - * @package cake - * @subpackage cake.tests.cases + * @package cake.tests.cases */ class DispatcherTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/error/error_handler.test.php b/cake/tests/cases/libs/error/error_handler.test.php index c6f33d600..ee5e43bca 100644 --- a/cake/tests/cases/libs/error/error_handler.test.php +++ b/cake/tests/cases/libs/error/error_handler.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', array('ErrorHandler', 'Controller', 'Router')); /** * ErrorHandlerTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ErrorHandlerTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/error/exception_renderer.test.php b/cake/tests/cases/libs/error/exception_renderer.test.php index 4de432fb9..1bc7e8bf0 100644 --- a/cake/tests/cases/libs/error/exception_renderer.test.php +++ b/cake/tests/cases/libs/error/exception_renderer.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', array('ExceptionRenderer', 'Controller', 'Component')); /** * Short description for class. * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class AuthBlueberryUser extends CakeTestModel { @@ -48,8 +46,7 @@ class AuthBlueberryUser extends CakeTestModel { /** * BlueberryComponent class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class BlueberryComponent extends Component { @@ -75,8 +72,7 @@ class BlueberryComponent extends Component { /** * TestErrorController class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class TestErrorController extends Controller { @@ -121,8 +117,7 @@ class TestErrorController extends Controller { /** * MyCustomExceptionRenderer class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class MyCustomExceptionRenderer extends ExceptionRenderer { @@ -146,8 +141,7 @@ class MissingWidgetThingException extends NotFoundException { } /** * ExceptionRendererTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ExceptionRendererTest extends CakeTestCase { @@ -265,7 +259,7 @@ class ExceptionRendererTest extends CakeTestCase { $exception = new NotFoundException('Page not found'); $ExceptionRenderer = new ExceptionRenderer($exception); - $this->assertType('CakeErrorController', $ExceptionRenderer->controller); + $this->assertInstanceOf('CakeErrorController', $ExceptionRenderer->controller); $this->assertEquals('error400', $ExceptionRenderer->method); $this->assertEquals($exception, $ExceptionRenderer->error); } @@ -280,7 +274,7 @@ class ExceptionRendererTest extends CakeTestCase { $exception = new MissingActionException('Page not found'); $ExceptionRenderer = new ExceptionRenderer($exception); - $this->assertType('CakeErrorController', $ExceptionRenderer->controller); + $this->assertInstanceOf('CakeErrorController', $ExceptionRenderer->controller); $this->assertEquals('error400', $ExceptionRenderer->method); $this->assertEquals($exception, $ExceptionRenderer->error); } diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php index 2895deb88..d120ff8f3 100644 --- a/cake/tests/cases/libs/file.test.php +++ b/cake/tests/cases/libs/file.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'File'); /** * FileTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class FileTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php index 472385243..b30bfc616 100644 --- a/cake/tests/cases/libs/folder.test.php +++ b/cake/tests/cases/libs/folder.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'File'); /** * FolderTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class FolderTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/html_coverage_report.test.php b/cake/tests/cases/libs/html_coverage_report.test.php index 39f41fb60..90fe7f69a 100644 --- a/cake/tests/cases/libs/html_coverage_report.test.php +++ b/cake/tests/cases/libs/html_coverage_report.test.php @@ -13,7 +13,6 @@ * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project * @package cake - * @subpackage cake.cake * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/libs/http/basic_authentication.test.php b/cake/tests/cases/libs/http/basic_authentication.test.php index f886a6686..990ed0750 100644 --- a/cake/tests/cases/libs/http/basic_authentication.test.php +++ b/cake/tests/cases/libs/http/basic_authentication.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.http + * @package cake.tests.cases.libs.http * @since CakePHP(tm) v 2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ App::import('Lib', 'http/BasicAuthentication'); /** * BasicMethodTest class * - * @package cake - * @subpackage cake.tests.cases.libs.http + * @package cake.tests.cases.libs.http */ class BasicMethodTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/http/digest_authentication.test.php b/cake/tests/cases/libs/http/digest_authentication.test.php index 2166aee24..17832ce45 100644 --- a/cake/tests/cases/libs/http/digest_authentication.test.php +++ b/cake/tests/cases/libs/http/digest_authentication.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.http + * @package cake.tests.cases.libs.http * @since CakePHP(tm) v 2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -51,8 +50,7 @@ class DigestHttpSocket extends HttpSocket { /** * DigestAuthenticationTest class * - * @package cake - * @subpackage cake.tests.cases.libs.http + * @package cake.tests.cases.libs.http */ class DigestAuthenticationTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/http_response.test.php b/cake/tests/cases/libs/http_response.test.php index 5d1647ebf..9155bb8a3 100644 --- a/cake/tests/cases/libs/http_response.test.php +++ b/cake/tests/cases/libs/http_response.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'HttpResponse'); /** * TestHttpResponse class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class TestHttpResponse extends HttpResponse { @@ -83,8 +81,7 @@ class TestHttpResponse extends HttpResponse { /** * HttpResponseTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class HttpResponseTest extends CakeTestCase { /** diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php index cefd649e2..94de48389 100644 --- a/cake/tests/cases/libs/http_socket.test.php +++ b/cake/tests/cases/libs/http_socket.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,7 +22,7 @@ App::import('Core', 'HttpSocket'); * TestAuthentication class * * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class TestAuthentication { @@ -168,8 +167,7 @@ class TestHttpSocket extends HttpSocket { /** * HttpSocketTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class HttpSocketTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php index 1ca37bcb1..5fdf3a93a 100644 --- a/cake/tests/cases/libs/i18n.test.php +++ b/cake/tests/cases/libs/i18n.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'i18n'); /** * I18nTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class I18nTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php index 4d383c887..3c04e0363 100644 --- a/cake/tests/cases/libs/inflector.test.php +++ b/cake/tests/cases/libs/inflector.test.php @@ -15,7 +15,7 @@ * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing * @package cake.tests - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license Open Group Test Suite License (http://www.opensource.org/licenses/opengroup.php) */ @@ -30,7 +30,7 @@ App::import('Core', 'Inflector'); * Short description for class. * * @package cake.tests - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class InflectorTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php index a1b35aee1..dd7a5a79c 100644 --- a/cake/tests/cases/libs/l10n.test.php +++ b/cake/tests/cases/libs/l10n.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'l10n'); /** * L10nTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class L10nTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/log/file_log.test.php b/cake/tests/cases/libs/log/file_log.test.php index f07ab9771..d861426b3 100644 --- a/cake/tests/cases/libs/log/file_log.test.php +++ b/cake/tests/cases/libs/log/file_log.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.log + * @package cake.tests.cases.libs.log * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'log/FileLog'); /** * CakeLogTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class FileLogTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php index e871a541d..80586925b 100644 --- a/cake/tests/cases/libs/magic_db.test.php +++ b/cake/tests/cases/libs/magic_db.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ if (!class_exists('MagicDb')) { /** * The test class for the MagicDb class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class MagicDbTest extends UnitTestCase { /** @@ -144,14 +142,12 @@ class MagicDbTest extends UnitTestCase { /** * Test data holding object for MagicDb tests * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ /** * MagicDbTestData class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class MagicDbTestData extends Object { /** diff --git a/cake/tests/cases/libs/model/behavior_collection.test.php b/cake/tests/cases/libs/model/behavior_collection.test.php index 27c71e2f9..efe549297 100644 --- a/cake/tests/cases/libs/model/behavior_collection.test.php +++ b/cake/tests/cases/libs/model/behavior_collection.test.php @@ -14,8 +14,7 @@ * * @copyright CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ require_once dirname(__FILE__) . DS . 'models.php'; /** * TestBehavior class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TestBehavior extends ModelBehavior { @@ -340,8 +338,7 @@ class TestBehavior extends ModelBehavior { /** * Test2Behavior class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Test2Behavior extends TestBehavior{ } @@ -349,8 +346,7 @@ class Test2Behavior extends TestBehavior{ /** * Test3Behavior class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Test3Behavior extends TestBehavior{ } @@ -358,8 +354,7 @@ class Test3Behavior extends TestBehavior{ /** * Test4Behavior class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Test4Behavior extends ModelBehavior{ function setup($model, $config = null) { @@ -372,8 +367,7 @@ class Test4Behavior extends ModelBehavior{ /** * Test5Behavior class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Test5Behavior extends ModelBehavior{ function setup($model, $config = null) { @@ -386,8 +380,7 @@ class Test5Behavior extends ModelBehavior{ /** * Test6Behavior class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Test6Behavior extends ModelBehavior{ function setup($model, $config = null) { @@ -400,8 +393,7 @@ class Test6Behavior extends ModelBehavior{ /** * Test7Behavior class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Test7Behavior extends ModelBehavior{ function setup($model, $config = null) { @@ -414,8 +406,7 @@ class Test7Behavior extends ModelBehavior{ /** * BehaviorCollection class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class BehaviorCollectionTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php index a7705dcd9..e3ec6daf9 100644 --- a/cake/tests/cases/libs/model/behaviors/acl.test.php +++ b/cake/tests/cases/libs/model/behaviors/acl.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs.tests.model.behaviors.acl + * @package cake.libs.tests.model.behaviors.acl * @since CakePHP v 1.2.0.4487 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,7 +25,7 @@ App::import('Core', 'db_acl'); * Test Person class - self joined model * * @package cake -* @subpackage cake.tests.cases.libs.model.behaviors +* @package cake.tests.cases.libs.model.behaviors */ class AclPerson extends CakeTestModel { @@ -106,7 +105,7 @@ class AclPerson extends CakeTestModel { * AclUser class * * @package cake -* @subpackage cake.tests.cases.libs.model.behaviors +* @package cake.tests.cases.libs.model.behaviors */ class AclUser extends CakeTestModel { @@ -147,7 +146,7 @@ class AclUser extends CakeTestModel { * AclPost class * * @package cake -* @subpackage cake.tests.cases.libs.model.behaviors +* @package cake.tests.cases.libs.model.behaviors */ class AclPost extends CakeTestModel { @@ -188,7 +187,7 @@ class AclPost extends CakeTestModel { * AclBehaviorTest class * * @package cake -* @subpackage cake.tests.cases.libs.controller.components +* @package cake.tests.cases.libs.controller.components */ class AclBehaviorTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php index b5dbabe52..9b6e223f5 100644 --- a/cake/tests/cases/libs/model/behaviors/containable.test.php +++ b/cake/tests/cases/libs/model/behaviors/containable.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php'); /** * ContainableTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors */ class ContainableBehaviorTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php index ee13fe3bb..24f39807d 100644 --- a/cake/tests/cases/libs/model/behaviors/translate.test.php +++ b/cake/tests/cases/libs/model/behaviors/translate.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php'); /** * TranslateBehaviorTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors */ class TranslateBehaviorTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php index 75375459f..96e4e174d 100644 --- a/cake/tests/cases/libs/model/behaviors/tree.test.php +++ b/cake/tests/cases/libs/model/behaviors/tree.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors * @since CakePHP(tm) v 1.2.0.5330 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ require_once(dirname(dirname(__FILE__)) . DS . 'models.php'); /** * NumberTreeTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors */ class NumberTreeTest extends CakeTestCase { @@ -1279,8 +1277,7 @@ class NumberTreeTest extends CakeTestCase { /** * ScopedTreeTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors */ class ScopedTreeTest extends CakeTestCase { @@ -1580,8 +1577,7 @@ class ScopedTreeTest extends CakeTestCase { /** * AfterTreeTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors */ class AfterTreeTest extends CakeTestCase { @@ -1636,8 +1632,7 @@ class AfterTreeTest extends CakeTestCase { /** * UuidTreeTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.behaviors + * @package cake.tests.cases.libs.model.behaviors */ class UuidTreeTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php index ff5c8ffdd..62050194d 100644 --- a/cake/tests/cases/libs/model/cake_schema.test.php +++ b/cake/tests/cases/libs/model/cake_schema.test.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5550 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Model', 'CakeSchema', false); /** * Test for Schema database management * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class MyAppSchema extends CakeSchema { @@ -125,8 +123,7 @@ class MyAppSchema extends CakeSchema { /** * TestAppSchema class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TestAppSchema extends CakeSchema { @@ -239,8 +236,7 @@ class TestAppSchema extends CakeSchema { /** * SchmeaPost class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SchemaPost extends CakeTestModel { @@ -280,8 +276,7 @@ class SchemaPost extends CakeTestModel { /** * SchemaComment class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SchemaComment extends CakeTestModel { @@ -313,8 +308,7 @@ class SchemaComment extends CakeTestModel { /** * SchemaTag class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SchemaTag extends CakeTestModel { @@ -346,8 +340,7 @@ class SchemaTag extends CakeTestModel { /** * SchemaDatatype class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SchemaDatatype extends CakeTestModel { @@ -377,7 +370,7 @@ class SchemaDatatype extends CakeTestModel { * * @uses CakeTestModel * @package - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Testdescribe extends CakeTestModel { @@ -393,8 +386,7 @@ class Testdescribe extends CakeTestModel { /** * SchemaCrossDatabase class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SchemaCrossDatabase extends CakeTestModel { @@ -426,8 +418,7 @@ class SchemaCrossDatabase extends CakeTestModel { /** * SchemaCrossDatabaseFixture class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SchemaCrossDatabaseFixture extends CakeTestFixture { @@ -472,8 +463,7 @@ class SchemaCrossDatabaseFixture extends CakeTestFixture { /** * SchemaPrefixAuthUser class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SchemaPrefixAuthUser extends CakeTestModel { /** @@ -499,8 +489,7 @@ class SchemaPrefixAuthUser extends CakeTestModel { /** * CakeSchemaTest * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CakeSchemaTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php index 04212fa4a..54f022963 100644 --- a/cake/tests/cases/libs/model/connection_manager.test.php +++ b/cake/tests/cases/libs/model/connection_manager.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5550 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'ConnectionManager'); /** * ConnectionManagerTest * - * @package cake - * @subpackage cake.tests.cases.models + * @package cake.tests.cases.models */ class ConnectionManagerTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php index 8ea86d221..1b25e9435 100644 --- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,8 +25,7 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_mssql.php'; /** * DboMssqlTestDb class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources.dbo + * @package cake.tests.cases.libs.model.datasources.dbo */ class DboMssqlTestDb extends DboMssql { @@ -130,8 +128,7 @@ class DboMssqlTestDb extends DboMssql { /** * MssqlTestModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class MssqlTestModel extends Model { @@ -232,8 +229,7 @@ class MssqlTestModel extends Model { /** * MssqlClientTestModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class MssqlClientTestModel extends Model { /** @@ -267,8 +263,7 @@ class MssqlClientTestModel extends Model { /** * DboMssqlTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources.dbo + * @package cake.tests.cases.libs.model.datasources.dbo */ class DboMssqlTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php index bd29b5d39..1e4c0ed93 100644 --- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php'; /** * DboMysqlTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources.dbo + * @package cake.tests.cases.libs.model.datasources.dbo */ class DboMysqlTest extends CakeTestCase { /** diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php index 3efa451bd..592b1eac0 100644 --- a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo' . DS . 'dbo_oracle /** * DboOracleTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources.dbo + * @package cake.tests.cases.libs.model.datasources.dbo */ class DboOracleTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php index c71836f5d..35b465f63 100644 --- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php'; /** * DboPostgresTestDb class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class DboPostgresTestDb extends DboPostgres { @@ -63,8 +61,7 @@ class DboPostgresTestDb extends DboPostgres { /** * PostgresTestModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class PostgresTestModel extends Model { @@ -157,8 +154,7 @@ class PostgresTestModel extends Model { /** * PostgresClientTestModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class PostgresClientTestModel extends Model { @@ -198,8 +194,7 @@ class PostgresClientTestModel extends Model { /** * DboPostgresTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources.dbo + * @package cake.tests.cases.libs.model.datasources.dbo */ class DboPostgresTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php index b42b6209a..a1fc1cd4a 100644 --- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs + * @package cake.libs * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboSqlite')); /** * DboSqliteTestDb class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class DboSqliteTestDb extends DboSqlite { @@ -61,8 +59,7 @@ class DboSqliteTestDb extends DboSqlite { /** * DboSqliteTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources.dbo + * @package cake.tests.cases.libs.model.datasources.dbo */ class DboSqliteTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php index fa5edf6c6..66b4a9cc1 100644 --- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** * DboSourceTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class DboSourceTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php index fb0a9f3f3..537f2f361 100644 --- a/cake/tests/cases/libs/model/db_acl.test.php +++ b/cake/tests/cases/libs/model/db_acl.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.controller.components.dbacl.models + * @package cake.tests.cases.libs.controller.components.dbacl.models * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'db_acl'); /** * DB ACL wrapper test class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class DbAclNodeTestBase extends AclNode { @@ -48,8 +46,7 @@ class DbAclNodeTestBase extends AclNode { /** * Aro Test Wrapper * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class DbAroTest extends DbAclNodeTestBase { @@ -81,8 +78,7 @@ class DbAroTest extends DbAclNodeTestBase { /** * Aco Test Wrapper * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class DbAcoTest extends DbAclNodeTestBase { @@ -114,8 +110,7 @@ class DbAcoTest extends DbAclNodeTestBase { /** * Permission Test Wrapper * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class DbPermissionTest extends CakeTestModel { @@ -155,8 +150,7 @@ class DbPermissionTest extends CakeTestModel { /** * DboActionTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class DbAcoActionTest extends CakeTestModel { @@ -188,8 +182,7 @@ class DbAcoActionTest extends CakeTestModel { /** * DbAroUserTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class DbAroUserTest extends CakeTestModel { @@ -227,8 +220,7 @@ class DbAroUserTest extends CakeTestModel { /** * TestDbAcl class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components + * @package cake.tests.cases.libs.controller.components */ class TestDbAcl extends DbAcl { @@ -249,8 +241,7 @@ class TestDbAcl extends DbAcl { /** * AclNodeTest class * - * @package cake - * @subpackage cake.tests.cases.libs.controller.components.dbacl.models + * @package cake.tests.cases.libs.controller.components.dbacl.models */ class AclNodeTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php index 9809b3a0d..3fa31afd6 100644 --- a/cake/tests/cases/libs/model/model.test.php +++ b/cake/tests/cases/libs/model/model.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); /** * ModelBaseTest * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ abstract class BaseModelTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php index e61865e57..ae4045743 100644 --- a/cake/tests/cases/libs/model/model_delete.test.php +++ b/cake/tests/cases/libs/model/model_delete.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php'; /** * ModelDeleteTest * - * @package cake - * @subpackage cake.tests.cases.libs.model.operations + * @package cake.tests.cases.libs.model.operations */ class ModelDeleteTest extends BaseModelTest { diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php index a8b5a6796..fdd410bde 100644 --- a/cake/tests/cases/libs/model/model_integration.test.php +++ b/cake/tests/cases/libs/model/model_integration.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -45,8 +44,7 @@ class DboMock extends DboSource { /** * ModelIntegrationTest * - * @package cake - * @subpackage cake.tests.cases.libs.model.operations + * @package cake.tests.cases.libs.model.operations */ class ModelIntegrationTest extends BaseModelTest { @@ -61,27 +59,27 @@ class ModelIntegrationTest extends BaseModelTest { $Article = new ArticleFeatured(); $this->assertTrue(isset($Article->belongsTo['User'])); $this->assertFalse(property_exists($Article, 'User')); - $this->assertType('User', $Article->User); + $this->assertInstanceOf('User', $Article->User); $this->assertTrue(isset($Article->belongsTo['Category'])); $this->assertFalse(property_exists($Article, 'Category')); $this->assertTrue(isset($Article->Category)); - $this->assertType('Category', $Article->Category); + $this->assertInstanceOf('Category', $Article->Category); $this->assertTrue(isset($Article->hasMany['Comment'])); $this->assertFalse(property_exists($Article, 'Comment')); $this->assertTrue(isset($Article->Comment)); - $this->assertType('Comment', $Article->Comment); + $this->assertInstanceOf('Comment', $Article->Comment); $this->assertTrue(isset($Article->hasAndBelongsToMany['Tag'])); //There was not enough information to setup the association (joinTable and associationForeignKey) //so the model was not lazy loaded $this->assertTrue(property_exists($Article, 'Tag')); $this->assertTrue(isset($Article->Tag)); - $this->assertType('Tag', $Article->Tag); + $this->assertInstanceOf('Tag', $Article->Tag); $this->assertFalse(property_exists($Article, 'ArticleFeaturedsTag')); - $this->assertType('AppModel', $Article->ArticleFeaturedsTag); + $this->assertInstanceOf('AppModel', $Article->ArticleFeaturedsTag); $this->assertEquals($Article->hasAndBelongsToMany['Tag']['joinTable'], 'article_featureds_tags'); $this->assertEquals($Article->hasAndBelongsToMany['Tag']['associationForeignKey'], 'tag_id'); } @@ -97,10 +95,10 @@ class ModelIntegrationTest extends BaseModelTest { $Article = new ArticleB(); $this->assertTrue(isset($Article->hasAndBelongsToMany['TagB'])); $this->assertFalse(property_exists($Article, 'TagB')); - $this->assertType('TagB', $Article->TagB); + $this->assertInstanceOf('TagB', $Article->TagB); $this->assertFalse(property_exists($Article, 'ArticlesTag')); - $this->assertType('AppModel', $Article->ArticlesTag); + $this->assertInstanceOf('AppModel', $Article->ArticlesTag); $UuidTag = new UuidTag(); $this->assertTrue(isset($UuidTag->hasAndBelongsToMany['Fruit'])); @@ -110,7 +108,7 @@ class ModelIntegrationTest extends BaseModelTest { $this->assertFalse(property_exists($UuidTag, 'FruitsUuidTag')); $this->assertTrue(isset($UuidTag->FruitsUuidTag)); - $this->assertType('FruitsUuidTag', $UuidTag->FruitsUuidTag); + $this->assertInstanceOf('FruitsUuidTag', $UuidTag->FruitsUuidTag); } /** @@ -129,7 +127,7 @@ class ModelIntegrationTest extends BaseModelTest { $Article->bindModel(array('belongsTo' => array('User'))); $this->assertTrue(isset($Article->belongsTo['User'])); $this->assertFalse(property_exists($Article, 'User')); - $this->assertType('User', $Article->User); + $this->assertInstanceOf('User', $Article->User); } /** diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php index 93808578c..5be36aaf3 100755 --- a/cake/tests/cases/libs/model/model_read.test.php +++ b/cake/tests/cases/libs/model/model_read.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php'; /** * ModelReadTest * - * @package cake - * @subpackage cake.tests.cases.libs.model.operations + * @package cake.tests.cases.libs.model.operations */ class ModelReadTest extends BaseModelTest { diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php index d921618c0..0da3c18e9 100644 --- a/cake/tests/cases/libs/model/model_validation.test.php +++ b/cake/tests/cases/libs/model/model_validation.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php'; /** * ModelValidationTest * - * @package cake - * @subpackage cake.tests.cases.libs.model.operations + * @package cake.tests.cases.libs.model.operations */ class ModelValidationTest extends BaseModelTest { diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index c726ea47f..44a6585c6 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ require_once dirname(__FILE__) . DS . 'model.test.php'; /** * ModelWriteTest * - * @package cake - * @subpackage cake.tests.cases.libs.model.operations + * @package cake.tests.cases.libs.model.operations */ class ModelWriteTest extends BaseModelTest { diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php index b116962b0..6c61254fb 100644 --- a/cake/tests/cases/libs/model/models.php +++ b/cake/tests/cases/libs/model/models.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.6464 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); /** * Test class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Test extends CakeTestModel { @@ -65,8 +63,7 @@ class Test extends CakeTestModel { /** * TestAlias class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TestAlias extends CakeTestModel { @@ -113,8 +110,7 @@ class TestAlias extends CakeTestModel { /** * TestValidate class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TestValidate extends CakeTestModel { @@ -178,8 +174,7 @@ class TestValidate extends CakeTestModel { /** * User class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class User extends CakeTestModel { @@ -203,8 +198,7 @@ class User extends CakeTestModel { /** * Article class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Article extends CakeTestModel { @@ -302,8 +296,7 @@ class BeforeDeleteComment extends CakeTestModel { /** * NumericArticle class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class NumericArticle extends CakeTestModel { @@ -327,8 +320,7 @@ class NumericArticle extends CakeTestModel { /** * Article10 class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Article10 extends CakeTestModel { @@ -360,8 +352,7 @@ class Article10 extends CakeTestModel { /** * ArticleFeatured class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ArticleFeatured extends CakeTestModel { @@ -417,8 +408,7 @@ class ArticleFeatured extends CakeTestModel { /** * Featured class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Featured extends CakeTestModel { @@ -442,8 +432,7 @@ class Featured extends CakeTestModel { /** * Tag class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Tag extends CakeTestModel { @@ -459,8 +448,7 @@ class Tag extends CakeTestModel { /** * ArticlesTag class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ArticlesTag extends CakeTestModel { @@ -476,8 +464,7 @@ class ArticlesTag extends CakeTestModel { /** * ArticleFeaturedsTag class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ArticleFeaturedsTag extends CakeTestModel { @@ -493,8 +480,7 @@ class ArticleFeaturedsTag extends CakeTestModel { /** * Comment class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Comment extends CakeTestModel { @@ -526,8 +512,7 @@ class Comment extends CakeTestModel { /** * Modified Comment Class has afterFind Callback * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ModifiedComment extends CakeTestModel { @@ -571,8 +556,7 @@ class ModifiedComment extends CakeTestModel { /** * Modified Comment Class has afterFind Callback * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class AgainModifiedComment extends CakeTestModel { @@ -616,8 +600,7 @@ class AgainModifiedComment extends CakeTestModel { /** * MergeVarPluginAppModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MergeVarPluginAppModel extends AppModel { @@ -634,8 +617,7 @@ class MergeVarPluginAppModel extends AppModel { /** * MergeVarPluginPost class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MergeVarPluginPost extends MergeVarPluginAppModel { @@ -659,8 +641,7 @@ class MergeVarPluginPost extends MergeVarPluginAppModel { /** * MergeVarPluginComment class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MergeVarPluginComment extends MergeVarPluginAppModel { @@ -685,8 +666,7 @@ class MergeVarPluginComment extends MergeVarPluginAppModel { /** * Attachment class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Attachment extends CakeTestModel { @@ -702,8 +682,7 @@ class Attachment extends CakeTestModel { /** * Category class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Category extends CakeTestModel { @@ -719,8 +698,7 @@ class Category extends CakeTestModel { /** * CategoryThread class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class CategoryThread extends CakeTestModel { @@ -744,8 +722,7 @@ class CategoryThread extends CakeTestModel { /** * Apple class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Apple extends CakeTestModel { @@ -793,8 +770,7 @@ class Apple extends CakeTestModel { /** * Sample class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Sample extends CakeTestModel { @@ -818,8 +794,7 @@ class Sample extends CakeTestModel { /** * AnotherArticle class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class AnotherArticle extends CakeTestModel { @@ -843,8 +818,7 @@ class AnotherArticle extends CakeTestModel { /** * Advertisement class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Advertisement extends CakeTestModel { @@ -868,8 +842,7 @@ class Advertisement extends CakeTestModel { /** * Home class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Home extends CakeTestModel { @@ -893,8 +866,7 @@ class Home extends CakeTestModel { /** * Post class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Post extends CakeTestModel { @@ -930,8 +902,7 @@ class Post extends CakeTestModel { /** * Author class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Author extends CakeTestModel { @@ -967,8 +938,7 @@ class Author extends CakeTestModel { /** * ModifiedAuthor class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ModifiedAuthor extends Author { @@ -998,8 +968,7 @@ class ModifiedAuthor extends Author { /** * Project class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Project extends CakeTestModel { @@ -1023,8 +992,7 @@ class Project extends CakeTestModel { /** * Thread class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Thread extends CakeTestModel { @@ -1056,8 +1024,7 @@ class Thread extends CakeTestModel { /** * Message class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Message extends CakeTestModel { @@ -1081,8 +1048,7 @@ class Message extends CakeTestModel { /** * Bid class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Bid extends CakeTestModel { @@ -1106,8 +1072,7 @@ class Bid extends CakeTestModel { /** * NodeAfterFind class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class NodeAfterFind extends CakeTestModel { @@ -1174,8 +1139,7 @@ class NodeAfterFind extends CakeTestModel { /** * NodeAfterFindSample class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class NodeAfterFindSample extends CakeTestModel { @@ -1207,8 +1171,7 @@ class NodeAfterFindSample extends CakeTestModel { /** * NodeNoAfterFind class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class NodeNoAfterFind extends CakeTestModel { @@ -1264,8 +1227,7 @@ class NodeNoAfterFind extends CakeTestModel { /** * Node class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Node extends CakeTestModel{ @@ -1297,8 +1259,7 @@ class Node extends CakeTestModel{ /** * Dependency class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Dependency extends CakeTestModel { @@ -1314,8 +1275,7 @@ class Dependency extends CakeTestModel { /** * ModelA class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ModelA extends CakeTestModel { @@ -1347,8 +1307,7 @@ class ModelA extends CakeTestModel { /** * ModelB class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ModelB extends CakeTestModel { @@ -1380,8 +1339,7 @@ class ModelB extends CakeTestModel { /** * ModelC class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ModelC extends CakeTestModel { @@ -1413,8 +1371,7 @@ class ModelC extends CakeTestModel { /** * ModelD class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ModelD extends CakeTestModel { @@ -1438,8 +1395,7 @@ class ModelD extends CakeTestModel { /** * Something class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Something extends CakeTestModel { @@ -1463,8 +1419,7 @@ class Something extends CakeTestModel { /** * SomethingElse class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SomethingElse extends CakeTestModel { @@ -1488,8 +1443,7 @@ class SomethingElse extends CakeTestModel { /** * JoinThing class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class JoinThing extends CakeTestModel { @@ -1513,8 +1467,7 @@ class JoinThing extends CakeTestModel { /** * Portfolio class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Portfolio extends CakeTestModel { @@ -1538,8 +1491,7 @@ class Portfolio extends CakeTestModel { /** * Item class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Item extends CakeTestModel { @@ -1571,8 +1523,7 @@ class Item extends CakeTestModel { /** * ItemsPortfolio class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ItemsPortfolio extends CakeTestModel { @@ -1588,8 +1539,7 @@ class ItemsPortfolio extends CakeTestModel { /** * Syfile class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Syfile extends CakeTestModel { @@ -1613,8 +1563,7 @@ class Syfile extends CakeTestModel { /** * Image class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Image extends CakeTestModel { @@ -1630,8 +1579,7 @@ class Image extends CakeTestModel { /** * DeviceType class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class DeviceType extends CakeTestModel { @@ -1675,8 +1623,7 @@ class DeviceType extends CakeTestModel { /** * DeviceTypeCategory class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class DeviceTypeCategory extends CakeTestModel { @@ -1692,8 +1639,7 @@ class DeviceTypeCategory extends CakeTestModel { /** * FeatureSet class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class FeatureSet extends CakeTestModel { @@ -1709,8 +1655,7 @@ class FeatureSet extends CakeTestModel { /** * ExteriorTypeCategory class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ExteriorTypeCategory extends CakeTestModel { @@ -1734,8 +1679,7 @@ class ExteriorTypeCategory extends CakeTestModel { /** * Document class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Document extends CakeTestModel { @@ -1759,8 +1703,7 @@ class Document extends CakeTestModel { /** * Device class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Device extends CakeTestModel { @@ -1776,8 +1719,7 @@ class Device extends CakeTestModel { /** * DocumentDirectory class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class DocumentDirectory extends CakeTestModel { @@ -1793,8 +1735,7 @@ class DocumentDirectory extends CakeTestModel { /** * PrimaryModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class PrimaryModel extends CakeTestModel { @@ -1810,8 +1751,7 @@ class PrimaryModel extends CakeTestModel { /** * SecondaryModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class SecondaryModel extends CakeTestModel { @@ -1827,8 +1767,7 @@ class SecondaryModel extends CakeTestModel { /** * JoinA class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class JoinA extends CakeTestModel { @@ -1852,8 +1791,7 @@ class JoinA extends CakeTestModel { /** * JoinB class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class JoinB extends CakeTestModel { @@ -1877,8 +1815,7 @@ class JoinB extends CakeTestModel { /** * JoinC class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class JoinC extends CakeTestModel { @@ -1902,8 +1839,7 @@ class JoinC extends CakeTestModel { /** * ThePaper class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ThePaper extends CakeTestModel { @@ -1943,8 +1879,7 @@ class ThePaper extends CakeTestModel { /** * Monkey class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Monkey extends CakeTestModel { @@ -1968,8 +1903,7 @@ class Monkey extends CakeTestModel { /** * AssociationTest1 class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class AssociationTest1 extends CakeTestModel { @@ -2003,8 +1937,7 @@ class AssociationTest1 extends CakeTestModel { /** * AssociationTest2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class AssociationTest2 extends CakeTestModel { @@ -2038,8 +1971,7 @@ class AssociationTest2 extends CakeTestModel { /** * Callback class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Callback extends CakeTestModel { @@ -2047,8 +1979,7 @@ class Callback extends CakeTestModel { /** * CallbackPostTestModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class CallbackPostTestModel extends CakeTestModel { public $useTable = 'posts'; @@ -2099,8 +2030,7 @@ class CallbackPostTestModel extends CakeTestModel { /** * Uuid class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Uuid extends CakeTestModel { @@ -2116,8 +2046,7 @@ class Uuid extends CakeTestModel { /** * DataTest class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class DataTest extends CakeTestModel { @@ -2133,8 +2062,7 @@ class DataTest extends CakeTestModel { /** * TheVoid class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TheVoid extends CakeTestModel { @@ -2158,8 +2086,7 @@ class TheVoid extends CakeTestModel { /** * ValidationTest1 class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ValidationTest1 extends CakeTestModel { @@ -2250,8 +2177,7 @@ class ValidationTest1 extends CakeTestModel { /** * ValidationTest2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ValidationTest2 extends CakeTestModel { @@ -2312,8 +2238,7 @@ class ValidationTest2 extends CakeTestModel { /** * Person class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Person extends CakeTestModel { @@ -2343,8 +2268,7 @@ class Person extends CakeTestModel { /** * UnderscoreField class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class UnderscoreField extends CakeTestModel { @@ -2360,8 +2284,7 @@ class UnderscoreField extends CakeTestModel { /** * Product class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Product extends CakeTestModel { @@ -2377,8 +2300,7 @@ class Product extends CakeTestModel { /** * Story class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Story extends CakeTestModel { @@ -2418,8 +2340,7 @@ class Story extends CakeTestModel { /** * Cd class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Cd extends CakeTestModel { @@ -2443,8 +2364,7 @@ class Cd extends CakeTestModel { /** * Book class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Book extends CakeTestModel { @@ -2468,8 +2388,7 @@ class Book extends CakeTestModel { /** * OverallFavorite class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class OverallFavorite extends CakeTestModel { @@ -2485,8 +2404,7 @@ class OverallFavorite extends CakeTestModel { /** * MyUser class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MyUser extends CakeTestModel { @@ -2510,8 +2428,7 @@ class MyUser extends CakeTestModel { /** * MyCategory class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MyCategory extends CakeTestModel { @@ -2535,8 +2452,7 @@ class MyCategory extends CakeTestModel { /** * MyProduct class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MyProduct extends CakeTestModel { @@ -2560,8 +2476,7 @@ class MyProduct extends CakeTestModel { /** * MyCategoriesMyUser class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MyCategoriesMyUser extends CakeTestModel { @@ -2577,8 +2492,7 @@ class MyCategoriesMyUser extends CakeTestModel { /** * MyCategoriesMyProduct class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class MyCategoriesMyProduct extends CakeTestModel { @@ -2595,8 +2509,7 @@ class MyCategoriesMyProduct extends CakeTestModel { /** * NumberTree class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class NumberTree extends CakeTestModel { @@ -2662,8 +2575,7 @@ class NumberTree extends CakeTestModel { /** * NumberTreeTwo class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class NumberTreeTwo extends NumberTree { @@ -2687,8 +2599,7 @@ class NumberTreeTwo extends NumberTree { /** * FlagTree class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class FlagTree extends NumberTree { @@ -2704,8 +2615,7 @@ class FlagTree extends NumberTree { /** * UnconventionalTree class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class UnconventionalTree extends NumberTree { @@ -2728,8 +2638,7 @@ class UnconventionalTree extends NumberTree { /** * UuidTree class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class UuidTree extends NumberTree { @@ -2745,8 +2654,7 @@ class UuidTree extends NumberTree { /** * Campaign class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Campaign extends CakeTestModel { @@ -2770,8 +2678,7 @@ class Campaign extends CakeTestModel { /** * Ad class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Ad extends CakeTestModel { @@ -2803,8 +2710,7 @@ class Ad extends CakeTestModel { /** * AfterTree class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class AfterTree extends NumberTree { @@ -2834,8 +2740,7 @@ class AfterTree extends NumberTree { /** * Nonconformant Content class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Content extends CakeTestModel { @@ -2875,8 +2780,7 @@ class Content extends CakeTestModel { /** * Nonconformant Account class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Account extends CakeTestModel { @@ -2908,8 +2812,7 @@ class Account extends CakeTestModel { /** * Nonconformant ContentAccount class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class ContentAccount extends CakeTestModel { @@ -2941,8 +2844,7 @@ class ContentAccount extends CakeTestModel { /** * FilmFile class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class FilmFile extends CakeTestModel { public $name = 'FilmFile'; @@ -2951,8 +2853,7 @@ class FilmFile extends CakeTestModel { /** * Basket test model * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Basket extends CakeTestModel { public $name = 'Basket'; @@ -2971,8 +2872,7 @@ class Basket extends CakeTestModel { /** * TestPluginArticle class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TestPluginArticle extends CakeTestModel { @@ -3010,8 +2910,7 @@ class TestPluginArticle extends CakeTestModel { /** * TestPluginComment class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TestPluginComment extends CakeTestModel { @@ -3041,8 +2940,7 @@ class TestPluginComment extends CakeTestModel { /** * Uuidportfolio class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Uuidportfolio extends CakeTestModel { @@ -3066,8 +2964,7 @@ class Uuidportfolio extends CakeTestModel { /** * Uuiditem class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class Uuiditem extends CakeTestModel { @@ -3092,8 +2989,7 @@ class Uuiditem extends CakeTestModel { /** * UuiditemsPortfolio class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class UuiditemsUuidportfolio extends CakeTestModel { @@ -3109,8 +3005,7 @@ class UuiditemsUuidportfolio extends CakeTestModel { /** * UuiditemsPortfolioNumericid class * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class UuiditemsUuidportfolioNumericid extends CakeTestModel { @@ -3126,8 +3021,7 @@ class UuiditemsUuidportfolioNumericid extends CakeTestModel { /** * TranslateTestModel class. * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TranslateTestModel extends CakeTestModel { @@ -3159,8 +3053,7 @@ class TranslateTestModel extends CakeTestModel { /** * TranslateTestModel class. * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TranslateWithPrefix extends CakeTestModel { /** @@ -3188,8 +3081,7 @@ class TranslateWithPrefix extends CakeTestModel { /** * TranslatedItem class. * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TranslatedItem extends CakeTestModel { @@ -3229,8 +3121,7 @@ class TranslatedItem extends CakeTestModel { /** * TranslatedItem class. * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TranslatedItem2 extends CakeTestModel { /** @@ -3265,8 +3156,7 @@ class TranslatedItem2 extends CakeTestModel { /** * TranslatedItemWithTable class. * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TranslatedItemWithTable extends CakeTestModel { @@ -3322,8 +3212,7 @@ class TranslatedItemWithTable extends CakeTestModel { /** * TranslateArticleModel class. * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TranslateArticleModel extends CakeTestModel { @@ -3355,8 +3244,7 @@ class TranslateArticleModel extends CakeTestModel { /** * TranslatedArticle class. * - * @package cake - * @subpackage cake.tests.cases.libs.model + * @package cake.tests.cases.libs.model */ class TranslatedArticle extends CakeTestModel { @@ -3564,8 +3452,7 @@ class TransactionTestModel extends CakeTestModel { /** * TestModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel extends CakeTestModel { @@ -3644,8 +3531,7 @@ class TestModel extends CakeTestModel { /** * TestModel2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel2 extends CakeTestModel { @@ -3669,8 +3555,7 @@ class TestModel2 extends CakeTestModel { /** * TestModel4 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel3 extends CakeTestModel { @@ -3694,8 +3579,7 @@ class TestModel3 extends CakeTestModel { /** * TestModel4 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel4 extends CakeTestModel { @@ -3785,8 +3669,7 @@ class TestModel4 extends CakeTestModel { /** * TestModel4TestModel7 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel4TestModel7 extends CakeTestModel { @@ -3834,8 +3717,7 @@ class TestModel4TestModel7 extends CakeTestModel { /** * TestModel5 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel5 extends CakeTestModel { @@ -3908,8 +3790,7 @@ class TestModel5 extends CakeTestModel { /** * TestModel6 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel6 extends CakeTestModel { @@ -3971,8 +3852,7 @@ class TestModel6 extends CakeTestModel { /** * TestModel7 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel7 extends CakeTestModel { @@ -4022,8 +3902,7 @@ class TestModel7 extends CakeTestModel { /** * TestModel8 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel8 extends CakeTestModel { @@ -4088,8 +3967,7 @@ class TestModel8 extends CakeTestModel { /** * TestModel9 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class TestModel9 extends CakeTestModel { @@ -4152,8 +4030,7 @@ class TestModel9 extends CakeTestModel { /** * Level class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class Level extends CakeTestModel { @@ -4216,8 +4093,7 @@ class Level extends CakeTestModel { /** * Group class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class Group extends CakeTestModel { @@ -4283,8 +4159,7 @@ class Group extends CakeTestModel { /** * User2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class User2 extends CakeTestModel { @@ -4361,8 +4236,7 @@ class User2 extends CakeTestModel { /** * Category2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class Category2 extends CakeTestModel { @@ -4450,8 +4324,7 @@ class Category2 extends CakeTestModel { /** * Article2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class Article2 extends CakeTestModel { @@ -4527,8 +4400,7 @@ class Article2 extends CakeTestModel { /** * CategoryFeatured2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class CategoryFeatured2 extends CakeTestModel { @@ -4579,8 +4451,7 @@ class CategoryFeatured2 extends CakeTestModel { /** * Featured2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class Featured2 extends CakeTestModel { @@ -4642,8 +4513,7 @@ class Featured2 extends CakeTestModel { /** * Comment2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class Comment2 extends CakeTestModel { @@ -4701,8 +4571,7 @@ class Comment2 extends CakeTestModel { /** * ArticleFeatured2 class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class ArticleFeatured2 extends CakeTestModel { @@ -4788,8 +4657,7 @@ class ArticleFeatured2 extends CakeTestModel { /** * MysqlTestModel class * - * @package cake - * @subpackage cake.tests.cases.libs.model.datasources + * @package cake.tests.cases.libs.model.datasources */ class MysqlTestModel extends Model { diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php index 9ec3538ea..f9998cdf9 100644 --- a/cake/tests/cases/libs/multibyte.test.php +++ b/cake/tests/cases/libs/multibyte.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.6833 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Multibyte'); /** * MultibyteTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class MultibyteTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php index a371cf9f2..45126a053 100644 --- a/cake/tests/cases/libs/object.test.php +++ b/cake/tests/cases/libs/object.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', array('Object', 'Controller', 'Model')); /** * RequestActionPost class * - * @package cake - * @subpackage cake.tests.cases.libs.object + * @package cake.tests.cases.libs.object */ class RequestActionPost extends CakeTestModel { @@ -47,8 +45,7 @@ class RequestActionPost extends CakeTestModel { /** * RequestActionController class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RequestActionController extends Controller { @@ -134,8 +131,7 @@ class RequestActionController extends Controller { /** * RequestActionPersistentController class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RequestActionPersistentController extends Controller { @@ -168,8 +164,7 @@ class RequestActionPersistentController extends Controller { /** * TestObject class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class TestObject extends Object { @@ -319,8 +314,7 @@ class TestObject extends Object { /** * ObjectTestModel class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ObjectTestModel extends CakeTestModel { public $useTable = false; @@ -330,8 +324,7 @@ class ObjectTestModel extends CakeTestModel { /** * Object Test class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ObjectTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/object_collection.test.php b/cake/tests/cases/libs/object_collection.test.php index 3eecfd70d..cfb177378 100644 --- a/cake/tests/cases/libs/object_collection.test.php +++ b/cake/tests/cases/libs/object_collection.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -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/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php index c1ed8fb43..930674093 100644 --- a/cake/tests/cases/libs/router.test.php +++ b/cake/tests/cases/libs/router.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ if (!defined('FULL_BASE_URL')) { /** * RouterTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class RouterTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php index 35013ca53..c3f420782 100644 --- a/cake/tests/cases/libs/sanitize.test.php +++ b/cake/tests/cases/libs/sanitize.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5428 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Sanitize'); /** * DataTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class SanitizeDataTest extends CakeTestModel { @@ -47,8 +45,7 @@ class SanitizeDataTest extends CakeTestModel { /** * Article class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class SanitizeArticle extends CakeTestModel { @@ -72,8 +69,7 @@ class SanitizeArticle extends CakeTestModel { /** * SanitizeTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class SanitizeTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/security.test.php b/cake/tests/cases/libs/security.test.php index da37e7e7c..a1c7a18af 100644 --- a/cake/tests/cases/libs/security.test.php +++ b/cake/tests/cases/libs/security.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Security'); /** * SecurityTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class SecurityTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/session/cache_session.test.php b/cake/tests/cases/libs/session/cache_session.test.php index 264318c2a..9f0572cd0 100644 --- a/cake/tests/cases/libs/session/cache_session.test.php +++ b/cake/tests/cases/libs/session/cache_session.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.libs.session + * @package cake.tests.cases.libs.session * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/cases/libs/session/database_session.test.php b/cake/tests/cases/libs/session/database_session.test.php index 013ea6f2d..b3c457c2d 100644 --- a/cake/tests/cases/libs/session/database_session.test.php +++ b/cake/tests/cases/libs/session/database_session.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.cases.libs.session + * @package cake.tests.cases.libs.session * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -96,7 +95,7 @@ class DatabaseSessionTest extends CakeTestCase { $storage = new DatabaseSession(); $session = ClassRegistry::getObject('session'); - $this->assertType('SessionTestModel', $session); + $this->assertInstanceOf('SessionTestModel', $session); $this->assertEquals('Session', $session->alias); $this->assertEquals('test', $session->useDbConfig); } diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php index a4d6a5427..c648940bb 100644 --- a/cake/tests/cases/libs/set.test.php +++ b/cake/tests/cases/libs/set.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Set'); /** * SetTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class SetTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php index 1e5e84d54..124e252d7 100644 --- a/cake/tests/cases/libs/string.test.php +++ b/cake/tests/cases/libs/string.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'String'); /** * StringTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class StringTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php index ae4c90dc1..524e77fc3 100644 --- a/cake/tests/cases/libs/test_manager.test.php +++ b/cake/tests/cases/libs/test_manager.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -30,8 +29,7 @@ class TestTestManager extends TestManager { /** * TestManagerTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class TestManagerTest extends CakeTestCase { @@ -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/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php index 002902a9d..2766823b9 100644 --- a/cake/tests/cases/libs/validation.test.php +++ b/cake/tests/cases/libs/validation.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Validation'); /** * CustomValidator class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class CustomValidator { @@ -88,8 +86,7 @@ class TestDeValidation { /** * Test Case for Validation Class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ValidationTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php index 4ef761091..44b38f903 100644 --- a/cake/tests/cases/libs/view/helper.test.php +++ b/cake/tests/cases/libs/view/helper.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', array('View', 'Helper', 'Router')); /** * HelperTestPost class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class HelperTestPost extends Model { @@ -66,8 +64,7 @@ class HelperTestPost extends Model { /** * HelperTestComment class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class HelperTestComment extends Model { @@ -101,8 +98,7 @@ class HelperTestComment extends Model { /** * HelperTestTag class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class HelperTestTag extends Model { @@ -134,8 +130,7 @@ class HelperTestTag extends Model { /** * HelperTestPostsTag class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class HelperTestPostsTag extends Model { @@ -187,8 +182,7 @@ class TestHelper extends Helper { /** * Html5TestHelper class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class Html5TestHelper extends TestHelper { @@ -217,8 +211,7 @@ class Html5TestHelper extends TestHelper { /** * HelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class HelperTest extends CakeTestCase { @@ -858,8 +851,8 @@ class HelperTest extends CakeTestCase { 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), )); $Helper = new TestHelper($this->View); - $this->assertType('OtherHelperHelper', $Helper->OtherHelper); - $this->assertType('HtmlHelper', $Helper->Html); + $this->assertInstanceOf('OtherHelperHelper', $Helper->OtherHelper); + $this->assertInstanceOf('HtmlHelper', $Helper->Html); App::build(); } diff --git a/cake/tests/cases/libs/view/helper_collection.test.php b/cake/tests/cases/libs/view/helper_collection.test.php index d5f1480dd..e87d67a2b 100644 --- a/cake/tests/cases/libs/view/helper_collection.test.php +++ b/cake/tests/cases/libs/view/helper_collection.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -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(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), )); $result = $this->Helpers->load('TestPlugin.OtherHelper'); - $this->assertType('OtherHelperHelper', $result, 'Helper class is wrong.'); - $this->assertType('OtherHelperHelper', $this->Helpers->OtherHelper, 'Class is wrong'); + $this->assertInstanceOf('OtherHelperHelper', $result, 'Helper class is wrong.'); + $this->assertInstanceOf('OtherHelperHelper', $this->Helpers->OtherHelper, 'Class is wrong'); App::build(); } diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php index 95d8e9a01..cc08e4d83 100644 --- a/cake/tests/cases/libs/view/helpers/cache.test.php +++ b/cake/tests/cases/libs/view/helpers/cache.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Helper', 'Cache'); /** * CacheTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class CacheTestController extends Controller { @@ -55,8 +53,7 @@ class CacheTestController extends Controller { /** * CacheHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class CacheHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php index 8c01f95eb..dccaf21c0 100644 --- a/cake/tests/cases/libs/view/helpers/form.test.php +++ b/cake/tests/cases/libs/view/helpers/form.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,7 +24,7 @@ App::import('Helper', 'Form'); * ContactTestController class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class ContactTestController extends Controller { @@ -50,7 +49,7 @@ class ContactTestController extends Controller { * Contact class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class Contact extends CakeTestModel { @@ -147,7 +146,7 @@ class Contact extends CakeTestModel { * ContactTagsContact class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class ContactTagsContact extends CakeTestModel { @@ -195,7 +194,7 @@ class ContactTagsContact extends CakeTestModel { * ContactNonStandardPk class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class ContactNonStandardPk extends Contact { @@ -233,7 +232,7 @@ class ContactNonStandardPk extends Contact { * ContactTag class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class ContactTag extends Model { @@ -263,7 +262,7 @@ class ContactTag extends Model { * UserForm class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class UserForm extends CakeTestModel { @@ -323,7 +322,7 @@ class UserForm extends CakeTestModel { * OpenidUrl class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class OpenidUrl extends CakeTestModel { @@ -399,7 +398,7 @@ class OpenidUrl extends CakeTestModel { * ValidateUser class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class ValidateUser extends CakeTestModel { @@ -468,7 +467,7 @@ class ValidateUser extends CakeTestModel { * ValidateProfile class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class ValidateProfile extends CakeTestModel { @@ -548,7 +547,7 @@ class ValidateProfile extends CakeTestModel { * ValidateItem class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class ValidateItem extends CakeTestModel { @@ -617,7 +616,7 @@ class ValidateItem extends CakeTestModel { * TestMail class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class TestMail extends CakeTestModel { @@ -650,7 +649,7 @@ class TestMail extends CakeTestModel { * FormHelperTest class * * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class FormHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php index 2defe93ab..142fe91b5 100644 --- a/cake/tests/cases/libs/view/helpers/html.test.php +++ b/cake/tests/cases/libs/view/helpers/html.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ if (!defined('FULL_BASE_URL')) { /** * TheHtmlTestController class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class TheHtmlTestController extends Controller { @@ -52,8 +50,7 @@ class TheHtmlTestController extends Controller { /** * HtmlHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class HtmlHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php index 87c2b8b2b..868581ff6 100644 --- a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php +++ b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php @@ -15,7 +15,7 @@ * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project * @package cake.tests - * @subpackage cake.tests.cases.views.helpers + * @package cake.tests.cases.views.helpers * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ App::import('Helper', array('Html', 'Js', 'JqueryEngine')); diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php index 1fd1602a7..8926ab94e 100644 --- a/cake/tests/cases/libs/view/helpers/js.test.php +++ b/cake/tests/cases/libs/view/helpers/js.test.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -64,8 +63,7 @@ class OptionEngineHelper extends JsBaseEngineHelper { /** * JsHelper TestCase. * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class JsHelperTest extends CakeTestCase { /** diff --git a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php index 53af75a80..1b44d4497 100644 --- a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php +++ b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php @@ -17,7 +17,7 @@ * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project * @package cake.tests - * @subpackage cake.tests.cases.views.helpers + * @package cake.tests.cases.views.helpers * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ App::import('Helper', array('Html', 'Js', 'MootoolsEngine')); diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php index 30022d2cd..99857df99 100644 --- a/cake/tests/cases/libs/view/helpers/number.test.php +++ b/cake/tests/cases/libs/view/helpers/number.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('View', 'View'); /** * NumberHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class NumberHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php index b5e37983b..63272aad7 100644 --- a/cake/tests/cases/libs/view/helpers/paginator.test.php +++ b/cake/tests/cases/libs/view/helpers/paginator.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ if (!defined('FULL_BASE_URL')) { /** * PaginatorHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class PaginatorHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php index 395b25cd7..86b8d3a73 100644 --- a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php +++ b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php @@ -15,7 +15,7 @@ * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project * @package cake.tests - * @subpackage cake.tests.cases.views.helpers + * @package cake.tests.cases.views.helpers * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ App::import('Helper', array('Html', 'Js', 'PrototypeEngine')); diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php index f836d890f..93c344d67 100644 --- a/cake/tests/cases/libs/view/helpers/rss.test.php +++ b/cake/tests/cases/libs/view/helpers/rss.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Helper', array('Rss', 'Time')); /** * RssHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class RssHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php index c61421bd1..cf5169243 100644 --- a/cake/tests/cases/libs/view/helpers/session.test.php +++ b/cake/tests/cases/libs/view/helpers/session.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Helper', array('Session')); /** * SessionHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class SessionHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php index cdb5dcecb..03ad9ee2f 100644 --- a/cake/tests/cases/libs/view/helpers/text.test.php +++ b/cake/tests/cases/libs/view/helpers/text.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Helper', 'Text'); /** * TextHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class TextHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php index 668467296..67481f5a4 100644 --- a/cake/tests/cases/libs/view/helpers/time.test.php +++ b/cake/tests/cases/libs/view/helpers/time.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ App::import('Core', 'View'); /** * TimeHelperTest class * - * @package cake - * @subpackage cake.tests.cases.libs.view.helpers + * @package cake.tests.cases.libs.view.helpers */ class TimeHelperTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/media.test.php b/cake/tests/cases/libs/view/media.test.php index 39b9d190d..115f74505 100644 --- a/cake/tests/cases/libs/view/media.test.php +++ b/cake/tests/cases/libs/view/media.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', array('Media', 'Controller', 'CakeResponse')); /** * MediaViewTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class MediaViewTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php index 314d38ba7..dc03b6663 100644 --- a/cake/tests/cases/libs/view/theme.test.php +++ b/cake/tests/cases/libs/view/theme.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ App::import('Core', 'Controller'); /** * ThemePostsController class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class ThemePostsController extends Controller { @@ -57,8 +55,7 @@ class ThemePostsController extends Controller { /** * TestThemeView class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class TestThemeView extends ThemeView { @@ -101,8 +98,7 @@ class TestThemeView extends ThemeView { /** * ThemeViewTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ThemeViewTest extends CakeTestCase { diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php index 9e4d7a44a..70ef8a6ca 100644 --- a/cake/tests/cases/libs/view/view.test.php +++ b/cake/tests/cases/libs/view/view.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ App::import('Core', array('ErrorHandler')); /** * ViewPostsController class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class ViewPostsController extends Controller { @@ -74,8 +72,7 @@ class ViewPostsController extends Controller { /** * TestView class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class TestView extends View { @@ -121,7 +118,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); @@ -140,8 +136,7 @@ class TestView extends View { /** * TestAfterHelper class * - * @package cake - * @subpackage cake.tests.cases.libs.view + * @package cake.tests.cases.libs.view */ class TestAfterHelper extends Helper { @@ -177,8 +172,7 @@ class TestAfterHelper extends Helper { /** * ViewTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class ViewTest extends CakeTestCase { @@ -547,7 +541,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); } /** @@ -562,8 +556,8 @@ class ViewTest extends CakeTestCase { $View->helpers = array('Html', 'Form'); $View->loadHelpers(); - $this->assertType('HtmlHelper', $View->Html, 'Object type is wrong.'); - $this->assertType('FormHelper', $View->Form, 'Object type is wrong.'); + $this->assertInstanceOf('HtmlHelper', $View->Html, 'Object type is wrong.'); + $this->assertInstanceOf('FormHelper', $View->Form, 'Object type is wrong.'); } /** diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php index 666a4f45d..169c38933 100644 --- a/cake/tests/cases/libs/xml.test.php +++ b/cake/tests/cases/libs/xml.test.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ App::import('Core', 'Xml'); /** * Article class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class XmlArticle extends CakeTestModel { @@ -50,8 +48,7 @@ class XmlArticle extends CakeTestModel { /** * User class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class XmlUser extends CakeTestModel { @@ -73,8 +70,7 @@ class XmlUser extends CakeTestModel { /** * XmlTest class * - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs */ class XmlTest extends CakeTestCase { diff --git a/cake/tests/fixtures/account_fixture.php b/cake/tests/fixtures/account_fixture.php index f4f948dfa..756d92355 100644 --- a/cake/tests/fixtures/account_fixture.php +++ b/cake/tests/fixtures/account_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AccountFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php index e95de48e8..93fc08664 100644 --- a/cake/tests/fixtures/aco_action_fixture.php +++ b/cake/tests/fixtures/aco_action_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AcoActionFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php index be296aaf8..77c625781 100644 --- a/cake/tests/fixtures/aco_fixture.php +++ b/cake/tests/fixtures/aco_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AcoFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php index d277beea1..a45c2dc6e 100644 --- a/cake/tests/fixtures/aco_two_fixture.php +++ b/cake/tests/fixtures/aco_two_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AcoTwoFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/ad_fixture.php b/cake/tests/fixtures/ad_fixture.php index c6f955da4..56989b072 100644 --- a/cake/tests/fixtures/ad_fixture.php +++ b/cake/tests/fixtures/ad_fixture.php @@ -13,8 +13,7 @@ * * @copyright CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * @link http://www.cakephp.org - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ /** * AdFixture class * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AdFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php index 8c1e8b629..32c7bca5e 100644 --- a/cake/tests/fixtures/advertisement_fixture.php +++ b/cake/tests/fixtures/advertisement_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AdvertisementFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/after_tree_fixture.php b/cake/tests/fixtures/after_tree_fixture.php index 098863888..1c5fa8e9c 100644 --- a/cake/tests/fixtures/after_tree_fixture.php +++ b/cake/tests/fixtures/after_tree_fixture.php @@ -13,8 +13,7 @@ * * @copyright CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * @link http://www.cakephp.org - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ /** * AdFixture class * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AfterTreeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php index d0807c788..a62287a06 100644 --- a/cake/tests/fixtures/another_article_fixture.php +++ b/cake/tests/fixtures/another_article_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AnotherArticleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php index 0de5f3bea..e0e9d3e88 100644 --- a/cake/tests/fixtures/apple_fixture.php +++ b/cake/tests/fixtures/apple_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AppleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php index f224dfc97..f0f5adceb 100644 --- a/cake/tests/fixtures/aro_fixture.php +++ b/cake/tests/fixtures/aro_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AroFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php index 86b774720..409be3489 100644 --- a/cake/tests/fixtures/aro_two_fixture.php +++ b/cake/tests/fixtures/aro_two_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AroTwoFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php index 6c204fc49..4265bf011 100644 --- a/cake/tests/fixtures/aros_aco_fixture.php +++ b/cake/tests/fixtures/aros_aco_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ArosAcoFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php index 9c3251d64..e62e48306 100644 --- a/cake/tests/fixtures/aros_aco_two_fixture.php +++ b/cake/tests/fixtures/aros_aco_two_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ArosAcoTwoFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php index 64c4bc38c..062813621 100644 --- a/cake/tests/fixtures/article_featured_fixture.php +++ b/cake/tests/fixtures/article_featured_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ArticleFeaturedFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php index e84b863d5..60c8c7096 100644 --- a/cake/tests/fixtures/article_featureds_tags_fixture.php +++ b/cake/tests/fixtures/article_featureds_tags_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ArticleFeaturedsTagsFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php index b6f21e7b3..41b256da1 100644 --- a/cake/tests/fixtures/article_fixture.php +++ b/cake/tests/fixtures/article_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ArticleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php index 1091901a6..c475d87a4 100644 --- a/cake/tests/fixtures/articles_tag_fixture.php +++ b/cake/tests/fixtures/articles_tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ArticlesTagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/assert_tags_test_case.php b/cake/tests/fixtures/assert_tags_test_case.php index 27cc08d19..1cef87aea 100644 --- a/cake/tests/fixtures/assert_tags_test_case.php +++ b/cake/tests/fixtures/assert_tags_test_case.php @@ -5,8 +5,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); /** * This class helpes in indirectly testing the functionaliteies of CakeTestCase::assertTags * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AssertTagsTestCase extends CakeTestCase { diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php index d43defa4f..748c10d78 100644 --- a/cake/tests/fixtures/attachment_fixture.php +++ b/cake/tests/fixtures/attachment_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AttachmentFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php index fb727e6a7..8c82b6717 100644 --- a/cake/tests/fixtures/auth_user_custom_field_fixture.php +++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.1.8013 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AuthUserCustomFieldFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php index 2613b3d64..5efc6be2e 100644 --- a/cake/tests/fixtures/auth_user_fixture.php +++ b/cake/tests/fixtures/auth_user_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AuthUserFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php index 2f9381621..8f705f4fe 100644 --- a/cake/tests/fixtures/author_fixture.php +++ b/cake/tests/fixtures/author_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class AuthorFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/bake_article_fixture.php b/cake/tests/fixtures/bake_article_fixture.php index 304bd6b3c..8543ee6ba 100644 --- a/cake/tests/fixtures/bake_article_fixture.php +++ b/cake/tests/fixtures/bake_article_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BakeArticleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/bake_articles_bake_tag_fixture.php b/cake/tests/fixtures/bake_articles_bake_tag_fixture.php index d1f6ef5d8..d046718b3 100644 --- a/cake/tests/fixtures/bake_articles_bake_tag_fixture.php +++ b/cake/tests/fixtures/bake_articles_bake_tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BakeArticlesBakeTagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/bake_comment_fixture.php b/cake/tests/fixtures/bake_comment_fixture.php index 8de6696be..b75d0821b 100644 --- a/cake/tests/fixtures/bake_comment_fixture.php +++ b/cake/tests/fixtures/bake_comment_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * BakeCommentFixture fixture for testing bake * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BakeCommentFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/bake_tag_fixture.php b/cake/tests/fixtures/bake_tag_fixture.php index e5057385e..74dfa473b 100644 --- a/cake/tests/fixtures/bake_tag_fixture.php +++ b/cake/tests/fixtures/bake_tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BakeTagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/basket_fixture.php b/cake/tests/fixtures/basket_fixture.php index 7ad9f8d0d..3984c65b1 100644 --- a/cake/tests/fixtures/basket_fixture.php +++ b/cake/tests/fixtures/basket_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BasketFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php index dd1b4c130..df915dc71 100644 --- a/cake/tests/fixtures/bid_fixture.php +++ b/cake/tests/fixtures/bid_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BidFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php index f1cd03351..868ee4c5c 100644 --- a/cake/tests/fixtures/binary_test_fixture.php +++ b/cake/tests/fixtures/binary_test_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BinaryTestFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/book_fixture.php b/cake/tests/fixtures/book_fixture.php index 83e1b6f09..bf85000af 100644 --- a/cake/tests/fixtures/book_fixture.php +++ b/cake/tests/fixtures/book_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7198 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class BookFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php index ace714d5b..84b1a64b1 100644 --- a/cake/tests/fixtures/cache_test_model_fixture.php +++ b/cake/tests/fixtures/cache_test_model_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CacheTestModelFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php index 6d6103ca0..f28c6277f 100644 --- a/cake/tests/fixtures/callback_fixture.php +++ b/cake/tests/fixtures/callback_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CallbackFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/campaign_fixture.php b/cake/tests/fixtures/campaign_fixture.php index 1d4fb7edb..ec0411b76 100644 --- a/cake/tests/fixtures/campaign_fixture.php +++ b/cake/tests/fixtures/campaign_fixture.php @@ -13,8 +13,7 @@ * * @copyright CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * @link http://www.cakephp.org - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ /** * CampaignFixture class * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CampaignFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php index 419699773..7ea0fba2d 100644 --- a/cake/tests/fixtures/category_fixture.php +++ b/cake/tests/fixtures/category_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CategoryFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php index 65b840cbc..92563dd7b 100644 --- a/cake/tests/fixtures/category_thread_fixture.php +++ b/cake/tests/fixtures/category_thread_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CategoryThreadFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/cd_fixture.php b/cake/tests/fixtures/cd_fixture.php index 59b4952cf..c2e668c0a 100644 --- a/cake/tests/fixtures/cd_fixture.php +++ b/cake/tests/fixtures/cd_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7198 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CdFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php index 559c78e00..2f5cfaa26 100644 --- a/cake/tests/fixtures/comment_fixture.php +++ b/cake/tests/fixtures/comment_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CommentFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/content_account_fixture.php b/cake/tests/fixtures/content_account_fixture.php index b765fc403..4cf803a22 100644 --- a/cake/tests/fixtures/content_account_fixture.php +++ b/cake/tests/fixtures/content_account_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ContentAccountFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/content_fixture.php b/cake/tests/fixtures/content_fixture.php index a7e9eb5ca..067410fbf 100644 --- a/cake/tests/fixtures/content_fixture.php +++ b/cake/tests/fixtures/content_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ContentFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/cake/tests/fixtures/counter_cache_post_fixture.php index 9aa3f2ce1..ea7ec7b9b 100644 --- a/cake/tests/fixtures/counter_cache_post_fixture.php +++ b/cake/tests/fixtures/counter_cache_post_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CounterCachePostFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php index efa9c553c..cdb05f0da 100644 --- a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php +++ b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CounterCachePostNonstandardPrimaryKeyFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/cake/tests/fixtures/counter_cache_user_fixture.php index 9ebc2e3ac..4d47c33cd 100644 --- a/cake/tests/fixtures/counter_cache_user_fixture.php +++ b/cake/tests/fixtures/counter_cache_user_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CounterCacheUserFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php index 3134f4650..3fe938bc6 100644 --- a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php +++ b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class CounterCacheUserNonstandardPrimaryKeyFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php index 43c4fd7d3..273777c2f 100644 --- a/cake/tests/fixtures/data_test_fixture.php +++ b/cake/tests/fixtures/data_test_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class DataTestFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php index 9bfaad3d7..39055a018 100644 --- a/cake/tests/fixtures/datatype_fixture.php +++ b/cake/tests/fixtures/datatype_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7026 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class DatatypeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php index 5514e696e..d9765317a 100644 --- a/cake/tests/fixtures/dependency_fixture.php +++ b/cake/tests/fixtures/dependency_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6879//Correct version number as needed** * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for file. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6879//Correct version number as needed** */ class DependencyFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php index c927feeda..8371cbe21 100644 --- a/cake/tests/fixtures/device_fixture.php +++ b/cake/tests/fixtures/device_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class DeviceFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php index 6750ac7ed..7feb7b97c 100644 --- a/cake/tests/fixtures/device_type_category_fixture.php +++ b/cake/tests/fixtures/device_type_category_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class DeviceTypeCategoryFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php index ecbdb2091..ddd82adc1 100644 --- a/cake/tests/fixtures/device_type_fixture.php +++ b/cake/tests/fixtures/device_type_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class DeviceTypeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php index 485cdeca4..732eae1f2 100644 --- a/cake/tests/fixtures/document_directory_fixture.php +++ b/cake/tests/fixtures/document_directory_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class DocumentDirectoryFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php index 5d9f438bf..93c1ec4ae 100644 --- a/cake/tests/fixtures/document_fixture.php +++ b/cake/tests/fixtures/document_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class DocumentFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php index f7b609ed7..cbc27668c 100644 --- a/cake/tests/fixtures/exterior_type_category_fixture.php +++ b/cake/tests/fixtures/exterior_type_category_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ExteriorTypeCategoryFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php index 3e26310ff..a42084973 100644 --- a/cake/tests/fixtures/feature_set_fixture.php +++ b/cake/tests/fixtures/feature_set_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class FeatureSetFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php index 4777e2d36..1070e2732 100644 --- a/cake/tests/fixtures/featured_fixture.php +++ b/cake/tests/fixtures/featured_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class FeaturedFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/film_file_fixture.php b/cake/tests/fixtures/film_file_fixture.php index fa9fe736b..9a07df3cd 100644 --- a/cake/tests/fixtures/film_file_fixture.php +++ b/cake/tests/fixtures/film_file_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class FilmFileFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/fixturized_test_case.php b/cake/tests/fixtures/fixturized_test_case.php index c9b932b3e..810a2089f 100644 --- a/cake/tests/fixtures/fixturized_test_case.php +++ b/cake/tests/fixtures/fixturized_test_case.php @@ -5,8 +5,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); /** * This class helps in testing the life-cycle of fixtures inside a CakeTestCase * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class FixturizedTestCase extends CakeTestCase { @@ -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/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php index 31c39e1a6..229ad81eb 100644 --- a/cake/tests/fixtures/flag_tree_fixture.php +++ b/cake/tests/fixtures/flag_tree_fixture.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5331 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ * * Like Number Tree, but uses a flag for testing scope parameters * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class FlagTreeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/fruit_fixture.php b/cake/tests/fixtures/fruit_fixture.php index 484b99478..abd9eeaa4 100644 --- a/cake/tests/fixtures/fruit_fixture.php +++ b/cake/tests/fixtures/fruit_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7953 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class FruitFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/cake/tests/fixtures/fruits_uuid_tag_fixture.php index 8d7cff938..afa328b38 100644 --- a/cake/tests/fixtures/fruits_uuid_tag_fixture.php +++ b/cake/tests/fixtures/fruits_uuid_tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7953 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class FruitsUuidTagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/group_update_all_fixture.php b/cake/tests/fixtures/group_update_all_fixture.php index e1dd56bcc..ebd320b99 100644 --- a/cake/tests/fixtures/group_update_all_fixture.php +++ b/cake/tests/fixtures/group_update_all_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class GroupUpdateAllFixture extends CakeTestFixture { public $name = 'GroupUpdateAll'; diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php index e3988bcc4..2f90ea64a 100644 --- a/cake/tests/fixtures/home_fixture.php +++ b/cake/tests/fixtures/home_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class HomeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php index 369b877b9..1eaaae118 100644 --- a/cake/tests/fixtures/image_fixture.php +++ b/cake/tests/fixtures/image_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ImageFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php index fdca77fcb..8aa2487a1 100644 --- a/cake/tests/fixtures/item_fixture.php +++ b/cake/tests/fixtures/item_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ItemFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php index 88029e048..fd128a1eb 100644 --- a/cake/tests/fixtures/items_portfolio_fixture.php +++ b/cake/tests/fixtures/items_portfolio_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ItemsPortfolioFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php index f9d9776a3..d979f30c4 100644 --- a/cake/tests/fixtures/join_a_b_fixture.php +++ b/cake/tests/fixtures/join_a_b_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class JoinABFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php index b8c9786ca..f66fa499f 100644 --- a/cake/tests/fixtures/join_a_c_fixture.php +++ b/cake/tests/fixtures/join_a_c_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class JoinACFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php index 0910b132d..891697321 100644 --- a/cake/tests/fixtures/join_a_fixture.php +++ b/cake/tests/fixtures/join_a_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class JoinAFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php index e9f5a9019..a636e7243 100644 --- a/cake/tests/fixtures/join_b_fixture.php +++ b/cake/tests/fixtures/join_b_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class JoinBFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php index c50a606e8..d858a5e11 100644 --- a/cake/tests/fixtures/join_c_fixture.php +++ b/cake/tests/fixtures/join_c_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class JoinCFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php index 75c009f28..13b8dc8f6 100644 --- a/cake/tests/fixtures/join_thing_fixture.php +++ b/cake/tests/fixtures/join_thing_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class JoinThingFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php index 0c62b85f9..e491f031f 100644 --- a/cake/tests/fixtures/message_fixture.php +++ b/cake/tests/fixtures/message_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class MessageFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/cake/tests/fixtures/my_categories_my_products_fixture.php index a20ad3daa..d33fafa86 100644 --- a/cake/tests/fixtures/my_categories_my_products_fixture.php +++ b/cake/tests/fixtures/my_categories_my_products_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class MyCategoriesMyProductsFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/cake/tests/fixtures/my_categories_my_users_fixture.php index 0366794dd..c6c557e0f 100644 --- a/cake/tests/fixtures/my_categories_my_users_fixture.php +++ b/cake/tests/fixtures/my_categories_my_users_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class MyCategoriesMyUsersFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/my_category_fixture.php b/cake/tests/fixtures/my_category_fixture.php index ba1225a1c..954a2d429 100644 --- a/cake/tests/fixtures/my_category_fixture.php +++ b/cake/tests/fixtures/my_category_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class MyCategoryFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php index e934e4447..424c820c9 100644 --- a/cake/tests/fixtures/my_product_fixture.php +++ b/cake/tests/fixtures/my_product_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class MyProductFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/my_user_fixture.php b/cake/tests/fixtures/my_user_fixture.php index fb2d0c236..09922a594 100644 --- a/cake/tests/fixtures/my_user_fixture.php +++ b/cake/tests/fixtures/my_user_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class MyUserFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php index e5f88c49d..3e527eb0e 100644 --- a/cake/tests/fixtures/node_fixture.php +++ b/cake/tests/fixtures/node_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6879 //Correct version number as needed** * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for file. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6879 //Correct version number as needed** */ class NodeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php index 80ce2970e..84ea86fce 100644 --- a/cake/tests/fixtures/number_tree_fixture.php +++ b/cake/tests/fixtures/number_tree_fixture.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5331 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ * * Generates a tree of data for use testing the tree behavior * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class NumberTreeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/cake/tests/fixtures/number_tree_two_fixture.php index 20f154844..2414acb60 100644 --- a/cake/tests/fixtures/number_tree_two_fixture.php +++ b/cake/tests/fixtures/number_tree_two_fixture.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5331 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -25,8 +24,7 @@ * * Generates a tree of data for use testing the tree behavior * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class NumberTreeTwoFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php index dc5b3b45f..06f86e289 100644 --- a/cake/tests/fixtures/numeric_article_fixture.php +++ b/cake/tests/fixtures/numeric_article_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class NumericArticleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/cake/tests/fixtures/overall_favorite_fixture.php index ddb555496..fb46f74d1 100644 --- a/cake/tests/fixtures/overall_favorite_fixture.php +++ b/cake/tests/fixtures/overall_favorite_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7198 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class OverallFavoriteFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php index ae8b9391d..652b1dc31 100644 --- a/cake/tests/fixtures/person_fixture.php +++ b/cake/tests/fixtures/person_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class PersonFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php index 40a18c7b7..a3c9c3985 100644 --- a/cake/tests/fixtures/portfolio_fixture.php +++ b/cake/tests/fixtures/portfolio_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class PortfolioFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php index 98264bd68..dcc808a60 100644 --- a/cake/tests/fixtures/post_fixture.php +++ b/cake/tests/fixtures/post_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class PostFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php index cddf3e4ee..9a1217569 100644 --- a/cake/tests/fixtures/posts_tag_fixture.php +++ b/cake/tests/fixtures/posts_tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class PostsTagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php index 4194f97a7..058489f58 100644 --- a/cake/tests/fixtures/primary_model_fixture.php +++ b/cake/tests/fixtures/primary_model_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class PrimaryModelFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/product_fixture.php b/cake/tests/fixtures/product_fixture.php index 207ae2073..effee768a 100644 --- a/cake/tests/fixtures/product_fixture.php +++ b/cake/tests/fixtures/product_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ProductFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/product_update_all_fixture.php b/cake/tests/fixtures/product_update_all_fixture.php index 6ca5377f9..80d11cb2f 100644 --- a/cake/tests/fixtures/product_update_all_fixture.php +++ b/cake/tests/fixtures/product_update_all_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ProductUpdateAllFixture extends CakeTestFixture { public $name = 'ProductUpdateAll'; diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php index d28aa1578..961cf532a 100644 --- a/cake/tests/fixtures/project_fixture.php +++ b/cake/tests/fixtures/project_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ProjectFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php index f5e915765..fa150a748 100644 --- a/cake/tests/fixtures/sample_fixture.php +++ b/cake/tests/fixtures/sample_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class SampleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php index c273850d5..0fcf88699 100644 --- a/cake/tests/fixtures/secondary_model_fixture.php +++ b/cake/tests/fixtures/secondary_model_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class SecondaryModelFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php index d517730b1..cbbc89d5c 100644 --- a/cake/tests/fixtures/session_fixture.php +++ b/cake/tests/fixtures/session_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class SessionFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php index 5b57d72b1..b6d965298 100644 --- a/cake/tests/fixtures/something_else_fixture.php +++ b/cake/tests/fixtures/something_else_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class SomethingElseFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php index c0dfccd6f..356b533ca 100644 --- a/cake/tests/fixtures/something_fixture.php +++ b/cake/tests/fixtures/something_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class SomethingFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php index cc2bcf619..4e441b64f 100644 --- a/cake/tests/fixtures/stories_tag_fixture.php +++ b/cake/tests/fixtures/stories_tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class StoriesTagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php index 4604a202f..3a8cdfa6a 100644 --- a/cake/tests/fixtures/story_fixture.php +++ b/cake/tests/fixtures/story_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class StoryFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php index 59fb672f9..f143adc33 100644 --- a/cake/tests/fixtures/syfile_fixture.php +++ b/cake/tests/fixtures/syfile_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class SyfileFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php index a56e4c485..fb792236c 100644 --- a/cake/tests/fixtures/tag_fixture.php +++ b/cake/tests/fixtures/tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php index af5dfd8ea..79c3c36ff 100644 --- a/cake/tests/fixtures/test_plugin_article_fixture.php +++ b/cake/tests/fixtures/test_plugin_article_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 7660 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TestPluginArticleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php index 854e098bf..d70038e32 100644 --- a/cake/tests/fixtures/test_plugin_comment_fixture.php +++ b/cake/tests/fixtures/test_plugin_comment_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 7660 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TestPluginCommentFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php index 24060d815..4d64767ce 100644 --- a/cake/tests/fixtures/the_paper_monkies_fixture.php +++ b/cake/tests/fixtures/the_paper_monkies_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ThePaperMonkiesFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php index 76bb1d28b..ed24b6b82 100644 --- a/cake/tests/fixtures/thread_fixture.php +++ b/cake/tests/fixtures/thread_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class ThreadFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php index 756153814..d28417539 100644 --- a/cake/tests/fixtures/translate_article_fixture.php +++ b/cake/tests/fixtures/translate_article_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TranslateArticleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php index bc7926a4d..730dfad64 100644 --- a/cake/tests/fixtures/translate_fixture.php +++ b/cake/tests/fixtures/translate_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TranslateFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php index bae466c86..08a0a3d9a 100644 --- a/cake/tests/fixtures/translate_table_fixture.php +++ b/cake/tests/fixtures/translate_table_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TranslateTableFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/translate_with_prefix_fixture.php b/cake/tests/fixtures/translate_with_prefix_fixture.php index 04549b02e..87045605f 100644 --- a/cake/tests/fixtures/translate_with_prefix_fixture.php +++ b/cake/tests/fixtures/translate_with_prefix_fixture.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -26,8 +25,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TranslateWithPrefixFixture extends CakeTestFixture { /** diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php index 978a8b5f3..b5238baae 100644 --- a/cake/tests/fixtures/translated_article_fixture.php +++ b/cake/tests/fixtures/translated_article_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TranslatedArticleFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php index 91a0571eb..95eede406 100644 --- a/cake/tests/fixtures/translated_item_fixture.php +++ b/cake/tests/fixtures/translated_item_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class TranslatedItemFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/cake/tests/fixtures/unconventional_tree_fixture.php index 7d1b39838..ea57f6f06 100644 --- a/cake/tests/fixtures/unconventional_tree_fixture.php +++ b/cake/tests/fixtures/unconventional_tree_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7879 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ * Like Number tree, but doesn't use the default values for lft and rght or parent_id * * @uses CakeTestFixture - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UnconventionalTreeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php index 3322284b1..1962e403d 100644 --- a/cake/tests/fixtures/underscore_field_fixture.php +++ b/cake/tests/fixtures/underscore_field_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * UnderscoreFieldFixture class * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UnderscoreFieldFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php index 86683d2e9..2adb7841f 100644 --- a/cake/tests/fixtures/user_fixture.php +++ b/cake/tests/fixtures/user_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UserFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php index 559dc810b..50f735ceb 100644 --- a/cake/tests/fixtures/uuid_fixture.php +++ b/cake/tests/fixtures/uuid_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UuidFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/cake/tests/fixtures/uuid_tag_fixture.php index a126903e8..94e1ba7bc 100644 --- a/cake/tests/fixtures/uuid_tag_fixture.php +++ b/cake/tests/fixtures/uuid_tag_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7953 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UuidTagFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/cake/tests/fixtures/uuid_tree_fixture.php index c34bc2c3c..5828533e2 100644 --- a/cake/tests/fixtures/uuid_tree_fixture.php +++ b/cake/tests/fixtures/uuid_tree_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7984 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ * UuidTreeFixture class * * @uses CakeTestFixture - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UuidTreeFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/cake/tests/fixtures/uuiditem_fixture.php index 1e70eb287..5b6e15e8e 100644 --- a/cake/tests/fixtures/uuiditem_fixture.php +++ b/cake/tests/fixtures/uuiditem_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UuiditemFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php index 94a5a2e49..eeafb752d 100644 --- a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php +++ b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UuiditemsUuidportfolioFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php index c4ae9c768..f8f6baedc 100644 --- a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php +++ b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture { diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/cake/tests/fixtures/uuidportfolio_fixture.php index fb3745d3b..3c6b86f28 100644 --- a/cake/tests/fixtures/uuidportfolio_fixture.php +++ b/cake/tests/fixtures/uuidportfolio_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Short description for class. * - * @package cake - * @subpackage cake.tests.fixtures + * @package cake.tests.fixtures */ class UuidportfolioFixture extends CakeTestFixture { diff --git a/cake/tests/lib/cake_fixture_manager.php b/cake/tests/lib/cake_fixture_manager.php index 099da5557..2615847ca 100644 --- a/cake/tests/lib/cake_fixture_manager.php +++ b/cake/tests/lib/cake_fixture_manager.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php index 184dc7912..7581bd6a8 100644 --- a/cake/tests/lib/cake_test_case.php +++ b/cake/tests/lib/cake_test_case.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ require_once CAKE_TESTS_LIB . 'cake_test_fixture.php'; /** * CakeTestCase class * - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib */ class CakeTestCase extends PHPUnit_Framework_TestCase { @@ -494,7 +492,7 @@ class CakeTestCase extends PHPUnit_Framework_TestCase { * @return void */ protected function assertIsA($object, $type, $message = '') { - return $this->assertType($type, $object, $message); + return $this->assertInstanceOf($type, $object, $message); } /** diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php index b7676cf5c..ec56d09ec 100644 --- a/cake/tests/lib/cake_test_fixture.php +++ b/cake/tests/lib/cake_test_fixture.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -23,8 +22,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); /** * Short description for class. * - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib */ class CakeTestFixture { diff --git a/cake/tests/lib/cake_test_model.php b/cake/tests/lib/cake_test_model.php index 819c3cbe2..a896a50d9 100644 --- a/cake/tests/lib/cake_test_model.php +++ b/cake/tests/lib/cake_test_model.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -22,8 +21,7 @@ require_once LIBS.'model'.DS.'model.php'; /** * Short description for class. * - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib */ class CakeTestModel extends Model { public $useDbConfig = 'test'; diff --git a/cake/tests/lib/cake_test_suite.php b/cake/tests/lib/cake_test_suite.php index c1ad5adb5..f7d7497d5 100644 --- a/cake/tests/lib/cake_test_suite.php +++ b/cake/tests/lib/cake_test_suite.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php index 4642dc2b4..36937ed2c 100644 --- a/cake/tests/lib/cake_test_suite_dispatcher.php +++ b/cake/tests/lib/cake_test_suite_dispatcher.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/cake_web_test_case.php b/cake/tests/lib/cake_web_test_case.php index 8a98e3525..256e75933 100644 --- a/cake/tests/lib/cake_web_test_case.php +++ b/cake/tests/lib/cake_web_test_case.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -21,8 +20,7 @@ /** * Simple wrapper for the WebTestCase provided by SimpleTest * - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib */ class CakeWebTestCase extends WebTestCase { } diff --git a/cake/tests/lib/controller_test_case.php b/cake/tests/lib/controller_test_case.php index 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/cake/tests/lib/coverage/base_coverage_report.php b/cake/tests/lib/coverage/base_coverage_report.php index d532f06d6..7960a6e75 100644 --- a/cake/tests/lib/coverage/base_coverage_report.php +++ b/cake/tests/lib/coverage/base_coverage_report.php @@ -14,7 +14,6 @@ * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project * @package cake - * @subpackage cake.cake * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/coverage/html_coverage_report.php b/cake/tests/lib/coverage/html_coverage_report.php index ae4fa081c..bdd18e972 100644 --- a/cake/tests/lib/coverage/html_coverage_report.php +++ b/cake/tests/lib/coverage/html_coverage_report.php @@ -13,7 +13,6 @@ * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project * @package cake - * @subpackage cake.cake * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/coverage/text_coverage_report.php b/cake/tests/lib/coverage/text_coverage_report.php index 3450f2b36..66e84d32e 100644 --- a/cake/tests/lib/coverage/text_coverage_report.php +++ b/cake/tests/lib/coverage/text_coverage_report.php @@ -13,7 +13,6 @@ * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project * @package cake - * @subpackage cake.cake * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/cake/tests/lib/reporter/cake_base_reporter.php index f20bf1928..9f4b3d3ec 100644 --- a/cake/tests/lib/reporter/cake_base_reporter.php +++ b/cake/tests/lib/reporter/cake_base_reporter.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.libs.reporter + * @package cake.tests.libs.reporter * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,7 +23,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); * CakeBaseReporter contains common reporting features used in the CakePHP Test suite * * @package cake - * @subpackage cake.tests.lib + * @package cake.tests.lib */ class CakeBaseReporter implements PHPUnit_Framework_TestListener { diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php index 2b66df509..63153ba9c 100755 --- a/cake/tests/lib/reporter/cake_html_reporter.php +++ b/cake/tests/lib/reporter/cake_html_reporter.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.libs.reporter + * @package cake.tests.libs.reporter * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,7 +25,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); * in an HTML format / context. * * @package cake - * @subpackage cake.tests.lib + * @package cake.tests.lib */ class CakeHtmlReporter extends CakeBaseReporter { diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php index 070855c1b..cf4cea447 100644 --- a/cake/tests/lib/reporter/cake_text_reporter.php +++ b/cake/tests/lib/reporter/cake_text_reporter.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.libs.reporter + * @package cake.tests.libs.reporter * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -26,7 +25,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); * CakeTextReporter contains reporting features used for plain text based output * * @package cake - * @subpackage cake.tests.lib + * @package cake.tests.lib */ class CakeTextReporter extends CakeBaseReporter { diff --git a/cake/tests/lib/templates/footer.php b/cake/tests/lib/templates/footer.php index e9b6c6746..0f6ab6a69 100644 --- a/cake/tests/lib/templates/footer.php +++ b/cake/tests/lib/templates/footer.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/templates/header.php b/cake/tests/lib/templates/header.php index 5f80658c1..df19f02d9 100644 --- a/cake/tests/lib/templates/header.php +++ b/cake/tests/lib/templates/header.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/templates/menu.php b/cake/tests/lib/templates/menu.php index a596ac139..bb81dc7cf 100644 --- a/cake/tests/lib/templates/menu.php +++ b/cake/tests/lib/templates/menu.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/templates/missing_conenction.php b/cake/tests/lib/templates/missing_conenction.php index 37c242507..eb88d1aaa 100644 --- a/cake/tests/lib/templates/missing_conenction.php +++ b/cake/tests/lib/templates/missing_conenction.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/templates/phpunit.php b/cake/tests/lib/templates/phpunit.php index 4a865523b..0e525d5ab 100644 --- a/cake/tests/lib/templates/phpunit.php +++ b/cake/tests/lib/templates/phpunit.php @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/templates/xdebug.php b/cake/tests/lib/templates/xdebug.php index 5722a91ff..f826509eb 100644 --- a/cake/tests/lib/templates/xdebug.php +++ b/cake/tests/lib/templates/xdebug.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php index 9322db04e..7cb6a3fdd 100644 --- a/cake/tests/lib/test_manager.php +++ b/cake/tests/lib/test_manager.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -29,8 +28,7 @@ require_once CAKE_TESTS_LIB . 'cake_test_suite.php'; * TestManager is the base class that handles loading and initiating the running * of TestCase and TestSuite classes that the user has selected. * - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib */ class TestManager { /** diff --git a/cake/tests/lib/test_runner.php b/cake/tests/lib/test_runner.php index c2ca7f809..22def2a23 100644 --- a/cake/tests/lib/test_runner.php +++ b/cake/tests/lib/test_runner.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.tests.libs + * @package cake.tests.libs * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -27,8 +26,7 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); /** * Class to customize loading of test suites from CLI * - * @package cake - * @subpackage cake.cake.tests.lib + * @package cake.tests.lib */ class TestRunner extends PHPUnit_TextUI_Command { diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php index 3c53bfde1..d2f06fc4d 100644 --- a/cake/tests/test_app/config/acl.ini.php +++ b/cake/tests/test_app/config/acl.ini.php @@ -14,8 +14,7 @@ ; * ; * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) ; * @link http://cakephp.org CakePHP(tm) Project -; * @package cake -; * @subpackage cake.app.config +;; * @package app.config ; * @since CakePHP(tm) v 0.10.0.1076 ; * @license MIT License (http://www.opensource.org/licenses/mit-license.php) ; */ diff --git a/cake/tests/test_app/config/routes.php b/cake/tests/test_app/config/routes.php index 17fdccf25..8d401d581 100644 --- a/cake/tests/test_app/config/routes.php +++ b/cake/tests/test_app/config/routes.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.test_app.config + * @package cake.tests.test_app.config * @since CakePHP v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/console/shells/sample.php b/cake/tests/test_app/console/shells/sample.php index 8994803e8..aa892b1ec 100644 --- a/cake/tests/test_app/console/shells/sample.php +++ b/cake/tests/test_app/console/shells/sample.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.vendors.shells + * @package cake.tests.test_app.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/cake/tests/test_app/controllers/tests_apps_controller.php index f7f2faf9f..24f193b48 100644 --- a/cake/tests/test_app/controllers/tests_apps_controller.php +++ b/cake/tests/test_app/controllers/tests_apps_controller.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/cake/tests/test_app/controllers/tests_apps_posts_controller.php index 0b11bd068..af28f42c4 100644 --- a/cake/tests/test_app/controllers/tests_apps_posts_controller.php +++ b/cake/tests/test_app/controllers/tests_apps_posts_controller.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/libs/cache/test_app_cache.php b/cake/tests/test_app/libs/cache/test_app_cache.php index d138764d3..1a8a47ac0 100644 --- a/cake/tests/test_app/libs/cache/test_app_cache.php +++ b/cake/tests/test_app/libs/cache/test_app_cache.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/libs/library.php b/cake/tests/test_app/libs/library.php index 5047e0868..10fc5f10f 100644 --- a/cake/tests/test_app/libs/library.php +++ b/cake/tests/test_app/libs/library.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/libs/log/test_app_log.php b/cake/tests/test_app/libs/log/test_app_log.php index bd65581dc..129e1b65d 100644 --- a/cake/tests/test_app/libs/log/test_app_log.php +++ b/cake/tests/test_app/libs/log/test_app_log.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/cake/tests/test_app/models/behaviors/persister_one_behavior.php index eebe0ba5d..8ef3cf6af 100644 --- a/cake/tests/test_app/models/behaviors/persister_one_behavior.php +++ b/cake/tests/test_app/models/behaviors/persister_one_behavior.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.test_app.models + * @package cake.tests.test_app.models * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting * the amount of associations and data returned. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs */ class PersisterOneBehaviorBehavior extends ModelBehavior { } diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/cake/tests/test_app/models/behaviors/persister_two_behavior.php index e17180e24..6cbd0483b 100644 --- a/cake/tests/test_app/models/behaviors/persister_two_behavior.php +++ b/cake/tests/test_app/models/behaviors/persister_two_behavior.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.test_app.models + * @package cake.tests.test_app.models * @since CakePHP(tm) v 1.2.0.5669 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -24,8 +23,7 @@ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting * the amount of associations and data returned. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs */ class PersisterTwoBehaviorBehavior extends ModelBehavior { } diff --git a/cake/tests/test_app/models/comment.php b/cake/tests/test_app/models/comment.php index 9ded58dde..0f0b142d8 100644 --- a/cake/tests/test_app/models/comment.php +++ b/cake/tests/test_app/models/comment.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs. + * @package cake.libs. * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php index a13bc3c65..26e1b1dd6 100644 --- a/cake/tests/test_app/models/persister_one.php +++ b/cake/tests/test_app/models/persister_one.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.test_app.models + * @package cake.tests.test_app.models * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php index b157e7850..68313cd6e 100644 --- a/cake/tests/test_app/models/persister_two.php +++ b/cake/tests/test_app/models/persister_two.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.tests.test_app.models + * @package cake.tests.test_app.models * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/models/post.php b/cake/tests/test_app/models/post.php index 2155d970d..5a1c15370 100644 --- a/cake/tests/test_app/models/post.php +++ b/cake/tests/test_app/models/post.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs. + * @package cake.libs. * @since CakePHP v 1.2.0.7726 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/config/load.php b/cake/tests/test_app/plugins/test_plugin/config/load.php index 709468c0a..07576e051 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/load.php +++ b/cake/tests/test_app/plugins/test_plugin/config/load.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app + * @package cake.tests.test_app * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/cake/tests/test_app/plugins/test_plugin/config/more.load.php index bedf5cff0..f0c9744f8 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/more.load.php +++ b/cake/tests/test_app/plugins/test_plugin/config/more.load.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app + * @package cake.tests.test_app * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php index fd3a283c8..9f9bd3571 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php +++ b/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.app.config.sql + * @package app.config.sql * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/example.php b/cake/tests/test_app/plugins/test_plugin/console/shells/example.php index 8380eb901..76e750913 100644 --- a/cake/tests/test_app/plugins/test_plugin/console/shells/example.php +++ b/cake/tests/test_app/plugins/test_plugin/console/shells/example.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.vendors.shells + * @package cake.tests.test_app.plugins.test_plugin.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php b/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php index 4c4dc2823..ca6668b2f 100644 --- a/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php +++ b/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.vendors.shells + * @package cake.tests.test_app.plugins.test_plugin.vendors.shells * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php index 08168bb27..cff9b4a0d 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php index b3bd6f25f..8c478bba6 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php index 78e87ce56..c09948394 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php index 3b2bb344d..28acded03 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php index 87fd60dc7..2ad779059 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php index ea74c447e..36d67e950 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php index 3342755dc..a1afa5d46 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php index 3ce8c9837..3072ca08e 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php index decf3ef66..647e33177 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php index 4a54e3554..669ac584c 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php +++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.test_app.models + * @package cake.tests.test_app.models * @since CakePHP(tm) v 1.2.0.5669 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -27,8 +26,7 @@ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting * the amount of associations and data returned. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs */ class TestPluginPersisterOneBehavior extends ModelBehavior { } diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php index 90ba761e0..162078e51 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php +++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.tests.test_app.models + * @package cake.tests.test_app.models * @since CakePHP(tm) v 1.2.0.5669 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -27,8 +26,7 @@ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting * the amount of associations and data returned. * - * @package cake - * @subpackage cake.cake.console.libs + * @package cake.console.libs */ class TestPluginPersisterTwoBehavior extends ModelBehavior { } diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php index 430d5c446..74519a19d 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.tests.test_app.plugins.test_plugin + * @package cake.tests.test_app.plugins.test_plugin * @since CakePHP v 1.2.0.4487 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php index ac9782643..0edd39cf1 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. * @link http://cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs. + * @package cake.libs. * @since CakePHP v 1.2.0.7726 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php index 781841fa2..afef031a3 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php @@ -15,8 +15,7 @@ * * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. * @link http://cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs. + * @package cake.libs. * @since CakePHP v 1.2.0.7726 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php index 0c6090a76..b0441191f 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php @@ -14,8 +14,7 @@ * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.tests.test_app.plugins.test_plugin + * @package cake.tests.test_app.plugins.test_plugin * @since CakePHP v 1.2.0.4487 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php index 89b70da0d..f8c2265d5 100644 --- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php index 5f6162fcc..6dc24ad8b 100644 --- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php +++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.cases.libs + * @package cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php index 2566444f9..435b67a84 100644 --- a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php +++ b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.vendors.sample + * @package cake.tests.test_app.plugins.test_plugin.vendors.sample * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php index 50dbe616f..41d62cbd0 100644 --- a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php +++ b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.vendors + * @package cake.tests.test_app.plugins.test_plugin.vendors * @since CakePHP(tm) v 1.2.0.7629 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php index 07b109f6b..eb70d228c 100644 --- a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php +++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php index fee89f004..d92752535 100644 --- a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php +++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers + * @package cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php b/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php index dea25fd74..290188779 100644 --- a/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php +++ b/cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin_two.vendors.shells + * @package cake.tests.test_app.plugins.test_plugin_two.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php b/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php index 7c091ea92..7c7da0c3a 100644 --- a/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php +++ b/cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.plugins.test_plugin_two.vendors.shells + * @package cake.tests.test_app.plugins.test_plugin_two.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/vendors/Test/MyTest.php b/cake/tests/test_app/vendors/Test/MyTest.php index 888c9395d..d1a94d55b 100644 --- a/cake/tests/test_app/vendors/Test/MyTest.php +++ b/cake/tests/test_app/vendors/Test/MyTest.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.vendors.somename + * @package cake.tests.test_app.vendors.somename * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/vendors/Test/hello.php b/cake/tests/test_app/vendors/Test/hello.php index e6cd3fbba..7f886aef0 100644 --- a/cake/tests/test_app/vendors/Test/hello.php +++ b/cake/tests/test_app/vendors/Test/hello.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.vendors.Test + * @package cake.tests.test_app.vendors.Test * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php index 16ba606ba..58e797165 100644 --- a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php +++ b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.vendors.sample + * @package cake.tests.test_app.vendors.sample * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/vendors/somename/some.name.php b/cake/tests/test_app/vendors/somename/some.name.php index 54c144fe3..1394bf894 100644 --- a/cake/tests/test_app/vendors/somename/some.name.php +++ b/cake/tests/test_app/vendors/somename/some.name.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.vendors.somename + * @package cake.tests.test_app.vendors.somename * @since CakePHP(tm) v 1.2.0.4206 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/vendors/welcome.php b/cake/tests/test_app/vendors/welcome.php index dedd3e196..6b36caf0c 100644 --- a/cake/tests/test_app/vendors/welcome.php +++ b/cake/tests/test_app/vendors/welcome.php @@ -12,8 +12,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests - * @package cake - * @subpackage cake.tests.test_app.vendors + * @package cake.tests.test_app.vendors * @since CakePHP(tm) v 1.2.0.7629 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/elements/email/html/custom.ctp b/cake/tests/test_app/views/elements/email/html/custom.ctp index 6b46d7c65..6d1b5702a 100644 --- a/cake/tests/test_app/views/elements/email/html/custom.ctp +++ b/cake/tests/test_app/views/elements/email/html/custom.ctp @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org) * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements.email.html + * @package cake.libs.view.templates.elements.email.html * @since CakePHP(tm) v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/tests/test_app/views/elements/email/html/default.ctp b/cake/tests/test_app/views/elements/email/html/default.ctp index de87b4eb8..8efbaa94d 100644 --- a/cake/tests/test_app/views/elements/email/html/default.ctp +++ b/cake/tests/test_app/views/elements/email/html/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements.email.html + * @package cake.libs.view.templates.elements.email.html * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/elements/email/text/custom.ctp b/cake/tests/test_app/views/elements/email/text/custom.ctp index 623dba240..601023b74 100644 --- a/cake/tests/test_app/views/elements/email/text/custom.ctp +++ b/cake/tests/test_app/views/elements/email/text/custom.ctp @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org) * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements.email.text + * @package cake.libs.view.templates.elements.email.text * @since CakePHP(tm) v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/tests/test_app/views/elements/email/text/default.ctp b/cake/tests/test_app/views/elements/email/text/default.ctp index 9d384e3f8..7655f1430 100644 --- a/cake/tests/test_app/views/elements/email/text/default.ctp +++ b/cake/tests/test_app/views/elements/email/text/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements.email.text + * @package cake.libs.view.templates.elements.email.text * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/elements/email/text/wide.ctp b/cake/tests/test_app/views/elements/email/text/wide.ctp index 67b03b057..1e476fbee 100644 --- a/cake/tests/test_app/views/elements/email/text/wide.ctp +++ b/cake/tests/test_app/views/elements/email/text/wide.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.elements.email.text + * @package cake.libs.view.templates.elements.email.text * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/helpers/banana.php b/cake/tests/test_app/views/helpers/banana.php index 0489d80f2..f57db5219 100644 --- a/cake/tests/test_app/views/helpers/banana.php +++ b/cake/tests/test_app/views/helpers/banana.php @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/ajax.ctp b/cake/tests/test_app/views/layouts/ajax.ctp index dadf156ed..93371552b 100644 --- a/cake/tests/test_app/views/layouts/ajax.ctp +++ b/cake/tests/test_app/views/layouts/ajax.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/ajax2.ctp b/cake/tests/test_app/views/layouts/ajax2.ctp index 0fa4fbacb..673abbaab 100644 --- a/cake/tests/test_app/views/layouts/ajax2.ctp +++ b/cake/tests/test_app/views/layouts/ajax2.ctp @@ -13,8 +13,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/cache_layout.ctp b/cake/tests/test_app/views/layouts/cache_layout.ctp index 1fd6ff624..d76c26936 100644 --- a/cake/tests/test_app/views/layouts/cache_layout.ctp +++ b/cake/tests/test_app/views/layouts/cache_layout.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/default.ctp b/cake/tests/test_app/views/layouts/default.ctp index f75592f05..21dacb2d9 100644 --- a/cake/tests/test_app/views/layouts/default.ctp +++ b/cake/tests/test_app/views/layouts/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.pages + * @package cake.libs.view.templates.pages * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/email/html/default.ctp b/cake/tests/test_app/views/layouts/email/html/default.ctp index 8b5a339f8..cc4364bb1 100644 --- a/cake/tests/test_app/views/layouts/email/html/default.ctp +++ b/cake/tests/test_app/views/layouts/email/html/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts.email.html + * @package cake.libs.view.templates.layouts.email.html * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/email/html/thin.ctp b/cake/tests/test_app/views/layouts/email/html/thin.ctp index 21ef3747f..87ece8384 100644 --- a/cake/tests/test_app/views/layouts/email/html/thin.ctp +++ b/cake/tests/test_app/views/layouts/email/html/thin.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts.email.html + * @package cake.libs.view.templates.layouts.email.html * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/email/text/default.ctp b/cake/tests/test_app/views/layouts/email/text/default.ctp index eb9a46daa..ad1aee411 100644 --- a/cake/tests/test_app/views/layouts/email/text/default.ctp +++ b/cake/tests/test_app/views/layouts/email/text/default.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts.email.text + * @package cake.libs.view.templates.layouts.email.text * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/flash.ctp b/cake/tests/test_app/views/layouts/flash.ctp index 1b7745cf2..bed0624c4 100644 --- a/cake/tests/test_app/views/layouts/flash.ctp +++ b/cake/tests/test_app/views/layouts/flash.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/layouts/multi_cache.ctp b/cake/tests/test_app/views/layouts/multi_cache.ctp index d3bb46503..d14ce36de 100644 --- a/cake/tests/test_app/views/layouts/multi_cache.ctp +++ b/cake/tests/test_app/views/layouts/multi_cache.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.layouts + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/cake/tests/test_app/views/posts/sequencial_nocache.ctp index 7fa93fa5c..c6aa3eb09 100644 --- a/cake/tests/test_app/views/posts/sequencial_nocache.ctp +++ b/cake/tests/test_app/views/posts/sequencial_nocache.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.pages + * @package cake.libs.view.templates.pages * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/cake/tests/test_app/views/posts/test_nocache_tags.ctp index b3ee6f828..745ef4ad9 100644 --- a/cake/tests/test_app/views/posts/test_nocache_tags.ctp +++ b/cake/tests/test_app/views/posts/test_nocache_tags.ctp @@ -11,8 +11,7 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake - * @subpackage cake.cake.libs.view.templates.pages + * @package cake.libs.view.templates.pages * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/index.php b/index.php index cb0352b8a..265576a3c 100644 --- a/index.php +++ b/index.php @@ -17,7 +17,6 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */