adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 19:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8929 commits 7 branches 0 tags 44 MiB
Commit graph

5292 commits

Author SHA1 Message Date
mark_story
f847080cbf Changing more php version strings. 2010-10-03 12:46:03 -04:00
mark_story
36737e6419 Adding documentation for new xml options. Adding a default setting to fix all the E_NOTICE errors triggered in [503b7cf5d7] 
Fixes #284
 2010-10-02 19:20:43 -04:00
teknoid
503b7cf5d7 Adding slug option to avoid auto-slug of tags. Test included. Addresses #284 
Signed-off-by: mark_story <mark@mark-story.com>
 2010-10-02 19:16:07 -04:00
mark_story
d83c51cde9 Fixing expiration conditions on CSRF tokens. 2010-10-02 18:27:39 -04:00
mark_story
7f7c202f35 Removing old CSRF token validation checks. 
Removing failing test because the feature moved.
Adding tests for expired and wrong keys.
 2010-10-02 17:16:40 -04:00
mark_story
ac90916b84 Adding some documentation about token consumption. 2010-10-02 00:22:44 -04:00
mark_story
a10f1478ee Adding support for nonce expiry. 
Adding simple time based nonce expiration. This does a simple cleanup on
each request, to remove stale tokens.  Tests added.
 2010-10-02 00:20:58 -04:00
mark_story
5c27abd35f Applying patch from 'hashmich' to make jQueryEngine not override the success callback. This allows you to provide a success callback and still get the html insertion when used with the update key. 
Tests updated.
Fixes #1158
 2010-10-01 22:43:46 -04:00
mark_story
711e736cd3 Adding very minimal and incomplete implementation of csrf consumption. 
Tests added for consuming csrf tokens on each request.
 2010-10-01 00:13:34 -04:00
mark_story
5e26d282a1 Fixing connection specific schema generation 
Fixing missing table errors when reading schema for specific connections.
Tests updated to check that tables not on a connection are never touched.  Fixes #1106
 2010-09-30 23:22:57 -04:00
mark_story
d83907a77d Changing order of conditions, to put cheaper ones first. 
Also fixes issues on safe_mode servers.
Fixes #1164
 2010-09-30 23:03:23 -04:00
mark_story
dc6b33f80e Making tokens persist across 'requests'. 
Removing more serialize/unserialize calls.
 2010-09-30 00:26:44 -04:00
mark_story
f5ed91137a Adding csrfCheck related properties. 
nonces are now being populated into the session.
 2010-09-30 00:18:25 -04:00
mark_story
b088daf045 Adding tests for csrf feature separation. 
Removing serialize() calls as they didn't really add anything.
 2010-09-30 00:06:38 -04:00
mark_story
c573fd0432 Fixing issue where a beforeDelete() could trigger a table truncation. 
Moving the exists check below beforeDelete() and behavior->beforeDelete() so any records deleted in the callbacks will not exist when db->delete() is called.  Test updated. Fixes #250
 2010-09-29 23:31:41 -04:00
mark_story
72a1c959a1 Adding CakeSession::clear() which is primarily useful when testing, and offers an alternative to using CakeSession::destroy() 2010-09-29 23:01:23 -04:00
mark_story
b08aba8e86 Adding a missing rollback when validation on an associated record fails, and validate = first. Fixes #1147 2010-09-28 23:37:28 -04:00
mark_story
0761edecfb Making the cake:nocache stripping more relaxed so that if either condition to enable caching is on, tags will be stripped. Tests added. Fixes #1148 2010-09-28 23:03:56 -04:00
mark_story
995a14c140 Making MemcacheEngine understand IPv6 addresses. Fixes #1143 2010-09-26 01:11:19 -04:00
mark_story
6d7f2d37ab Fixing issue where fields with the exact same name as the model would result in incorrect name attributes. Tests added. Fixes #1123 2010-09-26 00:46:51 -04:00
mark_story
237b66d193 Adding support for httpOnly cookies to CookieComponent. Fixes #1127 2010-09-25 23:24:37 -04:00
mark_story
3395f4221e Adding Inflector::reset(). This makes non-isolated test runs possible. Adding inflector to the libs suite. 2010-09-25 23:04:49 -04:00
mark_story
d64bd2a82c Making cookie component not send gobs of headers when being tested. 
Making test case pass in cli.
 2010-09-24 23:30:01 -04:00
mark_story
b59033687d Making private properties and methods protected so they can be manipulated with mocks. 2010-09-24 23:30:00 -04:00
mark_story
cdda1bfb17 Correcting comment. 2010-09-24 23:28:48 -04:00
mark_story
f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
 2010-09-24 23:27:22 -04:00
mark_story
a4746c7227 Applying patch from 'kworr' to reorder the switch in DboPostgres::value() to fix issues with pgsql 9.0. Fixes #1139 2010-09-24 22:47:18 -04:00
mark_story
8cd266c77f Correcting example in doc block. Fixes #1132 2010-09-24 22:23:24 -04:00
ADmad
e161b41e3c CakeSession::__write() now correctly uses the Session model's primaryKey instead of hardcoded fieldname "id". Fixed #1129 2010-09-23 14:00:59 +05:30
mark_story
7e4f9c4953 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-09-21 21:14:23 -04:00
mark_story
ce1115b0b4 Adding I18n::clear() to remove most of the private variable access from the i18n test case. 
Changing casing of classname in test case.
 2010-09-21 21:13:45 -04:00
0x20h
2eac24c31a removed destructor, caching is done on file loading (fixes and improves #1085) 
Signed-off-by: mark_story <mark@mark-story.com>
 2010-09-21 21:03:36 -04:00
0x20h
ba8280423d * changed indexing order of the i18n __domains array to allow caching by domain+language (fixes #1085) 
* adapted testcase

Signed-off-by: mark_story <mark@mark-story.com>
 2010-09-21 21:03:29 -04:00
mark_story
729a45703b Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121 2010-09-21 20:34:27 -04:00
ADmad
b9a7b27ba1 Fixing regression cased by commit d5ffdc288d causing ajax layout to be not auto set for ajax request for html pages. Refs #1099 2010-09-21 00:25:17 +05:30
mark_story
b648b61422 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-09-19 18:32:07 -04:00
mark_story
c3d5c3fd00 Fixing issue in Cache where duration = 0 would not read/write from cache. This prevented the creation of non expiring cache entries in APC and memcache. 
Adding a return false to FileEngine as it was omitted in the past.
Fixes #1120
 2010-09-19 12:20:07 -04:00
ADmad
e10d634f91 Mails sent using php's "mail()" function now have header fields terminated by CRLF and body too contains CR and LF only as combination CRLF in compliannce with RFC 2822. Closes #1071 2010-09-19 03:54:32 +05:30
mark_story
7518d0e804 Removing dead code in Cache. 
Adding tests for ApcEngine::clear().
 2010-09-18 12:52:08 -04:00
mark_story
b6d845adc4 Updating calls of Cache::set() inside Cache. Updating the documentation for set() so it better explains how the temporary settings work. 
Updating APC and Memcache engine tests to reflect the lack of state being stored inside Cache.
 2010-09-18 12:32:43 -04:00
mark_story
5e725e62ca Making MemcacheEngine match the interface. 2010-09-18 11:11:51 -04:00
mark_story
b432e60971 Making Cache::set() work with 2 or 3 parameters. Test cases added. 2010-09-18 11:11:28 -04:00
ADmad
d5ffdc288d Including RequestHandler in controller now automatically sends proper content-type and encoding headers for html pages too like it does for other known file types. Closes #1099 2010-09-18 20:20:52 +05:30
mark_story
9ccbe5e269 Removing unnecessary call to config(). 2010-09-18 00:46:26 -04:00
mark_story
dc65f2306b Making Cache methods always need a config name. This allows the removal of hidden and often confusing state that gets remembered by Cache each time config() is called. Removing the hidden state makes Cache more predictable. 2010-09-18 00:45:29 -04:00
Joe Beeson
b9163b95fe Added a warning that will appear on the homepage to alert users that 
their PCRE installation doesn't have Unicode support which can cause a
whole mess of trouble if gone unnoticed. The warning will only display
if their system doesn't have support, not if it does. Fixes #1113

Signed-off-by: mark_story <mark@mark-story.com>
 2010-09-18 00:17:51 -04:00
mark_story
e91fa68f8e Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105 2010-09-18 00:13:03 -04:00
mark_story
d113d7d612 Removing dead code from DboSource::fields() 
Updating fields() to use implode, so complex virtual fields are better handled.  Fixes #1079
 2010-09-18 00:04:36 -04:00
mark_story
5a8648cca0 Fixing issue in DboSource::_matchRecords() where unqualified conditions would result in 1=1 conditions. Fixing incorrect test case. Fixes #930 2010-09-16 00:17:09 -04:00
mark_story
1707c92aa1 Removing duplicated code. 2010-09-14 23:15:10 -04:00
mark_story
c255539980 Removing assignment of reference to theme view. 
Removing cruft in ThemeView test.
 2010-09-14 23:13:00 -04:00
mark_story
f34cfd1f1e Updating EmailComponent to use new methods on the ComponentCollection to ensure it always has a controller reference. 
Removing triggerDisabled key as its no longer needed or wanted.
 2010-09-14 23:02:38 -04:00
mark_story
273a189e98 Adding some documentation about component callbacks. 2010-09-14 23:01:39 -04:00
mark_story
30589e2cdf Removing dead method. 2010-09-14 22:56:33 -04:00
mark_story
0ef76eb69a Adding a reference of the controller to the component collection, so components can easily access the controller in their constructor. 2010-09-14 22:52:51 -04:00
mark_story
7a14d3a8f2 Fixing issue where mockObject expectations were not counted hiding fails. Fixing all objects not actually being iterated. 2010-09-14 22:40:46 -04:00
mark_story
0baaf6801b Removing call to RequestHandler as its just a pass through to the request object which is available in that scope. Updating the test cases to not use deprecated and non-existent things. 2010-09-14 22:12:14 -04:00
mark_story
97dd7c7644 Adding support to ObjectCollection and its subclasses to trigger callbacks on all objects instead of just the enabled ones. Fixes issues where inner components would not get access to the controller as the initialize callback wasn't fired. This fixes some backwards compatibility issues. Tests updated. 2010-09-14 21:57:40 -04:00
mark_story
2906927a16 Adding BC wrappers for helpers. 
Updating paginator test case to use non deprecated properties.
 2010-09-13 23:12:00 -04:00
mark_story
e4b2fb173b Removing the deprecated properties. 
Removing property copying to helpers.
Making the view test cases pass again.
 2010-09-13 23:11:59 -04:00
mark_story
634cea24eb Adding 'action' into View::__get() to make an integration test pass. 2010-09-13 23:11:59 -04:00
mark_story
a521291afd Adding a __set() method to make some tests pass. 
Updating internal usage to not use deprecated attributes.
Updating test cases to not use deprecated attributes.
 2010-09-13 23:11:59 -04:00
mark_story
84565151de Removing all the deprecated properties from Controller. 
Adding a __get() method to provide the properties that were moved to CakeRequest.
Tests added.
 2010-09-13 23:11:59 -04:00
mark_story
c7fb20d13a Reformatting doc block indentation. 2010-09-13 23:09:00 -04:00
mark_story
834c44b303 Fixing return value tag. 2010-09-13 23:06:15 -04:00
mark_story
d7bb7699e2 Applying patch from '0x20h' to fix issue where domain translation files would be mixed together causing duplicate data in the various cache files. There should now be one cache per domain + language. Fixes #1085 2010-09-13 22:17:05 -04:00
mark_story
6519de3a2e Adding CakeRequest::data() to make reading/writing data similar to CakeSession. 
Tests added.
 2010-09-12 14:05:57 -04:00
mark_story
730e373afe Merge branch '1.3' into 2.0 
Conflicts:
	cake/libs/cake_session.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/fixtures/data_test_fixture.php
 2010-09-12 13:35:46 -04:00
mark_story
e9d194822d Adding more tests for SMTP address formatting. Fixes #1100 2010-09-12 11:48:09 -04:00
Juan Basso
46f784f956 Support to DOMDocument/DOMNode in Xml::toArray(). 2010-09-12 11:25:37 -03:00
predominant
703344cbae Updated version number to 1.3.4 2010-09-12 17:57:55 +10:00
Juan Basso
a006ee0019 Updating docs. 2010-09-11 22:20:21 -03:00
Juan Basso
7237713a30 Added test to dont use encoding in XML. 2010-09-11 22:12:54 -03:00
Juan Basso
2e7851c2be Support to namespaces in Xml::fromArray(). 2010-09-11 21:51:49 -03:00
mark_story
e4d34b640b Merge branch '2.0-exceptions' into 2.0 
Conflicts:
	cake/libs/error.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/error.test.php
 2010-09-10 20:31:16 -04:00
Scott Reeves
9ac8d1af1b Cleaning up link to 1.3 docs, fixing link to blog tutorial. Fixes #1097 
Signed-off-by: mark_story <mark@mark-story.com>
 2010-09-10 19:42:06 -04:00
mark_story
f8dbeb2b70 Adding documentation for a new feature. 2010-09-09 22:02:36 -04:00
mark_story
4a0e34a0d6 Applying patch from 'jeremyharris' to make RequestHandler::renderAs() accept an array of options that can be used to send a file as a download. Fixes #950 2010-09-09 21:31:34 -04:00
mark_story
d5e906f086 Adding deprecation flags. 2010-09-08 22:49:00 -04:00
mark_story
12338a0c16 Updating instance method calls in AclComponent. 2010-09-08 22:48:21 -04:00
mark_story
b60f65f420 Adding a tiny bit of documentation to App::import(). 2010-09-08 22:29:47 -04:00
mark_story
d5bde3fe7a Adding a call to session_destroy() to remove the session data. This fixes the issue where data would not be totally destroyed. Fixes #1089 2010-09-08 22:05:53 -04:00
Juan Basso
c8c20eafdc Xml::build now supports options and can return DOMDocument. 2010-09-08 21:47:55 -03:00
Juan Basso
071ff04556 Xml::fromArray now receives a list of options unless simple format. 2010-09-08 19:40:33 -03:00
Juan Basso
a8b6182d43 Changing Xml::fromArray to use DOMDocument unless SimpleXMLElement. The return continue as SimpleXMLElement. 2010-09-08 19:18:58 -03:00
mark_story
5d703c4f50 Fixing + adding imports for Scaffold. 2010-09-08 00:11:37 -04:00
mark_story
fa9eb94fb0 Adding base class import for view classes. 2010-09-08 00:10:36 -04:00
mark_story
4ff52da57e Making import() ing a component ensure that the Component base class is loaded. 2010-09-07 23:39:31 -04:00
Juan Basso
ca7e327af1 Fixing the documentation. 2010-09-07 18:19:14 -03:00
Mark Story
2b3099fa70 Removing duplicate method call. 2010-09-07 00:42:49 -04:00
Mark Story
e15069769d Adding tests for #1079 and fixing some formatting. 2010-09-07 00:09:06 -04:00
Juan Basso
c1a75cbc47 Support to namespaces in Xml::toArray(). 2010-09-07 00:31:50 -03:00
Juan Basso
5f902d42e0 Changing the default format of fromArray from attributes to tags. 2010-09-06 23:11:45 -03:00
Mark Story
0f23634382 Adding stack traces to error400 and error500 when debug > 0. 
Adding the stack trace element.
 2010-09-06 18:09:11 -04:00
Mark Story
09fd8ba463 Adding stack trace output to the framework errors. 2010-09-06 17:54:48 -04:00
Mark Story
d88da3d579 Merge branch '1.3' into 2.0 
Conflicts:
	cake/libs/configure.php
	cake/libs/model/connection_manager.php
	cake/libs/model/model.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
 2010-09-06 16:53:04 -04:00
Mark Story
c60edfae6d Fixing issue where errors containing code = 500, were not actually converted to error500 when debug = 0. Making missingConnection, and missingTable into error500 errors. 2010-09-06 16:46:41 -04:00
Mark Story
464d2217e6 Renaming model_behavior test to behavior_collection test as that's the class that contains the tested methods. 2010-09-06 13:51:42 -04:00
Mark Story
73057b8853 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-09-06 13:39:37 -04:00
Mark Story
5789aaf24d Applying patch from 'tkykmw'. Behavior mapped methods are no longer run through strtolower(). Mapped methods are now case sensitive. Fixes #318 2010-09-06 13:38:01 -04:00
predominant
a6b08c94d0 Merge remote branch 'origin/2.0' into 2.0 
Conflicts:
	cake/libs/session/database_session.php
 2010-09-06 23:57:36 +10:00
Mark Story
d54c901f5d Moving _setupDatabase() into the Database session class, as that's the only place its used. 2010-09-06 01:12:23 -04:00
Mark Story
474ace09c1 Adding CakeResponse to the list of included files for Controller. 2010-09-06 01:11:26 -04:00
Mark Story
d62ae2900a Fixing issue where ConnectionManager wasn't triggering session close, causing issues with database sessions. 2010-09-06 01:10:45 -04:00
Mark Story
27ae7f1f44 Making session storage classes not static, there was no real reason they were static before, and removing the static methods allows them to have constructors. This will allow moving database specific features from CakeSession to DatabaseSession. 2010-09-06 00:43:58 -04:00
ADmad
bfaaa6b8ba Fixing unnecessary extra calls to 'afterFind' callback of 'hasMany' associated models. Closes #995 2010-09-05 23:53:24 +05:30
Mark Story
01eb0bf07d Making messages optional for HTTP exceptions. 2010-09-05 11:32:35 -04:00
Mark Story
e5b4dd94d7 Renaming exceptions to not use Error400, Error500. Instead HTTP status words are used. 
Adding more common HTTP status errors.
Updating tests for ErrorHandler.
 2010-09-05 02:05:31 -04:00
Mark Story
b7791dd94f Removing variable that wasn't provided by the exception. 2010-09-05 02:04:08 -04:00
Mark Story
82fffe6914 Fixing issue where FormHelper::select() with multiple = checkbox and a custom name attribute would not work correctly. Fixes #1078 2010-09-05 01:28:13 -04:00
Mark Story
cc17e1a85a Adding more doc blocks to error classes. 2010-09-04 19:18:14 -04:00
Mark Story
954676c9f6 Adding doc blocks to the new exception classes. 2010-09-04 19:16:06 -04:00
Mark Story
d198230e61 Fixing issue where errors that did not have a 500+ code would use the incorrect status code. 2010-09-04 19:06:10 -04:00
Mark Story
4d863618f5 Refactoring exception handling so codes are much more flexible and easy to change. 
Made error404 and error500 more generic.
Removed error() as it didn't really make that much sense.
 2010-09-04 15:38:10 -04:00
Mark Story
4980f42dc5 Renaming file. 2010-09-04 15:35:01 -04:00
Mark Story
fa7549dc4c Fixing comments and removing cakeError(). Instead you should be throwing exceptions. 2010-09-04 01:34:45 -04:00
Mark Story
8c428ff8a8 Moving where AppError is used, as infinite recursion is no fun. 2010-09-03 15:03:33 -04:00
Mark Story
f2db19767d Adding in support for AppError. 2010-09-03 10:30:35 -04:00
Mark Story
3940b059a3 Adding a big docblock to explain how to setup application exception handling. 2010-09-02 16:39:09 -04:00
Mark Story
2e8a60f932 Removing some mentions of cakeError as its been removed. Also adding information about exceptions that can be raised. 2010-09-02 16:38:19 -04:00
Mark Story
dbdd17f51a Adding test cases from 'euromark' and updating how email addresses are parsed so they are slightly more conformant to RFC 5322. Fixes #1066 2010-09-02 11:16:10 -04:00
Mark Story
3e5e52d52e Fixing doc block for Form::create(). Fixes #1058 2010-09-02 00:29:04 -04:00
Mark Story
063fcf557d Moving error handler inclusion to before Configure::bootstrap() so app error handlers can be created. 
Fixing issue where unknown exception types would not be handled spewing out errors.  Unknown exception types are interpreted as 500 errors.
 2010-09-01 20:29:55 -04:00
mark_story
a8d4015f47 Updating bootstrap process in CLI to match the one in web. 
Updating all_libs to use new file.
Updating error_handler test to run in cli.
Updating Controller so it imports required classes.
 2010-08-30 22:59:10 -04:00
mark_story
1f30c06695 Fixing method coercion in error404 so it only coerces CakeExceptions. 
Test Added.
 2010-08-29 23:39:28 -04:00
mark_story
534f6006f8 Adding omitted parent call. 2010-08-29 23:38:46 -04:00
mark_story
612c52bb8b Adding a beforeRender() that automatically escapes all the content sent to errors handled by CakeErrorController. 2010-08-29 23:31:20 -04:00
mark_story
f1164c93d6 Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery. 2010-08-29 21:37:25 -04:00
mark_story
741f2972f9 Removing non required attribute from missing controller error page. 2010-08-29 15:12:50 -04:00
mark_story
99cde14432 No more skipped tests for ErrorHandler. 
Removing missing_model as it was never called.
 2010-08-29 13:49:10 -04:00
predominant
465b15c64e Removing reference assignments. 2010-08-29 23:09:33 +10:00
mark_story
7fb62e9b7e Updating more error messages to use exceptions. 2010-08-29 01:26:21 -04:00
mark_story
041aeecce4 Renaming test case file to match class file. 
Updating tests and methods for missing_action, missing_view, private_action.
 2010-08-29 01:01:36 -04:00
mark_story
88c66c057d Renaming error.php to error_handler.php to better match its class name. 2010-08-29 01:00:36 -04:00
mark_story
756baeafdb Making CakeErrorController get the most recent request, this will help when using requestAction. 
Updating test cases for error404.
Updating ErrorHandler
 2010-08-28 23:32:14 -04:00
mark_story
8712a90c8b Adding some tests for construction. 2010-08-28 22:50:29 -04:00
mark_story
a30721b46b Moving exception classes around and making all the core exceptions extend one class that overrides the code to 500. The code value will be used as the HTTP status code for the error page. 2010-08-28 22:49:52 -04:00
mark_story
5d942ee609 Extracting a few methods to make testing easier, and subclasses easier to create. 2010-08-28 19:53:21 -04:00
mark_story
5257a66fe5 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-08-28 11:26:28 -04:00
mark_story
26f4ad4da1 Modifying bootstrap so it sets a default exception handler. 
Making a ghetto implementation of exception handling.
Adding a crude test case, adding incomplete markers to all other tests.
 2010-08-28 01:39:02 -04:00
predominant
04d3353ee4 Adding access specifiers to methods 2010-08-28 15:38:48 +10:00
mark_story
9b3e91089a Adding omitted types of exceptions. 2010-08-28 01:38:03 -04:00
mark_story
5de88c0f02 Moving CakeErrorController to its own file. 2010-08-28 01:37:39 -04:00
predominant
f7addabcf2 Whitespace removal 2010-08-28 15:27:12 +10:00
mark_story
a2186c412a Updating doc blocks for CakeRequest and CakeResponse. 2010-08-28 00:59:07 -04:00
mark_story
d8b2bcdf06 Making view + helpers groups pass. 2010-08-28 00:40:12 -04:00
mark_story
9485f0a993 Merge branch 'request-response' into 2.0 
Conflicts:
	cake/tests/cases/libs/controller/controller.test.php
 2010-08-28 00:24:07 -04:00
mark_story
e4545dbe5e Fixing failing tests in Dispatcher.test. 2010-08-28 00:19:09 -04:00
mark_story
c76f205bcb Adding exceptions file. 2010-08-28 00:18:46 -04:00
mark_story
2cdb10812d Merge branch '2.0-exceptions' into 2.0 
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/tests/cases/dispatcher.test.php
 2010-08-28 00:14:34 -04:00