predominant
52cdef900b
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/tree.php
cake/libs/router.php
cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
predominant
21f61ee34a
Merge remote branch 'origin/1.3' into 1.3
2010-04-09 21:58:25 +10:00
predominant
cb0ae6ed76
Fixed TimeHelper tests. Force setting of timezone to GMT+5 to ensure tests are passing.
2010-04-09 21:20:01 +10:00
predominant
ac81ba75cb
Added timezone setting to allow tests to pass in all timezones.
2010-04-09 21:17:55 +10:00
predominant
ea635d6bea
Fix protected call for _build on CakeSchema, and associated references.
2010-04-09 20:41:28 +10:00
Mark Story
30e6c57a96
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-04-08 23:37:27 -04:00
Mark Story
c38249ac28
Updating HtmlHelper + JavascriptHelper to call assetTimestamp() after webroot(). This allows theme files in webroot/theme to be correctly timestamped.
...
Updating tests to reflect changes in behaviour. Fixes #244
2010-04-08 23:36:04 -04:00
predominant
59fb134455
Change private methods to specify access, and add proected on methods that missed mass updates.
2010-04-09 13:33:25 +10:00
predominant
19b66b8617
Change luhn validation to public.
2010-04-09 13:30:58 +10:00
predominant
1d39b93785
Change access modifier on _stop() to protected.
2010-04-09 13:24:23 +10:00
predominant
94603b2cb7
Making dispatcher constructor public and removing return statement.
2010-04-09 13:19:47 +10:00
José Lorenzo Rodríguez
05af213d59
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
2010-04-08 22:26:04 -04:30
sdoney
9f601ea334
Adding/Updating @link tags pointing to cookbook sections
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-08 22:46:05 -04:00
José Lorenzo Rodríguez
03e3c3249f
Removing whitespace at the end of the file
2010-04-08 22:15:49 -04:30
Mark Story
94391d71c2
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-04-08 22:41:55 -04:00
Mark Story
9d3a2c61d4
Removing test that is no longer relevant due to changes in Router.
2010-04-08 22:40:45 -04:00
José Lorenzo Rodríguez
7eb3055720
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
...
* '1.3' of git@github.com:cakephp/cakephp1x:
Adding PluginShortRoute into default connected routes. Fixes issues with the framework having built in 404s.
Implementing PluginShortRoute and some tests for its methods.
Fixing tests that started failing because of removal of short routes on reverse routing.
Removing plugin shortcuts entirely.
Adding additional test for plugin shortcut routes including prefixed shortcut routes.
Updating doc block for Router::__connectDefaultRoutes()
Removing Dispatcher::_restructureParams() as it is no longer used.
Moving expectations inline.
Fixing tests that should have never worked, and removing additional calls to _restructureParams. Adding in prefixed plugin shortcuts as they were missing.
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.
Making PluginShortRoute check that the action exists before attempting to proceed. Updated tests.
Adding doc blocks to PluginShortRoute. Adding PluginShortRoute into Router.
Shrinking number of lines in dispatcher test case.
Adding PluginShortRoute, and a few test cases.
2010-04-08 18:24:24 -04:30
José Lorenzo Rodríguez
59f7cb47d3
Improving test coverage on FormHelper to show the usage of the 'secure' key for inputs.
...
Fixing issue with select inputs that does not honor the value of 'secure'
2010-04-08 18:23:07 -04:30
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
