Commit graph

3115 commits

Author SHA1 Message Date
mark_story
eeec362741 Merge remote-tracking branch 'ceeram/2.2-hash' into 2.2-hash 2012-04-07 14:28:40 -04:00
mark_story
a24aca6ffc Fix a few code standards errors. 2012-04-06 22:56:01 -04:00
mark_story
ff35762e92 Fix coding standards warnings. 2012-04-06 22:34:29 -04:00
mark_story
38b7ae3c67 Coding standards cleanup.
Fix coding standards
Simplify addition of empty.
Add doc block for new feature.
2012-04-06 21:47:02 -04:00
Clément Hallet
613e3824e0 add tests for the 'empty radio option' feature 2012-04-06 21:37:19 -04:00
Clément Hallet
a7a55631d8 remove 'empty' option from once checked 2012-04-06 21:37:19 -04:00
Clément Hallet
00b2c49af2 FormHelper : use the empty option for radio buttons 2012-04-06 21:37:18 -04:00
mark_story
4eea72205b Merge branch '2.1' into 2.2 2012-04-06 21:34:11 -04:00
mark_story
fe1a6d7d7e Fragments should not be urlencoded()
encoding them breaks fragments for client side
applications like backbone.js

Fixes #2755
2012-04-06 21:32:37 -04:00
mark_story
b3419be0fb Fix issues loading response classes from plugins.
Fixes #2759
2012-04-06 20:38:14 -04:00
mark_story
790d9beeb7 Always reconfigure global state.
Fixes issues wher the test suite with no fixtures could hit
a non test connection.

Fixes #2743
2012-04-06 20:27:56 -04:00
Mark Story
d000b3aa97 Merge pull request #601 from luisarmando/infoUpgrade
Outputs messages of which plugin is going to have locations upgrade.
2012-04-06 17:12:09 -07:00
Luís Armando
5b324f8024 Outputs messages of which plugin is going to have locations upgrade. 2012-04-06 18:06:18 -03:00
ADmad
863094da58 Fixing eg. code in doc block 2012-04-07 00:28:59 +05:30
Ceeram
c2a8fca00c Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
2012-04-05 23:27:21 +02:00
Ceeram
30268f6a08 Only check for existing method expresion() when it actually will be called.
Datasources that use calculate() should not be forced to implement expression() as well
2012-04-05 23:15:18 +02:00
ADmad
c6ce15720e Revert "Always use error layout when rendering error pages."
This reverts commit 3495422ac5.
2012-04-06 00:47:50 +05:30
Ceeram
8c631fa022 add test to show label options in inputDefaults 2012-04-05 17:47:08 +02:00
mark_story
5c590aad09 Add missing ClassRegistry import.
Fixes #2757
2012-04-05 08:33:12 -04:00
Ceeram
223604fb0d update docblock of AclComponent 2012-04-05 13:51:00 +02:00
Tigran Gabrielyan
3c4087da4f Fixing default value of contain 2012-04-04 19:06:54 -07:00
mark_story
83789915a3 Update docs about PHP5.4 constant. 2012-04-04 21:36:56 -04:00
mark_story
8497677e97 Fix notice error when there are no requests. 2012-04-04 21:32:51 -04:00
Tigran Gabrielyan
bf628c493c Added ability for Auth login to use contain 2012-04-04 18:09:38 -07:00
Ceeram
2b7fe21ee0 remove all Set::extract() from core and tests 2012-04-05 01:33:57 +02:00
Ceeram
7700a0261b only use and test SORT_NATURAL on PHP 5.4 2012-04-04 18:21:52 +02:00
ADmad
1cc5206442 Merge branch '2.1-dbosource' into 2.1 2012-04-04 19:58:48 +05:30
ADmad
93639a7c43 Fixed bug where associated model's afterfind was not triggered in particular case 2012-04-04 19:48:37 +05:30
Ceeram
d2098828c6 Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750 2012-04-04 15:07:45 +02:00
mark_story
77f698dbcd Fix which request is used for error pages.
The most recent request in the request stack should be used,
as it is most likely the request containing an exception.

Fixes incorrect error pages generated inside requestAction() calls.

Fixes #2746
2012-04-03 13:24:36 -04:00
mark_story
f09e5a36d2 Fix SessionComponent::id() not returning the id.
When reading the id() with SessionComponent, the session should
auto start, otherwise you could get null back. This makes the return
more consistent.

Fixes #2749
2012-04-03 13:21:52 -04:00
ADmad
7ed90c72ae Updating API docblock for Model::query() 2012-04-03 19:06:41 +05:30
mark_story
72cb96b727 Fix a few more coding standards errors. 2012-04-02 23:23:53 -04:00
mark_story
18296d2bf6 Fix a few coding standards errors. 2012-04-02 23:19:05 -04:00
Ceeram
34a730dfd8 ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709 2012-04-02 18:48:02 +02:00
mark_story
e5ca80b711 Add additional sort flag support.
Add natural, numeric, and string sorting to Hash.
Fixes #1700
2012-04-01 23:09:15 -04:00
mark_story
4e67698506 Fix issues with SQLServer + boolean columns.
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.

Fixes #2439
2012-04-01 22:10:05 -04:00
Norio Suzuki
26b93afc3c fixed CakeEmail::reset, no initialized charset and headerCharset property 2012-04-01 23:42:18 +00:00
mark_story
475a1596b7 Merge branch '2.1' into 2.2 2012-04-01 15:37:21 -04:00
mark_story
ee7a224639 Fix a code style warning. 2012-03-31 21:40:20 -04:00
mark_story
6677127c8e Fix coding standard error. 2012-03-31 21:38:39 -04:00
mark_story
432d00de19 Another small optimization. 2012-03-31 21:37:10 -04:00
mark_story
7d098fa5f0 Some small performance optimizations. 2012-03-31 21:25:02 -04:00
mark_story
6a9fdd841a Fix failing tests.
Set::merge() accepts anything even non-array values.
2012-03-31 13:38:09 -04:00
mark_story
990fbcdea0 Remove duplicated code backup.
This restoration/backup is done in the parent class.
2012-03-31 13:32:44 -04:00
Mark Story
54bfa4cc05 Merge pull request #587 from shama/patch-mb-number
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
2012-03-31 10:22:25 -07:00
mark_story
a463033ee9 Set -> Hash 2012-03-31 08:49:04 -04:00
ADmad
3495422ac5 Always use error layout when rendering error pages. 2012-03-31 12:42:17 +05:30
ADmad
04c30238cb Merge pull request #585 from shama/patch-auth-redirect
Default to loginRedirect, if set, on authError in AuthComponent
2012-03-30 23:19:22 -07:00
ADmad
1763219053 Adding tests for getting session id when using DatabaseSession. Disproves #2734 2012-03-31 00:40:44 +05:30
Ceeram
65f25ed910 test added to show pagination conditions will not result in incorrect count, refs #2736 2012-03-30 19:06:01 +02:00
José Lorenzo Rodríguez
4958f0ee5d Using a more specific function to check for numbers on redis engine read 2012-03-28 23:22:30 -05:30
José Lorenzo Rodríguez
e6a87bac40 Removing extra spaces 2012-03-28 23:18:32 -05:30
Jose Lorenzo Rodriguez
f105abde4e Implementing Redis cache engine 2012-03-28 23:30:33 -04:30
Jose Lorenzo Rodriguez
18b843467f Making lazy loader throw an exception for missing helpers 2012-03-28 22:12:46 -04:30
Ceeram
eba0b1f999 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-03-28 22:34:31 +02:00
Ceeram
7df6477526 add test to prove #2723 2012-03-28 22:24:02 +02:00
José Lorenzo Rodríguez
c67feb0629 Merge pull request #589 from shama/patch-substr-optimizations
substr() optimizations throughout core
2012-03-28 13:23:16 -07:00
Kyle Robinson Young
e2a46f76c7 substr() optimizations 2012-03-28 13:07:26 -07:00
ADmad
47558e8db5 Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723
This reverts commit 96f73d6392, reversing
changes made to 9d017c2b5c.

Conflicts:

	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
2012-03-29 01:33:21 +05:30
Kyle Robinson Young
33ab634aba Controller $name set optimization 2012-03-28 11:37:27 -07:00
Kyle Robinson Young
4370bf280a Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
Fixes #2602
2012-03-28 10:46:31 -07:00
Rachman Chavik
6fa30db504 CakeEmail can use theme when rendering template 2012-03-28 22:01:30 +07:00
Kyle Robinson Young
319d154aee Default to loginRedirect, if set, on authError in AuthComponent
Implements #2390
Based on the patch written by @dereuromark
2012-03-27 22:51:47 -07:00
Jose Lorenzo Rodriguez
5a41024cf3 Removing hardcoded helper from PagesController in skel 2012-03-27 23:53:22 -04:30
Jose Lorenzo Rodriguez
f349c9e34c Removing hardcoded helpers from Controller and PagesController class since they are now lazy loaded 2012-03-27 23:45:01 -04:30
Jose Lorenzo Rodriguez
f688d5777e Implementing helper lazy loading 2012-03-27 23:44:23 -04:30
Jose Lorenzo Rodriguez
c270e7ffda Adding test for lazy loading helpers in views 2012-03-27 23:43:41 -04:30
Jose Lorenzo Rodriguez
f009e96a69 Adding test for lazy loading helpers using the collection 2012-03-27 23:36:16 -04:30
Kyle Robinson Young
c700fedbf8 Update test suite header version to 2.2
Conflicts:

	lib/Cake/TestSuite/templates/header.php
2012-03-27 19:52:58 -04:00
Mark Story
0443fe1507 Merge pull request #584 from shama/patch-inpath-test
Add test/doc for reverse Folder::inPath()
2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9 Add test/doc for reverse Folder::inPath() 2012-03-27 11:55:13 -07:00
Jose Lorenzo Rodriguez
4f6f041730 Using same serialization strategy for request object in cached views, this prevents some failing tests in environments
with different charsets
2012-03-27 00:57:15 -04:30
Jose Lorenzo Rodriguez
e5cc7d0f73 Fixed failing test 2012-03-27 00:20:35 -04:30
Jose Lorenzo Rodriguez
2a1e4a2aae Making clearGroup() a no-op method instead of abstract to ease migration to 2.2 2012-03-27 00:08:24 -04:30
Jose Lorenzo Rodriguez
2bb3dc6bf7 Reducing key length when using groups in WincacheEngine 2012-03-27 00:07:23 -04:30
Jose Lorenzo Rodriguez
afba5aafb7 Redcing key name when using groups in MemcacheEngine 2012-03-27 00:05:56 -04:30
Jose Lorenzo Rodriguez
27b90b0e47 Reducing key size when using groups in ApcEngine 2012-03-27 00:01:34 -04:30
Jose Lorenzo Rodriguez
2100a64ffd Prefixing group names in XcacheEngine 2012-03-27 00:00:52 -04:30
Jose Lorenzo Rodriguez
ffdd98be1b Prefixing group names in WincacheEngine 2012-03-26 23:35:15 -04:30
Jose Lorenzo Rodriguez
98b14ff144 Prefixing group names in MemcacheEgine 2012-03-26 23:34:03 -04:30
Jose Lorenzo Rodriguez
957322ec82 Prefixing group names with the cache enging prefix to avoid possible conflicts with shared servers 2012-03-26 23:02:26 -04:30
mark_story
c1531d3faa Fix a few small code standards issues. 2012-03-26 23:04:32 -04:00
mark_story
95d4549c9b Docs + coding standards. 2012-03-26 22:57:50 -04:00
mark_story
c087576f20 Port changes done to Set into Hash
See #2722
2012-03-26 22:39:13 -04:00
mark_story
6e0e15682f Remove duplication where possible. 2012-03-26 22:33:46 -04:00
mark_story
66eabe462a Copy Set::expand into Hash class. 2012-03-26 22:32:58 -04:00
mark_story
c7a9f3412f Add compatibility for 2.1.
Set always needs to be loaded, as that's how 2.1 worked.
2012-03-26 22:32:57 -04:00
mark_story
a76a926ac1 Fix more uses of Set -> Hash 2012-03-26 22:32:57 -04:00
mark_story
9015d78017 Port most recent changes in Set to Hash.
See [68eeee80d8] and
[af575027da]
2012-03-26 22:32:56 -04:00
mark_story
e55927c007 Update the doc links. 2012-03-26 22:32:56 -04:00
mark_story
ed32e0b39b Update another usage. 2012-03-26 22:32:56 -04:00
mark_story
17bfbbb9df Port over Set to Hash usage. 2012-03-26 22:32:55 -04:00
mark_story
0ef9adba93 Move and rename pushDiff onto Hash.
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
2012-03-26 22:32:54 -04:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
mark_story
29048b3bb7 Update to use Hash.
Update CakeSession & Configure to use Hash.
2012-03-26 22:25:41 -04:00
mark_story
8becc4c985 Fix misnamed method calls. 2012-03-26 22:25:40 -04:00
mark_story
2231087ba3 Rename Set2 -> Hash. 2012-03-26 22:25:40 -04:00
mark_story
5b4b936157 Make filter() more flexible. 2012-03-26 22:25:40 -04:00
mark_story
239f52c48c Move nest() over
Make get() able to take arrays for $path.
2012-03-26 22:25:40 -04:00
mark_story
afa0329330 Fix incomplete test. 2012-03-26 22:25:39 -04:00
mark_story
ae66682c35 Add apply(), map() and reduce()
Add tests as well.
2012-03-26 22:25:39 -04:00
mark_story
8cadac3ee5 Add tests for issue #104 2012-03-26 22:25:39 -04:00
mark_story
ff5e72c9a7 Move Set::format across.
Remove the {0} style of formatting.  Custom formatting
syntax is a bit silly. sprintf() is more than expressive enough
for this method.
2012-03-26 22:25:39 -04:00
mark_story
e4a505797d Move combine() across. 2012-03-26 22:25:39 -04:00
mark_story
aa4dca6c0c Move Set::check across. 2012-03-26 22:25:39 -04:00
mark_story
771efd950e Fix sort() not working. 2012-03-26 22:25:38 -04:00
mark_story
57d50cd018 Extract common method. 2012-03-26 22:25:38 -04:00
mark_story
3d8a955043 Add remove() and insert()
Also add support for multi insert and multi remove.
2012-03-26 22:25:38 -04:00
mark_story
6b69ed269a Extracting duplicate loops. 2012-03-26 22:25:38 -04:00
mark_story
e72127e359 WIP, adding sort() and remove() 2012-03-26 22:25:37 -04:00
mark_story
31181f58d6 Add attribute pattern matching. 2012-03-26 22:25:37 -04:00
mark_story
cbfa938303 Fix muliple attribute conditions. 2012-03-26 22:25:37 -04:00
mark_story
8ad4e66eba Making attributes work with any selector type.
Attributes work with all base selectors.
2012-03-26 22:25:37 -04:00
mark_story
9269a6dcde Added some more operators.
Attribute + {n} is still not working.
2012-03-26 22:25:36 -04:00
mark_story
6c87be97ef Implement presence and equality attributes. 2012-03-26 22:25:36 -04:00
mark_story
e87901ac6d Adding tests for {n} and {s} 2012-03-26 22:25:36 -04:00
mark_story
37181e99a8 Basic path selectors implemented for extract(). 2012-03-26 22:25:36 -04:00
mark_story
b3861c01dc Move numeric() into Set2. 2012-03-26 22:25:36 -04:00
mark_story
1315e0f1a1 Moving filter() into Set2. 2012-03-26 22:25:35 -04:00
mark_story
885d5dfd80 Make contains() non-recursive.
Add a few more tests for contains().
2012-03-26 22:25:35 -04:00
mark_story
d37e10a8a9 Move contains() across.
Fix a few issues in contains() with nested needle values.
2012-03-26 22:25:35 -04:00
mark_story
ad65098348 Move normalize() into Set2.
Dropping the ability to 'normalize' string data.
2012-03-26 22:25:34 -04:00
mark_story
e736ea3af9 Move merge() into Set2. 2012-03-26 22:25:34 -04:00
mark_story
51f45c0f28 Moving flatten() across.
It is no longer recursive either.
2012-03-26 22:25:34 -04:00
mark_story
51e3ee0425 Adding dimensions() and maxDimensions()
Splitting the Set::countDim() into two methods.  This creates a simpler
API, as each method only does one job, and only has one argument.  Also
replacing recursion with iteration.
2012-03-26 22:25:34 -04:00
mark_story
db3485d47c Add function prototypes. 2012-03-26 22:25:34 -04:00
mark_story
328513d35e Start Set2. 2012-03-26 22:25:33 -04:00
mark_story
6b045318d8 Merge branch '2.1' into 2.2 2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82 Fix Set::insert() not overwriting values.
Set::insert() failed to overwrite values that were previously
defined as strings.  Remove test in SessionComponentTest that was
ensuring this bug stuck around.

Fixes #2722
2012-03-26 21:50:53 -04:00
Thomas Ploch
ce8b10e46f Fixing cache group related test cases. 2012-03-26 14:30:01 +02:00
Jose Lorenzo Rodriguez
cf2b6acd71 Fixing some typos 2012-03-26 00:29:02 -04:30
Jose Lorenzo Rodriguez
945925bdb9 Implemented group cache delete in FileEngine 2012-03-25 23:33:37 -04:30
Jose Lorenzo Rodriguez
04ec41384b Implemented read/write support for groups in FileEngine 2012-03-25 23:00:28 -04:30
Jose Lorenzo Rodriguez
c5c99a7c29 Implemented group support in WincacheEngine 2012-03-25 22:34:04 -04:30
Jose Lorenzo Rodriguez
9c733b4420 Implementing group support for XcacheEngine 2012-03-25 22:20:39 -04:30
Jose Lorenzo Rodriguez
6f9d2c01db Implmented cache group clearing in Memcache engine 2012-03-25 21:23:27 -04:30
Jose Lorenzo Rodriguez
b373309ba9 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
Jose Lorenzo Rodriguez
43cf2f0647 Update version number to 2.1.1 2012-03-25 21:00:26 -04:30
Jose Lorenzo Rodriguez
d0f7842f36 Added test for deleting kwys under a group in MemcacheEngine 2012-03-25 20:10:04 -04:30
Jose Lorenzo Rodriguez
411bd85900 Implementing group read/write support to MemcacheEngine 2012-03-25 20:08:37 -04:30
Jose Lorenzo Rodriguez
4f131d54f1 Implemented group delete for cache keys in ApcEngine 2012-03-25 19:45:32 -04:30
Jose Lorenzo Rodriguez
ae34c64fa3 Adding test for delete + groups in ApcEngine 2012-03-25 19:22:32 -04:30
Jose Lorenzo Rodriguez
3c9c3ef9ba Implemented group read/write support for the ApcEngine 2012-03-25 19:17:08 -04:30
Jose Lorenzo Rodriguez
58a59fd4a4 Fixing broken test 2012-03-25 18:10:25 -04:30
Kyle Robinson Young
a905954484 Update test suite header version to 2.1 2012-03-25 10:36:30 -07:00
Kyle Robinson Young
b8705a71fb Remove no longer needed empty file 2012-03-24 21:46:32 -07:00
mark_story
49a455a2cb Fix some code standards warnings. 2012-03-24 22:15:08 -04:00
ADmad
c847ec216c Changing assetEqual() to assertEquals() 2012-03-25 04:27:57 +05:30
mark_story
fca8b1dd30 Fix issue where requestAction() would not strip base url.
requestAction + Controller::referer() don't work well together.
Stripping the base domain, and normalizing the URL gives an application
request which works much better.  This keeps RequestHandler more
transparent when overloading redirects.

Fixes #2711
2012-03-24 18:11:07 -04:00
Thomas Ploch
68e4e0e7ae Revert "Added TestCakeSession::clear() to CakeSessionTest teardown."
This reverts commit b346ac961c.
2012-03-24 21:43:25 +01:00
Thomas Ploch
b346ac961c Added TestCakeSession::clear() to CakeSessionTest teardown. 2012-03-24 21:41:19 +01:00
Thomas Ploch
fda065101b Fixed test cases for successful being built on travis. 2012-03-24 21:32:31 +01:00
Jose Lorenzo Rodriguez
16bde9c723 Making sure components in controller test cases always have a fresh reference to the request object, fixes #2705 2012-03-24 14:34:29 -04:30
mark_story
83ceef045d Removing tests that fail on Postgres and Sqlite.
Fixes #2174
2012-03-23 21:21:18 -04:00
dogmatic69
7c697eb9be adding an extra check to only type cast if its a int/true/false so you can still use fields etc in the queries 2012-03-23 21:21:18 -04:00
dogmatic69
a5685947b9 Adding failing tests for bool updates switching with the field name 2012-03-23 21:21:08 -04:00
ADmad
4b49a287a6 Show plugin name in error message if a plugin component was requested 2012-03-24 00:22:50 +05:30
Ceeram
817015e6b3 remove unneccesary elseif 2012-03-23 16:37:02 +01:00
Ceeram
d748fc7451 Merge branch '2.1' into 2.2 2012-03-23 16:32:04 +01:00
Ceeram
4a6159c9af session_cache_limiter() removed, it was set to invalid value as well
Also remove setting P3P header
2012-03-23 16:31:26 +01:00
José Lorenzo Rodríguez
3a4d173ce2 Merge pull request #577 from shama/patch-assert-order
Correct parameter order of assertEquals and assertNotEquals
2012-03-23 06:57:02 -07:00
Kyle Robinson Young
21c4967cc6 App::uses the File Utility as write() uses File 2012-03-22 23:48:57 -07:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
34e1afd8ef Add support for custom console error handling
Both errors and exceptions can be configured for the console
at the application layer now.

Fixes #2696
2012-03-22 20:52:49 -04:00
mark_story
3851ad08a6 Fix code standards warnings. 2012-03-21 21:56:53 -04:00
mark_story
69e63b11a4 Change method to only return true/false.
null/true/false is complicated.  Fix issues with some
of the test fixtures.  imalsonotrequired was actually required
as it's last rule didn't specify allowEmpty = true and had a range
validation rule.
2012-03-21 21:06:49 -04:00
Thomas Ploch
cabb0d00ac Added support for 'on' validation key in FormHelper. Fixes #2169. 2012-03-21 21:06:49 -04:00
mark_story
20bdf1d7b0 Add escaping to table names.
SQLite was not quoting table names, so tables with
keywords caused errors.

Fixes #2702
2012-03-21 21:04:34 -04:00
Ceeram
c9528b8446 Merge branch '2.1' into 2.2 2012-03-21 11:19:08 +01:00
Ceeram
0a94202fb6 fixing test of previous commit 2012-03-21 11:07:51 +01:00
Ceeram
4dfbfe9c8b fix saveAll deep option, when associated data is empty, or has deeper associated model data as first key in array 2012-03-21 10:38:04 +01:00
mark_story
01e035f726 Move logic to afterDelete.
Because behavior callbacks are fired first, removing data in the
beforeDelete could result in data loss if the model prevents deletion.

Fixes #2699
2012-03-20 22:36:48 -04:00
Mark Story
3abb7d966b Merge pull request #569 from tPl0ch/2.2-datasource-close
Adding basic implementation of DataSource::close().
2012-03-20 18:06:00 -07:00
Mark Story
57babc87b0 Merge pull request #570 from dogmatic69/2111
Add regex option to String::highlight()

Fixes #2111
2012-03-20 17:39:54 -07:00
Kyle Robinson Young
db9c3e5bf3 Remove unused code and correct doc for modelClass 2012-03-20 14:44:14 -07:00
Ceeram
247f5522c6 add test for saveAll deep 2012-03-20 20:41:41 +01:00
Thomas Ploch
8ad65366dc Fixed ModelWrite test. Removed undefined method calls to assertCount(). 2012-03-20 15:06:26 +01:00
mark_story
714ec60507 Fix a few more standards errors. 2012-03-19 21:58:56 -04:00
mark_story
edd54e4ddf Ignore the remaining errors.
They are just part of the test to compare objects + arrays.
No need to cause standards errors.
2012-03-19 21:38:51 -04:00
Ceeram
091ad53b80 ensure boolean values are converted to correct value on update, avoiding issues with posgres boolean type 2012-03-19 13:27:26 +01:00
Ceeram
c38419e33a Fixing test, some 5.2 installs do not have function to read mime 2012-03-19 09:52:09 +01:00
mark_story
94b3839b2e Fix a few more small issues. 2012-03-18 23:25:19 -04:00
mark_story
12efa3eb70 Remove duplication in the I18n test. 2012-03-18 22:29:16 -04:00
mark_story
2bbf38038d Remove duplicated code in testsuite shell. 2012-03-18 21:57:15 -04:00
mark_story
67698248ca Fix some coding standards errors. 2012-03-18 21:48:50 -04:00
mark_story
c58b61c17b Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
dbb2dd44d7 Fix more coding standards. 2012-03-18 21:20:33 -04:00
Ceeram
4191e2e573 adding test to disprove ticket, closes #2691 2012-03-19 01:27:35 +01:00
mark_story
e33dc98124 Fix more coding style errors. 2012-03-18 18:52:35 -04:00
mark_story
480c1bbb54 Fix coding standards. 2012-03-18 18:06:10 -04:00
mark_story
7798914676 Fix most code standards errors in Case/TestSuite. 2012-03-18 17:31:53 -04:00
mark_story
fc234d82f1 Fix coding standards in Case/Model/Behavior. 2012-03-18 14:31:13 -04:00
mark_story
346e048371 Fix coding standards in Datasource tests. 2012-03-18 13:08:27 -04:00
mark_story
6f8e7f1bc5 Revert "Fix coding standards errors."
This reverts commit 3362100512.
2012-03-18 12:29:39 -04:00
mark_story
3362100512 Fix coding standards errors. 2012-03-18 12:20:24 -04:00
Thomas Ploch
b28b25f642 Added 'Fixed whitespace. 2012-03-18 11:12:19 +01:00
Thomas Ploch
7cfcef54ed Added 'Enable Debug Output' link to CakeHtmlReporter. 2012-03-18 11:10:12 +01:00
ADmad
0832e18e9e Adding separate error layout for CakeErrorController as using default layout often caused nested errors. Closes #2682 2012-03-18 14:05:41 +05:30
ADmad
bdddc85946 Making option 'unique' => 'keepExisting' for HABTM association behave consistently with all acceptable data formats. 2012-03-18 13:43:21 +05:30
mark_story
1e403c6a7f Fix more coding standards issues. 2012-03-17 23:53:13 -04:00
mark_story
fab9547ac9 Fix coding standard issues with fixtures. 2012-03-17 23:31:17 -04:00
mark_story
c54ac257f1 Fix getCrumbs() with no crumbs and first link.
Apply patch from 'Andy Hobbs' to fix issues with breadcrumbs, and
a starting breadcrumb.

Fixes #2689
2012-03-17 23:23:42 -04:00
mark_story
d0733ceb00 Fix most coding standards in Case/Network 2012-03-16 22:19:01 -04:00
mark_story
544930f882 Skip validation when recovering trees.
Fixes #2663
2012-03-16 21:57:20 -04:00
mark_story
8fdd57568b Make method protected.
API changes should be minimized in bug fix releases.
Fix broken builds.
2012-03-16 21:46:07 -04:00
mark_story
381e5b10bc Add tests for GH-558 2012-03-16 21:05:06 -04:00
Mark Story
6e4456fbd7 Merge pull request #558 from stefanozoffoli/patch-3
Prevent blackhole auth error for multi fields.

Fields with .1.0 should not blackhole.
2012-03-16 18:04:49 -07:00
mark_story
111db16ca6 Restore error handlers.
When switching error handlers, remember to pop off the stack.
2012-03-16 20:56:24 -04:00
Mark Story
fd824c1da5 Merge pull request #561 from tPl0ch/2.1-configure-error
Fixed resetting of ErrorHandlers when custom error handlers are set in core.php
2012-03-16 17:46:39 -07:00
dogmatic69
d3a44811ce adding test and fix for hightlighting tags, old bug 2111 for 1.3 but its the same issue. This should make more options possible 2012-03-16 21:20:27 +00:00
Thomas Ploch
a06eba7e24 Adding basic implementation of DataSource::close().
Since this method will be called in Destructor.
2012-03-16 21:08:48 +01:00
Norio Suzuki
358b84b577 Add charset() / headerCharset() methods to CakeEmail class 2012-03-16 12:54:30 +00:00
mark_story
f5804cb4ca Fix most coding standards in Test/Case/View 2012-03-15 22:50:05 -04:00
mark_story
6a55749e27 Fix reading multiple keys in a single request.
Fixes #2676
2012-03-15 21:45:48 -04:00
mark_story
5713cd3269 Fix the way bash is invoked.
Using /usr/bin/env is more portable to various *nix flavours.
Fixes #2688
2012-03-15 20:20:39 -04:00
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