diff --git a/app/Config/core.php b/app/Config/core.php index 97d26629d..fb9c951bc 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -200,6 +200,7 @@ * timestamping regardless of debug value. */ //Configure::write('Asset.timestamp', true); + /** * Compress CSS output by removing comments, whitespace, repeating tags, etc. * This requires a/var/cache directory to be writable by the web server for caching. diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php index 67500e2bf..351fb73b1 100644 --- a/lib/Cake/Cache/Cache.php +++ b/lib/Cake/Cache/Cache.php @@ -374,6 +374,7 @@ class Cache { self::set(null, $config); return $success; } + /** * Decrement a number under the key and return decremented value. * @@ -401,6 +402,7 @@ class Cache { self::set(null, $config); return $success; } + /** * Delete a key from the cache. * diff --git a/lib/Cake/Cache/Engine/XcacheEngine.php b/lib/Cake/Cache/Engine/XcacheEngine.php index d0951c527..72100f76d 100644 --- a/lib/Cake/Cache/Engine/XcacheEngine.php +++ b/lib/Cake/Cache/Engine/XcacheEngine.php @@ -110,6 +110,7 @@ class XcacheEngine extends CacheEngine { public function decrement($key, $offset = 1) { return xcache_dec($key, $offset); } + /** * Delete a key from the cache * diff --git a/lib/Cake/Console/Command/ApiShell.php b/lib/Cake/Console/Command/ApiShell.php index 3c0e0f834..653189029 100644 --- a/lib/Cake/Console/Command/ApiShell.php +++ b/lib/Cake/Console/Command/ApiShell.php @@ -151,6 +151,7 @@ class ApiShell extends AppShell { ))->description(__d('cake_console', 'Lookup doc block comments for classes in CakePHP.')); return $parser; } + /** * Show help for this shell. * diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php index 05505835a..68e0d1ab2 100644 --- a/lib/Cake/Console/Command/UpgradeShell.php +++ b/lib/Cake/Console/Command/UpgradeShell.php @@ -554,6 +554,7 @@ class UpgradeShell extends AppShell { ); $this->_filesRegexpUpdate($patterns); } + /** * Move application views files to where they now should be * diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index cf69e312b..7b529f74e 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/lib/Cake/Console/Templates/skel/Config/core.php @@ -200,6 +200,7 @@ * timestamping regardless of debug value. */ //Configure::write('Asset.timestamp', true); + /** * Compress CSS output by removing comments, whitespace, repeating tags, etc. * This requires a/var/cache directory to be writable by the web server for caching. diff --git a/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css b/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css index b6b86e594..259d8f17c 100644 --- a/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css +++ b/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css @@ -365,6 +365,7 @@ form .submit input[type=submit] { form .submit input[type=submit]:hover { background: #5BA150; } + /* Form errors */ form .error { background: #FFDACC; @@ -646,6 +647,7 @@ pre { overflow: auto; text-shadow: none; } + /* excerpt */ .cake-code-dump pre, .cake-code-dump pre code { diff --git a/lib/Cake/Console/Templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php index 4e83f44bd..2435ae184 100644 --- a/lib/Cake/Console/Templates/skel/webroot/index.php +++ b/lib/Cake/Console/Templates/skel/webroot/index.php @@ -24,6 +24,7 @@ if (!defined('DS')) { define('DS', DIRECTORY_SEPARATOR); } + /** * These defines should only be edited if you have cake installed in * a directory layout other than the way it is distributed. @@ -37,6 +38,7 @@ if (!defined('ROOT')) { define('ROOT', dirname(dirname(dirname(__FILE__)))); } + /** * The actual directory name for the "app". * diff --git a/lib/Cake/Console/Templates/skel/webroot/test.php b/lib/Cake/Console/Templates/skel/webroot/test.php index e6f33ef4f..670e2ed44 100644 --- a/lib/Cake/Console/Templates/skel/webroot/test.php +++ b/lib/Cake/Console/Templates/skel/webroot/test.php @@ -24,6 +24,7 @@ ini_set('display_errors', 1); if (!defined('DS')) { define('DS', DIRECTORY_SEPARATOR); } + /** * These defines should only be edited if you have cake installed in * a directory layout other than the way it is distributed. @@ -37,6 +38,7 @@ ini_set('display_errors', 1); if (!defined('ROOT')) { define('ROOT', dirname(dirname(dirname(__FILE__)))); } + /** * The actual directory name for the "app". * diff --git a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php index 0e3d004b5..b0a2d08f5 100644 --- a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php @@ -100,6 +100,7 @@ class DigestAuthenticate extends BaseAuthenticate { $this->settings['opaque'] = md5($this->settings['realm']); } } + /** * Authenticate a user using Digest HTTP auth. Will use the configured User model and attempt a * login using Digest HTTP auth. @@ -142,6 +143,7 @@ class DigestAuthenticate extends BaseAuthenticate { } return false; } + /** * Find a user record using the standard options. * diff --git a/lib/Cake/Error/exceptions.php b/lib/Cake/Error/exceptions.php index ade225b8e..d2b99b671 100644 --- a/lib/Cake/Error/exceptions.php +++ b/lib/Cake/Error/exceptions.php @@ -226,6 +226,7 @@ class MissingActionException extends CakeException { parent::__construct($message, $code); } } + /** * Private Action exception - used when a controller action * starts with a `_`. diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php index 18c483392..ff39122b2 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlserver.php +++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php @@ -585,6 +585,7 @@ class Sqlserver extends DboSource { return parent::value($data, $column); } } + /** * Returns an array of all result rows for a given SQL query. * Returns false if no rows matched. @@ -742,6 +743,7 @@ class Sqlserver extends DboSource { } return $affected; } + /** * Executes given SQL statement. * diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index f46c8f438..c814d9cd4 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -3075,6 +3075,7 @@ class Model extends Object { } return $valid; } + /** * Marks a field as invalid, optionally setting the name of validation * rule (in case of multiple validation for field) that was broken. diff --git a/lib/Cake/Routing/Route/PluginShortRoute.php b/lib/Cake/Routing/Route/PluginShortRoute.php index 7ae7a6bc1..6801ab6a6 100644 --- a/lib/Cake/Routing/Route/PluginShortRoute.php +++ b/lib/Cake/Routing/Route/PluginShortRoute.php @@ -1,5 +1,4 @@ assertEquals($result, array()); } + /** * testHttpBase method * diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php index 9d3cbd6d8..71fbb5d1c 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php @@ -364,6 +364,7 @@ class MemcacheEngineTest extends CakeTestCase { Cache::clear(false, 'memcache2'); } + /** * test that a 0 duration can succesfully write. * diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php index f39c0f2e1..2f24456c1 100644 --- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php +++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php @@ -28,6 +28,7 @@ class PhpReaderTest extends CakeTestCase { parent::setUp(); $this->path = CAKE . 'Test' . DS . 'test_app' . DS . 'Config'. DS; } + /** * test reading files * diff --git a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php index 7591b4918..2a0eeb73c 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php @@ -19,12 +19,12 @@ * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ - App::uses('ShellDispatcher', 'Console'); App::uses('ConsoleOutput', 'Console'); App::uses('ConsoleInput', 'Console'); App::uses('Shell', 'Console'); App::uses('TemplateTask', 'Console/Command/Task'); + /** * TemplateTaskTest class * diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php index cbb081018..212d62a66 100644 --- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php +++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php @@ -71,6 +71,7 @@ class TaskCollectionTest extends CakeTestCase { $this->assertFalse($this->Tasks->enabled('DbConfig'), 'DbConfigTask should be disabled'); } + /** * test missingtask exception * diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php index b26ee9085..37dff2eef 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php @@ -163,6 +163,7 @@ class BasicAuthenticateTest extends CakeTestCase { $result = $this->auth->authenticate($request, $this->response); $this->assertFalse($result); } + /** * test authenticate sucesss * diff --git a/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php b/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php index 1561889db..56fe5b645 100644 --- a/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php @@ -499,6 +499,7 @@ class CookieComponentTest extends CakeTestCase { $this->assertNull($this->Cookie->read('User.email')); $this->Cookie->destroy(); } + /** * Test deleting recursively with keys that don't exist. * diff --git a/lib/Cake/Test/Case/Controller/Component/DbAclTest.php b/lib/Cake/Test/Case/Controller/Component/DbAclTest.php index bb1d750f5..8ab493808 100644 --- a/lib/Cake/Test/Case/Controller/Component/DbAclTest.php +++ b/lib/Cake/Test/Case/Controller/Component/DbAclTest.php @@ -470,6 +470,7 @@ class DbAclTest extends CakeTestCase { $this->Acl->deny('Bobs', 'ROOT/printers/DoesNotExist', 'create'); } + /** * debug function - to help editing/creating test cases for the ACL component * diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php index 5e12a3d4f..3703d86f3 100644 --- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php @@ -45,6 +45,7 @@ class RequestHandlerTestController extends Controller { $this->viewPath = 'Posts'; $this->render('index'); } + /** * test method for ajax redirection + parameter parsing * diff --git a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php index 208b147d6..2167936e4 100644 --- a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php +++ b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php @@ -110,6 +110,7 @@ class ComponentCollectionTest extends CakeTestCase { $this->assertFalse($this->Components->enabled('Cookie'), 'Cookie should be disabled'); } + /** * test missingcomponent exception * diff --git a/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php b/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php index bf37c8dcc..fb05d2ef6 100644 --- a/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php @@ -34,6 +34,7 @@ class MergeVarsAppController extends Controller { * @var array */ public $components = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false)); + /** * helpers * @@ -42,7 +43,6 @@ class MergeVarsAppController extends Controller { public $helpers = array('MergeVar' => array('format' => 'html', 'terse')); } - /** * MergeVar Component * diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index 7459fb06a..a209e3213 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -35,12 +35,14 @@ class ControllerTestAppController extends Controller { * @var array */ public $helpers = array('Html'); + /** * uses property * * @var array */ public $uses = array('ControllerPost'); + /** * components property * @@ -305,6 +307,7 @@ class TestComponent extends Object { */ public function beforeRedirect() { } + /** * initialize method * @@ -320,6 +323,7 @@ class TestComponent extends Object { */ public function startup(&$controller) { } + /** * shutdown method * @@ -327,6 +331,7 @@ class TestComponent extends Object { */ public function shutdown(&$controller) { } + /** * beforeRender callback * @@ -351,6 +356,7 @@ class AnotherTestController extends ControllerTestAppController { * @var string 'Name' */ public $name = 'AnotherTest'; + /** * uses property * @@ -358,6 +364,11 @@ class AnotherTestController extends ControllerTestAppController { */ public $uses = null; +/** + * merge parent + * + * @var string + */ protected $_mergeParent = 'ControllerTestAppController'; } @@ -1114,6 +1125,7 @@ class ControllerTest extends CakeTestCase { $Controller->startupProcess(); } + /** * Tests that the shutdown process calls the correct functions * diff --git a/lib/Cake/Test/Case/Controller/ScaffoldTest.php b/lib/Cake/Test/Case/Controller/ScaffoldTest.php index b375fe6c9..c96885597 100644 --- a/lib/Cake/Test/Case/Controller/ScaffoldTest.php +++ b/lib/Cake/Test/Case/Controller/ScaffoldTest.php @@ -16,7 +16,6 @@ * @since CakePHP(tm) v 1.2.0.5436 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ - App::uses('Router', 'Routing'); App::uses('Controller', 'Controller'); App::uses('Scaffold', 'Controller'); @@ -105,8 +104,6 @@ class TestScaffoldMock extends Scaffold { } } - - /** * Scaffold Test class * @@ -127,6 +124,7 @@ class ScaffoldTest extends CakeTestCase { * @var array */ public $fixtures = array('core.article', 'core.user', 'core.comment', 'core.join_thing', 'core.tag'); + /** * setUp method * @@ -273,6 +271,7 @@ class ScaffoldTest extends CakeTestCase { $result = ob_get_clean(); $this->assertRegExp('/Scaffold Mock has been updated/', $result); } + /** * test that habtm relationship keys get added to scaffoldFields. * @@ -308,6 +307,7 @@ class ScaffoldTest extends CakeTestCase { $result = $Scaffold->controller->viewVars; $this->assertEquals($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated', 'ScaffoldTag')); } + /** * test that the proper names and variable values are set by Scaffold * diff --git a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php index d07b88bdd..77e609262 100644 --- a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php +++ b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php @@ -126,6 +126,7 @@ class MyCustomExceptionRenderer extends ExceptionRenderer { echo 'widget thing is missing'; } } + /** * Exception class for testing app error handlers and custom errors. * @@ -409,6 +410,7 @@ class ExceptionRendererTest extends CakeTestCase { $result = ob_get_clean(); $this->assertContains('Not Found', $result); } + /** * test that error400 doesn't expose XSS * diff --git a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php index 020da5346..0567b19fb 100644 --- a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php @@ -2989,6 +2989,7 @@ class ContainableBehaviorTest extends CakeTestCase { $this->assertFalse(isset($result[0]['Comment']['published']), 'published found %s'); $this->assertFalse(isset($result[0]['User']['password']), 'password found %s'); } + /** * testFindConditionalBinding method * @@ -3568,6 +3569,7 @@ class ContainableBehaviorTest extends CakeTestCase { $this->assertTrue(isset($result[0]['Article'])); $this->assertTrue(isset($result[0]['User'])); } + /** * test that autoFields doesn't splice in columns that aren't part of the join. * diff --git a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php index 00f151fcf..4907d5f3b 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php @@ -829,6 +829,7 @@ class TranslateBehaviorTest extends CakeTestCase { ); $this->assertEquals($expected, $result); } + /** * testTranslateTableWithPrefix method * Tests that is possible to have a translation model with a custom tablePrefix diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php index 7a5fa1d28..22e6e8290 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php @@ -1202,6 +1202,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { $this->assertTrue($this->Tree->cacheQueries, 'cacheQueries was not restored after reorder(). %s'); $this->Tree->cacheQueries = $original; } + /** * testGenerateTreeListWithSelfJoin method * diff --git a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php index 90ac6fb5b..fe4c6f663 100644 --- a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php +++ b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php @@ -254,6 +254,7 @@ class TestBehavior extends ModelBehavior { } echo "onError trigger success"; } + /** * beforeTest method * diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php index 453cea334..f0762f19b 100644 --- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php +++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php @@ -440,12 +440,14 @@ class SchemaPrefixAuthUser extends CakeTestModel { * @var string */ public $name = 'SchemaPrefixAuthUser'; + /** * table prefix * * @var string */ public $tablePrefix = 'auth_'; + /** * useTable * @@ -746,6 +748,7 @@ class CakeSchemaTest extends CakeTestCase { $result = $this->Schema->generateTable('posts', $posts); $this->assertRegExp('/public \$posts/', $result); } + /** * testSchemaWrite method * diff --git a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php index f5bc4c18d..7407c1de9 100644 --- a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php +++ b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php @@ -24,7 +24,6 @@ App::uses('ConnectionManager', 'Model'); */ class ConnectionManagerTest extends CakeTestCase { - /** * tearDown method * @@ -34,6 +33,7 @@ class ConnectionManagerTest extends CakeTestCase { parent::tearDown(); CakePlugin::unload(); } + /** * testEnumConnectionObjects method * diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php index 967d0da5c..53062c901 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php @@ -225,6 +225,7 @@ class MysqlTest extends CakeTestCase { $this->Dbo->rawQuery('DROP TABLE ' . $this->Dbo->fullTableName($tableName)); } + /** * testLastAffected method * diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php index bbcee72f8..d1b486eea 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php @@ -206,6 +206,7 @@ class PostgresTest extends CakeTestCase { 'core.tag', 'core.articles_tag', 'core.attachment', 'core.person', 'core.post', 'core.author', 'core.datatype', ); + /** * Actual DB connection used in testing * diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php index 1b567ff48..05890dac1 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php @@ -163,6 +163,7 @@ class SqlserverTestModel extends Model { 'foreignKey' => 'client_id' ) ); + /** * find method * @@ -302,6 +303,7 @@ class SqlserverTest extends CakeTestCase { $result = $this->db->value('', 'binary'); $this->assertSame($expected, $result); } + /** * testFields method * @@ -459,6 +461,7 @@ class SqlserverTest extends CakeTestCase { ); $this->assertEquals($expected, $result); } + /** * testBuildColumn * @@ -521,6 +524,7 @@ class SqlserverTest extends CakeTestCase { $expected = '[body] nvarchar(MAX)'; $this->assertEquals($expected, $result); } + /** * testBuildIndex method * @@ -547,6 +551,7 @@ class SqlserverTest extends CakeTestCase { $expected = array('ALTER TABLE items ADD CONSTRAINT client_id UNIQUE([client_id], [period_id]);'); $this->assertEquals($expected, $result); } + /** * testUpdateAllSyntax method * diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php index b01956d52..f2cdd1150 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php @@ -137,6 +137,7 @@ class DatabaseSessionTest extends CakeTestCase { $result = $this->storage->write('', 'This is a Test'); $this->assertFalse($result); } + /** * test read() * diff --git a/lib/Cake/Test/Case/Model/DbAclTest.php b/lib/Cake/Test/Case/Model/DbAclTest.php index a815dc84f..edde6b82d 100644 --- a/lib/Cake/Test/Case/Model/DbAclTest.php +++ b/lib/Cake/Test/Case/Model/DbAclTest.php @@ -186,6 +186,7 @@ class DbAroUserTest extends CakeTestModel { * @var string 'auth_users' */ public $useTable = 'auth_users'; + /** * bindNode method * diff --git a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php index 74a881d98..d57f13616 100644 --- a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php +++ b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php @@ -32,6 +32,7 @@ class DboMock extends DboSource { public function name($field) { return $field; } + /** * Returns true to fake a database connection */ diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php index ccbe68f12..5b44c17af 100644 --- a/lib/Cake/Test/Case/Model/ModelReadTest.php +++ b/lib/Cake/Test/Case/Model/ModelReadTest.php @@ -7447,6 +7447,7 @@ class ModelReadTest extends BaseModelTest { ); $this->assertEquals($expected, $result); } + /** * Testing availability of $this->findQueryType in Model callbacks * diff --git a/lib/Cake/Test/Case/Model/ModelTestBase.php b/lib/Cake/Test/Case/Model/ModelTestBase.php index be8159299..fba4a0df5 100644 --- a/lib/Cake/Test/Case/Model/ModelTestBase.php +++ b/lib/Cake/Test/Case/Model/ModelTestBase.php @@ -41,6 +41,7 @@ abstract class BaseModelTest extends CakeTestCase { * @var bool false */ public $backupGlobals = false; + /** * fixtures property * diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php index c976d17f5..6f6b928a2 100644 --- a/lib/Cake/Test/Case/Model/ModelWriteTest.php +++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php @@ -539,6 +539,7 @@ class ModelWriteTest extends BaseModelTest { $result = $Model->save($data); $this->assertFalse($result); } + /** * test that beforeSave returning false can abort saves. * @@ -1795,6 +1796,7 @@ class ModelWriteTest extends BaseModelTest { $this->assertEquals(count($result['NotDoomedSomethingElse']), 2); $this->assertEquals(count($result['DoomedSomethingElse']), 1); } + /** * testHabtmSaveKeyResolution method * diff --git a/lib/Cake/Test/Case/Model/models.php b/lib/Cake/Test/Case/Model/models.php index a2e40dccd..8f4ef61b2 100644 --- a/lib/Cake/Test/Case/Model/models.php +++ b/lib/Cake/Test/Case/Model/models.php @@ -1894,6 +1894,7 @@ class AssociationTest2 extends CakeTestModel { class Callback extends CakeTestModel { } + /** * CallbackPostTestModel class * diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php index 36dcb58a9..310feab78 100644 --- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php +++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php @@ -676,6 +676,7 @@ class CakeEmailTest extends CakeTestCase { $result = $this->CakeEmail->transportClass(); $this->assertInstanceOf('DebugTransport', $result); } + /** * testSendWithContent method * @@ -1213,6 +1214,7 @@ class CakeEmailTest extends CakeTestCase { $this->assertTrue((bool)strpos($result['headers'], 'Message-ID: ')); $this->assertTrue((bool)strpos($result['headers'], 'To: ')); } + /** * testViewRender method * diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php index 75a4717d5..b827c6023 100644 --- a/lib/Cake/Test/Case/Routing/DispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php @@ -291,6 +291,7 @@ class ArticlesTestController extends ArticlesTestAppController { public function admin_index() { return true; } + /** * fake index method. * @@ -441,6 +442,7 @@ class TestCachedPagesController extends Controller { public function view($id = null) { $this->render('index'); } + /** * test cached forms / tests view object being registered * @@ -723,6 +725,7 @@ class DispatcherTest extends CakeTestCase { $controller = $Dispatcher->dispatch($url, $response, array('return' => 1)); } + /** * testDispatch method * diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php index 6101c7027..938b119a9 100644 --- a/lib/Cake/Test/Case/Routing/RouterTest.php +++ b/lib/Cake/Test/Case/Routing/RouterTest.php @@ -2084,6 +2084,7 @@ class RouterTest extends CakeTestCase { $this->assertEquals(Router::stripPlugin($url), $url); $this->assertEquals(Router::stripPlugin($url, null), $url); } + /** * testCurentRoute * @@ -2098,6 +2099,7 @@ class RouterTest extends CakeTestCase { $route = Router::currentRoute(); $this->assertEquals(array_merge($url, array('plugin' => null)), $route->defaults); } + /** * testRequestRoute * @@ -2124,6 +2126,7 @@ class RouterTest extends CakeTestCase { $route = Router::requestRoute(); $this->assertEquals(array_merge($url, array('plugin' => null)), $route->defaults); } + /** * testGetParams * @@ -2389,6 +2392,7 @@ class RouterTest extends CakeTestCase { $result = Router::url(array('base' => false)); $this->assertEquals('/posts', $result, 'with second requests, the last should win.'); } + /** * test that a route object returning a full url is not modified. * diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php index 5ee25e818..e5a99f007 100644 --- a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php @@ -214,8 +214,8 @@ class CakeTestCaseTest extends CakeTestCase { $manager->expects($this->once())->method('unload'); $result = $test->run(); $this->assertEquals(1, $result->errorCount()); - } + /** * testSkipIf * diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php index d3e3608b1..911d27900 100644 --- a/lib/Cake/Test/Case/Utility/FolderTest.php +++ b/lib/Cake/Test/Case/Utility/FolderTest.php @@ -184,6 +184,7 @@ class FolderTest extends CakeTestCase { chmod($path, '0777'); rmdir($path); } + /** * testOperations method * @@ -343,6 +344,7 @@ class FolderTest extends CakeTestCase { $result = Folder::addPathElement(DS . 'some' . DS . 'dir' . DS, 'another_path'); $this->assertEquals($result, DS . 'some' . DS . 'dir' . DS . 'another_path'); } + /** * testFolderRead method * diff --git a/lib/Cake/Test/Case/Utility/SetTest.php b/lib/Cake/Test/Case/Utility/SetTest.php index 563c96b42..dcb6b79fa 100644 --- a/lib/Cake/Test/Case/Utility/SetTest.php +++ b/lib/Cake/Test/Case/Utility/SetTest.php @@ -1291,6 +1291,7 @@ class SetTest extends CakeTestCase { $this->assertSame($expected, $result); $this->assertSame($result, Set::extract('{n}.B.field1', $items)); } + /** * testExtractWithArrays method * diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php index 1c44a5a25..09856dbee 100644 --- a/lib/Cake/Test/Case/Utility/ValidationTest.php +++ b/lib/Cake/Test/Case/Utility/ValidationTest.php @@ -53,6 +53,7 @@ class TestNlValidation { static function postal($check) { return true; } + /** * ssn function for testing ssn pass through * diff --git a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php index 5e187d0a6..7fa6cd4b6 100644 --- a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php @@ -68,6 +68,7 @@ class CacheHelperTest extends CakeTestCase { $this->markTestSkipped('TMP/views is not writable %s'); } } + /** * setUp method * @@ -158,6 +159,7 @@ class CacheHelperTest extends CakeTestCase { @unlink($filename); } + /** * Test cache parsing with cake:nocache tags in view file. * diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index 3e3ff9510..e7e5ad84c 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -990,6 +990,7 @@ class FormHelperTest extends CakeTestCase { $result = $this->Form->unlockField(); $this->assertEquals(array('Address.button'), $result); } + /** * Test that the correct fields are unlocked for image submits with no names. * @@ -1029,6 +1030,7 @@ class FormHelperTest extends CakeTestCase { $this->assertTags($result, $expected); $this->assertEquals(array('test', 'test_x', 'test_y'), $this->Form->unlockField()); } + /** * testFormSecurityMultipleInputFields method * @@ -4143,6 +4145,7 @@ class FormHelperTest extends CakeTestCase { ); $this->assertTags($result, $expected); } + /** * testSelectHiddenFieldOmission method * @@ -5824,6 +5827,7 @@ class FormHelperTest extends CakeTestCase { ); $this->assertTags($result, $expected); } + /** * testPostLink method * @@ -6597,6 +6601,7 @@ class FormHelperTest extends CakeTestCase { $this->assertRegExp('/name="created\[min\]"/', $result, 'min name attribute is wrong.'); $this->assertRegExp('/name="created\[meridian\]"/', $result, 'meridian name attribute is wrong.'); } + /** * testEditFormWithData method * diff --git a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php index 977894353..92d1038db 100644 --- a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php @@ -48,6 +48,7 @@ class OptionEngineHelper extends JsBaseEngineHelper { public function testMap($options = array()) { return $this->_mapOptions('request', $options); } + /** * test method for option parsing * @@ -697,6 +698,7 @@ class JsBaseEngineTest extends CakeTestCase { $this->View = $this->getMock('View', array('addScript'), array(&$controller)); $this->JsEngine = new OptionEngineHelper($this->View); } + /** * tearDown method * diff --git a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php index 1c373783c..4fdf01080 100644 --- a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php @@ -74,6 +74,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $this->assertEquals($result, $this->Moo); $this->assertEquals($this->Moo->selection, '$$("#some_long-id.class")'); } + /** * test event binding * @@ -93,6 +94,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = "\$(\"myLink\").addEvent(\"click\", function (event) {event.stop();\nthis.setStyle(\"display\", \"none\");});"; $this->assertEquals($expected, $result); } + /** * test dom ready event creation * @@ -103,6 +105,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = 'window.addEvent("domready", function (event) {foo.name = "bar";});'; $this->assertEquals($expected, $result); } + /** * test Each method * @@ -114,6 +117,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = '$("foo").each(function (item, index) {item.setStyle("display", "none");});'; $this->assertEquals($expected, $result); } + /** * test Effect generation * @@ -153,6 +157,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = '$("foo").set("slide", {duration:"long"}).slide("out");'; $this->assertEquals($expected, $result); } + /** * Test Request Generation * @@ -223,6 +228,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = 'var jsRequest = new Request.HTML({method:"post", onComplete:function () {doComplete}, onRequest:function () {doBefore}, onSuccess:function (responseText, responseXML) {doSuccess}, update:"update-zone", url:"\\/people\\/edit\\/1"}).send();'; $this->assertEquals($expected, $result); } + /** * test sortable list generation * @@ -241,6 +247,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = 'var jsSortable = new Sortables($("myList"), {constrain:"parent", onComplete:onStop, onSort:onSort, onStart:onStart, snap:5});'; $this->assertEquals($expected, $result); } + /** * test drag() method * @@ -273,6 +280,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { 'hover' => 'onHover', )); } + /** * test drop() method * @@ -300,6 +308,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = '$("my-drag").makeDraggable({droppables:$("drop-me"), onDrop:function (element, droppable, event) {onDrop}, onEnter:function (element, droppable) {onHover}, onLeave:function (element, droppable) {onLeave}});'; $this->assertEquals($expected, $result); } + /** * test slider generation * @@ -341,6 +350,7 @@ class MootoolsEngineHelperTest extends CakeTestCase { $expected = 'var jsSlider = new Slider($("slider"), $("my-handle"), {mode:"horizontal", onChange:function (step) {change;}, onComplete:function (event) {complete;}});'; $this->assertEquals($expected, $result); } + /** * test the serializeForm implementation. * diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php index 3354af80b..36e91f454 100644 --- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php @@ -87,6 +87,7 @@ class TextHelperTest extends CakeTestCase { $this->assertSame($this->Text->truncate($text8, 15), 'Vive la R'.chr(195).chr(169).'pu...'); $this->assertSame($this->Text->truncate($text9, 10), 'НОПРСТУ...'); } + /** * testHighlight method * diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index 38bf61df2..8907f72d2 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -447,6 +447,7 @@ class ViewTest extends CakeTestCase { $this->View->element('test_element', array(), array('callbacks' => true)); $this->mockObjects[] = $this->View->ElementCallbackMockHtml; } + /** * test that additional element viewVars don't get overwritten with helpers. * diff --git a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php index 9ab33aff0..061ecfc5b 100644 --- a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php +++ b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php @@ -34,12 +34,14 @@ class TranslateWithPrefixFixture extends CakeTestFixture { * @var string 'Translate' */ public $name = 'TranslateWithPrefix'; + /** * table property * * @var string 'i18n' */ public $table = 'i18n_translate_with_prefixes'; + /** * fields property * @@ -53,6 +55,7 @@ class TranslateWithPrefixFixture extends CakeTestFixture { 'field' => array('type' => 'string', 'null' => false), 'content' => array('type' => 'text') ); + /** * records property * diff --git a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php index 12baeccb0..399924dae 100644 --- a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php +++ b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php @@ -45,6 +45,7 @@ class CakeTestSuiteDispatcher { 'filter' => false, 'fixture' => null ); + /** * Baseurl for the request * diff --git a/lib/Cake/Utility/Sanitize.php b/lib/Cake/Utility/Sanitize.php index 50a7d1abe..3fff82d8e 100644 --- a/lib/Cake/Utility/Sanitize.php +++ b/lib/Cake/Utility/Sanitize.php @@ -1,5 +1,4 @@