Commit graph

7422 commits

Author SHA1 Message Date
Mark Story
4d780ee1f3 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 00:04:14 -04:00
Mark Story
0427fe9777 Merge branch 'no-shortcuts' into 1.3 2010-04-08 00:03:58 -04:00
Mark Story
81dc0d42b9 Adding PluginShortRoute into default connected routes. Fixes issues with the framework having built in 404s.
Adding tests for the default connected routes.
2010-04-08 00:03:46 -04:00
José Lorenzo Rodríguez
7668894888 Fixing error introduced by previous commit 2010-04-07 09:51:29 -04:30
Mark Story
131578cb42 Implementing PluginShortRoute and some tests for its methods. 2010-04-06 23:05:04 -04:00
Mark Story
07efd76b42 Fixing tests that started failing because of removal of short routes on reverse routing. 2010-04-06 22:44:23 -04:00
ADmad
b3f860b762 Adding test case for Validation::url(). Disproves #552 2010-04-07 02:20:05 +05:30
predominant
e4d292bfa4 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/shell.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
Mark Story
518cab91e5 Fixing discrepancy between how belongsTo and hasOne assocations are treated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379 2010-04-05 21:50:28 -04:00
predominant
51d71b4541 Adjust view __scripts to be a protected instance variable, and add test methods for View addScript tests. 2010-04-05 21:15:17 +10:00
predominant
34c7c1551f Added default constructor. 2010-04-05 17:30:24 +10:00
predominant
f5fa56ff3c Remove Overloadable from Helper class. 2010-04-05 16:45:14 +10:00
predominant
5f2d091810 Cleanup some whitespace. 2010-04-05 16:43:47 +10:00
predominant
e0534a7a70 Remove PHP4 code from dynamic call, and change call__ to __call. 2010-04-05 16:43:20 +10:00
predominant
b65395c155 Moved PHP5 Overloadable class to Overloadable. 2010-04-05 16:40:40 +10:00
predominant
57b52cf577 Fix access not being specified on certain methods in Helper. 2010-04-05 16:39:29 +10:00
predominant
34077c992b Removed PHP4 Overloadable class. 2010-04-05 15:03:07 +10:00
predominant
e05d670982 Remove PHP4 option in overloadable class include. 2010-04-05 13:24:24 +10:00
predominant
50a547167b Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
sdoney
dde52399ca Adding @link tags pointing to cookbook sections
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-04 22:09:49 -04:00
Juan Basso
91332fc64b Removing pluralize of pluralized name. Fixes #543
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-04 21:47:02 -04:00
Mark Story
d990c6ed44 Adding tests for single quoted attributes to assertTags(). Because of the __array_permute works ensuring quotes match is a non-trivial problem. Fixing single quoted attributes not being matchable with assertTags(). Fixes #539 2010-04-04 21:43:29 -04:00
predominant
14b6a7ac5e Fixing access to private and protected variables in Xml class. 2010-04-05 08:57:40 +10:00
Mark Story
bdd8811924 Removing plugin shortcuts entirely. 2010-04-04 16:34:07 -04:00
José Lorenzo Rodríguez
45ccba5d94 Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524 2010-04-04 13:24:39 -04:30
predominant
3039645a17 Fix testing of protected baseConfig in CakeSocket. 2010-04-04 18:34:49 +10:00
predominant
3c2e7a091d Changed access to private __associations on Model to associations() calls. 2010-04-04 18:17:43 +10:00
predominant
97388d2e61 Fixed access to protected property in CakeSession tests. 2010-04-04 17:21:01 +10:00
predominant
e1e96e213a Changed public vars to use public keyword in app/ 2010-04-04 17:14:14 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
4c93fc9e52 Uopdate default bake template to assign public to functions and variables. 2010-04-04 16:46:01 +10:00
predominant
329a13fe5f Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
predominant
29dc12dbc2 Changed all $__ declared variables to private. 2010-04-04 16:33:39 +10:00
Mark Story
e57e8f3962 Adding additional test for plugin shortcut routes including prefixed shortcut routes. 2010-04-04 00:21:21 -04:00
Mark Story
781af4a80c Updating doc block for Router::__connectDefaultRoutes() 2010-04-04 00:13:16 -04:00
Mark Story
6fe46314c9 Removing Dispatcher::_restructureParams() as it is no longer used. 2010-04-03 23:56:06 -04:00
Mark Story
87f1972f75 Moving expectations inline. 2010-04-03 23:37:31 -04:00
Mark Story
ed60939292 Fixing tests that should have never worked, and removing additional calls to _restructureParams. Adding in prefixed plugin shortcuts as they were missing. 2010-04-03 23:32:14 -04:00
Mark Story
2814ddc2d5 Modifying Dispatcher tests to modify private variables (which is bad, but there is no way to change which plugins Router uses to create patterns). This allows the removal of two calls to _restructureParams. 2010-04-03 22:24:31 -04:00
Mark Story
95802176bb Making PluginShortRoute check that the action exists before attempting to proceed. Updated tests. 2010-04-03 17:10:39 -04:00
Mark Story
a18d1be4c3 Adding doc blocks to PluginShortRoute. Adding PluginShortRoute into Router. 2010-04-03 16:54:41 -04:00
Mark Story
f605454aca Shrinking number of lines in dispatcher test case. 2010-04-03 16:29:36 -04:00
Mark Story
874c511fe2 Adding PluginShortRoute, and a few test cases. 2010-04-03 16:29:20 -04:00
Mark Story
558a9db642 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-02 15:51:00 -04:00
Mark Story
3503872ab8 Fixing Form::dateTime() for GET forms. Tests added. Fixes #522 2010-04-02 15:50:43 -04:00
ADmad
1b8165d890 Enhancing email component to allow using alias for attachments. Closes #6 2010-04-03 00:37:02 +05:30
Mark Story
fdd8a51a07 Removing coercion of error methods into error404 as its generally not helpful to have errors converted into error404. Fixes #538 2010-04-02 14:02:57 -04:00
Mark Story
e6f9c420b6 Removing transactional property from the Set test, as it was removed from the Model in the last commit. Ref #531 2010-04-02 13:55:05 -04:00
Mark Story
44b216cec3 Removing Model::$transaction as it did nothing. The property was added but never completed. Leaving the model property looking like it does something when in fact it does absolutely nothing. Refs #531 2010-04-02 13:53:53 -04:00