19 commits

Author	SHA1	Message	Date
mark_story	53d265cfba	Merge branch 'master' into 2.4	2013-08-23 12:56:43 -04:00
euromark	036954b52d	remove duplicate newlines according to CS	2013-08-20 20:27:06 +02:00
euromark	6ed85f2d5d	doc block	2013-06-10 15:10:32 +02:00
euromark	394bf1054d	remove name attribute where not necessary, clean up doc blocks	2013-06-08 04:29:08 +02:00
Marc Würth	4c9f0414cb	Improved the DocBlocks and other code cleanup ... Fixed @license tag, url comes first Whitespace and other minor code cleanup Added some docblocks	2013-05-31 00:11:19 +02:00
Rachman Chavik	a63b54c34b	Fix: Incorrect model being used as Controller::$modelClass ... We cannot be sure that Controller::$uses have not been iterated, so reset the array to use the first value.	2013-05-24 17:50:43 +07:00
Graham Weldon	66d856d883	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
Graham Weldon	7b860debe4	This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years. ... I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.	2013-02-08 20:59:49 +09:00
Kyle Robinson Young	b8488b8dfe	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
Kyle Robinson Young	90e7afbdc7	Correct parameter order of assertEquals and assertNotEquals	2012-03-22 23:37:12 -07:00
Juan Basso	3b1bd90ad6	Updated copyright to 2012.	2012-03-12 22:46:07 -04:00
Kyle Robinson Young	4176e59e52	Typo fixes in tests	2012-02-23 15:29:53 -08:00
Kyle Robinson Young	1e1c7a036d	Code consistency formatting tweaks	2011-12-06 12:52:48 -08:00
Kyle Robinson Young	98f03dc6df	Replacing test case compatibility functions	2011-11-16 21:07:08 -05:00
Juan Basso	61833294f0	Changed the visibility to methods that not affect others classes.	2011-08-20 01:39:30 -04:00
Jose Lorenzo Rodriguez	cfd2d9e00b	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Juan Basso	192812ee7f	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
Renan Gonçalves	438050dcaa	Adding 'public' visibility to all public methods.	2011-05-30 22:02:32 +02:00
Jose Lorenzo Rodriguez	900dfef2f7	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30

Renamed from lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php (Browse further)