Commit graph

2114 commits

Author SHA1 Message Date
mark_story
d2010308d4 Merge branch 'master' into 2.3 2012-10-23 20:20:52 -04:00
mark_story
3729ac1f2f Fix issue where the incorrect meridian would be selected.
When combining 12 hour format, interval and afternoon times, the
incorrect meridian would be selected.  Moving the hour math into
FormHelper::hour() makes that method generally more correct and lenient
on its input.

Fixes #3299
2012-10-23 12:47:12 -04:00
euromark
044cf60b69 move the test case to its own method 2012-10-23 16:07:43 +02:00
euromark
5064601c6f adding test case 2012-10-23 15:11:23 +02:00
ADmad
1763f46340 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
Mark Story
746eaf9389 Merge pull request #894 from dereuromark/comp-fix-save-all
BC mod for saveAll()
2012-10-22 18:40:38 -07:00
Mark Story
d75bd48c25 Merge pull request #905 from dereuromark/2.3-ini
allow ini files to have separators between sections for better readability
2012-10-22 18:38:49 -07:00
mark_story
ed6ff92296 Remove bad test. 2012-10-22 20:55:56 -04:00
mark_story
a0a61b5980 Fix issue where createSchema() would omit primary keys sometimes.
Fix missing primary key SQL when using the primary flag + other indexes.

Fixes #3292
2012-10-22 20:46:10 -04:00
Jose Lorenzo Rodriguez
1c0c8604c8 Pushed before fxing error in test case, I suck. Refs #3291 2012-10-22 23:09:31 +02:00
Jose Lorenzo Rodriguez
9dc3b243ac Correct inflection rules for cookies, fixes fixes #3291 2012-10-22 23:07:42 +02:00
mark_story
d4631a6ead Remove bad test. 2012-10-20 21:03:38 -04:00
mark_story
0b0b361e48 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
2012-10-20 20:48:11 -04:00
mark_story
08556ab879 Fix saveAssociated() with validate=first, atomic=false
When using the above options & validation errors on the associated
models, saving would not be aborted.

Fixes #3285
2012-10-20 15:12:05 -04:00
mark_story
888b1f4795 Fix issue with using contain() and query[contain]
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287
2012-10-20 14:51:52 -04:00
euromark
5a8092fc1b allow ini files to have separators between sections for better readability
dump now makes spaces between sections in init files
2012-10-18 17:20:15 +02:00
mark_story
307759516b Try to make tests less fragile. 2012-10-15 22:54:03 -04:00
mark_story
1cc82ff39f Merge branch 'master' into 2.3 2012-10-15 21:48:55 -04:00
mark_story
6d3ae3b83c Fix missed use of VERSION. 2012-10-15 21:48:36 -04:00
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
mark_story
f6c5ceb77a Use id() as VERSION doesn't exist in phpunit 3.6 2012-10-15 21:38:10 -04:00
mark_story
f89fe0e1ef Fix tests that fail in PHPUnit 3.7
Add skips for PHPUnit 3.6. Mock object expects required clones in 3.6,
but fail in 3.7 with clones.
2012-10-15 21:36:12 -04:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
mark_story
59f84024e5 Handle REQUEST_URI with domain names properly.
Don't depend on parse_url() as it fails with corrupted urls.  Instead
use FULL_BASE_URL to prepare an absolute path.

Fixes #3270
2012-10-14 11:58:07 -04:00
ADmad
56a0eb04b7 Fix incomplete patch 61dd1098d3 2012-10-14 18:44:10 +05:30
Mark Story
7ea3ee466d Merge pull request #899 from dereuromark/2.3-more-tests
default value null makes more sense. add test cases for false.
2012-10-13 18:28:34 -07:00
ADmad
61dd1098d3 Allow specifying tag for current page number. Closes #2892 2012-10-13 12:34:00 +05:30
euromark
7bf08fdcc7 default value null makes more sense. add test cases for false. 2012-10-12 16:03:05 +02:00
euromark
2dfb40bac0 remove duplicate line 2012-10-11 14:54:11 +02:00
mark_story
1110e26483 Fix 0'th index file not being copied to $_FILES.
Fixes #3256
2012-10-11 08:39:46 -04:00
mark_story
8800d7bdec Reduce duplication in test case. 2012-10-11 08:28:59 -04:00
mark_story
b1dfab87e4 Fix autoLinkUrls so it re-capture query strings.
Fixes #3296
2012-10-11 08:28:59 -04:00
euromark
1e2ac0b9c8 comp mod for saveAll()
better approach

test case to assert saveAll still behaves like previous versions
2012-10-11 14:03:59 +02:00
ADmad
5de492fb25 Allow saving new records with pre specified primary key value with treebehavior. 2012-10-11 01:03:49 +05:30
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
ADmad
33a879ff41 Fix find('count') with 'group' when result has only one group. Closes #1677 2012-10-09 10:43:27 +05:30
mark_story
9a66768aa4 Merge branch 'master' into 2.3 2012-10-08 13:08:58 -04:00
mark_story
72f4d4fac0 Fix issue with logging scopes
Logging scopes should be exclusive and not allow messages matching on
level alone to be logged.  By using scopes + levels you opt-in to new
behavior so grabbing all messages by level should not occur.

Fixes #3264
2012-10-08 12:57:02 -04:00
ADmad
a1aa73c1a2 Cache character set names 2012-10-07 21:58:49 +05:30
AD7six
fa6defea37 url encode nested named parameters in unmatched routes
reference: #2988
and 31033239bd
2012-10-05 11:40:58 +02:00
AD7six
5140baf83d Load routes as late as possible.
As a concequence - routes will also work by default in the cli
2012-10-04 21:41:12 +02:00
ADmad
1c0492eb8b Allow throwing exception instead of redirecting upon unauthorized access attempt. Closes #591 2012-10-04 18:40:57 +05:30
mark_story
a3ae58da09 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/View.php
2012-10-01 21:20:25 -04:00
ADmad
47708c52cd Allow content to be added before existing content in view block. 2012-10-02 00:11:54 +05:30
ADmad
ce9ad1f2ed Fix failing tests 2012-10-01 20:22:41 +05:30
euromark
7383298410 making messages() and errors() reset themselves by default 2012-10-01 14:20:53 +02:00
mark_story
c94886a988 Add missing import that causes tests to fail in isolation. 2012-09-30 22:51:19 -04:00
mark_story
affb3192ad Fix issue where including elements + extending views fails.
If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.

Fixes #3248
2012-09-30 22:44:27 -04:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
dogmatic69
095e8df995 fixing a error in the tests 2012-10-01 00:49:39 +01:00
ADmad
035f727686 Replace Model::read() with Model::find('first') in baked controller
Removed references to Ajax and Javascript helpers
2012-09-30 14:41:37 +05:30
mark_story
80c355baa5 Make minutes/hours wrap around correctly.
Also account for times around midnight that roll over days/months/years.

Fixes #3242
2012-09-28 22:50:46 -04:00
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
mark_story
853d866c35 Remove port numbers from Message-id domains.
Fixes #3244
2012-09-28 21:20:14 -04:00
Mark Story
51245ce41d Merge pull request #874 from dereuromark/2.3-languages
after correcting nld the iso standard should be enforced for all langs
2012-09-28 17:55:02 -07:00
Mark Story
87fc86133c Merge pull request #873 from dereuromark/coding-standards
correcting coding-standards
2012-09-28 17:49:32 -07:00
euromark
032704346a after correcting nld the iso standard should be enforced for all languages 2012-09-28 14:46:29 +02:00
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
mark_story
eed59a95ad Fix whitespace. 2012-09-27 21:42:15 -04:00
mark_story
393849a9ba Make exception rendererer more resiliant
Exceptions in beforeRender() should render correct error pages.

Fixes #3235
2012-09-27 21:39:22 -04:00
mark_story
99edef0abc Re-order assertions.
Group the true/false assertions.
2012-09-27 21:39:14 -04:00
euromark
c87b53a7d8 correcting iso standard for nld (dutch) - making dut the alias 2012-09-27 10:10:40 +02:00
mark_story
76d21c6d56 Try to fix another test failure caused by blowfish.
travis ci seems to have wonky hashing with blowfish on the 5.2 boxes.
Skip tests when we know blowfish is messed up.
2012-09-26 22:25:05 -04:00
mark_story
ea784f68dc Try skipping blowfish tests if hashes are wrong.
Another attempt at fixing failing tests on travisci.
2012-09-26 22:00:52 -04:00
Jose Lorenzo Rodriguez
047ffd1530 Removing variable from dump test as it does not exist anymore 2012-09-25 17:01:06 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
Jose Lorenzo Rodriguez
b0822d2246 Introducing failing test case to prove issue in CakeTime 2012-09-25 15:23:19 +02:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4 Merge pull request #859 from dereuromark/2.3-format-delta
adding CakeNumber::formatDelta() and fixing issue with format()
2012-09-21 00:18:35 -07:00
dogmatic69
6d4f4b57d7 adding a plugin propery to models wwith tests for ticket #85
Merge pull request #696
2012-09-20 21:31:31 -04:00
mark_story
268e58956d Attempt to make tests pass when OpenSSL is not enabled. 2012-09-20 21:28:29 -04:00
mark_story
d3ba9703a5 Try to make some time related test failures go away. 2012-09-20 21:07:14 -04:00
euromark
7aa78c40f3 test case to proof that less between strings also work and do not error 2012-09-21 02:57:10 +02:00
Ber Clausen
aaefbf1c2f Add MySQL FULLTEXT support.
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext

Fixes #262
2012-09-20 20:42:30 -04:00
mark_story
a9750264e4 Revert "Add MySQL FULLTEXT support."
This reverts commit 36c99a358f.
2012-09-20 20:39:02 -04:00
Mark Story
f4a639cbfa Merge pull request #862 from bar/mysql-fulltext
Add MySQL FULLTEXT support.

Fixes #262
2012-09-20 17:20:23 -07:00
euromark
490bbf836d remove debug statement 2012-09-21 00:09:42 +02:00
euromark
bfaed32e58 allow between to be an array of strings 2012-09-21 00:06:26 +02:00
Mark Story
e931211fcc Merge pull request #858 from dereuromark/2.3-request
adding query() for CakeRequest
2012-09-20 06:40:23 -07:00
Ber Clausen
36c99a358f Add MySQL FULLTEXT support.
Minor optimizations and testing added.
2012-09-20 00:35:42 -03:00
euromark
0be1943bcd adding basic test 2012-09-20 01:56:52 +02:00
euromark
3fa6b96ad0 adding CakeNumber::formatDelta() and fixing issue with near-zero values and format() 2012-09-20 01:41:41 +02:00
mark_story
0f0b5e7668 Fix incorrect radio selection with falsey values.
Use strval() to work around 0 == '' type issues.
Cleanup some tests.

Fixes #3221
2012-09-19 10:14:29 -04:00
euromark
60385d1d28 test the query() method with arrays passed via $_GET 2012-09-19 03:14:55 +02:00
mark_story
da6d49e554 Fix code conventions. 2012-09-18 14:50:03 -04:00
mark_story
5d830d7adb Fix multiple selects always failing post validation.
Fixes #3218
2012-09-18 14:41:51 -04:00
Mark Story
5d4a6fd6b6 Merge pull request #856 from ceeram/2.3-cakenumber
Simplify and improve fromReadableSize().
2012-09-18 10:55:28 -07:00
euromark
e8cfac0eec adding query() for CakeRequest 2012-09-18 19:38:53 +02:00
Ceeram
ff676b5ea4 allow for lowercase as well, also strip the unit part off before pow() 2012-09-18 17:15:33 +02:00
Mark Story
144761c0b2 Merge pull request #852 from cakephp/2.3-reset-sequence
Implement resetSequence()

Fixes #3206
2012-09-18 07:42:11 -07:00
Tigran Gabrielyan
d30e092966 Fixed test case 2012-09-18 00:46:06 -07:00
Tigran Gabrielyan
f1a344eee4 Added test case for view block default value 2012-09-18 00:41:33 -07:00
Mark Story
07c5102de5 Merge pull request #850 from ceeram/2.2-filesize
Add CakeNumber::fromReadableSize() and Validation::filesize()
2012-09-17 17:55:23 -07:00
mark_story
55dcb9c3b3 Implement resetSequence()
This is an optional method in DboSource that allows datasources to
resetSequence values in tables.  This is useful for datasources like
Postgres, and makes using fixtures much easier.

Fixes #3026
2012-09-17 20:50:05 -04:00
Ceeram
9530e68ae6 add default return value as parameter to use when size can not be determined 2012-09-17 13:21:50 +02:00
Mark Story
cdfead0feb Merge pull request #849 from dogmatic69/rijndael-fatal-error
skipping the rijndael test if mcrypt_encrypt() is not available
2012-09-15 18:00:07 -07:00
dogmatic69
26934236b1 skipping the rijndael test if mcrypt_encrypt() is not available 2012-09-15 11:43:39 +01:00
dogmatic69
4899b5b91b changing is_writeable() to is_writable() 2012-09-15 11:17:35 +01:00
dogmatic69
a38a616cba changing join() to implode() for consistency 2012-09-15 11:06:02 +01:00
mark_story
ccd33782da Fix whitespace errors. 2012-09-14 22:37:39 -04:00
Mark Story
89c98233b5 Merge pull request #843 from dereuromark/2.3-ticket-3172
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
dogmatic69
5cc03ca805 converting if($foo == true) to if($foo) 2012-09-14 18:54:29 +01:00
Renan Gonçalves
d33f676ddd Handling a fatal error on console should call Shell::_stop(1).
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
2012-09-14 14:17:07 +02:00
mark_story
7d2cbec79d Revert "Fix null not stopping model callbacks."
This reverts commit 82a8400def.

The previous change broke a number of tests as existing tests expect
that a return value of null will not stop events.
2012-09-13 22:49:17 -04:00
mark_story
82a8400def Fix null not stopping model callbacks.
Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks.  This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.

Fixes #3123
2012-09-13 22:11:46 -04:00
Mark Story
5081be171f Merge pull request #821 from dereuromark/2.3-folder-merge
allow Folder to merge recursivly and add scheme option
2012-09-13 18:00:02 -07:00
mark_story
fb9360767e Make connection exceptions more helpful.
Fixes #3204
2012-09-12 22:31:07 -04:00
Rachman Chavik
0cae19a14e enable PluginDot for routeClass parameter 2012-09-12 21:24:56 +07:00
mark_story
99a9cc9669 Fix required field detection.
Fix required field detection to match documentation and behavior when
validating. Having `allowEmpty` in the first validation rule, makes the
field not 'required' as the field is allowed to be empty.

Fixes #3194
2012-09-11 21:59:46 -04:00
euromark
2d9d400ecb correct spelling 2012-09-10 23:08:14 +02:00
euromark
f7acab7cae doc block update 2012-09-10 19:20:15 +02:00
euromark
37068539bd allow Folder to merge recursivly and add scheme option 2012-09-10 10:23:52 +02:00
Ceeram
ce1b387de2 fix incorrect docblock 2012-09-10 09:17:29 +02:00
mark_story
4f637ed4c4 Revert "Fix failing tests in PHPUnit 3.7.0-RC2"
This reverts commit d26040e3aa.
This change causes tests to fail in PHPUnit 3.6, this will have to wait
until 3.7.0 stable.
2012-09-09 21:36:33 -04:00
mark_story
d26040e3aa Fix failing tests in PHPUnit 3.7.0-RC2 2012-09-09 21:25:53 -04:00
mark_story
e8c1140fc8 Fix notice error. 2012-09-09 21:08:21 -04:00
mark_story
a934f700f1 Fix parsing '0' as a url.
Fixes #3198
2012-09-09 20:56:40 -04:00
Jose Lorenzo Rodriguez
9ac5cbed36 Added MailTransport test class refs #2824 2012-09-09 15:48:14 +02:00
mark_story
6664acba79 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
a214fcd992 Remove never reached code in Debugger::trimPath and test more results 2012-09-05 15:57:53 -07:00
mark_story
c7647b775f Attempt to fix build error in travis. 2012-09-04 17:25:02 -04:00
ADmad
28951865c6 Hidden divs created by FormHelper can now be customized. 2012-09-04 23:56:30 +05:30
mark_story
0d826528e1 Supress fewer errors.
PHPUnit raises exceptions on errors, there isn't much point in
supressing all these errors.
2012-09-03 20:13:30 -04:00
mark_story
771cfde196 Fix coding standards. 2012-09-03 20:09:13 -04:00
euromark
2170d87488 check() for CookieComponent and Configure (similar to CakeSession::check()) 2012-09-04 01:04:48 +02:00
Mark Story
eb33929829 Merge pull request #731 from dereuromark/2.3-fix-rss-test
2.3 fix rss test
2012-09-03 15:03:44 -07:00
mark_story
3cb501f1c5 Fix issue created in [e8b5d81fd7]
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.

Fixes #3178
2012-09-03 13:24:38 -04:00
brq
fca98e39f9 Allow postLink() to support other HTTP methods; it defaults to POST 2012-09-02 12:57:35 -05:00
mark_story
21a51a374a Revert "Make test a bit more solid."
This reverts commit 072991d0da.
2012-09-01 14:43:11 +01:00
mark_story
072991d0da Make test a bit more solid. 2012-09-01 14:34:10 +01:00
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
474e42cc08 Switch File::info() tests to use a different file.
text/php files are not detected reliably across platforms. Use a plain
text file instead.  This should fix builds on travis.ci
2012-09-01 12:40:05 +01:00
mark_story
d3105332dc Fix coding standards errors. 2012-09-01 12:14:15 +01:00
mark_story
e8b5d81fd7 Fix quoting of field names containing -.
Fixes #3165
2012-08-31 14:25:02 +01:00
mark_story
894fc1256a Add test cases for strings containing quotes.
Show that both double and single quoted strings are
handled correctly by ExtractTask.

Closes #3155
2012-08-30 23:48:32 +01:00
mark_story
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
mark_story
d92ff9cc10 Merge branch '2.3' of github.com:cakephp/cakephp into 2.3 2012-08-30 19:42:46 +01:00
mark_story
d4ee62be61 Add support for biginteger on SQLserver. 2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d Add bigint support for Sqlite.
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e Add bigint support for postgres 2012-08-30 14:48:59 +01:00
Tommy MacWilliam
ec35e3158c added tests for bigints 2012-08-30 14:48:59 +01:00
Juan Basso
fd2f3aed46 Changed to accept language do not return the qualifiers and order the values by the qualifier. Also, making the test case insensitive 2012-08-28 23:52:05 -04:00
Ber Clausen
63548267e9 Refactor Validator::decimal() to be more flexible with decimal
separators and PHP magic.
Lots of testing added.
2012-08-27 23:25:17 -03:00
Mark Story
7135ff29fb Merge pull request #773 from bar/master-fix-inireader
Add plugin support to IniReader, and harden tests.
2012-08-27 12:36:57 -07:00
Ber Clausen
bdac857293 Add plugin support to IniReader, and harden tests.
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
2012-08-27 10:04:26 -03:00
Ceeram
f1ce3f9ae5 remove settings parameter from initialize as this is not being passed. only the constructor gets settings passed 2012-08-27 11:42:57 +02:00
mark_story
cbb64bd082 Fix blackhole requests with empty select boxes.
When a select box was entirely empty (no option element)
secured form submission should not fail.

Fixes #3153
2012-08-26 22:53:48 -04:00
mark_story
934838f77c Fix whitespace. 2012-08-26 22:17:36 -04:00
Ceeram
abe74adf8a partial remove onlyAllow from baked code, only keep in delete to be rfc compliant 2012-08-26 15:00:49 +02:00
James Hall
20baeb83db Change to match coding standards 2012-08-26 02:11:43 +01:00
James Hall
a3b5065f8a Make sure the environment variable is set 2012-08-26 00:33:32 +01:00
James Hall
6c4ba233ba Fix testSendRenderWithImage when non running on port 80 2012-08-26 00:23:32 +01:00
Jose Lorenzo Rodriguez
f6278488af Ensuring list of behavior methods are refreshed between calls of
validates() in the model, fixes #3071
2012-08-25 14:05:19 +02:00
Jose Lorenzo Rodriguez
60eb228ddf Fixing issues with validation rules not being reset after calling
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
2012-08-25 13:29:16 +02:00
Ceeram
27d83eedfe use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included 2012-08-25 09:38:40 +02:00
Tigran Gabrielyan
0441c9f6c3 Added tests for bake shell cache prefix generation 2012-08-24 22:52:02 -04:00
mark_story
d66d37c92b Merge branch 'master' into 2.3 2012-08-24 22:50:29 -04:00
Ber Clausen
b75a6b440a Treat float numbers with trailing zeroes removed by PHP, accordingly.
Revert #2800 (28bd6880df) regex changes. Also add more tests.

Signed-off-by: mark_story <mark@mark-story.com>
2012-08-24 22:22:12 -04:00
Ceeram
cb80338c7d avoid duplication in return value when saving habtm 2012-08-24 00:50:46 +02:00
Mark Story
064fef1a15 Merge pull request #779 from dereuromark/2.3-ellipsis-html
use html ellipsis if possible
2012-08-23 13:20:38 -07:00
Mark Story
fe3d99cdfc Merge pull request #775 from sitedyno/BlowfishAuthenticate
Add BlowfishAuthenticate adapter.
2012-08-23 13:16:34 -07:00
Heath Nail
d24bbcb255 Add BlowfishAuthenticate adapter. 2012-08-23 11:23:51 -04:00
Ceeram
c5ebbc991c Revert "Merge pull request #784 from ceeram/habtmmerge"
This reverts commit fa5aa6278f, reversing
changes made to 88604ac757.
2012-08-23 16:00:41 +02:00
ceeram
973670ca1c Merge pull request #749 from ceeram/2.3-allow
Add allowed() to CakeRequest, to check if the request method matches the...
2012-08-22 16:44:11 -07:00
Ceeram
d730acba59 Add onlyAllow() to CakeRequest, to check if the request method matches the allowed ones.
Throws exception if not matched, using the required Allow response header.
2012-08-22 17:23:24 +02:00
Ceeram
e7dc23b920 Ensure callbacks are triggered when using Xml/Json view with view templates.
PaginatorHelper for instance needs this to correctly set options
2012-08-22 13:13:49 +02:00
Ceeram
fb0053753e avoid duplication in returned results for habtm 2012-08-22 13:03:47 +02:00
mark_story
d5333a2ff1 Merge branch 'master' into 2.3 2012-08-20 16:20:27 -04:00
mark_story
e75fdd21ee Add tests to show caseinsensitive nature of detectors.
Closes #3132
2012-08-20 11:43:10 -04:00
euromark
07d92ef678 correcting test 2012-08-17 14:02:20 +02:00
euromark
7969062614 legacy support with test cases 2012-08-17 13:57:47 +02:00
euromark
40398429ff coding standards 2012-08-17 13:37:04 +02:00
euromark
f201684873 use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length) 2012-08-17 13:31:01 +02:00
Mark Story
9e96c473f4 Merge pull request #752 from dereuromark/2.3-truncate-tail
String::tail()
2012-08-16 11:02:06 -07:00
Mark Story
08e4362d40 Merge pull request #772 from bar/master-fix-phpreader
The actual config file must always have .php extension.
2012-08-16 11:00:27 -07:00
mark_story
c83e941497 Merge branch 'master' into 2.3 2012-08-15 21:00:49 -04:00
mark_story
b0f2cfd1d1 Fix coding standards. 2012-08-15 20:19:08 -04:00
ADmad
7ac01154f7 Merge branch '2.2-configure' 2012-08-15 20:09:25 +05:30
ADmad
18c5a4aee5 Make file extension optional for Configure reader adapter's dump function. 2012-08-15 19:38:58 +05:30
mark_story
e183e91b17 Make CakeRequest work with content-type headers that include a charset.
Refs #3113
2012-08-14 12:42:05 -04:00
ber clausen
0dec093f48 The actual config file must always have .php extension. 2012-08-13 23:50:58 -03:00
euromark
e1fbfcef00 fix contain for find method 2012-08-13 08:10:51 +02:00
ADmad
65e63c51c8 More missing parent calls. 2012-08-12 02:28:12 +05:30
ADmad
802f00b6e3 Adding missing calls to parent. 2012-08-12 02:13:10 +05:30
ADmad
4a483b4897 If cache is disabled in app and js cache file is not written don't return script tag with file url.
Instead return script block with inline js content.
2012-08-12 01:08:05 +05:30
mark_story
11227f5490 Fix coding standards. 2012-08-10 21:50:37 -04:00
Mark Story
7dae12456a Merge pull request #759 from dereuromark/2.3-cake-schema
2.3 cake schema
2012-08-10 18:11:50 -07:00
Ceeram
ab7dd99e43 add missing docblock, remove unneeded code 2012-08-10 11:05:19 +02:00
Ceeram
7ea1a59035 adding test for viewClass mapping 2012-08-10 10:33:37 +02:00
mark_story
6f7557898d Fix whitespace and comment errors. 2012-08-09 20:51:29 -04:00
mark_story
4487673060 Merge branch 'master' into 2.3 2012-08-09 20:43:47 -04:00
Ceeram
d4986b5f24 add responseHeader() method to new base exception class, ExceptionRenderer will pass the headers to the response.
Tests added.
2012-08-09 14:52:05 +02:00
José Lorenzo Rodríguez
596f2c0d91 Merge pull request #734 from steinkel/feature/smtp-tls
Adding TLS support to SmtpTransport
2012-08-08 23:36:13 -07:00
mark_story
dca050fbd6 Fix errors with recursion in debug()
Fixes #3102
2012-08-08 22:30:27 -04:00
euromark
5190b9f2c9 asserting that under_scored names result in valid ClassNames 2012-08-08 16:35:59 +02:00
euromark
62dee78ca5 adding models for schema generate 2012-08-08 14:15:28 +02:00
José Lorenzo Rodríguez
1ff63758ad Merge pull request #750 from tigrang/security-component-enhancement
Added `disabledActions` feature to SecurityComponent
2012-08-06 12:05:17 -07:00
mark_story
57c495f53a Enabled Debugger::exportVar() to display private & protected properties.
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
2012-08-06 13:32:52 -04:00
ADmad
8931b74ba2 Removed variable escaping in CakeErrorController::beforeRender(). Closes #3074 2012-08-05 02:36:29 +05:30
mark_story
b32273e713 Fix whitespace errors. 2012-08-04 15:57:04 -04:00
euromark
2a570e639c ellipsis instead of ending/beginning for core wide consistency 2012-08-04 19:58:23 +02:00
mark_story
e59555a66f Merge branch 'master' into 2.3 2012-08-03 22:45:56 -04:00
mark_story
788cf52572 Fix saving empty values for translated fields with multiple locales 2012-08-03 22:40:38 -04:00
Christopher Vrooman
bbd0b9dd8b Tweaked DocBlocks
Set property and return to boolean for DocBlocks of the CallbackPostTestModel class.
2012-08-03 22:40:28 -04:00
Christopher Vrooman
de1450763b Added a failing test to testSavePartialFields
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
2012-08-03 21:19:44 -04:00
Tigran Gabrielyan
617d470427 Renamed disabledActions to unlockedActions 2012-08-03 11:01:19 -07:00
euromark
a208eb6cb1 fixes disabled attribute for multiple checkboxes 2012-08-02 21:35:05 -04:00
Tigran Gabrielyan
df8ec17626 Added disabledActions feature to SecurityComponent 2012-08-02 18:27:52 -07:00
euromark
917d912a43 String::tail() 2012-08-02 13:21:31 +02:00
euromark
64ba8c6b6e remove debug statement 2012-08-02 10:18:14 +02:00
mark_story
cffc36e4e0 Fix notice error when impossible conditions are created.
Fixes #3084
2012-08-01 23:05:56 -04:00
euromark
319658e9d3 asserting escaped output for sms protocol 2012-08-01 12:48:21 +02:00
euromark
b6fe8af701 adding sms as protocol 2012-08-01 12:38:06 +02:00
euromark
2a674fc461 adding a test for the yet untested javascript protocol 2012-08-01 12:14:46 +02:00
euromark
f0ffe098d3 adding html helper tests for special protocols 2012-08-01 12:11:05 +02:00
euromark
b73be3139f allowing tel protocol for mobile devices 2012-08-01 12:02:50 +02:00
Schlaefer
af8c5716fc Added test for RSS to allow namespace tags if namespace is specified
If a namespace prefix is defined it's prefix should not be stripped
from the tag: `<dc:creator>` stays `<dc:creator>`.

Other prefixes are still stripped from the tag name.

This test is missing in 19f0e72d58
2012-07-30 10:10:19 +02:00
mark_story
7b939186a1 Fix ( and ) not being correctly handled by autoLinkUrls
Fixes #3077
2012-07-29 21:18:33 -04:00
Schlaefer
19f0e72d58 fix #2858 RSS helper bug with namedspaced keys
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
2012-07-29 14:24:46 +02:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00
mark_story
27e2132a13 Generated SQL should not contain multi-column primary keys
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.

Fixes #3069
2012-07-27 22:31:49 -04:00
ADmad
99813e97b3 Implemented feature to allow individual "empty" values for date time select elements 2012-07-28 01:47:21 +05:30
mark_story
f963e378b5 Fix coding standards errors. 2012-07-26 21:22:50 -04:00
mark_story
6e0cf0dab7 Fix failing test. 2012-07-26 21:19:20 -04:00
Kyle Robinson Young
cbf5328b33 Fix failing test with controller task listAll 2012-07-25 22:12:55 -07:00
Mark Story
4dd532d3a9 Merge pull request #724 from SimonEast/h_encoding
Prevent booleans from being encoded (converted to strings) by h() function
2012-07-25 18:17:12 -07:00
Mark Story
b99be9878a Merge pull request #738 from zpencerq/authcomponentproblem
Auth Component can't return false from user($key)
2012-07-25 16:05:29 -07:00
Spencer Ellinor
6c1b05a5d4 Modify test case to show the issue. 2012-07-25 15:06:56 -04:00
mark_story
70c714d600 Fix incorrect context being used for excerpt.
Fixes #3064
2012-07-24 23:37:37 -04:00
Jorge González
f9f380d401 using annotations for catching exceptions in tests 2012-07-24 14:09:48 +01:00
mark_story
162d3bcb29 Fix whitespace errors. 2012-07-23 22:44:05 -04:00
mark_story
35bf3097cd Fixing missing imports in generated tests.
Fixes #3059
2012-07-23 21:25:55 -04:00
Jorge González
17db6f9d23 Merge branch '2.3' of https://github.com/cakephp/cakephp into feature/smtp-tls 2012-07-23 22:24:10 +01:00
mark_story
2359fb7e2e Simplify number formatting. 2012-07-22 21:28:49 -04:00
Heath Nail
434d3a7137 Add bcrypt support to Security::hash() 2012-07-22 21:15:00 -04:00
mark_story
ed19821168 Merge branch 'master' into 2.3 2012-07-22 21:01:28 -04:00
mark_story
e6ef218600 Fix associated translations being inserted.
Due to changes introduced in [1c0b6c076a]
associated translations would incorrectly be saved with a value of ''.

Fixes #3057
2012-07-22 20:59:24 -04:00
euromark
15cf55d444 different approach on the failing test 2012-07-22 03:59:59 +02:00
euromark
93957bc3e4 fix for windows. the check seems to be the wrong way. at least compared to the one in the rss class itself 2012-07-22 03:55:13 +02:00
mark_story
6ce4a3a1ec Add tests for contentDisposition flag.
Fixes #3042
2012-07-21 21:22:04 -04:00
mark_story
468302b526 Merge branch 'master' into 2.3 2012-07-21 20:59:56 -04:00
mark_story
6286b43329 Make tests pass on windows.
Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.

Refs #3055
2012-07-21 20:59:05 -04:00
Jorge González
f1250a3609 Merge branch '2.3', remote-tracking branch 'origin' into feature/smtp-tls 2012-07-21 20:49:46 +01:00
Jorge González
55c92065c6 adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010 2012-07-21 20:28:38 +01:00
Jorge González
27a895d7d8 adding enableCrypto() method to CakeSocket class 2012-07-21 14:23:47 +01:00
Simon East
1ea457e40e Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9 2012-07-20 12:48:57 +10:00
José Lorenzo Rodríguez
a7865b5d1d Removing some new by reference calls 2012-07-19 14:24:12 -05:30
Mark Story
f65b52bf11 Merge pull request #722 from uzyn/bugfix/url-validation
Fix URL validation to allow underscores in subdomain.
2012-07-19 12:40:30 -07:00
Christian Winther
bce82a2322 Better custom find for pagination
Instead of shuffling the paginator settings you can now simply add a new "findType" key and it will automatically change the find() type accordingly
2012-07-19 15:57:51 +02:00
U-Zyn Chua
e7c4064a69 Fix URL validation to allow underscores in subdomain. 2012-07-19 20:51:33 +08:00
mark_story
473d55f091 Allow 1 second of slip. 2012-07-18 22:22:57 -04:00
mark_story
3c6b50953b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
mark_story
7979ee5fa0 Remove test that is no longer needed for validation. 2012-07-17 23:18:25 -04:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00
mark_story
a63dd9ee9d Fix incorrect formatting in TreeBehavior.
Fixes #3045
2012-07-17 21:06:41 -04:00
mark_story
928de97338 Add additional tests for error triggering on missing validator.
Closes #3039
2012-07-15 19:47:28 -04:00
mark_story
fb92bde0fe Loosen exception types. 2012-07-14 16:18:21 -04:00
mark_story
22d4cb3794 Allow warnings for Xml entities.
For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
2012-07-14 16:08:54 -04:00
mark_story
a7c79e5da2 Fix warnings when deleting records that do not exist.
Fixes #3037
2012-07-14 15:54:07 -04:00
mark_story
6c905411ba Fix XML decoding attack via external entities. 2012-07-14 11:53:37 -04:00
Jose Lorenzo Rodriguez
39715bcd89 Adding missing afterValidate callback to behaviors, Fixes #3024 2012-07-10 20:35:26 -04:30
ADmad
69eba678f4 Deprecated MediaView and updated MediaView::render() to use CakeResponse::file() 2012-07-11 01:40:42 +05:30
ADmad
c5d1260421 Added CakeResponse::file() for serving files as response 2012-07-11 01:24:00 +05:30
mark_story
5e680cb292 Add tests for translate + partial fields.
Refs #3009
2012-07-07 12:03:29 -04:00
mark_story
369bbcc964 Fix failing tests.
* New properties on view caused fails in Debugger.
* Element cache keys have changed with the new refactoring.
2012-07-07 01:08:39 -04:00
Jose Lorenzo Rodriguez
ed4493da0c Automatic console logging streams were not respecting --quiet 2012-07-06 16:05:15 -04:30
AD7six
2967a4db23 text/javascript is not the correct mime for js 2012-07-06 13:17:15 +02:00
mark_story
591022f182 Make test case use SERVER_NAME conditionally. 2012-07-05 22:56:45 -04:00
Mark Story
ae01d473c3 Merge pull request #707 from SimonEast/fix_CakeEmailTest
Fix for CakeEmailTest.php that failed unless using 'localhost'
2012-07-05 19:40:54 -07:00
Rodrigo Moyle
e10f6f57a3 Fix notice error when parsing input data.
Prevent error in CakeRequest from parsing input data in
PUT and DELETE requests.

Fixes #3002

Signed-off-by: mark_story <mark@mark-story.com>
2012-07-05 22:06:02 -04:00
Simon East
de703a2692 Fix for CakeEmailTest.php that failed unless using 'localhost' 2012-07-06 11:59:39 +10:00
mark_story
e61f636bc7 Fix double base dir in image() with fullBase.
Fixes #2991
2012-07-03 20:48:17 -04:00
Rachman Chavik
22373868bb if blackHoleCallback is set, requests _must_ get blackholed 2012-07-03 19:27:02 +07:00
Rachman Chavik
86a74e3887 fix: windows console may not have ansi color support 2012-07-03 12:41:29 +07:00
mark_story
31033239bd Add missing urlencoding to nested named parameters.
Fixes #2988
2012-07-02 23:34:53 -04:00
Ceeram
6ec0afcf5d Add CakeNumber::fromReadableSize() and Validation::filesize() 2012-06-26 12:17:25 +02:00
mark_story
ad5345887a Refactor tests.
Use generators to reduce some duplication.
2012-06-24 21:57:00 -04:00
mark_story
3f78216e96 Revert changes in behavior made to timeAgoInWords()
Changes made in [0729aca706] changed
the generated text to not match the behavior in 2.1.
2012-06-24 20:54:47 -04:00
mark_story
eb7b66b37c Revert default value of allowEmpty.
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods.  Move some tests around and update tests that
probably should have been failing before.

Fixes #2983
2012-06-24 20:06:14 -04:00
ADmad
b2ccdd46e5 Fixed test failing when server's timezone is not UTC 2012-06-24 23:11:52 +05:30
mark_story
3e28326d9c Fix Controller::beforeRedirect() and array return.
Array return values from Controller::beforeRedirect() would be
incorrectly handled causing wrong URL's to be generated.

Fixes #2973
2012-06-24 12:03:31 -04:00
Jelle Henkens
db7d5426ec CakeTime no longer sets the timezone out of its scope on the date object 2012-06-24 11:10:55 +01:00
mark_story
5e54be4e5a Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Error/exceptions.php
2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303 better error message in MissingConnectionException when driver is not enabled 2012-06-23 11:42:26 +02:00
mark_story
13077a8f2f Add tests for previous commit. 2012-06-22 21:44:37 -04:00
dogmatic69
058f48fc7b Showing the list of shells grouped by plugin
The option to sort has been removed and the list of shells is now
sorted and grouped by plugin and then by command.

Core and app shells are always listed last.
2012-06-22 20:53:44 -04:00
Ceeram
2f5f1b28bc Merge branch '2.2-validatorrules' into 2.2 2012-06-20 15:01:26 +02:00
Ceeram
60c611fa47 Parse rules in getField() 2012-06-20 14:54:32 +02:00
Jose Lorenzo Rodriguez
03d31b57f7 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-06-19 19:28:20 -04:30
Ceeram
cd209ce099 Avoid using LC_ALL, on some installs this would cause error:
"setlocale(): Specified locale name is too long"
2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
Ceeram
8b94d9e9e7 Only change locale for LC_NUMERIC instead of LC_ALL, on some installs this woudl cause an error:
"setlocale(): Specified locale name is too long"
2012-06-19 18:33:51 +02:00
mark_story
89b2eddf0b Try regexp as not all locales are available. 2012-06-18 23:45:44 -04:00
mark_story
6a1e9e80b2 Try LC_ALL instead. 2012-06-18 23:31:10 -04:00
mark_story
77fc8a9d33 Switch to de_DE
nl_NL doesn't seem to exist on the ci server.
2012-06-18 23:25:42 -04:00
mark_story
001e89bf3f Fix formatting with locales using , as decimal separator
Fixes #2958
2012-06-18 23:13:09 -04:00
AD7six
d5cf2765dd remove referencers to fixtures that don't exist 2012-06-18 16:40:37 +02:00
Ceeram
0df1e90eed show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925 2012-06-18 14:20:53 +02:00
mark_story
54679023f9 Add support for DELETE + form encoded data.
Much like PUT, DELETE requests will automatically parse
form-urlencoded request bodies and set them as $this->data.
2012-06-17 20:03:45 -04:00
Ceeram
c5b19b658a Merge commit '74a0bd98c28991664fc0a3b0e8b34dc4f9dbf009' into 2.2 2012-06-15 09:42:22 +02:00
Ceeram
74a0bd98c2 throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype 2012-06-14 19:01:41 +02:00
AD7six
d01f0e9f67 correct tests to match desired behavior
by default we don't want fixtures pulled in from a different scope than
that of the test being baked
2012-06-14 13:38:17 +02:00
mark_story
5413143178 Don't modify app/Config/bootstrap when running tests. 2012-06-12 22:10:55 -04:00
euromark
ba62ecd21a whitespace 2012-06-12 16:59:16 +02:00
euromark
b32edfe378 fix double-encoding of external urls 2012-06-12 16:30:37 +02:00
Kyle Robinson Young
54745aada9 Fix custom validation methods with CakeValidationSet 2012-06-11 23:28:45 -07:00
mark_story
f6b50a948e Small fixes for validation formatting.
* Remove additional out() calls.
* Remove extra punctuation.
* Fix code standards.
* Fix failing test.
2012-06-10 21:57:15 -04:00
mark_story
76dd49145a Merge branch '2.1' into 2.2 2012-06-10 20:34:20 -04:00
mark_story
b2e82871f1 Attempt to fix failing build. 2012-06-10 20:08:17 -04:00
mark_story
7ae660c779 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Cache/Engine/XcacheEngine.php
2012-06-10 20:05:25 -04:00
mark_story
0a182b918f Fix $depth being decremented by 2.
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.

Fixes #2946
2012-06-10 20:00:34 -04:00
mark_story
454fae9bd0 Fix Validation::ip() not respecting type.
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.

Fixes #2944
2012-06-10 19:37:44 -04:00
ADmad
9ce216b09d Revert "Fix missing view variables."
Commit 7416c53 shows error message from last exception instead of first one
and also displays framework specific error messages instead of generic ones with debug off.
We don't want either.

This reverts commit 7416c530a2.
2012-06-11 02:36:51 +05:30
Jose Lorenzo Rodriguez
5ba5f906e6 Adding new test case for ModelValidator 2012-06-09 15:27:22 -04:30
Jose Lorenzo Rodriguez
0d013f8da5 Fixing CakeTime, the actual params for format() is $date and $format,
and not the other way around :)
2012-06-09 08:28:39 -04:30
Jelle Henkens
c8e58b50ba Adding cake core message extraction in cake extract 2012-06-07 23:55:36 +01:00
AD7six
2335ef1a13 remove pseudo-mock code
Not required, not used by any committed code
2012-06-06 23:08:40 +02:00
AD7six
a56ec8d6cf Correct TestTask tests
there will not be a setUp function for Controller tests
there will not be a tearDown
there will be no returned constructor logic from generateConstructor

all because for a controller test - you'd ordinarilly just call this->testAction
2012-06-06 23:04:18 +02:00
AD7six
b509bdb04b Automatically handle PUT requests
make the following "just work"

    curl -X PUT -d foo=bar http://...
2012-06-06 22:59:37 +02:00
Jose Lorenzo Rodriguez
51635c2ca6 Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e Fixing yet another issue related to beforeValidate and
validateAssociated
2012-06-06 10:07:01 -04:30
Rachman Chavik
8966f1b324 create CakeRequest in View instead of in CakeEmail 2012-06-04 22:21:41 +07:00
Rachman Chavik
e821c27f54 remove unnecessary lines 2012-06-04 09:18:36 +07:00
Rachman Chavik
9bafc5a3bb CakeEmail: create request object before rendering
Closes #2931
2012-06-04 09:18:29 +07:00
mark_story
fceb028499 Fix code style errors. 2012-06-03 21:11:34 -04:00
mark_story
8da42dfcfa Merge branch '2.1' into 2.2 2012-06-02 20:57:05 -04:00
mark_story
d1819dcabb Fix page 0 issue.
Refs #2929
2012-06-02 20:56:38 -04:00
mark_story
15a423ad70 Restrict page number passed to view.
Limit the page number to the max page number when passing data to the
view.  This prevents the helper from generating a huge number of links.

Fixes #2929
2012-06-02 20:26:09 -04:00
Ceeram
4c6453501e Merge branch '2.1' into 2.2 2012-06-02 01:47:21 +02:00
Jelle Henkens
e5eb7b490e Preventing cache collisions by adding the the datasource key 2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605 Replacing crc32 with md5 for less collisions in method caching 2012-06-01 10:42:26 +01:00
Rachman Chavik
07d9a75fcb Helpers in custom CakeErrorController are lost
Since many exceptions do not have its own 'template' file, customized
APP/Controller/CakeErrorController with its own list of helpers could be
ignored.

This happens becase ExceptionRenderer is forced to to use _outputMessageSafe
when a template is missing.  This causes Controller::$helpers to be reset with
default values.
2012-06-01 15:28:06 +07:00
Rachman Chavik
483d7124dd debug() may output path that is incorrectly truncated
This happens when debug is called in core source files that resides in
a different directory to the app.
2012-06-01 15:28:06 +07:00
mark_story
55c4ad3c1c Fix coding standards errors.
Also remove count() calls in TreeBehavior.
2012-05-31 21:20:11 -04:00
Mark Story
085ad0bb42 Merge pull request #672 from sitedyno/cookie-encryption-#471
Add stronger encryption, and make it available in cookiecomponent.

Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
2012-05-31 17:44:49 -07:00
Ceeram
6c9b2a1fec Fix user() return value for nested data 2012-05-31 15:13:24 +02:00
Mark Story
119377422e Merge pull request #674 from colares/ticket-2787
Add table attributes per column

Fixes #2787
2012-05-30 18:29:56 -07:00
mark_story
01b3135a63 You should be able to regex match null/''
Fixes #2926
2012-05-30 21:28:18 -04:00
mark_story
9a8ceaeba6 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
fb0cc50700 Allow Set::extract() to match null.
Fixes #2926
2012-05-30 21:19:46 -04:00
Tigran Gabrielyan
1367e5b927 Fixed failing test case 2012-05-30 15:26:59 -07:00
Ceeram
acbb2bebc9 adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions 2012-05-30 21:29:05 +02:00
Heath Nail
304d001dfb Implement rijndael optional cookie encryption. 2012-05-30 03:49:25 -04:00
Thiago Colares
fad7b0705f Increasing testTableHeaders case 2012-05-29 23:30:06 -03:00
Jelle Henkens
ab1f336e21 Adding timeout and port options to the redis cache engine 2012-05-29 23:39:56 +01:00
Ceeram
25c7a27495 fixing XmlView, XmlException: Invalid input was raised when _serialize is string and data is numerically indexed. 2012-05-29 09:46:00 +02:00
mark_story
0bfcd49249 Fix unbindTranslation not unbinding.
There were documented use cases that have never worked.  Fix that.
Also rename a method so it better describes what it does.

Fixes #2913
2012-05-27 21:25:55 -04:00
José Lorenzo Rodríguez
06476a22da Fixing failing tests caused by adding new validator, blind editing... hoping for the best 2012-05-27 19:48:46 -05:30
José Lorenzo Rodríguez
18c3fa79c9 Merge pull request #671 from burzum/2.2-validation
2.2 validation methods
2012-05-27 18:09:03 -07:00
Florian Krämer
e3a6e9e169 Adding uploadError() and mimeType() to the Validation class 2012-05-28 00:32:30 +02:00