adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-16 03:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9486 commits 7 branches 0 tags 44 MiB
Commit graph

3735 commits

Author SHA1 Message Date
mark_story
88c717dbd8 Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated. 2010-11-07 13:23:45 -05:00
mark_story
1ba28c246b Adding settings['callbacks'] as a way to define enabled/disabled state of helpers in settings arrays. This should replace the separate parameter. 
Tests updated.
 2010-11-07 13:23:45 -05:00
mark_story
4c0fd76a2e Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation. 2010-11-07 13:23:45 -05:00
mark_story
4739d7f955 Adding tests for CacheHelper callback methods. 2010-11-07 13:23:45 -05:00
mark_story
f7f9c3f6a2 Removing a test case that doesn't need to exist anymore as the conditions for cache generation are now in CacheHelper. 2010-11-07 13:23:44 -05:00
mark_story
2e140a9fd3 Adding tests for element callbacks. 2010-11-07 13:23:43 -05:00
mark_story
1b19ad48b4 Adding parameters to helper callbacks, these allow helpers to introspect more on the view/layout being rendered. 
Updating tests.
 2010-11-07 13:23:42 -05:00
mark_story
76919902b9 Removing direct tests of protected method. 
Refactoring View with the intention of eventually removing coupling with CacheHelper.
Making Helpers load after the first rendering method is called.
Moving callbacks out of _render() to make logic simpler, and with the idea that elements will get a callback too.
 2010-11-07 13:23:42 -05:00
Mark Story
8f31ef7149 Making $scripts_for_layout and $content_for_layout regular viewVars. This will allow helpers to manipulate them in callbacks. 
Made $___dataForView an optional parameter, it defaults to $this->viewVars if left undefined. Refs #624
 2010-11-07 13:23:42 -05:00
mark_story
1424e02488 Adding a method to CakeRequest to parse out the accept-language header. This will help remove features from l10n. 2010-11-07 01:35:36 -04:00
ADmad
eb76ab95f2 Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself. 2010-11-06 09:33:50 +05:30
mark_story
d56b812181 Fixing issue where an array to string conversion error could occur if you had multiple values for a model's primary key and you created a matching form. Tests added. 
Fixes #1257
 2010-11-04 21:08:40 -04:00
ADmad
81ce6f40b9 Added test cases showing usage of 'full_base' key for url generation. Refs #1256 2010-11-04 17:59:23 +05:30
José Lorenzo Rodríguez
3a8016b875 Even more methods containing quoting specific to mysql out of DboSource 2010-11-03 19:59:15 -04:30
José Lorenzo Rodríguez
6028705c72 Moving more methods out from DboSourceTest 2010-11-03 19:52:49 -04:30
José Lorenzo Rodríguez
86f1309a54 iMoving a couple of methods out from DboSourceTest 2010-11-03 19:40:09 -04:30
José Lorenzo Rodríguez
f2f378ca73 Moving testGenerateInnerJoinAssociationQuery out from DboSourceTest 2010-11-03 19:35:15 -04:30
José Lorenzo Rodríguez
605a6b17a5 Moving another method out of DboSourceTest 2010-11-03 19:18:51 -04:30
José Lorenzo Rodríguez
146af7faa5 Stating to move quoting test out from dbosource into mysql test 2010-11-03 19:14:22 -04:30
José Lorenzo Rodríguez
eedd823fd8 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-03 00:23:18 -04:30
mark_story
bff711e2dc Merge branch '2.0-console' into 2.0 
Conflicts:
	cake/console/shells/acl.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
 2010-11-02 23:49:19 -04:00
Juan Basso
b0a600f925 Merge branch '2.0-post-method' into 2.0 2010-11-03 01:42:06 -02:00
Juan Basso
adb2d90b9a Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://" 2010-11-03 01:26:41 -02:00
mark_story
d1403b0da8 Changing NumberHelper::currency() to format < 1euro based on the suggestions from 'Joel Haasnoot'. Instead of 99c you will get €0,99. 
Test cases updated.  Fixes #1253
 2010-11-02 21:56:24 -04:00
Mark Story
94f9f7afeb Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest. 2010-10-31 22:42:16 -04:00
Mark Story
c2063f1229 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-31 21:58:38 -04:00
Mark Story
08e7bcb7ab Merge branch '1.3' into integration 
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
 2010-10-31 21:56:59 -04:00
Juan Basso
7f448a1d35 Allowed the use of empty() and isset() in Controllers aliases properties. 2010-10-31 22:02:26 -02:00
Juan Basso
4eed660a62 Changed the form style to not affect layout. 2010-10-30 22:39:31 -02:00
Robert Sworder
593c45b6e7 Whitespace changes 2010-10-29 23:43:50 -04:00
Robert Sworder
9eb533b9f6 dateTime functions + tests 2010-10-29 23:43:50 -04:00
Robert Sworder
a876c77987 meridian function 2010-10-29 23:43:50 -04:00
Robert Sworder
d3c1e8c974 minute function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
5f0700342b hour function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
6620b3b8fc month function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
529791842c year function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
a1b1a07af2 __dateTimeSelected and day functions done, with tests 2010-10-29 23:43:48 -04:00
Robert Sworder
30f3494c98 Select function signature changed. Corresponding tests changed. 2010-10-29 23:43:48 -04:00
Robert Sworder
115c6102b9 Changes to make tests pass... 2010-10-29 23:43:48 -04:00
Mark Story
3ca0cdb1ee Adding support for route objects to return full urls. These urls are not changed by Router, and just returned. This will allow subdomain route classes to be created. 
Tests added.
 2010-10-29 21:33:56 -04:00
mark_story
f29bb562cb Adding a test for saving blank fields on a model. Closes #1243. 2010-10-29 00:13:09 -04:00
mark_story
f5fd069583 Applying patch from 'Justas Butkus' to fix CakeSchema::compare() 
Fixes issues with comparing null == '' and adds a new protected method to handle null aware array difference generation.
Tests added.
Fixes #1206
 2010-10-27 23:03:31 -04:00
mark_story
d7847288e4 Adding Fennec as a built-in mobile browser. 
Refactoring a test case to pull out the exceptional case.
Fixes #932
 2010-10-27 22:32:15 -04:00
José Lorenzo Rodríguez
8d80188c6c Updating more tests with boolean handling, maybe in the near future fixing this for both mysql and postgres is coming 2010-10-26 21:59:48 -04:30
José Lorenzo Rodríguez
eb49181c48 Bringing more boolean tests up to date in postgres 2010-10-26 21:49:03 -04:30
José Lorenzo Rodríguez
b3d8a619a3 Updating test for booleans in postgres 2010-10-26 21:46:29 -04:30
mark_story
3639f52117 Adding a test for containable modifying return. Refs #1219 2010-10-26 21:39:48 -04:00
José Lorenzo Rodríguez
d9222cf90a Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-10-26 20:42:30 -04:30
José Lorenzo Rodríguez
ff9748c6ba Adding some workaround in traslate behavior tests for postgres, all tests passing now 2010-10-26 20:34:25 -04:30
José Lorenzo Rodríguez
cc32ac8904 Simplifying tests for translatable behavior as they were hard to understand 2010-10-26 17:55:50 -04:30
José Lorenzo Rodríguez
16524bc72f Fixing test case for translate behavior 2010-10-26 17:53:33 -04:30
José Lorenzo Rodríguez
25c213e976 Preventing zero length of fields using prostgres 2010-10-25 20:25:07 -04:30
José Lorenzo Rodríguez
cec3512835 Fixing more errors in tests related to type casting 2010-10-25 19:47:32 -04:30
José Lorenzo Rodríguez
f027bf0f7b Fixing some errors in tests 2010-10-25 19:47:00 -04:30
SKAhack
9f2d33aa88 meta characters don't match on regex string 
Signed-off-by: mark_story <mark@mark-story.com>
 2010-10-24 21:42:11 -04:00
mark_story
a57f8d3851 Adding another test for csrfUseOnce. 2010-10-24 20:57:12 -04:00
José Lorenzo Rodríguez
1acb619e75 Implementing DboSource::insertMulti so it uses prepared statements, also changing internal uses of this method to reflect the new api, this brings as consequence a better abstracttion for datasources in model and fixtures, but breaks BC 2010-10-24 19:59:54 -04:30
mark_story
22239b4481 Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript. 2010-10-24 20:26:31 -04:00
José Lorenzo Rodríguez
34813ab35c Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-10-24 19:55:02 -04:30
mark_story
4496a0a0bb Reformatting code to use tabs. 
Fixing issue with float comparison.
Fixes #219
 2010-10-24 19:43:41 -04:00
C. James Callaway
b8f0dda964 Updating to match ticket, using radians() SQL function. 2010-10-24 19:39:18 -04:00
C. James Callaway
a429287c19 Adding testcase for ticket #219 2010-10-24 19:38:23 -04:00
Graham Weldon
d3e0ddbb0e Update copyright years. 2010-10-25 07:58:22 +11:00
mark_story
54854c493b Changing output buffering, as ajaxtest was making output and breaking tests in group contexts. 2010-10-24 00:39:46 -04:00
mark_story
155bfe6293 Fixing failing test caused by setting an expiry value outside of the PECL extensions limits. 2010-10-24 00:05:27 -04:00
mark_story
0b2a6acc64 Merge branch '2.0' into 2.0-console 2010-10-23 19:19:04 -04:00
mark_story
bf7b8b0e93 Fixing issues with RssHelper and updating tests to reflect changes in how Xml::build() differs from previous versions' Xml. 2010-10-23 13:11:50 -04:00
mark_story
7aaf7e6b68 Fixing issue where Xml would not read CDATA blocks. 2010-10-23 11:01:13 -04:00
mark_story
a72d6da9c3 Making plugin schema tests less likely to stomp on tables they shouldn't be changing. 2010-10-23 00:54:39 -04:00
José Lorenzo Rodríguez
c7763b316e Fixing some boolean issues in DboPostgres 2010-10-21 20:34:11 -04:30
José Lorenzo Rodríguez
0ffe6de9e4 Allowing multiple sql sentences to be executed only for creting or altering databases 2010-10-20 23:57:00 -04:30
mark_story
7c296211ef Making generating schema for connections with prefixes work correctly. The prefix needs to be removed so that when tables are created or updated they do not get the prefix added twice. 
Moving tests around. Fixes #1180
 2010-10-20 23:17:04 -04:00
mark_story
498417203b Making DboSource::fields() use cacheMethod() so it respects $cacheMethods. 
Test added.
Fixes #1211
 2010-10-20 22:28:31 -04:00
mark_story
077d1c5ad5 Applying patch from 'hashmich' to fix issues with slideUp and slideDown effects in prototype engine. 
Tests updated.
Fixes #1213
 2010-10-20 22:07:53 -04:00
José Lorenzo Rodríguez
d0fc2fd171 Fixing describing of table columns for postgres 2010-10-19 00:48:08 -04:30
mark_story
1c25e627ad Applying patch from 'Mark Mitchell' fixes issues with sending Email via smtp. Which were incorrect based on previous patches given for ticket #1100. 
Fixes #1205, Fixes #1204
 2010-10-18 22:06:12 -04:00
Juan Basso
373fa780f7 Created the method FormHelper::postLink() to create a link with form to send data via POST. This feature require javascript. 2010-10-18 21:51:17 -02:00
Juan Basso
4c106490ef Created the method FormHelper::postButton() to create a button with form to send data via POST. 2010-10-18 17:53:27 -02:00
José Lorenzo Rodríguez
5c87daf083 Implementing listSources for postgres 2010-10-18 00:08:34 -04:30
José Lorenzo Rodríguez
aedf69dee1 More refactoring to DboSource::value() 2010-10-17 23:55:11 -04:30
José Lorenzo Rodríguez
6778d4b565 Updating test case for floats 2010-10-17 23:42:12 -04:30
José Lorenzo Rodríguez
d9c9a32ff3 Refactoring DboSource::value() so postgres and mysq behavior is the same, updating test case 2010-10-17 23:38:55 -04:30
mark_story
84a8dbd85a Merge branch '2.0' into 2.0-console 2010-10-17 23:32:38 -04:00
Juan Basso
d771239104 Fixed support to save XML data in Models. 2010-10-17 22:47:43 -02:00
mark_story
d64aed59cc Adding console libs into AllTests 2010-10-17 17:33:16 -04:00
Juan Basso
b2035a5c96 Fixing tests that failing in Set because merge of Xml class. 2010-10-17 18:40:33 -02:00
José Lorenzo Rodríguez
ee4add9c32 Fixing test case 2010-10-17 15:53:44 -04:30
José Lorenzo Rodríguez
f215cd01f1 Fixing tests for CakeSchema 2010-10-17 15:25:04 -04:30
José Lorenzo Rodríguez
cbdfb3f76e Removing all references to mysqli 2010-10-17 11:49:17 -04:30
José Lorenzo Rodríguez
78717ab45c Fixing some test cases 2010-10-17 11:29:49 -04:30
José Lorenzo Rodríguez
7e2fe43ee3 FIxing query caching to take in account bound parameters 2010-10-17 10:51:54 -04:30
José Lorenzo Rodríguez
183e9c92df Removing some asignations by reference 2010-10-17 10:18:46 -04:30
José Lorenzo Rodríguez
082873721c Changing param order in execute() to maintain compatibility, making all tests pass 2010-10-16 20:28:07 -04:30
José Lorenzo Rodríguez
25915bd931 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-10-16 14:20:58 -04:30
José Lorenzo Rodríguez
d83c95cf46 Fixing bug in DboMysql::value() 2010-10-16 14:01:01 -04:30
José Lorenzo Rodríguez
88a2fb5058 Fixing bug in DboMysql::describe() 2010-10-16 13:44:16 -04:30
José Lorenzo Rodríguez
17f24719ee Replacing reference assignation for normal assignation in test case 2010-10-16 13:32:59 -04:30
José Lorenzo Rodríguez
84283ed6f3 Fixing DboMysql::listDetailedSources() 2010-10-16 13:28:18 -04:30
mark_story
c35ef7dbab Making class attribute bubble down into FormHelper::__selectOption(). 
Fixes issue where you couldn't change the classname of checkbox options.
Fixes #1202
 2010-10-16 13:32:04 -04:00
José Lorenzo Rodríguez
e03cbcb167 Fixing model describing and making pass testBlobSaving 2010-10-16 10:23:13 -04:30
mark_story
98a654c4b9 Expanding String::wrap to be able to indent and start indenting at a specific offset. 2010-10-15 22:46:03 -04:00
José Lorenzo Rodríguez
526205b546 Fixing test case in DboMysql 2010-10-15 18:41:17 -04:30
José Lorenzo Rodríguez
5e80cf8ff7 Improving DboMysql::index() 2010-10-15 17:27:36 -04:30
José Lorenzo Rodríguez
0fb2ac0285 Chaging implementation of DboMysql::getVersion(), improving connection options 2010-10-15 17:03:59 -04:30
José Lorenzo Rodríguez
70ed9a7b12 Fixing DboMysql::index() method 2010-10-15 17:02:37 -04:30
José Lorenzo Rodríguez
dc362d1a38 Adding test for DboMysql::getEncoding() 2010-10-14 23:18:07 -04:30
José Lorenzo Rodríguez
09e06d52b9 Implementing DboMysql::getVersion() 2010-10-14 23:15:17 -04:30
mark_story
7b5ae6a5c4 Adding String::wrap() to handle wrapping strings for console output. 2010-10-14 22:32:56 -04:00
mark_story
67874bd906 Fixing issue where defining a pattern for :action would create an optional route parameter that wouldn't respect its pattern. 
Added the default action value only when a pattern isn't defined.
Added tests to CakeRoute and Router to cover this case.
Fixes #1197
 2010-10-14 21:54:44 -04:00
José Lorenzo Rodríguez
b8479459d6 Inital work for connecting to mysql using PDO and gettng the table list, testing is easier as it now uses mocks 2010-10-14 01:10:51 -04:30
mark_story
517c8949f9 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-13 23:17:50 -04:00
mark_story
0c070f7131 Fixing tests that were failing due to SimpleTest being less sensitive to types than PHPUnit. 
Fixing tests that were failing due to XmlHelper being removed in 2.0.
 2010-10-13 23:09:55 -04:00
mark_story
f19e3d501c Merge branch '1.3' into integration 
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
 2010-10-13 22:30:40 -04:00
mark_story
6529e0e2b4 Making optiongroup elements follow the escape parameter. 
Tests added.
Fixes #1191
 2010-10-13 21:59:53 -04:00
mark_story
3f2109f3c3 Applying patch from 'dragonfly' to fix issue where FormHelper would always append an argument even if one was supplied. 
Test Added
Fixes #1155
 2010-10-13 21:36:05 -04:00
Jeremy Harris
692aafbf42 Merge remote branch 'upstream/2.0' into 2.0 2010-10-11 20:12:24 -07:00
mark_story
a0a84d1a8d Changing pattern used to read digest auth data. Allows emails to be used as usernames. 
This also adds the realm to the return value of SecurityComponent::parseDigestAuth().  Fixes #1181
 2010-10-11 22:35:47 -04:00
Jeremy Harris
b58899cf04 Added 'double' option to Santize::html() to pass double_encode parameter to htmlentities() 2010-10-11 18:25:11 -07:00
Juan Basso
c95c808f88 Merge with 2.0-xml 2010-10-10 23:21:56 -03:00
ADmad
62161203f2 Fixed issue where FormHelper::radio() and FormHelper::select() with option "multiple"=>"checkbox" would generate tag with invalid "id" attribute if a value was non alphanumeric 2010-10-10 23:16:48 +05:30
Phally
0d86302404 Fixed issue with Set::extract() where conditions containing a space and a slash would fail. Fixes #1185 
Signed-off-by: mark_story <mark@mark-story.com>
 2010-10-08 23:28:23 -04:00
Phally
0e5613f63d Fixed Set::extract() where single numeric keys (everything not 0) were skipped. Fixes #1175 
Signed-off-by: mark_story <mark@mark-story.com>
 2010-10-07 20:33:31 -04:00
José Lorenzo Rodríguez
5c025d0a18 More testing over the MediaView class 2010-10-03 23:30:47 -04:30
José Lorenzo Rodríguez
9daab17374 Improving test case for MediaView class 2010-10-03 23:30:02 -04:30
José Lorenzo Rodríguez
a611fd0e6c Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-03 19:36:24 -04:30
José Lorenzo Rodríguez
bf22928b6a Improving the CakeResponse::cache() method 2010-10-03 19:27:08 -04:30
José Lorenzo Rodríguez
0ba5023f3a Updating testcase and fixing small bug in last commit 2010-10-03 16:48:07 -04:30
mark_story
3ab77017ae Fixing OpenTest license mentions to use MIT License 
Fixing PHP versions 4 and 5 to only be PHP5.
 2010-10-03 12:31:21 -04:00
mark_story
b908365f9d Changing the @license tag on test files, as tests can now be MIT like 
the rest of CakePHP.
 2010-10-03 12:27:27 -04:00
mark_story
6cabfcec5b Removing dead tests from SessionHelper test case. 2010-10-03 12:15:01 -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
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
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
evilbloodydemon
38e128b597 test for #250 
Signed-off-by: mark_story <mark@mark-story.com>
 2010-09-29 23:06:47 -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
597058bab5 Reordering tests in AllRouting case. 
Changing how output buffers are emptied, so that its only done in cli.
 2010-09-29 22:42:01 -04:00
José Lorenzo Rodríguez
cff2864ba5 Fixing testcase 2010-09-29 01:14:44 -04:30
José Lorenzo Rodríguez
9d35ea0cbc Upgrading CodeCoverage repoting fo phpunit 3.5 2010-09-29 01:14:14 -04:30
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
9992cff96c Adding another test for #250. 2010-09-28 22:26:54 -04:00
José Lorenzo Rodríguez
4445c24008 Merge remote branch 'origin/2.0' into 2.0-phpunit-upgrade 2010-09-28 20:56:44 -04:30
José Lorenzo Rodríguez
f2b51d2375 Fixing parse error 2010-09-27 23:41:11 -04:30
José Lorenzo Rodríguez
87d5a791c6 Fixing helper tests 2010-09-27 23:40:57 -04:30
José Lorenzo Rodríguez
c3ccf15546 Replacing the use of removed "sharedFixture" and adding custom "fixtureManager" property to CakeTestCase 2010-09-27 23:37:56 -04:30
mark_story
3a14f780b9 Moving parent call to fix fatal errors caused by registry being empty. 2010-09-28 00:03:23 -04:00
José Lorenzo Rodríguez
0eaf437fe4 Merge remote branch 'origin/2.0' into 2.0-phpunit-upgrade 2010-09-27 23:19:47 -04:30
José Lorenzo Rodríguez
2635733aba Merge branch '2.0' into 2.0-phpunit-upgrade 2010-09-27 22:42:10 -04:30
José Lorenzo Rodríguez
ba168d1a72 Initial steps towards migrating to phpunit 3.5 2010-09-27 22:37:23 -04:30
mark_story
06ed3a96a7 Moving the plugin import tests to a separate method. 
Adding tests for importing a pluginAppHelper.
Closes #1111
 2010-09-26 12:30:12 -04:00
mark_story
0990728385 Adding tests for non latin domains to MemcacheEngine. Closes #1143 2010-09-26 12:04:06 -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
63d23df77a Merge branch 'setup-teardown' into all-tests 2010-09-25 22:34:20 -04:00
mark_story
0222717e33 Merge branch 'all-tests' of github.com:markstory/cakephp into all-tests 2010-09-25 22:34:10 -04:00
mark_story
54fa2e3742 Uncommenting model group in all tests. 2010-09-25 22:33:23 -04:00
José Lorenzo Rodríguez
27dfe2d521 Adding all_model suite to the all_tests one 2010-09-25 22:00:30 -04:30
mark_story
2b1bc99eb5 Fixing failing tests in auth and scaffold. 
Fixing more tests that had stray buffers.
 2010-09-25 22:27:31 -04:00
José Lorenzo Rodríguez
18b38f61e0 Fixing CakeTestFixture import feature 2010-09-25 21:53:48 -04:30
mark_story
92b57d81ee Moving common setup and teardown functionality in to CakeTestCase. 
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
 2010-09-25 21:36:49 -04:00
mark_story
24dd0af601 Adding debug backup for view test. 2010-09-25 10:50:35 -04:00
mark_story
f60a7fb854 Adding all libs to the all tests. 2010-09-25 10:42:20 -04:00
mark_story
843ada240a Removing AppController from ErrorHandler test as it can make testing harder. 
Removing broken buffering from tests that trigger errors / exceptions.
Adding a loadHelper() to the test_app layout so the layout always has the required helper.
 2010-09-25 10:41:08 -04:00
mark_story
714d8298c4 Fixing all tasks include. 
Removing drop table queries that cause other tests to fail.
 2010-09-25 01:25:42 -04:00
mark_story
26057c59c4 Fixing issue in DboSource test case where buffer would eat all the output. 
Removing dead tests from TestManager test.
 2010-09-25 01:13:01 -04:00
mark_story
8e6277c9d1 Updating schema shell test so it doesn't fail in groups. 
Updating suites to use new method.
 2010-09-25 00:13:37 -04:00
mark_story
5c94bdd028 Fixing failing tests in group context caused by state being stuck in static objects. 2010-09-24 23:30:02 -04:00
mark_story
4e5ebc5c0f Renaming all bake tasks to all tasks. 
Updating all tests.
 2010-09-24 23:30:02 -04:00
mark_story
94d738e834 Fixing failing tests and group test situational fails in console tests. Adding console tests to all tests. 2010-09-24 23:30:02 -04:00
mark_story
6974a8752f Removing a test that used eval(). It caused issues in group tests. 2010-09-24 23:30:02 -04:00
mark_story
12d0bdd2ee Adding a missing require to make tests run in cli. 
Adding test_suite suite to all tests as it now runs.
 2010-09-24 23:30:02 -04:00
mark_story
460a8bc4f6 test_suite suite now runs. Still has a few failing tests from the fixture test case. 2010-09-24 23:30:02 -04:00
mark_story
32dc4aac7b Fixing usage of mb_internal_encoding so it doesn't bone group tests. 2010-09-24 23:30:02 -04:00
José Lorenzo Rodríguez
5c3b4cfcc4 Removing all uses of the test_suite connection in the test cases 2010-09-24 23:30:01 -04:00
José Lorenzo Rodríguez
e89860e079 Skiping memcache test if Memcache is not installed 2010-09-24 23:30:01 -04:00
mark_story
53086635b3 Adding CakeRequest and CakeResponse to the routing group. 
Making more tests not fail in cli.
 2010-09-24 23:30:01 -04:00
José Lorenzo Rodríguez
0a1bc06843 Skiping ApcCache test if APC is not installed 2010-09-24 23:30:01 -04:00
mark_story
b52f78297f Removing dependencies on AppController because it can be a bit crazy. 
Uncommenting more groups from the AllTests.
 2010-09-24 23:30:01 -04:00
mark_story
e6824e6a41 Fixing duplicate class names. 2010-09-24 23:30:01 -04:00
mark_story
973841a264 Fixing issues in tests that caused group test to fail, and removing duplicate environment backup. 2010-09-24 23:30:01 -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
c5a47d4daa Clearing referrer more thoroughly. 2010-09-24 23:30:00 -04:00
mark_story
03d99d43be Fixing unbalanced ob_start(). 
Removing dead code.
 2010-09-24 23:30:00 -04:00
mark_story
92ed1e76da Fixing file included in all_models. 
Adding skip as tests fail when classes already exist.
Fixing skip condition to use newer api.
 2010-09-24 23:30:00 -04:00
mark_story
78c838bcdd Fixing failing tests caused by fixture data changes. 2010-09-24 23:30:00 -04:00
mark_story
2385747899 Some more fixes to make tests run better under all tests. 2010-09-24 23:28:49 -04:00
mark_story
76ef390d4a Updating CakeSchema test case to run in suites. It did not account for additional tables being in the database when it ran. 2010-09-24 23:28:48 -04:00
mark_story
7202a5e398 Starting something that will hopefully become a real All Tests. 2010-09-24 23:28:48 -04:00
mark_story
326ae9755f Updating debugger and error_handler tests to remove errors in CLI. 2010-09-24 23:28:48 -04:00
mark_story
98d1272374 Some fixes to make the test more reliable. 2010-09-24 23:28:48 -04:00
mark_story
d0028bf971 Fixing issue in HtmlHelper test where test files would be left behind. 2010-09-24 23:28:48 -04:00
mark_story
c9a6eba000 Fixing scaffold test so all_controllers suite runs in cli. 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
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
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
mark_story
443e523313 Adding tests for clearing the cache with memcache. 2010-09-18 13:15:37 -04:00
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
b432e60971 Making Cache::set() work with 2 or 3 parameters. Test cases added. 2010-09-18 11:11:28 -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
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
738d92cc3e Fixing failing tests caused by fixture data changes. 2010-09-18 00:03:22 -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
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
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
5d697b9d6e Fixing tests where objects were not added to the mockObjects lists, making their expects() not count. 2010-09-14 22:39:05 -04:00
mark_story
8e97a5ee2d Fixing failing tests caused by missing index in Security component testcase. 2010-09-14 22:20:30 -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
003d02d8d9 Making view test pass by moving property assignment on mock. 2010-09-13 23:11:59 -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
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
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
Juan Basso
ef147275d7 Added test to use Xml with Model. 2010-09-13 00:43:11 -03:00
mark_story
578674f0e1 Reformatting some code in Set::classicExtract test case. 2010-09-12 14:19:36 -04:00
mark_story
404e49b37d Adding tests for writing falsey values. 2010-09-12 14:08:17 -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
85ccd1f096 Fixing skipIf calls so email test runs in a reasonable time frame when there is no local smtp server. 2010-09-12 13:06:49 -04:00
mark_story
e9d194822d Adding more tests for SMTP address formatting. Fixes #1100 2010-09-12 11:48:09 -04:00
Juan Basso
213c83401f Added test to generate Soap Request from array using namespaces. 2010-09-12 12:06:59 -03:00
Juan Basso
89be9b0986 Added test to generate Rss from array using namespaces. 2010-09-12 11:54:11 -03:00
Juan Basso
46f784f956 Support to DOMDocument/DOMNode in Xml::toArray(). 2010-09-12 11:25:37 -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
55ecfe0292 Fixing stupid typo. 2010-09-11 15:48:48 -04:00
mark_story
7c79583caa Updating expiry time to be within tolerances of memcached. 2010-09-11 15:44:52 -04: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
mark_story
8625d7b374 Making debugger test case pass. 2010-09-09 22:58:34 -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
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
mark_story
5d703c4f50 Fixing + adding imports for Scaffold. 2010-09-08 00:11:37 -04:00
mark_story
2d86c1248f Adding view import to fix xml suite from not running. 2010-09-07 23:53:12 -04:00
Mark Story
aad72871a0 Adding more tests for virtualFields and complex expressions. Closes #1079 2010-09-07 00:32:44 -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
Juan Basso
87604f92c7 Adding a missing assert to tests. 2010-09-06 20:17:30 -03:00
Mark Story
45dab88180 Adding a cast to fix a failing test from the merge. 2010-09-06 16:54:32 -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
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
Mark Story
fd50c2ae2a Adding some tests for the constructor. 2010-09-06 01:21:58 -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
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
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
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
af87e5d5bc Adding a skip when AppError is present, as its behaviour is unknown. 2010-09-03 15:35:11 -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
Juan Basso
9239caa589 Added tests to use Xml with SOAP. 2010-09-01 21:37:32 -03: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
Juan Basso
a1eeb03e36 Added tests to use Xml with XML-RPC. 2010-09-01 21:14:21 -03:00
Juan Basso
ff29897bad Moving the rss content to a file. 2010-09-01 20:22:39 -03:00
Juan Basso
26b514e2cd Chaning tests of Xml to public. 2010-09-01 20:09:03 -03:00
Juan Basso
edcb5e4370 Added tests to use Xml with RSS. 2010-09-01 20:06:56 -03:00
mark_story
08d6c19ab6 Adding test for themes in app/webroot dir. Closes #1061 2010-08-31 21:21:05 -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
78ac5bd20f Removing sprintf() placeholders that don't work. 2010-08-29 23:28:54 -04:00
mark_story
efaa2e1177 Refactoring test case to use a dataprovider for the uniform/copy paste test cases. 2010-08-29 21:53:44 -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
99cde14432 No more skipped tests for ErrorHandler. 
Removing missing_model as it was never called.
 2010-08-29 13:49:10 -04: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
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
5d942ee609 Extracting a few methods to make testing easier, and subclasses easier to create. 2010-08-28 19:53:21 -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
c1209a1a7a Added RequestObject output in place of Controller:$output whicch no longer exists. 2010-08-28 15:15:23 +10:00
predominant
93b80042f8 Fix failing scaffold tests. 2010-08-28 15:01:43 +10:00
mark_story
d8b2bcdf06 Making view + helpers groups pass. 2010-08-28 00:40:12 -04:00
mark_story
dcb7a167b4 Fixing controller test cases. 2010-08-28 00:29:50 -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
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
José Lorenzo Rodríguez
f63b093d24 Merge branch '2.0-request' into 2.0 
Still tons of tests failing
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/html.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
 2010-08-27 23:31:41 -04:30