mark_story
72b98f58a8
Backport paginator changes for string integers.
...
Backport the intent of #7845 into 2.x. The implementation differs a bit
from 3.x but paginator helper internals are pretty different in both
branches.
Refs #7092
2015-12-26 22:52:57 -05:00
mark_story
430612f1df
Split mega test up.
...
The previous testNumbers() method was a behemoth. Split out the
scenarios for first/last a bit.
Refs #7902
2015-12-26 22:37:25 -05:00
mark_story
48450e71fa
Merge branch '2.7' into 2.8
2015-11-11 22:53:45 -05:00
mark_story
5e60cc5d18
Fix plugin view names being able to escape the plugin root directory.
...
Remove the ability to specify completely arbitrary view files. This is
possibly a breaking change. However, I feel the risks out weigh the
benefits in this situation. Now absolute paths must be located *within*
a configured view path.
2015-11-01 22:04:15 -05:00
Mark Scherer
8287981855
Make sure direction values are lowercased to be consistent.
2015-10-26 23:20:30 +01:00
mark_story
29490eb84f
Add tests for #7516
2015-10-10 22:32:41 -04:00
mark_story
506051f688
Correct input generation for postgres numeric types.
...
Numeric types in postgres are treated like decimals, except they can
have no length, precision or scale components defined.
IE does not accept 1.00000 as a valid step attribute so we'll default to
any when we encounter decimal types with no length.
Refs #7497
2015-10-01 21:46:21 -04:00
mark_story
143c34bdc1
Handle case where a visible input shares a name with an invisible one.
...
If a visible input is created *after* a hidden input was created, the
form would always blackhole unless the visible input had the same value
as the hidden input.
Refs #7274
2015-08-22 23:10:44 -04:00
Yoshiyuki Kinjo
e25be3a47e
Add failing test for FormHelper::input
...
FormHelper::input does not respect 'value' option when form is of date/time type.
Signed-off-by: mark_story <mark@mark-story.com>
Backport fixes from #7082 to 2.7
2015-07-22 21:59:44 -04:00
mark_story
cbd45f702d
Make FlashComponent/FlashHelper more backwards compatible.
...
Merge branch 'issue-6874' into 2.7.
Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
2015-06-26 22:05:32 -04:00
mark_story
97c5463387
Fix failing tests.
...
FlashHelper uses `Message` not flash now. This is more backwards
compatible with 2.x
Refs #6874
2015-06-26 22:04:00 -04:00
mark_story
ae2ea1ea6c
Merge branch '2.6' into 2.7
2015-06-25 21:50:47 -04:00
Highstrike
58983f717a
2.7.0-RC Auth doesn't use the new Flash component
...
Changed 'Flash.' to 'Message.' and also provided backwards compatibility
in FlashHelper->render
2015-06-24 14:06:35 +03:00
Mark Scherer
fc57e43a5b
Adjust tests.
2015-06-21 12:13:09 +02:00
mark_story
664ba53c89
Merge branch '2.6' into 2.7
2015-06-20 10:03:14 -04:00
Mark Scherer
ccac3b3e06
Allow deep options for radio() just as for select().
2015-06-16 13:23:51 +02:00
mark_story
d7d8b90986
Merge branch '2.6' into 2.7
2015-05-28 19:34:59 -04:00
nojimage
8ebc9cdd87
refs #6635 FormHelper::radio() return collect id attributes with multibyte
2015-05-25 22:10:50 +09:00
Mark Scherer
4f3602ad5f
Adjust bake, docblocks and tests for notBlank.
2015-05-17 22:27:16 +02:00
Mark Scherer
4915e802c1
Fix tableCells()
2015-05-02 16:52:51 +02:00
Mark Scherer
f510dac32a
fix cs
2015-05-02 16:16:27 +02:00
Mark Scherer
cdbf5a0dec
Correct brackets.
2015-05-02 14:26:57 +02:00
Mark Scherer
ed21f84236
Backport _xmlOptions
2015-05-02 14:24:02 +02:00
Mark Scherer
adf2eb03f2
Backport jsonOptions
2015-04-30 15:51:13 +02:00
mark_story
345d8d8390
Merge branch '2.6' into 2.7
2015-04-29 19:54:53 -04:00
Mark Scherer
3ba4308356
Use hour as field name.
2015-04-20 18:39:54 +02:00
Mark Scherer
c71a478876
Add test case.
2015-04-20 18:38:19 +02:00
mark_story
3151c53255
Merge branch '2.6' into 2.7
2015-03-23 22:50:09 -04:00
mark_story
744952e344
Fix FormHelper::create() dropping 0 value parameter.
...
When 0 is the first passed parameter we shouldn't drop it.
Fixes #6107
2015-03-19 21:15:20 -04:00
José Lorenzo Rodríguez
277f641108
Merge pull request #6064 from robmcvey/jsonView
...
2.6 jsonView should throw exception if json_encode fails
2015-03-18 10:01:40 +01:00
mark_story
6df7bf9c21
Fix notice errors in pagination link generation.
...
No errors should be emitted when creating links for models that were not
paginated.
Refs #6090
2015-03-17 22:19:17 -04:00
Rob McVey
4741abcd63
Remove whitespace
2015-03-15 11:14:49 +00:00
Rob McVey
d94e05cf76
Assert exception msg contains UTF-8
...
The different versions of PHP throw several various messages for UTF-8
sequences, so this just performs a basic regex check
2015-03-15 11:01:51 +00:00
Rob McVey
a59a057133
assert correct exception msg thrown
2015-03-15 10:36:06 +00: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
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
mark_story
63769ae4a6
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-02-26 12:50:35 -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
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
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
mark_story
ac9a212d44
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
mark_story
03d8c40d99
Fix PHPCS error.
2015-01-09 15:32:33 -05:00
mark_story
98909fb465
Fix radio buttons not being added to security hash.
...
When some but not all inputs were disabled radio buttons were omitted
from the security hash. This caused blackhole failures as the input was
unexpected.
Refs #5603
2015-01-08 23:25:34 -05:00
euromark
63093e1d30
More String CakeText replacements and a BC class.
2015-01-05 00:55:23 +01:00
mark_story
4cd2c8fdcb
Merge branch 'master' into 2.7
2015-01-03 14:34:55 -05:00
mark_story
b6029d7ad1
Add some additional tests for autoLink.
...
Refs #5544
2015-01-03 14:30:56 -05:00
Rob McVey
76b7c8c594
More complex test case for GET params
2015-01-02 15:31:27 +00:00
Rob McVey
2bf41f3d85
Add missing double quote to link in test
2015-01-02 15:09:40 +00:00
Rob McVey
1ebcd9bf72
Test brackets are not autolinked inside href tag
2015-01-02 15:08:21 +00:00
mark_story
d21ae178bf
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-23 11:29:57 -05:00
euromark
0a974dd59f
Adjust tests
2014-12-22 22:07:51 +01:00
mark_story
839ef73d43
Merge branch '2.6' into 2.7
2014-12-17 21:46:54 -05:00
Walther Lalk
9be725613e
Backport helper method for view blocks from 3.0
...
Related PR is #5385
2014-12-11 16:44:11 +02:00
euromark
1e6876b627
Fix tests
2014-12-09 03:43:35 +01:00
euromark
f63d955f73
Add additional test.
2014-12-09 03:43:35 +01:00
euromark
dc41a1ff56
Fix paginator options when disabled.
2014-12-09 03:43:34 +01:00
Rachman Chavik
7bea96f534
Add test for css() and script() with the same resource identifier
2014-11-19 11:20:37 +07:00
euromark
41c646c5a1
Simplification of return types. No need to return more mixed than necessary.
2014-11-08 20:07:47 +01:00
euromark
e7f76a983a
Add a method for generating pagination meta links.
2014-11-02 22:29:02 +01:00
mark_story
579b16d90b
Merge branch 'master' into 2.6
2014-10-30 21:20:53 -04:00
mark_story
ebc1bcb624
Add additional useful tests for autoLink()
...
These new tests cover an important case that could easily be missed in
the future. Links with URL's should not be re-linked.
Refs #4998
2014-10-27 21:03:03 -04:00
mark_story
177b797aab
Merge branch 'master' into 2.6
2014-10-26 21:25:05 -04:00
Jan Ptacek
797635d26b
fixing testcases + do not disable the hidden input on partial disables
2014-10-25 21:05:37 +02:00
Schlaefer
388e412a82
fixes failing test cases from last CakeTime::timeAgoInWords changes
...
at b96eb1fb46
2014-10-01 11:09:00 +02:00
mark_story
cf45d3fab8
Merge branch 'master' into 2.6
2014-09-22 20:46:28 -04:00
Mischa ter Smitten
a69e9bc63b
Cs fixes
2014-09-18 10:50:35 +02:00
euromark
c65cb6f62b
wording
2014-09-13 13:39:11 +02:00
euromark
03d92494f1
Fix maxlength for manual type set and add textarea maxlength support.
2014-09-13 04:03:33 +02:00
ADmad
e410501791
Fix CS errors.
2014-07-03 23:13:55 +05:30
mark_story
2bcd817367
Merge branch 'master' into 2.6
2014-07-03 11:13:06 -04:00
euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
mark_story
b1610c145e
Merge branch 'master' into 2.6
2014-07-02 23:39:16 -04:00
Mark Story
187272c06a
Merge pull request #3824 from NickBeeuwsaert/element_events
...
Added view type getter and ensured element render events would get the proper type
2014-06-28 06:21:46 -04:00
Nick Beeuwsaert
733a610bf7
More coding standard fixes
2014-06-27 18:03:29 +00:00
Nick Beeuwsaert
6623a8a7f4
Adhering to CakePHP coding standards
2014-06-27 17:28:43 +00:00
Nick Beeuwsaert
f9aa954562
Changed Event names back, added view type getter
...
Changed `Element.beforeRender` and `Element.afterRender` back to
`View.beforeRender` and `View.afterRender` Also added a getter for
`View::_currentType`.
Added more tests to make sure that things were getting reset right
And also that View::render and View::element events were working
As expected
Changed Event names back, added view type getter
Changed `Element.beforeRender` and `Element.afterRender` back to
`View.beforeRender` and `View.afterRender` Also added a getter and
setter for `View::_currentType`.
Added more tests to make sure that things were getting reset right
And also that View::render and View::element events were working
As expected
2014-06-27 15:40:12 +00:00
Bryan Crowe
a1ae31e554
Fix identifier typos
2014-06-26 23:06:08 -04:00
Nick Beeuwsaert
7cef19fe96
Changed View::element()
to have an appropriately named event
...
And also made it so when the event fires the subjects type is
`View::TYPE_ELEMENT`. Wrote some tests which I hope are done right I
don't really know the bes way to write a test for a event listener
2014-06-25 22:08:59 -05:00
mark_story
a2673d8bf0
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Core/App.php
2014-06-25 09:22:10 -04:00
euromark
26fe1265ab
Mark App::pluginPath as deprecated and don't use it anymore.
2014-06-24 11:52:29 +02:00
mark_story
497ecd3f80
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-06-19 21:41:02 -04:00
mark_story
9136f63874
Fix autoLinkEmail() not working when emails are adjacent to HTML.
...
When an email address is adjacent to HTML it should be autolinked
correctly.
Refs #3656
2014-06-16 21:48:30 -04:00
mark_story
74d8e9ea40
Convert test to use a dataprovider instead of multiple calls.
...
Dataproviders are generally a bit easier to work with in the future.
2014-06-16 21:46:34 -04:00
mark_story
758599e6f4
Add once option to css().
...
The default value is false for backwards compatibility. In 3.0, the
default will be made consistent with script().
Refs #1973
Refs #3628
2014-06-04 22:15:56 -04:00
mark_story
db86b0c050
Don't disable the entire select when disabled is array(1)
...
When the disabled attribute is just array(1), then the attribute should
be filtered out of select element attributes. This is kind of a hacky
workaround but changing the underlying attribute handling is going to be
pretty tricky and far more dangerous.
Fixes #3546
2014-05-23 13:26:11 -04:00
mark_story
cd68002246
Add additional test case for named parameters.
...
Refs #3525
2014-05-22 14:14:35 -04:00
akiyan
781430c4af
Removed unnecessary conditional branch, fixed test and comment.
2014-05-22 14:08:18 -04:00
akiyan
67f256297d
Fixed secure form hash for special url.
...
No htmlspecialchars encode and without fragment identifer.
2014-05-22 14:08:11 -04:00
mark_story
e9ecfe0936
Remove x bit on files.
...
PHP files should not have executable permission set.
2014-05-13 12:30:14 -04:00