Mark Story
0f6e87cab8
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-04-17 02:10:58 -04:00
predominant
92215e1795
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/libs/inflector.php
cake/libs/view/helpers/text.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
23a22c73b7
Remove "not being used" comment from Model docblock. Fixes #590
2010-04-16 21:45:44 +10:00
predominant
c7fcaf995f
Convert getMictime() php4 hack to microtime(true)
2010-04-16 02:58:28 +10:00
predominant
0384ecad30
Removed remaining @filesource lines.
2010-04-16 02:48:47 +10:00
predominant
591eb43b26
Finalise shortcut translation function application.
2010-04-16 02:43:43 +10:00
predominant
74d7682707
Fix translation shortcut usage through testing console for updates
2010-04-16 02:38:12 +10:00
predominant
c98021dcd8
Converted views, router and security classes to new translation shotcut function use.
2010-04-16 02:20:15 +10:00
predominant
6bd9f0f05b
Convert models, datasources and file/folders to new version of translation shortcut function.
2010-04-16 02:00:25 +10:00
predominant
2f8d30d2c0
Convert controllers and sockets to new formate for shorthand translation functions.
2010-04-16 01:52:49 +10:00
predominant
41fe51d4b9
Cache classes converted to new shortcut translation usage.
2010-04-16 01:45:34 +10:00
predominant
1e425907b2
Change Cake Console files to new use of shortcut for translations.
2010-04-16 01:43:39 +10:00
predominant
c87d97b4c2
Removed echo default from translation shortcut functions.
2010-04-16 00:34:30 +10:00
Mark Story
1fef9e4a78
Making Configure/App methods static, removing reference operators.
...
Removing deprecated methods.
2010-04-15 00:06:17 -04:00
Mark Story
23b75f4ed2
Moving private members/methods to protected.
...
Changing Cache methods/members to static.
Removing singleton access to Cache.
2010-04-14 23:56:44 -04:00
Mark Story
17949ff9fc
Adding accessor to fix issues in test cases.
...
Removing check for php4 method name.
2010-04-14 23:36:47 -04:00
Mark Story
286e96624b
Removing reference operators and removing DS in TestManager and CakeTestCase.
2010-04-14 23:31:15 -04:00
Mark Story
20b0b1ff58
Removing reference operators in CakeTestFixture..
2010-04-14 23:27:34 -04:00
Mark Story
7705c404ee
Fixing / adding visibility.
...
Removing DS usage as its not needed in php5.
Removing reference operators.
2010-04-14 23:24:44 -04:00
Mark Story
50243f3b84
Fixing tests failing because of visibility.
2010-04-14 23:00:22 -04:00
Mark Story
79eeb33e35
Fixing constructors
...
Adding method visibility.
Removing reference operators.
2010-04-14 22:56:51 -04:00
Mark Story
4ef899fa54
Updating test suite to say 2.0!
2010-04-14 22:41:12 -04:00
Mark Story
8ef2a82a89
minor optimization to save one call to Helper::model() when creating forms.
2010-04-14 21:00:00 -04:00
ADmad
99e5f4a49f
Removing ampersand (&) from default transliteration map
2010-04-15 01:56:38 +05:30
Mark Story
dbe4747add
Making static methods static.
2010-04-14 00:29:44 -04:00
Mark Story
f13e70b936
Changing object constructor.
...
Adding visibility keyword.
2010-04-14 00:25:14 -04:00
Mark Story
cd42047dd5
Making CakeLog a static class, removing PHP4 workarounds and no longer needed singleton. Removes CakeLog::getInstance()
2010-04-14 00:23:15 -04:00
Mark Story
c4d57bd6e7
Removing AjaxHelper and JavascriptHelper as they were deprecated in 1.3 and are replaced by JsHelper + HtmlHelper.
2010-04-14 00:13:33 -04:00
Mark Story
508e0a2d9a
Removing all the deprecated PHP4 compatibility functions, and the shortform aliases. Removing associated tests.
2010-04-14 00:01:40 -04:00
Mark Story
958578c746
Fixing magic method visibility on Helper.
2010-04-13 23:54:21 -04:00
José Lorenzo Rodríguez
0300fc1c31
If connection is aborted, now MediaView returns false after stopping the transfer
2010-04-13 16:55:22 -04:30
José Lorenzo Rodríguez
940ce8b06e
Adding some test coverage on MediaView.
...
Now MediaView does not exit after successful render, closes #569
2010-04-13 16:44:14 -04:30
Mariano Iglesias
388bca4acd
Fixing syntax error generated by last merge conflict
2010-04-13 15:46:12 -03:00
Mariano Iglesias
a6b83cdd93
Fixing issue where TextHelper::autoLinkUrls was failing on some expressions
2010-04-13 15:39:30 -03:00
José Lorenzo Rodríguez
3fc212fe28
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
2010-04-13 01:09:42 -04:30
José Lorenzo Rodríguez
9d2819970d
Fixing schema generation for postgres. Now character varying without lenght is translated to "text", to avoid sql errors. Closes #564
2010-04-13 01:08:31 -04:30
predominant
4982705d07
More time helper test jiggering. Some peope still experiencing issues.
2010-04-13 15:06:44 +10:00
Mark Story
e2b5470d19
Updating version numbers to 1.3.0-RC4
2010-04-12 22:27:18 -04:00
predominant
df76ff47e3
Fix TimeHelper tests failing due to timezone changes.
2010-04-13 12:20:58 +10:00
ADmad
baaae6cdb7
Minor optimization in TreeBehavior::getparentnode() to avoid fetching unneeded associated records. Closes #572
2010-04-12 22:57:31 +05:30
Mark Story
404401b4de
Moving action modification when a prefix is detected so it affects all url arrays. Previously it was only applied to parameters in the current request. This fixes inconsistencies between request parameters and url parameters. Fixes #570
2010-04-11 23:13:18 -04:00
Mark Story
42bc252460
Fixing return value of CakeSession::__startSession(). Once headers were sent any further session objects would think that the session was not successfully started. Fixes issues in Helper group test. Also fixes #568
2010-04-11 11:41:10 -04:00
Mark Story
540157bbfd
Fixing title_for_layout not being set in apps made with bake. Fixes #567
2010-04-11 11:18:13 -04:00
predominant
a4cf737947
Fixing access specified on DboSource.
2010-04-11 15:25:18 +10:00
predominant
2e3d45c3de
Added public access to public method in CakeTestFixture
2010-04-11 15:22:25 +10:00
predominant
4cb06d83ea
Fix CakeSession tests so they dont call protected methods.
2010-04-11 15:18:55 +10:00
Mark Story
431b1f2328
Removing parameter mangling that is no longer needed.
2010-04-10 21:21:53 -04:00
Mark Story
561e5fa556
Adding an additional test for plugin + prefix routing.
2010-04-10 21:15:56 -04:00
Mark Story
955192a4ca
Updating dispatcher tests to reflect changes in default plugin routes.
...
Removing tests for routes that have been removed.
2010-04-10 21:14:18 -04:00
Mark Story
e1253f0bb5
Including a plugin short route for prefixes as well. There were failing Dispatcher tests relying on this.
2010-04-10 21:12:48 -04:00
predominant
ed02b0f54b
Fixing access modifier test on Test task.
2010-04-11 09:40:54 +10:00
predominant
4b919382bb
Fix Console Model test to correct index changes for validation.
2010-04-11 09:19:30 +10:00
ADmad
f6525e054f
Updating transliteration map used by Inflector::slug to preserve some of the older mappings as previous commit broke test cases
2010-04-11 04:42:58 +05:30
Hilton Gonçalves
c082ee6b9b
Update Default transliteration map used for Inflector::slug
...
Makes slugging of uppercase characters more consistent with lower case
ones.
Fixes #560
2010-04-10 18:09:54 -04:00
Mark Story
6c357ee555
Adding tests from 'tfs' fixes inconsistencies in extracting elements with one path selector. Fixes #555
2010-04-10 16:57:50 -04:00
Mark Story
fbaabad6bb
Fixing issues where route parameters that overlapped could cause route compilation errors. Tests added. Fixes #565
2010-04-10 11:17:24 -04:00
Matt Curry
1c5898d94b
Don't get User model if not needed. Fixes #563
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-10 10:40:56 -04:00
José Lorenzo Rodríguez
ceb2a1d4ed
Removing date_default_timezone_set, as it is only available in php 5+
...
Hoping for the days were this type of commit is no longer needed
2010-04-09 09:40:27 -04:30
predominant
b22b3b1f41
Fix a bunch of fixture tests testing for access modifiers.
2010-04-09 22:58:06 +10:00
predominant
75c741f5a6
Fix scaffold test on console, replaced 'var' with 'public'.
2010-04-09 22:55:43 +10:00
predominant
14280d6b5f
Merge remote branch 'origin/1.3' into 2.0
2010-04-09 22:07:16 +10:00
predominant
60bb9a9b56
Spacing doc blocks.
2010-04-09 22:06:44 +10:00
predominant
90a468bf9f
Removing mention of external site from test cases.
2010-04-09 22:06:06 +10:00
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