mark_story
c32e5559bb
Add test to ensure column was converted to integer.
...
Refs #5512
2015-03-14 22:23:17 -04:00
Rob McVey
fe0ddf2171
Assert exception is thrown, reset error handler in tearDown
2015-03-14 13:27:34 +00:00
Rob McVey
56c6f02efc
Remove tabs
2015-03-14 13:16:05 +00:00
Rob McVey
d3c24be84b
add a custom error handler for tests of json_encode
2015-03-14 13:12:09 +00:00
Rob McVey
2ba9f3b8fb
Encoding false is OK - should return string null
2015-03-13 16:21:54 +00:00
Rob McVey
ddfcb06d02
Coding standards
2015-03-13 16:13:29 +00:00
Rob McVey
08620704be
Handle json_encode failure
2015-03-13 16:12:21 +00:00
Rob McVey
05aba7afb6
Assert CakeException throw when json_encode fails
2015-03-13 15:52:22 +00:00
mark_story
0b916cedbb
Merge branch 'master' into 2.7
2015-03-09 21:55:20 -04:00
Mark Story
43f16f38f0
Merge pull request #5905 from davidsteinsland/fix_file_response_dots
...
Fix file response dots
2015-03-09 21:54:02 -04:00
mark_story
a9519d39f7
Fix whitelist being empty during afterSave.
...
whitelist should only be reset after afterSave event.
Refs #6028
2015-03-08 13:51:46 -04:00
Mark van Driel
ed5da19d10
Fixed return type of toQuarter in CakeTime and TimeHelper
2015-03-02 12:08:11 +01:00
José Lorenzo Rodríguez
a6ceec149a
Merge pull request #5981 from cakephp/issue-5973
...
Make maxLimit and limit settings independent.
2015-03-01 19:48:26 +01:00
mark_story
02c9dda9a7
Make maxLimit and limit settings independent.
...
Having maxLimit infer what it should be based on limit was not a very
transparent default behavior. The documentation states that maxLimit
will default to 100, but the code would default it to 'limit' if set.
This created confusing behavior when only one setting was defined.
Refs #5973
2015-02-27 22:35:52 -05:00
mark_story
8dba9879d4
Don't generate maxlength properties for decimal columns.
...
Int casting the decimal scale isn't going to work in a number of
situations as users may end up trying to include decimal points, commas
or spaces in larger amounts.
Fixes #5977
2015-02-27 21:08:54 -05:00
KullTC
a7c2f26599
Make sure default datasource is not used for mock
...
When a non-default datasource is used for a model and no test_ version of
that datasource is available, the getMockForModel method used the
models standard datasource, rahter than 'test'.
2015-02-27 15:26:49 +01:00
Mark Story
19f28c419e
Merge pull request #5954 from cakephp/issue-5948
...
Check line length to account for fence post.
2015-02-26 19:58:06 -05:00
mark_story
63769ae4a6
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
mark_story
c92cfb413f
Allow numeric sorts in PaginatorComponent.
...
When paginating data, we should not ignore numerically indexed order
conditions. Instead they should be handled similar to Model::find().
This creates a slightly different behavior when model's have default
sorting applied as more default sort options forms will be honoured.
Refs #5964
2015-02-25 21:38:56 -05:00
mark_story
ea79cf5d13
Fix words with WWW in them being autolinked.
...
Don't autolink words that don't have `www.` in them.
Fixes #5968
2015-02-25 20:52:35 -05:00
mark_story
b80a8947d7
Check line length to account for fence post.
...
When we have exactly 998 bytes CakeEmail should not emit an error.
Refs #5948
2015-02-24 21:52:34 -05:00
AD7six
d7d2516dc1
Remove unwanted whitespace
2015-02-23 17:22:55 +00:00
AD7six
5066bc33b4
Fix whitespace for paginator counter call
2015-02-23 16:46:43 +00:00
AD7six
b151295f1b
Add a better test for the index being correct
2015-02-23 16:46:23 +00:00
mark_story
831fe53f79
Ignore LC_TIME category when extracting messages.
...
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.
Refs #5933
2015-02-22 22:39:38 -05:00
ADmad
2a57d9b65f
Avoid reloading config file and recreating config instance.
2015-02-20 08:48:25 +05:30
David Steinsland
463fa660bc
Updated test
2015-02-19 17:28:32 +01:00
Jan Dorsman
e3b5306521
Fixing issue #5764
2015-02-19 12:19:27 +05:30
David Steinsland
960ddd0eb8
Added DocBlock
2015-02-15 19:34:28 +01:00
David Steinsland
5fd7396e47
Fixed downloading of files with dots
2015-02-15 19:32:33 +01:00
ADmad
204f50bb97
Allow level field to be null for pqsql and sqlite.
2015-02-15 23:04:13 +05:30
ADmad
e095885dc4
Fix test case
2015-02-15 22:35:42 +05:30
ADmad
6ad68ae1e2
Allow setting level (depth) of tree nodes on save.
...
Backported from 3.0.
2015-02-15 22:29:19 +05:30
Mark Story
9f1f158cc0
Merge pull request #5855 from tanuck/2.7-custom-flash-message
...
Backport of 3.x flash messages #5823
2015-02-14 22:07:30 -05:00
mark_story
b3c9c1615e
Fix doubly linking URLs starting with //
...
Fixes #5889
2015-02-13 21:40:50 -05:00
mark_story
eb85a875c0
Merge branch 'master' into 2.7
2015-02-10 23:00:43 -05:00
mark_story
3dfa22b021
Fix order of hasOne assocation.
...
This should fix non-deterministic failures.
2015-02-10 22:46:53 -05:00
mark_story
b974daac7b
Don't create invalid maxlength attributes for decimal columns.
...
Converting the maxlength to an int avoids any commas from decimal
columns.
Refs #5832
2015-02-05 22:53:40 -05:00
James Tancock
e173c29d33
Fix for phpcs
2015-02-04 15:31:50 +00:00
James Tancock
b8b6b67abd
Tests for ported Flash component & helper
2015-02-04 15:05:40 +00:00
Rachman Chavik
acd32b71fe
Fix: "bake plugin" generates incorrect directory for View/Layouts
2015-02-04 15:47:01 +07:00
ADmad
54fe7ed204
Add method to get depth of tree's node.
...
Backported from 3.0.
2015-02-01 17:27:46 +05:30
Mark Story
151f6e90e0
Merge pull request #5673 from davidsteinsland/fix_exception_handler_nesting
...
Fixed nesting when ExceptionRenderer throws exception
2015-01-28 22:00:57 -05:00
Mark Scherer
611889235a
Fix clear(). Add test cases.
2015-01-28 23:54:32 +01:00
Mark Story
35e0dc2bbd
Merge pull request #5760 from cakephp/master
...
Merge master into 2.7
2015-01-27 20:48:15 -05:00
Mark Story
b5cbe4de58
Merge pull request #5744 from cakephp/master-hotfix-testing
...
Fix ControllerTestCase redirect assert by always using 302 for redirect()
2015-01-26 20:27:36 -05:00
Mark Scherer
76f7754014
Adding a status code test.
2015-01-26 10:29:52 +01:00
mark_story
a8ae12a700
Fix warnings when php://output is used with ConsoleOutput.
...
The php://output stream is not compatible with posix functions.
Refs #4901
2015-01-25 22:24:24 -05:00
AD7six
f9ba950ad4
Skip Sqlite
...
Sqlite will accept an insert with duplicate primary keys and silently
drop the query. There is no exception, or indication that the insert
failed.
2015-01-23 08:47:05 +00:00
AD7six
838d23300b
Remove some exists checks by not validating
2015-01-23 08:29:59 +00:00
