Commit graph

2799 commits

Author SHA1 Message Date
Thomas Ploch
cadfe15549 Fixed problems with custom Error handlers when inclusion of APP bootstrap is defered. 2012-03-15 16:06:54 +01:00
Rachman Chavik
079ae8265c Set::expand as implemented by jeremyharris 2012-03-15 20:07:49 +07:00
Rachman Chavik
8fdb11121e Merge branch '2.1' into 2.2 2012-03-15 20:07:26 +07:00
mark_story
f1931e43ef Add class_exists() check for view class.
Check that the view class hasn't already been mapped in the autoloader
before mapping it. This allows developers to map view classes from
plugins.

Fixes #2684
2012-03-14 20:57:11 -04:00
Ceeram
3e0294a695 Several fixes for testcases.
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-15 01:31:28 +01:00
Ceeram
9f9c6fdd67 ensure correct order in results as postgres does not always return in same order 2012-03-15 01:31:09 +01:00
mark_story
1254a1068f Fixing issues with unwanted querystring parameters.
Because the request url was being appended as ?/$1 any nested
named parameters would be added as additional GET params.  This is
yet another case where named parameters are fail.  Modify the built-in
htaccess rules to not use a GET parameter at all, and just read
from REQUEST_URI.

Fixes #2678
2012-03-14 20:20:55 -04:00
Ceeram
40f4f54b34 Several fixes for testcases.
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-14 15:08:46 +01:00
mark_story
1efee89169 Fix most coding standards issues in Test/Case/Utility 2012-03-13 22:59:20 -04:00
mark_story
4e94ebe710 Fix doc blocks. 2012-03-13 21:04:56 -04:00
Ceeram
b871095125 ensure correct order in results as postgres does not always return in same order 2012-03-14 01:12:35 +01:00
Ceeram
7145bd6574 fix another failing test on postgres 2012-03-14 00:49:04 +01:00
Ceeram
467b0f1c45 fix failing test for postgres 2012-03-13 22:03:22 +01:00
dogmatic69
2ad0f8b8db setting defaults in the DBO so you do not need to pass every field possible to avoid errors. also adds a test for calling with some missing fields. fixes #1779 2012-03-13 17:40:25 +00:00
Stefano Zoffoli
60b9cd80a0 Prevent blackhole auth error where are present multi fields (part 2) 2012-03-13 17:02:22 +01:00
Rachman Chavik
af575027da fix Set::sort() for issue in previous commit 2012-03-13 12:45:06 +07:00
Rachman Chavik
beb0474d67 tests for regression in Set::sort(), re: #2673 2012-03-13 12:44:11 +07:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
907596b2f5 Fix coding standards in Case/Routing 2012-03-12 21:36:27 -04:00
mark_story
b2d393eeb9 Fix coding standards in Case/Event 2012-03-12 21:22:17 -04:00
mark_story
8b797b2577 Fix coding standards in Case/Error 2012-03-12 21:21:02 -04:00
mark_story
b4a444fb14 Fix coding standards in Case/Core 2012-03-12 21:17:50 -04:00
mark_story
5687d97a98 Merge branch '2.1' into 2.2 2012-03-12 20:31:33 -04:00
Ceeram
a2fb4178fb Testcase added, refs #2672 2012-03-12 20:24:53 -04:00
Mark Story
5033fb60d6 Merge pull request #557 from sime/2.1
array_merge breaks CakeSchema column type change 

Fixes #2672
2012-03-12 17:24:44 -07:00
Ceeram
68eeee80d8 Set::sort() now correctly sorts when using {s}.path, fixes #2673 2012-03-12 21:58:24 +01:00
mark_story
a9c8a520b2 Port [c19b233] to 2.1 2012-03-12 12:33:20 -04:00
Simon Males
791cc1a657 array_merge inappropriate for certain column types. e.g. Switching from VARCHAR(45) to DATETIME will carry length, collate and charset properties 2012-03-12 21:30:52 +11:00
mark_story
edb582944c Fix coding standards in Test/Case/Controller 2012-03-11 22:20:25 -04:00
mark_story
75f1a84069 Fix docs about ordering of callbacks.
Refs #GH-555
2012-03-11 21:35:11 -04:00
Ceeram
a4952166f7 make acl methods available in permission model 2012-03-11 17:07:42 +01:00
mark_story
8c611b236d Fixing missed cache reads for table schema.
Because cache keys were different, model schema would not be read from
the cache.  Make keys used consistent.

Fixes #2670
2012-03-11 10:24:05 -04:00
Ceeram
baf8991a1f updating version.txt 2012-03-11 15:19:32 +01:00
Ceeram
bbfaa9e947 Paginating now work well with custom find methods.
_findCount() will now pass $query['operation'] = 'count' for more flexibility.
Custom finders can distinguish the operation and return other $query if needed.
2012-03-11 15:14:50 +01:00
mark_story
4b3d8612e9 Fix typo causing notice errors.
Fixes #2658
2012-03-11 08:17:01 -04:00
mark_story
83a29f054e Fix Session.cookieTimeout default behavior.
When Session.cookieTimeout is undefined, it should
reflect the value set for 'timeout' and not default to 240.

Fixes #2669
2012-03-11 08:14:54 -04:00
mark_story
72d0105e20 Add plugin. prefix for plugin files.
This prevents app/plugin bleedthrough.  This is
particularly problematic in controllers, as plugin
controllers were partially accessible from non-plugin
routes.

Fixes #2658
2012-03-10 23:33:21 -05:00
mark_story
ed1d34accc Fix most coding standards issues in Test/Console 2012-03-10 23:32:02 -05:00
mark_story
fdcb3dc34f Fix coding standards. 2012-03-10 23:12:08 -05:00
mark_story
82d8df9c3e Fix more coding standards. 2012-03-10 22:30:56 -05:00
mark_story
932c9d4e2f Fix coding standards. 2012-03-10 22:29:35 -05:00
mark_story
7d256d0f7b One more time. 2012-03-10 22:00:16 -05:00
mark_story
81b487159b Try again at fixing the build. 2012-03-10 21:40:38 -05:00
mark_story
2d343070fe Try to fix build. 2012-03-10 21:33:40 -05:00
mark_story
69ab443ed6 Fix whitespace for coding standards. 2012-03-10 21:19:04 -05:00
Mark Story
f26d24b445 Merge pull request #552 from tPl0ch/2.1-error-handler-bootstrap
Move inclusion of APP bootstrap after initialization of ErrorHandler
2012-03-10 17:59:03 -08:00
ADmad
13b748ad86 Fixed bug where registering new packages would reset extra paths set for other packages. Closes #2666 2012-03-10 04:40:50 +05:30
Thomas Ploch
cc9b445ece Fixed warnings in stack trace element when no stack args are set. 2012-03-09 18:38:16 +01:00
Thomas Ploch
2c55c7c193 Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-error-handler-bootstrap 2012-03-09 18:37:53 +01:00
mark_story
150c9fc6a3 Remove parse_str() its buggy and wrong.
parse_str() replaces `.` with _ and drops duplicated keys, which is
incorrect.  Replace parse_str with an updated version of parseQuery
from 1.x

Fixes #2629
Fixes #2647
2012-03-08 21:05:28 -05:00
Mark Story
621b086d9c Merge pull request #549 from zoghal/fix2
urldecode trailing star
2012-03-08 17:03:56 -08:00
Thomas Ploch
7a93276ecf Move inclusion of application bootstrap behind ErrorHandler initialization in Configure::bootstrap(). 2012-03-08 16:00:13 +01:00
Mark Story
a4da64cacb Merge pull request #550 from majna/2.1-validation
Make Validation class more strict when checking values in list.
2012-03-07 17:34:54 -08:00
mark_story
3a8c49e319 Add check for simple category elements.
Fixes #2655
2012-03-07 19:52:06 -05:00
Majna
32f5b6f191 Fix failing test. 2012-03-07 19:27:23 +01:00
Saleh Souzanchi
683607de5e fix test Parse Trailing UTF8 2012-03-07 21:51:09 +03:30
Majna
4543a4cb88 Make Validation class more strict when checking values in list.
Use in_array() with 'strict' param. Affected rules are Validation::inList() and Validation::multiple().
2012-03-07 18:52:48 +01:00
Saleh Souzanchi
5e9af65486 testParseTrailingUTF8 2012-03-07 08:50:11 +03:30
Saleh Souzanchi
e741d79f9a urldecode trailing pass 2012-03-07 06:06:59 +03:30
mark_story
17eb0e4f68 Fix duplicate values when merging POST data.
Fixes #2648
2012-03-06 20:22:13 -05:00
Kyle Robinson Young
c7963835c7 Correct path in debug() 2012-03-05 14:44:45 -08:00
Thomas Ploch
79cab67be7 Adding missing 'recursive' option to DigestAuthenticate object.
Used integer casting in _findUser() method for 'recursive' option.
2012-03-05 11:06:46 +01:00
mark_story
664b0538b8 Fix more coding standards problems. 2012-03-04 22:49:38 -05:00
mark_story
c2f42343a3 Fix most coding standards issues in TestSuite/ 2012-03-04 21:51:50 -05:00
mark_story
9a6ad7e1e2 Fixing most coding standard issues in Model/ 2012-03-04 21:51:50 -05:00
Jose Lorenzo Rodriguez
9b395eb23b Update version number to 2.1.0 2012-03-04 19:36:50 -04:30
mark_story
a6da736149 Fix coding standards errors in Network/ 2012-03-04 11:18:20 -05:00
mark_story
863aaad4e3 Update docs for GH-322 2012-03-04 09:59:40 -05:00
Mark Story
ca25e75852 Merge pull request #322 from ingk/2.1
FormHelper: Allow a boolean value for the disabled attribute in function radio
2012-03-04 06:51:02 -08:00
mark_story
50e7f4c995 Merge branch '2.0' into 2.1 2012-03-03 23:20:18 -05:00
mark_story
dde19f97c7 Fix sortDir() to read default params.
sortDir() also did not reflect the default paging parameters.
This would result in initial links not matching the query used.

Fixes #2640
2012-03-03 23:19:50 -05:00
mark_story
8f72b696a0 Fix sortKey() not looking at default params.
sortKey() only looked at the options values, which do not include
default sorting options declared as settings in the helper.

Fixes #2640
2012-03-03 23:06:45 -05:00
mark_story
4640b8ea23 Fix coding standar errors in Routing/ 2012-03-03 20:28:22 -05:00
mark_story
dc2f6efe13 Fix coding standard errors in Log/ 2012-03-03 20:24:02 -05:00
mark_story
9d1e88ba13 Fix error from previous commit. 2012-03-03 20:22:21 -05:00
mark_story
c5be343b72 Fix most of the coding standards issues in I18n/
There are a number of whitespace related issues in Multibyte, and
variable name related ones in I18n that cannot be easily changed.
2012-03-03 20:15:21 -05:00
mark_story
15e6e9d981 Fix coding standards in Event/ 2012-03-03 19:55:18 -05:00
mark_story
60989ad6c8 Fix coding standard issues in Error/ 2012-03-03 19:46:15 -05:00
mark_story
63c992a85b Fix coding standards in Core/ 2012-03-03 19:37:46 -05:00
mark_story
61aba0f0f8 Fix most coding standard issues in Controller. 2012-03-03 19:27:46 -05:00
mark_story
db8c6b5c78 Fix most of the coding standards issues in Console/ 2012-03-03 18:55:29 -05:00
Ceeram
2a7bee0a5c make sure locale is restored correct in tests 2012-03-04 00:36:21 +01:00
Ceeram
169c99cedf Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-03-03 23:55:20 +01:00
Ceeram
08a4d0bf63 Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds 2012-03-03 23:55:03 +01:00
mark_story
c8b113ac91 Fix coding standards in Configure/ 2012-03-03 17:36:59 -05:00
mark_story
b06e15ce6f Fix coding standards in Config/ 2012-03-03 17:35:47 -05:00
mark_story
04c843b17b Fix coding standards in Cache/ 2012-03-03 17:34:13 -05:00
mark_story
9d325fe46e Fixing most coding standard issues in Utility/ 2012-03-03 17:31:47 -05:00
mark_story
acccdcde1f Fix coding standard issues in View/ 2012-03-03 17:10:12 -05:00
mark_story
0df239de2b Fix some coding standards issues. 2012-03-03 15:59:36 -05:00
mark_story
7d51db9e63 Merge branch '2.0' into 2.1 2012-03-03 12:27:22 -05:00
Takayuki Miwa
1475e87b38 Update PaginatorHelper::beforeRender to merge request->query with url options 2012-03-03 13:46:46 +09:00
Cauan Cabral
a3a2d55c94 Enable UpgradeShell to recognize new line between class name and { 2012-03-02 17:43:02 -04:00
mark_story
0b4f735b4c Update API docs for Set::extract()
Fixes #2634
2012-03-02 11:19:17 -05:00
Renan Gonçalves
3412c0cb0f Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer. 2012-03-02 15:59:59 +01:00
Renan Gonçalves
6d3bc7be86 Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer. 2012-03-02 15:55:58 +01:00
Jose Lorenzo Rodriguez
c84e25e5b4 Moving $_minimizedAttributes form HtmlHelper back into Helper, as _parseAttributes is using it 2012-03-01 14:56:56 -04:30
José Lorenzo Rodríguez
96f73d6392 Merge pull request #538 from mcammaert/2.1
Merging input defaults with passed options to preserve nested keys
2012-02-29 09:09:11 -08:00
Mark Story
9d017c2b5c Merge pull request #535 from michaelhagedon/2.1
Fixing _fromArray()
2012-02-29 08:32:45 -08:00
Manu Cammaert
9c24f81379 Test Case for Formhelper Bug 2012-02-29 11:03:55 +01:00
mark_story
1ddcde7c86 Fix how $uses is handled.
$uses now defaults to true.  All falsey values turn some features
off, and most truthy values enable them.

Fixes #2590
2012-02-28 19:35:06 -05:00
Manu Cammaert
cd2dca205c default options are lost in case of eg. validation error 2012-02-28 23:39:16 +01:00
Rob McVey
8e93c4cd34 Fix for Consolce/Task/TestTask::getRealClassName(). Controller names of exactly 10 letters
being returned incorrectly

Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 15:21:59 -05:00
Michael Hagedon
5eb4155236 Fixing case. 2012-02-28 13:20:47 -07:00
Mark Story
6599422a7a Merge pull request #534 from dogmatic69/2622
Fixes #2622
2012-02-28 12:11:44 -08:00
Michael Hagedon
ef80045fc5 Fixing _fromArray(). See http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/2624-xml_fromarray-does-not-handle-certain-array-structures-as-expected 2012-02-28 12:41:43 -07:00
dogmatic69
ac06880241 making the name lowercase in the addDetector method so that it will be found in the is() method fixes #2622 with tests. 2012-02-28 16:05:32 +00:00
mark_story
2665178ec9 Merge branch '2.0' into 2.1 2012-02-28 07:04:20 -05:00
Norio Suzuki
757579e1d1 Fixed a testcase, support PostgreSQL 9.1
Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 06:32:31 -05:00
ADmad
12364cac8c Fixed indentation 2012-02-28 02:04:43 +05:30
mark_story
0568746bfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
d577d6b84e Change cake.php to allow cake libs at ROOT
Splice the ROOT path into the include_path for console apps.
This allows users to override the system include_path with a local
version of CakePHP.

Fixes #2613
2012-02-26 12:03:22 -05:00
mark_story
faeb7b4536 Fix error creating schema files.
If you removed app/Config/Schema and tried to create
schema files, you'd get an error instead of a file.

Fixes #2618
2012-02-26 10:25:39 -05:00
mark_story
2a9a103d62 Fix bad xml help generation.
Fixes #2619
2012-02-26 10:21:04 -05:00
ADmad
a31be56f42 Wrapping error string in translator function. 2012-02-26 20:34:30 +05:30
mark_story
7665f369fa Merge branch '2.1-type-hinting-corrections' into 2.1 2012-02-25 20:07:18 -05:00
mark_story
e958e6c25f Fix strict and warning errors from type hints. 2012-02-25 20:06:48 -05:00
euromark
973dce916a php5 corrections 2012-02-25 19:46:07 -05:00
euromark
42762fffa9 fix broken test 2012-02-25 19:46:06 -05:00
euromark
45112088a1 type hinting models 2012-02-25 19:46:06 -05:00
euromark
22452f61f8 type hinting controllers and views 2012-02-25 19:46:06 -05:00
euromark
38c3e30a1e visibility attributes 2012-02-25 19:46:06 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Ceeram
677f0708dc create View instance after adding model params for request 2012-02-24 18:16:53 +01:00
José Lorenzo Rodríguez
2840dc74d3 Merge pull request #528 from vantienvnn/2.0
CakeRequest::here explicitly using & as a query string separator to overcome issue in some badly configured 5.3 servers
2012-02-24 06:51:12 -08:00
vantienvnn
c0b2d8ad9d Fixed #2615 2012-02-24 21:35:50 +07:00
ADmad
4edb378ef8 Added ability to pass ID as parameter to Model::exists() 2012-02-24 19:42:23 +05:30
Mark Story
fd927207c1 Merge pull request #524 from shama/patch-typos
Typo fixes in the tests
2012-02-23 17:11:08 -08:00
mark_story
ed22c17eba Fix path in Testsuite. 2012-02-23 20:09:11 -05:00
Ceeram
8eea263d71 fixing incorrect post data 2012-02-23 20:00:51 -05:00
Ceeram
9d71df475d another attempy to set correc order for expected and result in assert, definitely time for some coffee 2012-02-23 20:00:43 -05:00
Kyle Robinson Young
4176e59e52 Typo fixes in tests 2012-02-23 15:29:53 -08:00
Kyle Robinson Young
ea652394c7 Move DbAcl and IniAcl into Acl subfolder and rename Model/DbAclTest to AclNodeTest 2012-02-23 10:45:32 -08:00
Mark Story
94db313e39 Merge pull request #516 from dogmatic69/tree-behavior-optimization
Tree behavior optimization

Fixes #2600
2012-02-23 09:27:41 -08:00
Mark Story
3a391529d2 Merge pull request #520 from dogmatic69/2610
Closes #2610
2012-02-23 09:26:11 -08:00
Ceeram
6d3c659260 fixed expected and result order in asserts, also added extra test 2012-02-23 12:24:31 -05:00
Ceeram
836f913a64 testcase for incorrect merge of post data 2012-02-23 12:24:26 -05:00
Mark Story
1ddc8f6489 Merge pull request #519 from shama/patch-vis-convention
Correct convention with public visibility
2012-02-23 09:23:13 -08:00
Mark Story
66fd891503 Merge pull request #518 from shama/patch-cake-request-test
Fix failing tests with CakeRequest when ran in webrunner
2012-02-23 09:22:23 -08:00
Rachman Chavik
e59bff2729 prevent deletion of views/cache/empty in test runs 2012-02-23 22:20:23 +07:00
dogmatic69
c02912261b setting recursive to -1 2012-02-23 11:36:44 +00:00
dogmatic69
2787052bdd adding a truncate test for a url as explained in #2610 2012-02-23 11:17:58 +00:00
Kyle Robinson Young
c202859523 Correct convention with public visibility 2012-02-23 00:03:31 -08:00
Kyle Robinson Young
86fafd0ae5 Fix failing tests with CakeRequest when ran in webrunner 2012-02-22 23:50:13 -08:00
Rachman Chavik
c6449f649f adding missing ',' 2012-02-23 09:08:17 +07:00
Rachman Chavik
b545d8b201 fix getSchemaName() for Sqlserver.
Closes #2609.
2012-02-23 08:25:07 +07:00
dogmatic69
74a84c96f1 optimization of tree behavior as per ticket #2600 2012-02-23 00:56:20 +00:00
Ceeram
55b8f66095 fixing incorrect post data 2012-02-22 22:49:42 +01:00
Ceeram
2e2ee3b096 another attempy to set correc order for expected and result in assert, definitely time for some coffee 2012-02-22 22:31:28 +01:00
Ceeram
d5cdc46661 fixed expected and result order in asserts, also added extra test 2012-02-22 22:25:24 +01:00
Ceeram
44ea3fb122 testcase for incorrect merge of post data 2012-02-22 21:53:51 +01:00
Mark Story
b7302850b5 Merge pull request #467 from tPl0ch/2.1-required-update-create
Added support for simplified required validation on 'create' or 'update'. Fixes #230.
2012-02-22 09:43:13 -08:00
José Lorenzo Rodríguez
74d837bef3 Merge pull request #512 from shama/patch-test-fixes
Fix missing class errors with ComponentCollectionTest and DbAclTest
2012-02-22 03:48:40 -08:00
Stef van den Ham
98b84ce40b Fixed typo in TestSuiteShell 2012-02-22 09:38:59 +01:00
Mark Story
e5205a8dcc Merge pull request #511 from tigrang/crumb-list-opt
Moving duplicate logic to a new method
2012-02-21 19:50:35 -08:00
Mark Story
cee8f2cebb Merge pull request #508 from shama/patch-app-build
Updates to App::build() uses
2012-02-21 19:48:21 -08:00
Tigran Gabrielyan
95ba5f45a5 Keeping code dry in HtmlHelper::getCrumbs/getCrumbList 2012-02-21 11:38:13 -08:00
Mark Story
f138c73a77 Merge pull request #483 from tigrang/getCrumbList-enhancement
Added `startText` feature to HtmlHelper::getCrumbList()
2012-02-21 18:24:16 -08:00
mark_story
6684b775cd Fix failing tests. 2012-02-21 20:45:44 -05:00
Mark Story
3e79038b06 Merge pull request #505 from shama/patch-htaccess
Remove extraneous space in .htaccess
2012-02-21 17:40:58 -08:00
Mark Story
c2d753ffb4 Merge pull request #500 from shama/patch-visibility
Add missing visibility keywords
2012-02-21 17:36:36 -08:00
Mark Story
540f6669fd Merge pull request #498 from shama/patch-loadFixtures
Remove unnecessary loadFixtures() calls
2012-02-21 17:28:52 -08:00
Mark Story
d7026204d5 Merge pull request #497 from shama/patch-crossSchemaTest
Cleaning up ModelCrossSchemaHabtm test case
2012-02-21 17:27:01 -08:00
ceeram
6eb4f39afd Merge pull request #499 from shama/patch-dbAcl-uses
Use ComponentCollection and AclComponent on DbAclTest to avoid error
2012-02-21 01:20:52 -08:00
ADmad
007ac45b26 Merge pull request #496 from shama/patch-loadSingle-docblock
Fix docblock of CakeFixtureManager::loadSingle()
2012-02-20 22:06:47 -08:00
Mark Story
fe4f0009c9 Merge pull request #495 from shama/patch-cakeplugin-loadall
Load specific test plugins rather than all to avoid conflicts
2012-02-20 20:43:41 -08:00
mark_story
89df484fc5 Remove un-necessary Set::merge().
Using Set::merge() on an empty array causes issues with out of order
numeric keys. Only merge if necessary.

Fixes #2595
2012-02-18 22:18:16 -05:00
mark_story
2ddc3873c2 Update the Set::merge() documentation. 2012-02-18 16:01:07 -05:00
mark_story
fce70df6ff Fix failing tests.
rawurlencode() and urlencode() handle utf8 differently.
2012-02-18 11:18:03 -05:00
teddy
0ea00c5f07 urldecode $this->url before unsetting it from CakeRequest->query 2012-02-18 11:03:36 -05:00
teddy
e6905b44c3 urldecode custom route element values 2012-02-18 10:59:46 -05:00
mark_story
2f51ef00ed Add failing tests for patches from 'teddyzeenny'. 2012-02-18 10:53:47 -05:00
Kyle Robinson Young
962fe7c571 Fix missing class errors 2012-02-18 06:32:48 -08:00
Kyle Robinson Young
32e7943b00 Fix merge conflict with 62f8dea 2012-02-18 04:39:32 -08:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8 Use App::RESET instead of true with App::build() 2012-02-18 04:04:54 -08:00
Kyle Robinson Young
1312cdaedf Remove extraneous space in .htaccess 2012-02-17 21:32:09 -08:00
mark_story
2097d5a968 Fix duplicate items in HABTM associations.
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598
2012-02-17 21:10:14 -05:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Jose Lorenzo Rodriguez
a9c279aab0 Update version number to 2.1.0-RC 2012-02-20 18:10:22 -04:30
Jose Lorenzo Rodriguez
715c848577 Bringing theme code up to date with 2.0, cleaning logic a bit 2012-02-20 17:21:04 -04:30
Jose Lorenzo Rodriguez
6918b70ec3 REmoving usage of deprecated ThemeView 2012-02-20 16:49:16 -04:30
Jose Lorenzo Rodriguez
02fa1ae60b Fixing a few failing test cases 2012-02-20 16:17:59 -04:30
Jose Lorenzo Rodriguez
ea79ba81a4 Adding a simpler solution to the missing view files problem without altering the built paths in App 2012-02-20 15:39:03 -04:30
Jose Lorenzo Rodriguez
cec9d2e615 Revert "Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit."
This reverts commit 5c792aa831.
2012-02-20 15:21:03 -04:30
Ceeram
ee54daef35 AclNode now throws exception instead of trigger_error 2012-02-20 15:41:57 +01:00
Mark Story
9e8152f949 Merge pull request #417 from 0x20h/php-acl
PHP config file based ACL implementation
2012-02-19 19:34:56 -08:00
Christopher Vrooman
585f1e2c31 Minor changes to two error messages. 2012-02-19 14:47:49 -02:00
mark_story
943d928084 Merge branch '2.0' into 2.1 2012-02-18 22:19:38 -05:00
mark_story
20229eeb43 Merge branch '2.0' into 2.1 2012-02-18 11:22:18 -05:00
mark_story
89b9bb7297 Fix duplicate items in HABTM associations.
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598
2012-02-17 21:09:48 -05:00
Mark Story
60df31cfb6 Merge pull request #487 from dogmatic69/2.1
2.1
2012-02-17 17:38:03 -08:00
euromark
77624552eb added missing assertText methods to assert cross OS 2012-02-17 23:36:57 +01:00
Majna
0cd9a93e9e Remove unused variables and statements. 2012-02-17 21:10:43 +01:00
Majna
c40d132f81 Fix Folder::tree() when excluding dot files or folders.
When 'exclude' param is array('.') files/folders are not skipped. Added test.
2012-02-17 20:46:52 +01:00
dogmatic69
be49b2b942 fixing up the docs for Collection::attached(), was showing behaviors but is for all collections 2012-02-17 13:25:37 +00:00
Majna
1dbafe1d4f Fix docblocks. 2012-02-17 13:51:20 +01:00
Kyle Robinson Young
0c27a26cb8 Use ComponentCollection and AclComponent on DbAclTest to avoid error 2012-02-16 22:57:31 -08:00
Kyle Robinson Young
75882507bc Remove unnecessary loadFixtures() calls 2012-02-16 22:37:18 -08:00
Kyle Robinson Young
95b8675637 Cleaning up ModelCrossSchemaHabtm test case 2012-02-16 22:25:53 -08:00
Kyle Robinson Young
2d43f1873c Fix docblock of CakeFixtureManager::loadSingle() 2012-02-16 21:45:37 -08:00
Kyle Robinson Young
4141a3ab5b Load specific test plugins rather than all to avoid conflicts 2012-02-16 20:03:44 -08:00
Tigran Gabrielyan
af2fd03590 Added startText feature to HtmlHelper::getCrumbList() 2012-02-16 19:17:43 -08:00
mark_story
14228fa469 Fix more tests to use assertTextEquals()
Refs #2148
2012-02-16 21:51:56 -05:00
euromark
2afece41a0 email component osFix removal due to new assertTextEquals 2012-02-16 21:34:43 -05:00
mark_story
6412797dfc Add missing static. 2012-02-16 20:58:43 -05:00
Kyle Robinson Young
9fdc17eb1f Fix failing AuthComponent test 2012-02-16 15:58:42 -08:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
dogmatic69
3246cf7c1e adding the model alias so that there are no issues when the find has a join on it 2012-02-16 16:22:45 +00:00
ADmad
5c792aa831 Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit. 2012-02-16 18:15:12 +05:30
Mark Story
df0d1d681f Merge pull request #479 from slygoncito/0dace174a79b87a2a196cc2bc94dbb009b705878
Option 'currentClass' always defaults to 'current'.
2012-02-15 20:05:50 -08:00
Slygoncito
0dace174a7 Option 'currentClass' always defaults to 'current'. 2012-02-16 00:11:43 -03:00
ADmad
bda05293d7 Fixed failing test cases 2012-02-16 02:22:20 +05:30
ADmad
c7cfd45884 Syncing bake skeleton with app 2012-02-16 01:58:11 +05:30
ADmad
90f4c03627 Moving view files from core to app 2012-02-16 01:58:11 +05:30
mark_story
6fda055a1e Move initialize logic to __construct().
Fixes #2582
2012-02-15 14:15:44 -05:00
ADmad
55f63bbd5b Fixing error message. Closes #2579 2012-02-15 12:41:01 +05:30
mark_story
27367b491a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
	lib/Cake/View/Helper/TextHelper.php
2012-02-14 21:55:21 -05:00
Rachman Chavik
89d4b58073 fix indentation and add __construct() docblocks 2012-02-14 23:28:57 +07:00
Rachman Chavik
5eb1979b04 rename protected variable to $_engine 2012-02-14 23:28:57 +07:00
Rachman Chavik
fe479c636c adding tests for engine overrides 2012-02-14 23:28:57 +07:00
AD7six
369d316835 Restructure internals of Extract task
Use variables which are easily identifiable and an internal storage
structure which prevents duplicates.
2012-02-14 15:30:09 +01:00
Vinícius Krolow
07adcfe2f7 fixing regex of autoLinks to work with urls that have www 2012-02-14 11:08:37 -02:00
Rachman Chavik
d6fd051fb4 changing methods in CakeTime class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4 changing methods in CakeNumber class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445 changing methods in String class to static 2012-02-14 09:34:36 +07:00
mark_story
25ee90ace4 Fix failing tests. 2012-02-13 21:28:07 -05:00
mark_story
76711c9f71 Add missing rawurlencode()
When routes fail to match because of unknown named parameters,
values that needed urlencoding were missing it.

Fixes #2572
2012-02-13 21:16:57 -05:00
mark_story
afecb713ab Make button type nullable.
Fixes #GH365
2012-02-13 21:00:57 -05:00
Thomas Ploch
1a07f55d43 Renamed parameter to CakeResponse::cookie() to match cakephp standard naming. 2012-02-13 09:59:45 +01:00
Thomas Ploch
574b5dcd41 Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response 2012-02-13 09:56:39 +01:00
Jose Lorenzo Rodriguez
4cfc033387 Fixing failing test cases 2012-02-13 00:26:10 -04:30
Jose Lorenzo Rodriguez
4f176d4284 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-02-12 21:04:35 -04:30
Ceeram
bc07ba3839 Added option['deep'] to saveAll, to save unlimited levels associated data
Squashed commit of the following:

commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 22:29:33 2012 +0100

    update docblocks for deep save

commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff1
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:17:34 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 1d32698640fa1a3c1d606eeaf4740637ff8a1991
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:16:57 2012 +0100

    Revert "adding info in docblock about associated model fieldList"

    This reverts commit 7cc10a2b5afc1007c388a6da449781dc351d50cd.

commit 7cc10a2b5afc1007c388a6da449781dc351d50cd
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:05:18 2012 +0100

    adding info in docblock about associated model fieldList

commit db2ad2759f6af460715a8bbee167262bcbb62d77
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 17:51:44 2012 +0100

    add tests for deep saveAll respecting fieldList option

commit 14123fccfc43fac1b4cddeea8350dca8fb9c9821
Merge: cfdf25d 2afb05b
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 16:51:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit cfdf25d4b587c6f1a8cd6ec2bc46dc21fa3c6704
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Feb 7 13:54:59 2012 +0100

    Make saveAllTheThings fully BC, use $options['deep'] = true, to save infinite recursive data

commit 6e8c4380c37a31efc2a37a5ab6438db26d293eb3
Merge: 203c7e1 95aa7e3
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:22:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 203c7e1d9870e282ec7098297d47e49132904401
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:19:25 2012 +0100

    validate all the things as well

commit d920d0000fcab80fc48a29b45dbba147a2eed27c
Merge: d648f6a 4f1be12
Author: Ceeram <c33ram@gmail.com>
Date:   Mon Jan 23 18:22:12 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit d648f6a90419e0fa27ed1d9e9feb51c37fbf0397
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Dec 9 15:11:52 2011 +0100

    making saveAll, saveMany and saveAssociated not limited to only save directly related models
2012-02-13 01:00:28 +01:00
ADmad
1dd0ff1701 Updating docblock 2012-02-12 22:11:55 +05:30
mark_story
ad09b910ee Remove pointless comparison. 2012-02-12 10:09:25 -05:00
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
ab09229d40 Update API docs
View switching only happens for known mime types.
Refs #2565
2012-02-11 11:45:06 -05:00
mark_story
4c01ba7224 Add ics mime type.
Fixes #2565
2012-02-11 11:39:24 -05:00
mark_story
7e17da0ae8 Fix notice error when reading empty values.
When reading empty values a notice error would be triggered.
Slicing the first char off and comparing that solves this.

Fixes #2537
2012-02-11 11:33:04 -05:00
mark_story
6f914174a6 Fix issues with double / & leading/trailing /
Authorize classes should remove // and leading trailing /
Without this incorrect paths that fail to match nodes can be
generated.  This also allows settings[actionPath] to be
permissive in what it accepts.

Fixes #2563
2012-02-11 10:29:18 -05:00
mark_story
0207a61e9b Move alias wrapping into _formatAddress()
Fixes #2502
2012-02-11 10:16:08 -05:00
ADmad
e1dba6798f Added missing echos 2012-02-11 13:53:46 +05:30
Kyle Robinson Young
730ac10ae4 Add missing options to NumberHelper docblocks 2012-02-10 22:17:58 -08:00
ADmad
83e8d436f8 Fixing docbloc and adding tests for FormHelper::tagIsInvalid(). Refs #2562 2012-02-11 06:09:58 +05:30
Mark Story
6502ab8f39 Merge pull request #473 from majna/2.1-cache-clear
Fix Cache::clear() calls in tests.
2012-02-10 15:56:21 -08:00
Ceeram
1f0af2a138 Adding order on created to the find, avoid failing test by incorrect order in postgres 2012-02-10 23:51:41 +01:00
Ceeram
2897c72215 AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel
Conflicts:

	lib/Cake/Model/AclNode.php
	lib/Cake/Model/Aco.php
	lib/Cake/Model/Aro.php
2012-02-10 23:38:40 +01:00
Majna
42cbb8cafe Fix Cache::clear() calls in tests. 2012-02-10 20:38:41 +01:00