ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
mark_story
e05d7d1791
Make dispatcher::cached() use here()
...
This allows separate cache files to be created
for different query parameters.
Fixes #2381
2011-12-17 12:19:34 -05:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
Kyle Robinson Young
3974ea87d8
Move Route docblocks to make text available in the API
2011-12-07 00:03:11 -08:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
mark_story
8b3c72f7c1
Fix issue with nested named parameters.
...
Nested named parameters were not being correctly flattened.
Fixes #2329
2011-12-01 20:32:28 -05:00
mark_story
79d6a850ad
Fix theme files with spaces in them.
...
Fixes #2324
2011-12-01 18:16:01 -05:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
mark_story
cb49b242ae
Fix issue in Router with prefixes.
...
Prefixes should not be interpreted as named parameters.
Fixes #2269
2011-11-17 20:30:34 -05:00
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
Ceeram
7224de962e
removing unused variable, fixes #2227
2011-11-07 09:19:01 +01:00
mark_story
0304bb8796
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
mark_story
92f9a6c1db
Fix missing urlencod/urldecode in routing.
...
Named params and passed args should be urlencoded, as they
may contain non-ascii characters.
Refs GH-214
2011-10-29 20:42:07 -04:00
Jose Lorenzo Rodriguez
66cf86c154
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-28 23:46:13 -04:30
Jose Lorenzo Rodriguez
60e3f02eac
Setting a correct Content-Length for plugin assets
2011-10-28 23:45:31 -04:30
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
ad524b25ef
Merge branch '2.0' into 2.1
2011-10-25 22:29:03 -04:00
mark_story
477c492e86
Fix issue where named parameters would not be urldecoded.
...
Fixes #2155
2011-10-25 21:07:27 -04:00
mark_story
c3f647217d
Implement trailing greedy star star.
...
Trailing args grabs all trailing arguments as a single passed
parameter. This is useful when you want to have trailing arguments
that contain / in them.
2011-10-23 21:27:28 -04:00
mark_story
6d6aa3cb75
Add _stop() to RedirectRoute.
...
Moved from CakeResponse to RedirectRoute,
as RedirectRoute is the only place its currently needed.
Refs #2143
2011-10-22 22:56:50 -04:00
mark_story
32b48ecc7c
Fix issue with missing base on redirect route.
...
The request data wasn't set in Router when redirect routes are processed.
This caused the base to become missing. This causes issues with applications
running in a subdirectory.
2011-10-22 18:48:31 -04:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
mark_story
55064b6573
Applying fix from 'euromark' to fix protocol relative links
...
Fixes #2107
2011-10-17 21:03:25 -04:00
Renan Gonçalves
e37703efdd
Fixed typo from last commit.
2011-10-16 13:42:50 +02:00
Renan Gonçalves
573a349209
Using plugin name on exception thrown and in templates files.
2011-10-16 13:40:36 +02:00
mark_story
4810518c7d
Fix issue where abstract or interface controllers
...
would be constructed by Dispatcher.
Tests added.
Fixes #2048
2011-09-30 22:40:30 -04:00
mark_story
0e5797d69d
Make full page caching + Themes work.
...
Dispatcher now uses ThemeView for rendering cache files.
This enables nocache blocks to reference theme elements.
Fixes #1858
2011-09-17 13:19:43 -04:00
Mark Story mark@mark-story.com
41b22c5521
Fixing Router::mapResources() so it works with plugins.
...
Fixes #1956
2011-09-01 18:49:01 +01:00
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00
mark_story
6acf024a2b
Fixing incorrect keying for ext routing parameter. It was
...
nested under params[url][ext]. This makes it unlike
all other routing parameters. Having the nested value
also makes reversing requests harder, and generating urls more
difficult.
Adding a test for Router::reverse() and extensions.
Fixes #1923 , fixes #1928
2011-08-22 22:26:02 -04:00
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
Juan Basso
16ef234180
Removing trailing spaces.
2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
fdacc9de16
Fixing issues with request stack not being used correctly
...
when there are requestAction requests being performed.
Adding Router::popRequest() to allow manipulation of request stack
so nested requestAction or serial requestAction calls work correctly.
Fixes #1906
2011-08-12 21:21:05 -04:00
mark_story
e4a7c8f3d7
Cleanup of minor issues found with phpmd.
2011-08-06 21:15:31 -04:00
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
2a50a1ea99
Included @var in API that was missing.
2011-07-31 17:05:20 -04:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Juan Basso
e74d835a62
Fixed some API doc in routing and cache.
2011-07-30 17:02:25 -04:00
Mark Story
8149e4f049
Removing unused property.
...
Removing broken dispatch pass-though method.
2011-07-28 13:12:18 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Mark Story
c8647b227a
Moving plugin route loading to app/Config/routes.php
...
Its old position would end up with plugin routes being loaded
after the core fallback routes.
2011-07-22 20:29:45 -04:00
mark_story
16073b4e44
Fixing notice errors in Router.
...
Updating AuthComponent tests for changes in Router behavior.
2011-07-22 20:29:45 -04:00
mark_story
cfb3e8a15b
Moving default routes into a separate file.
...
Removing Router::defaults() as its not needed anymore.
Removing default routes from inside router.
Removing properties related to default routes.
Removing dead tests and updating tests.
2011-07-22 20:29:45 -04:00
mark_story
c25394278b
Returning response objects from controllers wasn't working correctly.
2011-07-22 20:29:44 -04:00
mark_story
177cd39abb
Moving private method detection into Controller.
...
This fixes an issue where potected methods would
not be called, and no exception would be raised.
2011-07-22 20:29:44 -04:00
mark_story
b0749acbb6
Starting to change how Controller::render() and response
...
objects are handled.
2011-07-22 20:29:44 -04:00
mark_story
9641bcc8df
Modifying Dispatcher and its test cases to accept a CakeResponse as part of its
...
arguments.
2011-07-22 20:29:43 -04:00
Robert Sworder
fb3a1928d3
Minor comment and path changes.
2011-06-25 15:08:41 +01:00
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Jose Lorenzo Rodriguez
5b8865a3a7
Making plugin routes load after app routes, closes #1722
2011-05-22 21:50:56 -04:30
mark_story
6289f20b83
Fixing Router::reverse() serializing all of _Token.
...
Removing CSRF tokens from the parameters SecurityComponent exports.
Updating tests for both Router and SecurityComponent.
Fixes #1697
2011-05-16 20:35:27 -04:00
AD7six
0cb70ae3bb
remove CONFIGS constant
2011-05-15 18:34:52 +02:00
Jose Lorenzo Rodriguez
91bce16e9d
Merge remote-tracking branch 'origin/2.0' into 2.0-merge
...
Conflicts:
lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
lib/Cake/tests/Case/Log/Engine/FileLog.php
lib/Cake/tests/Case/Log/Engine/FileLogTest.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
Joey Trapp
3675e73c73
Added a flag to Router::reverse that is passed on to the Router::url call
...
Fixes #1638
Signed-off-by: mark_story <mark@mark-story.com>
2011-05-10 21:07:56 -04:00
Jose Lorenzo Rodriguez
ca99b5b515
Fixing Router and Dispatcher so they user the plugin loader
2011-05-09 00:01:00 -04:30
Jose Lorenzo Rodriguez
2c3132fa85
Fixing some TestSuite tests
2011-05-08 23:25:32 -04:30
mark_story
695d38fe68
Removing stupid default that stops other convention based features from working properly.
2011-05-04 22:16:46 -04:00
evilbloodydemon
3c9cb3b97d
Unused variables in Routing removed
2011-04-23 00:02:09 +04:00
Jose Lorenzo Rodriguez
000e05b468
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
a3447592d5
updating langauge domains
...
cake - end user
cake_error - error messages
cake_developer - not an error just for the developer
2011-03-19 18:23:01 +01:00
AD7six
e7f39b456f
translation changes in the Routing dir
2011-03-12 20:01:53 +01:00
Jose Lorenzo Rodriguez
90b01b7ec3
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-10 23:17:54 -04:30
Jose Lorenzo Rodriguez
75e5496983
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-09 12:58:49 -04:30
Jose Lorenzo Rodriguez
9c0ab75a03
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-05 23:42:25 -04:30
Jose Lorenzo Rodriguez
f8a08432f4
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-05 17:37:31 -04:30
Jose Lorenzo Rodriguez
42b3f993b9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-01 23:04:52 -04:30
José Lorenzo Rodríguez
deae38546b
Fixing App::objects() and App::setObjects() so all dispatcher tests pass
2011-02-22 00:44:33 -04:30
José Lorenzo Rodríguez
a9d2078d25
Revert "Refactoring Dispatcher::_isPrivate to directly check for controller methods, doing in in the controller could be unnecessary"
...
This reverts commit c431ddd22c
.
Conflicts:
lib/Cake/Routing/Dispatcher.php
2011-02-22 00:13:35 -04:30
José Lorenzo Rodríguez
d9c99b5ef6
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
4c0e06c451
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
827a74b734
Merge remote branch 'origin/2.0' into 2.0-class-loading
2010-12-19 23:12:37 -04:30
José Lorenzo Rodríguez
8436fd53d0
Changing initial uses of App::uses() to the new packages system
2010-12-15 01:20:02 -04:30
José Lorenzo Rodríguez
07e43bb0f8
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
8e5bd76752
Fixing several errors when running the testsuite
2010-12-11 01:17:55 -04:30
José Lorenzo Rodríguez
9e64754005
Adding check to no overwrite cache if it has not been modified
2010-12-07 00:00:20 -04:30
José Lorenzo Rodríguez
6de52f795f
Completing the round of micro optimization, it was fun while it lasted
2010-12-06 23:15:18 -04:30
José Lorenzo Rodríguez
c431ddd22c
Refactoring Dispatcher::_isPrivate to directly check for controller methods, doing in in the controller could be unnecessary
2010-12-06 22:57:09 -04:30
José Lorenzo Rodríguez
fcd23b0978
Starting to change the class loading for app classes
2010-12-05 10:54:42 -04:30
José Lorenzo Rodríguez
b4387d2f51
More replacements to get class loaded using the new file scheme
2010-12-04 02:34:30 -04:30
José Lorenzo Rodríguez
3c23080dd2
Moving more classes to the new schema, slowly uncommenting code and implementing new class loader
2010-12-03 20:53:47 -04:30
José Lorenzo Rodríguez
ca34b22dbb
Renaming more core classes, next step would be to tweek the autoloader to find only on Cake/ "namespace" (for now)
2010-12-03 20:15:54 -04:30
José Lorenzo Rodríguez
c57dd6f0f1
Starting to move files to match the PHP standards group file naming standard
2010-12-03 19:38:57 -04:30