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
7670 commits 7 branches 0 tags 44 MiB
Commit graph

3229 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
f1eaec11f5 Migrating StringTest to phpunit 2010-05-19 00:05:49 -04:30
José Lorenzo Rodríguez
50021ee646 Merge branch '2.0-phpunit' of git@github.com:cakephp/cakephp into 2.0-phpunit 2010-05-18 23:57:41 -04:30
José Lorenzo Rodríguez
103d5c2505 Partially migrated JsHelperTest to phpunit 2010-05-18 23:56:50 -04:30
mark_story
07c957e827 Making PaginatorHelper test run under PHPUnit. 2010-05-19 00:14:37 -04:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
José Lorenzo Rodríguez
327d42d6de Fixing CacheHelperTest for phpunit 2010-05-17 22:35:54 -04:30
José Lorenzo Rodríguez
f7949d6ace Fixing FormHelperTest for phpunit 2010-05-17 22:30:04 -04:30
mark_story
3a60aa07de Fixing issues where setting jQueryObject did not affect request() and its connected methods. 
Tests added.
Fixes #728
 2010-05-17 18:25:50 -04:00
mark_story
4915645fb1 Applying patch from 'Daren Thomas' fixes issues where sorting on virtualFields did not work properly when using aliased sort link keys. Tests added. Fixes #680 2010-05-16 23:42:14 -04:00
José Lorenzo Rodríguez
32a46e9eda Converting HtmlHelperTest to phpunit 2010-05-15 21:05:22 -04:30
Mark Story
a29866b7fb Updating test for 1.3 2010-05-13 23:09:23 -04:00
Mark Story
3d98cc6f53 Adding tests for welsh added in previous commit. 2010-05-13 23:08:32 -04:00
Mark Story
9303de936e Fixing fatal error trying to run coverage on the coverage reporter. 
Removing old CodeCoverageManager implementation.
 2010-05-13 21:44:30 -04:00
José Lorenzo Rodríguez
689e46be4f Converting ConfigureTest to phpunit 2010-05-13 00:52:38 -04:30
José Lorenzo Rodríguez
f3f37a126f Converting CakeSocketTest to phpunit 2010-05-13 00:50:30 -04:30
José Lorenzo Rodríguez
72959e7872 Converting CAkeSessionTest to phpunit 2010-05-13 00:21:16 -04:30
José Lorenzo Rodríguez
6613cfb662 Migrating CacheTest to phpunit 2010-05-13 00:13:40 -04:30
José Lorenzo Rodríguez
3e3817f113 Merge commit 'mark/2.0-coverage' into 2.0-phpunit 
Conflicts:
	cake/tests/lib/reporter/cake_html_reporter.php
 2010-05-13 00:05:30 -04:30
José Lorenzo Rodríguez
8c3df122eb Merge commit 'lorenzo/2.0-phpunit' into 2.0-phpunit 
Conflicts:
	cake/tests/lib/reporter/cake_html_reporter.php
	cake/tests/lib/test_manager.php
 2010-05-12 23:58:56 -04:30
Mark Story
d349551dd7 Adding tests for generating method coverage with the reporter. 
Adding method visibility
 2010-05-12 22:43:44 -04:00
Mark Story
79839c07d2 Fixing issues where ModelBehavior::detach() would not detach behaviors when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711 2010-05-11 23:08:14 -04:00
Mark Story
0648c6604b Adding some additional tests for possible php4 compatibility issues. 2010-05-11 23:01:40 -04:00
Mark Story
6add43a4bc Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675 2010-05-11 22:40:56 -04:00
ADmad
3539660cd0 Space is now properly added inbetween when 'asc'/'desc' class is appended to user defined css class in PaginatorHelper::sort. Fixes #710 2010-05-12 00:42:02 +05:30
Richard Sbresny
05beaab272 Removed unnecessary unset 
Signed-off-by: Mark Story <mark@mark-story.com>
 2010-05-11 00:14:38 -04:00
Richard Sbresny
b04a3f8514 Switched over to using the previously unused Security::inactiveMins() method for getting timeout modifiers 
Signed-off-by: Mark Story <mark@mark-story.com>
 2010-05-11 00:14:20 -04:00
Richard Sbresny
a4950f6940 Updated session timeout calculations to use the security level from core.php as the multiplier. 
Signed-off-by: Mark Story <mark@mark-story.com>
 2010-05-11 00:11:20 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
e8e2235cfa Updating coverage report and tests to include hiding javascript. 2010-05-09 22:15:20 -04:00
José Lorenzo Rodríguez
bc9479efcf Fixing XmlTest to be compatible with PHPUnit 2010-05-09 18:18:40 -04:30
José Lorenzo Rodríguez
809550087c Finxing ThemeTest to be compatible with PHPUnit 2010-05-09 16:27:09 -04:30
José Lorenzo Rodríguez
d252fdeb52 Fixing View test case to be compatible with PHPUnit 2010-05-09 16:09:02 -04:30
Mark Story
f084a82dfc Refactoring how coverage diffs are generated to better use data from phpunit. Removing methods made redundant by data changes. 2010-05-09 12:30:55 -04:00
Mark Story
ac318faf5a Switching back to using non raw code coverage data as it has been filtered by phpunit's filters. combining the data from phpunit into a singular cohesive report. 2010-05-09 02:08:32 -04:00
Mark Story
3c3655aefd Fixing failing tests. 2010-05-09 01:16:44 -04:00
Mark Story
9a20a2344b Continuing work on updated code coverage reports. 2010-05-09 00:40:05 -04:00
Mark Story
955c6bea9f Verbose coverage generation has been added and tests added. 2010-05-09 00:04:03 -04:00
Mark Story
f6b49cd865 Updating file headers. 2010-05-08 18:12:20 -04:00
Mark Story
fad99ad1f4 Adding tests for merging of report data. 2010-05-08 18:08:02 -04:00
Mark Story
ac5f731940 Starting work on HtmlCoverageReport and adding a test case. 2010-05-08 17:59:14 -04:00
José Lorenzo Rodríguez
79c001197d Merge commit 'mark/2.0-phpunit' into 2.0-phpunit 
Conflicts:
	cake/tests/lib/test_manager.php
 2010-05-08 17:18:43 -04:30
José Lorenzo Rodríguez
fb09adca68 Adding tests for skipIf 2010-05-08 16:36:11 -04:30
José Lorenzo Rodríguez
4d3a6e8ca6 Fixing and testing for CakeTestCase::loadFixtures() 2010-05-08 16:14:22 -04:30
José Lorenzo Rodríguez
2b5cd26fc6 Adding tests for CakeTestCase fixtures 2010-05-08 15:56:21 -04:30
Mark Story
933378223b Updating CakeLog tests to use @expectedException annotation. 2010-05-08 16:17:20 -04:00
José Lorenzo Rodríguez
82a1bd6f80 Cleaning up CakeTestCase and adding some tests for it 2010-05-08 01:19:45 -04:30
Mark Story
1a7dce3af6 Updating DboMysql to fix an issue where virtualFields that were simple 
aliases to fields on other tables would end up in the wrong place.
Tests added.  Fixes #655
 2010-05-07 23:26:13 -04:00
Mark Story
745afe888b Adding more tests for saving records with nulls. Closes #675 2010-05-07 22:23:18 -04:00
Mark Story
f152181c03 Adding tests for saving models with id == null. Closes #675 2010-05-06 22:24:11 -04:00
Mark Story
45d052b55a Fixing failing tests in ViewTask test case, caused by changes in core templates. 
Fixing incorrect variable usage where models would be double singularized causing incorrect names.  Fixes #668
 2010-05-06 21:38:14 -04:00
José Lorenzo Rodríguez
bed87b87c6 Removing code from CakeTestCase around the method "testAction" which was a bad way of testing controllers, often making it more difficult. 
This also removes class contamination in newly created test cases
 2010-05-05 22:42:56 -04:30
José Lorenzo Rodríguez
b53d21ff52 Fixing a group test case to show how to create one, and to make pass TestManager test case 2010-05-04 23:58:17 -04:30
José Lorenzo Rodríguez
fd4a82d6e9 Adding test for TestManager::runGroupTest() 2010-05-04 23:56:40 -04:30
Mark Story
fcad9b464c Fixing tests broken by changes in default bake templates. 
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
 2010-05-04 23:27:41 -04:00
José Lorenzo Rodríguez
c23f66e35c Removing "extends" from TestManager as it wasn't used anyway. 
Making some methods static as they were called statically
More testing on TestManager
 2010-05-04 20:51:58 -04:30
José Lorenzo Rodríguez
cdf4006f16 Refactoring TestManager::runAllTests() and improving the TestManager test case 2010-05-04 18:25:15 -04:30
Mark Story
ce10c85367 Making Sanitize::stripScripts() to remove multi-line script and style blocks. Fixes #657 2010-05-03 22:33:20 -04:00
Mark Story
95dbae8acf Making RequestHandler component carry along a passed status code. This fixes issues where RequestHandler hijacks an redirect(). Fixes #658 2010-05-03 22:07:13 -04:00
Mark Story
c48f6d6536 Fixing safe parameter from leaking into request() calls in JsHelper::submit() and JsHelper::link(). Fixes #656 2010-05-02 21:17:10 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0 
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
 2010-05-02 17:53:42 -04:00
Mark Story
b5a0dccc3a Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-05-02 17:03:20 -04:00
Mark Story
4a0ead8a62 Fixing asset filtering for assets in themes and plugins. These assets should now correctly enter the configured asset filters. Fixes #650. Fixes #160 2010-05-02 16:48:35 -04:00
ADmad
f386dca6d8 Controller::loadModel() now returns true when model is succesfully instantiated as stated in docblock. Added test case. 2010-05-02 05:34:38 +05:30
José Lorenzo Rodríguez
ad51115e12 Fixing bug where required class would be added to form fields when using single rule syntax in $validate even if allowEmpty is set to true 
Closes #654
 2010-04-30 16:42:59 -04:30
José Lorenzo Rodríguez
9b040a5ed3 Fixing code formating 2010-04-30 16:07:59 -04:30
ADmad
0471ea046f Adding test case for 'required' class adding to wrapping div based on model validations. Refs #654 2010-05-01 01:19:52 +05:30
Mark Story
328c58635b Fixing inflection of words ending in analysis. Fixes #619 2010-04-27 23:03:37 -04:00
ADmad
c2bd87144e Adding test case for HtmlHelper::url() showing use of key 'full_base' for parameter. Refs #627 2010-04-27 00:19:01 +05:30
predominant
9243f6601a Merge remote branch 'markstory/2.0' into 2.0 2010-04-26 14:11:07 +10:00
predominant
d5073d7bcf Fixed failing Set tests from Model class visibility. 2010-04-26 12:53:02 +10:00
Mark Story
af6435ece8 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-25 00:22:57 -07:00
Mark Story
46b9e76d8e Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-24 17:34:45 -07:00
Mark Story
ce260debbc Adding tests for passed arguments with dots when parseExtensions() has been called. Refs #620 2010-04-24 17:30:00 -07:00
ADmad
46df1be384 Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-25 02:34:18 +05:30
Mark Story
3e85577c1f Adding tests for dispatcher to show periods not being removed. Refs #620 2010-04-24 10:42:19 -07:00
Mark Story
5f03862f25 Adding tests that show that Router is not chopping off periods from passed arguments. Refs #620 2010-04-24 10:40:15 -07:00
Mark Story
9ddbd6f686 Removing dependancy on Object from CakeSocket. Making tests less dependant on having a network connection. 2010-04-23 21:41:20 -07:00
Mark Story
e8b6d45850 Fixing fatal errors in HttpSocket test case. 2010-04-24 00:31:10 -04:00
Mark Story
a17a38ddf4 Fixing fatal errors in View test. 
Removing =& and making tests use instanceof instead of is_object()
 2010-04-24 00:22:21 -04:00
Mark Story
35ec5ce2fc Updating test method names and moving parameter modification around. 2010-04-23 23:59:57 -04:00
Mark Story
e111735905 Changing AclBase into AclInterface as it is now an interface. 
Splitting the test case into separate test cases for each class.
 2010-04-23 23:52:36 -04:00
Mark Story
523eda018e Deprecating AclComponent::revoke() and AclComponent::grant() they were simply aliases that create a larger API with no real benefit. 2010-04-23 23:14:55 -04:00
Mark Story
62982c57b4 Making AclComponent throw exceptions when it encounters an error. 
Making AclBase an abstract class.
Adding AclComponent::adapter() for runtime modification of the Acl implementation.
Tests added, updated and fixed.
 2010-04-23 23:03:51 -04:00
Mark Story
33a2907202 Adding CakeLogInterface and implementing it in core and test suite classes. The new interface is used for method detection instead of a hard method check. Making CakeLog throw exceptions instead of trigger errors when things go wrong. 2010-04-23 22:31:21 -04:00
Mark Story
4d4d9e78f8 Adding App::setObjects() as a temporary way to modify App's cache of plugins. This allows the DispatcherTest to successfully run. 2010-04-23 22:04:16 -04:00
Mark Story
0a8aafe3c8 Fixing reference to method name. 2010-04-23 22:03:11 -04:00
Mark Story
d926a379b4 Removing params() it was a pretty much useless function, and was deprecated. 2010-04-23 21:32:23 -04:00
Mark Story
84002687c8 Making Security a static class. 
Fixing static access issues in test case.
 2010-04-23 21:28:54 -04:00
Mark Story
33bfe0e5e2 Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available. 
Correcting JsHelper::call__ into JsHelper::__call
Updating test cases to remove reference operators
 2010-04-23 21:21:31 -04:00
Mark Story
9e08196c76 More tests for ajax link delegation. 2010-04-23 21:14:23 -04:00
Mark Story
bf566e1aad Fixing failing tests in PaginatorHelper and moving tests related to JsHelper interaction into a separate test method. 2010-04-23 21:10:23 -04:00
Mark Story
999eb4be7b Fixing illegal access in HtmlHelper tests, replacing with mock object. 2010-04-23 20:51:24 -04:00
Mark Story
8cce38692a Simplifying route configuration failure test case. 2010-04-23 20:42:53 -04:00
Mark Story
0fc106428a Adding exception tossing for invalid cacheengine configuration. 2010-04-23 20:41:29 -04:00
Mark Story
797fa0009a Making Router throw exceptions when invalid route classes are used for routes. 2010-04-23 20:22:02 -04:00
Mark Story
bc6b8e5dfd Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-23 00:04:15 -04:00
predominant
f51ce734bf Import Validation from old 2.0 branch. 2010-04-23 12:53:47 +10:00
Mark Story
215333e56f Making tests more accurate to normal use, removing extra params and adding some tests for sortKey. Refs #614 2010-04-22 22:53:36 -04:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0 
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
 2010-04-23 12:52:56 +10:00
Mark Story
a92b9000bf Adding tests for non .com domains. Refs #605 2010-04-22 21:37:27 -04:00
José Lorenzo Rodríguez
fca070fe9e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding tests for and fixing the behavior of `cake acl initdb` it now correctly delegates to SchemaShell.  Fixes #608
  Making TestTask not depend on Inflection rules for creating directory names,  refs #610
  Adding tests for Inflector::rules() clearing cached values.  Fixes #609
  Clear cache of pluralized, singularized and tableize when set rules.
 2010-04-22 16:50:25 -04:30
José Lorenzo Rodríguez
65f01fa31c Fixing model introspection in FormHelper to better take in account realted models with aliased names 2010-04-22 16:37:15 -04:30
Mark Story
568e9d3a89 Adding tests for and fixing the behavior of cake acl initdb it now correctly delegates to SchemaShell. Fixes #608 2010-04-21 23:28:40 -04:00
Mark Story
1d3b653e57 Adding tests for Inflector::rules() clearing cached values. Fixes #609 2010-04-21 22:49:48 -04:00
Mark Story
120fdd9045 Removing other uses of Routing.admin as it has been removed from Router. 2010-04-20 23:43:51 -04:00
Mark Story
a71a8a89b2 Removing support for Routing.admin. Use Routing.prefixes instead. 2010-04-20 23:40:13 -04:00
José Lorenzo Rodríguez
5ceb19304e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-19 23:33:43 -04:30
José Lorenzo Rodríguez
e1c4b9696b Adding documentation on 'attributes' key for FormHelper::error 2010-04-19 23:32:58 -04:30
José Lorenzo Rodríguez
23eea00a0b Fixing FormHelper::error to no add error names and messages as html attributes. Fixes #585 
This introduces the special key 'attributes' to FormHelper::error() when passed in the second parameter
The contents of said key will be converted into html attributes for the error container tag
 2010-04-19 23:25:57 -04:30
Mark Story
7bf594ff17 Removing private method access, and removing tests for features that will be removed. 2010-04-19 23:54:09 -04:00
Mark Story
e92e212b8d Fixing Router's constructor. 
Adding static visibility to Router methods.
Adding a method for testing Router extensions.
Router::mapResources() now returns the mapped resources
Fixing visibility issues in test cases.
 2010-04-19 23:44:45 -04:00
Mark Story
f86d0de5ee Adding test to show correct functioning of containable + field() + recursive = -1. Closes #409 2010-04-19 23:16:59 -04:00
Mark Story
029d2581af Fixing autoFields causing invalid SQL when cross database joins are being done. Tests added. Fixes #476 2010-04-19 22:39:07 -04:00
Mark Story
2bf9504cfb Removing inheritance from Object. 
Adding missing visibility keywords, and adding static keywords.
Removing @tags.
 2010-04-19 00:10:22 -04:00
Mark Story
9046083dc8 Removing Overloadable and Overloadable2 they are not needed in PHP5. 
Removing inheritance and test cases related to Overloadable.
 2010-04-18 01:02:39 -04:00
Mark Story
4425743bcd Adding tests for creating cache configs of different types in sequence. Demonstrates error explained in #596. 2010-04-17 18:50:28 -04:00
Mark Story
9ae8b737dc Trimming trailing whitespace. 2010-04-17 13:05:26 -04:00
Mark Story
ae8ace79fa Adding additional tests for JavascriptHelper::object() options. Closes #588 2010-04-17 12:44:04 -04:00
Mark Story
78f14401ca Fixing issue where using delivery = debug and not using sessions would cause a fatal error. send() will now return the contents that would get written into the session. Fixes #595 2010-04-17 12:27:50 -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
0384ecad30 Removed remaining @filesource lines. 2010-04-16 02:48:47 +10:00
predominant
74d7682707 Fix translation shortcut usage through testing console for updates 2010-04-16 02:38:12 +10: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
50243f3b84 Fixing tests failing because of visibility. 2010-04-14 23:00:22 -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
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
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
predominant
df76ff47e3 Fix TimeHelper tests failing due to timezone changes. 2010-04-13 12:20:58 +10:00
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
predominant
4cb06d83ea Fix CakeSession tests so they dont call protected methods. 2010-04-11 15:18:55 +10: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
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
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
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