Commit graph

710 commits

Author SHA1 Message Date
mark_story
0f584c0e8b Merge branch 'master' into 2.5 2014-02-24 21:19:17 -05:00
mark_story
0776b87214 Fix postLink() & postButton() with nested data.
Flatten deeply nested array data before generating hidden inputs.
This solves 'Array to string conversion' errors.

Closes #2894
2014-02-24 21:17:31 -05:00
jalbertocr
35f152b333 Make sure a datetime instance is valid to avoid fatal errors. 2014-02-19 20:50:30 -03:00
mark_story
3433f4a1f0 Clean up changes code standards and tests.
Refs #2582
2014-02-17 11:03:49 -05:00
Jonas
b32deed4aa changed FormHelper::secure() and FormHelper::end() to support attributes in the hidden CSRF-protection tags that are being generated for SecurityComponent to allow specification of additional html attributes like HTML5s "form" attribute. This allows separation of Form instantiation/controls and form data - for instance within html tables
improved tests for testing against additional attributes for Form::secure()

improved tests for testing against additional attributes for Form::end()

removed array cast, fixed test

fixed docblock format

format

Fixed a bug, this won't work as some forms are just empty
2014-02-17 10:54:02 -05:00
ADmad
9de3418079 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
ADmad
d9489257d3 Don't return true from view classes' render() method.
It cause's Controller:render() to set the response body as `true`.

Refs #2780
2014-02-06 03:06:00 +05:30
mark_story
be8ebfc005 Merge branch 'master' into 2.5 2014-02-05 09:22:46 -05:00
AD7six
adc0bf3ded BC fix for checkbox ids
Revert to previous behavior for id generation of checkboxes, This commit
can be reverted for 2.5+ is desired

Fixes #2733
2014-02-03 17:57:26 +00:00
mark_story
605351d0c9 Allow empty values in checkboxes.
Allow the checkbox value attribute to be empty. This is required to make
checkboxes with a value of 0.

Fixes #2717
2014-01-30 21:12:06 -05:00
Walter Nasich
43604f64d5 Rendering a proper value for html5 attribute 'step' 2014-01-30 17:17:50 -03:00
mark_story
75dd2ff1fb Merge branch 'master' into 2.5 2014-01-16 15:20:40 -05:00
mark_story
f25e84f4fb Don't select year 0 when there are all 0's.
Year 0 is almost never a 'good' selection value and causes odd behavior
when paired with MySQL.

Fixes #2658
2014-01-15 10:23:45 -05:00
mark_story
3cee3b0e99 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Mark Story
1cb7e4f0ff Merge pull request #1635 from dereuromark/master-dom-ids
Fix duplicate ID generation of for multiple checkboxes.
2013-12-24 07:02:38 -08:00
euromark
b392254c92 fix cs 2013-12-24 15:20:32 +01:00
mark_story
7e5c0f7185 Merge branch 'master' into 2.5 2013-12-20 14:15:35 -05:00
mark_story
5bddc477a3 Fix incorrectly handled time values around 12:00:00
When using 12 hour formats & intervals, values around 12:00 were
incorrecly converted to midnight.

Fixes #2507
2013-12-19 17:36:27 -05:00
mark_story
30e139412d Fix input type inference when type=>checkbox
FormHelper should not infer types when the explicit type is checkbox.
Instead the provided type should be used.

Fixes #2491
2013-12-16 23:26:20 -05:00
euromark
8ebf004450 Also make DOM ids for radio element values unique. 2013-12-04 02:14:08 +01:00
euromark
587a04ab84 prevent possible XSS attack via form helper selects and unescaped output. 2013-12-04 01:51:39 +01:00
euromark
aae0f762dd Collision free approach to resolve the DOM ID issue in a clean way. Fix to generation of ids for multiple checkboxes. Resolves ticket 4064. 2013-12-04 01:30:57 +01:00
mark_story
8578708e76 Merge branch 'master' into 2.5 2013-12-01 21:37:37 -05:00
mark_story
a9ca1bdc58 Add tests and fix other cases where autoLinkEmail would fail.
Refs #2403
2013-11-29 22:57:43 -05:00
mark_story
bbe4c659aa Add tests for TextHelper::autoLink()
Add tests for email addresses embedded in urls.

Refs #2403
2013-11-29 21:57:08 -05:00
mark_story
430ef88118 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-11-25 23:15:15 -05:00
mark_story
a4460ff228 Fix tests even better than before.
The current tests work on travis, but fail on jenkins. Fix that up.
2013-11-21 22:57:50 -05:00
mark_story
71312932e8 Merge branch 'master' into 2.5 2013-11-21 21:46:21 -05:00
mark_story
0e7b0ad111 Fix failing test. 2013-11-21 21:46:03 -05:00
mark_story
3b8208be2e Merge branch 'master' into 2.5 2013-11-18 21:49:13 -05:00
Matheus Pedroso
4677ddf490 Fix duplicated webroot path on HtmlHelper::meta('icon'). 2013-11-18 23:38:01 -02:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
mark_story
a07608cbb9 Fix incorrect CSRF token fields when using postLink()
Creating a postLink after creating a GET form would result in the
incorrect fields being generated.

Fixes #2308
2013-11-11 21:56:55 -05:00
mark_story
3561929be7 Merge branch 'master' into 2.5 2013-11-10 21:53:09 -05:00
mark_story
8d38861a2e Fix missing HTML encoding on URL's generated by Html->meta().
The input URL was not correctly handled as an asset URL and thus was
not correctly HTML or URL escaped. This created invalid HTML when
favicon URLs included query string arguments.

Refs #2233
2013-11-09 14:31:09 -05:00
mark_story
bf2f2e772e Split existing tests up, and add tests for Router based image URL's
Refs #2233
2013-11-09 12:00:56 -05:00
ADmad
d647fe8a91 Added buffering of form tags generated by FormHelper::postLink() 2013-11-03 23:11:11 +05:30
mark_story
aaac360833 Merge branch 'master' into 2.5 2013-10-30 14:58:20 -04:00
mark_story
525efcb808 Remove use of deprecated constants.
Fixes #2232
2013-10-29 17:49:16 -04:00
ADmad
d9ca148499 Merge branch 'master' into 2.5
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
Marc Würth
39cd7565ef Throw an exception when starting a view block twice 2013-10-26 03:35:12 +02:00
José Lorenzo Rodríguez
45bd01fdc0 Merge pull request #2132 from dereuromark/2.5-paginator-sort
Ability to use PaginatorHelper::sort() with only one direction.
2013-10-24 05:40:42 -07:00
euromark
def015108d Ability to use PaginatorHelper::sort() with only one direction. 2013-10-19 12:44:50 +02:00
Cameri
2b234236d6 Removed /mpm from 'url' option for last test in JqueryEngineHelper::testRequest(). 2013-10-18 11:41:38 -04:00
Cameri
069b309249 Added test case for JqueryEngineHelper::request() to validate 'xhr' callback. 2013-10-18 11:00:15 -04:00
Marc Würth
bf8a13a77c Added binary type to field type map, defaulting to file input field
Refs  https://github.com/cakephp/cakephp/issues/2071
2013-10-15 22:25:51 +02:00
Mark Story
ce74153389 Merge pull request #1691 from uzyn/2.5-decimal
Add support for decimal type in Schema.

Fixes #3171
2013-10-14 08:36:15 -07:00
Jose Lorenzo Rodriguez
df549898ad Merge remote-tracking branch 'origin/2.5' into k-halaburda-master 2013-10-12 01:05:02 +02:00
Bryan Crowe
c1dd0e4393 Changed url to URL where appropriate 2013-10-07 23:17:58 -04:00
mark_story
60b0893c79 Merge branch 'master' into 2.5 2013-10-06 23:49:32 -03:00
ADmad
aa60b8791a Fixed setting "required" attribute for file input. Closes #4124
In general fixed the issue where enabling SECURE_SKIP for a field
skipped "required" attribute check altogether. Instead now "required"
is set to false for hidden fields by default.
2013-10-04 20:35:38 +05:30
euromark
eb98770304 Remove leftover of pageTitle. 2013-10-04 00:35:56 +02:00
U-Zyn Chua
4806d09d7e Setting of step for decimal field based on precision. 2013-09-29 22:44:50 +08:00
U-Zyn Chua
091658a752 Decimal support for FormHelper. 2013-09-29 22:40:35 +08:00
mark_story
5e9b22271a Merge branch 'master' into 2.5 2013-09-27 22:26:33 -04:00
Mark Story
355e2efbc6 Merge pull request #1685 from dereuromark/master-autolink
Test to prove that autoLink has issues with umlauts.
2013-09-27 06:53:38 -07:00
euromark
bd87ef45f2 complete autoLinkEmail() 2013-09-27 15:01:46 +02:00
euromark
205f7a504b also fix autoLinkEmail() 2013-09-27 14:56:53 +02:00
euromark
2a954b6095 Make TextHelper::autoLink() work properly with umlauts. 2013-09-27 14:48:57 +02:00
Renan Gonçalves
bd1c0b18ff Merge pull request #1679 from dereuromark/master-cleanup-tests
Don't use comp. wrappers anymore.
2013-09-27 04:10:39 -07:00
mark_story
cc5795c67d Merge branch 'master' into 2.5 2013-09-26 10:07:10 -04:00
Bryan Crowe
915b51b239 Updated JavaScript casing and JsHelper references in doc blocks 2013-09-25 22:46:38 -04:00
euromark
0b45a2eca8 correct order of params 2013-09-25 22:07:52 +02:00
euromark
9844da8e99 Don't use comp. wrappers anymore. 2013-09-25 20:58:29 +02:00
euromark
2455af09c5 Resolves ticket #4100 2013-09-25 14:01:35 +02:00
mark_story
d2577fac60 Merge branch 'master' into 2.5 2013-09-21 20:01:50 -04:00
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +02:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
5ec9b145bf Fix label element for attributes not matching their inputs.
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for #3936
and lack of tests for create() + radio().

Fixes #4071
2013-09-16 22:38:28 -04:00
mark_story
a2bd91638e Merge branch 'master' into 2.5 2013-09-12 19:47:13 -04:00
euromark
a796b26f13 fix renderLayout and update deprecated and outdated code 2013-09-13 00:09:31 +02:00
Simon Males
50ad043092 View::get() default param test 2013-09-11 22:22:50 +08:00
Ber Clausen
c3ee9a2058 JsonView should return null if no data is set, regardless of the type of '_serialize'.
It should also honor true/false/0/'' values.
2013-09-07 02:38:52 -03:00
euromark
959988cfa1 Remove last yoda conditions as per coding standards guidelines. 2013-09-06 18:36:57 +02:00
mark_story
e3e4efba0a Add test for issue #3936
radio() method should accept an array for the label element.

Refs #3936
2013-09-05 11:04:47 -04:00
mark_story
229c824da6 Remove a default helper from View.
This goes back to the days of yore and combined with
b8320fdbb7 it causes issues. The specific
issue at hand was testing a helper that uses other aliased helpers
(HtmlHelper specifically). The core helper would always be loaded
instead of the aliased one.
2013-09-01 21:39:59 -04:00
Phally
28dbc5b89b PHPCS fixes. 2013-08-31 13:30:05 +02:00
ADmad
75e8facd2f Remove JS constant use from tests. 2013-08-31 11:45:59 +05:30
mark_story
7bd2174c5b Refactor tests to use a data provider. 2013-08-30 15:36:18 -04:00
mark_story
94b602b684 Merge pull request #1456 'fix-for-3515' into 2.4
Conflicts:
	lib/Cake/Test/Case/View/ViewTest.php

Fixes #3515
2013-08-30 15:27:49 -04:00
mark_story
c03edd9d1a Don't load Helpers in dataviews when _serialize is set.
Loading helpers when they aren't going to be used is wasteful.
2013-08-28 15:47:44 -04:00
mark_story
b8320fdbb7 Load helpers at View construction.
Loading helpers earlier in View's lifecycle allows for the removal of
many duplicated code segments and a now useless property. It slightly
modifies how View behaves in a test case, but that issue is easily
remedied by calling loadHelpers() a second time.

This primarily fixes issues where helpers may not be loaded in View
subclasses if they override any of View's methods. This is particularly
problematic when aliased helpers are involved.

Refs #4030
2013-08-28 12:27:07 -04:00
mark_story
42feb8dff6 Fix failing test.
Quote encoding in confirm handlers has changed in 2.4. Update the
relevant test.
2013-08-24 21:51:42 -04:00
mark_story
53d265cfba Merge branch 'master' into 2.4 2013-08-23 12:56:43 -04:00
mark_story
24123e2374 Add test for postLink with escape false + confirm option.
Closes #4008
2013-08-21 13:09:47 -04:00
euromark
036954b52d remove duplicate newlines according to CS 2013-08-20 20:27:06 +02:00
Alexander Hofbauer
80e589f19d Correctly encode confirm handlers
With encode set to false the onclick handler will be sent through
h() regardless, making links and postLinks work again.
2013-08-13 10:11:22 +02:00
Jose Lorenzo Rodriguez
9d07fc4330 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Utility/CakeNumber.php
	lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
José Lorenzo Rodríguez
890d4a9e2c Merge pull request #1478 from aleho/2.4
Use a protected method to generate confirm() links
2013-08-11 13:51:29 -07:00
Marc Würth
2a540ff8a8 Fix for #3515, functional extension & tests
https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3515

I used (string) because it is faster than strval() and there are no real benefits in this case.
Also enabled assign(), append() and prepend() to take any values convertible to string.

Removed try/catch as discussed with ADmad.
Changed the three exception expecting tests to check for PHPUnit_Framework_Error now.
2013-08-09 01:34:08 +02:00
euromark
fc2d28974b remove undocumented code and uncessary in_array() checks + cleanup 2013-08-08 03:56:58 +02:00
euromark
1339a9dfe1 coding standards according to new sniffer rules 2013-08-08 01:03:21 +02:00
ADmad
faa4262969 Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url
Fixed full urls on asset methods
2013-08-07 10:29:11 -07:00
Mark
6c30851783 Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding
provide ability for rounding - closes #1986
2013-08-07 10:15:35 -07:00
Alexander Hofbauer
8601e0078a Implement a Helper method to generate confirm() links
This allows for overriding the default behavior of showing
confirm()-dialogs in Html and Form helpers.
2013-08-06 10:04:44 +02:00
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
Juan Basso
cda1a1e6c9 Added test for relative path using app asset configuration 2013-08-03 11:04:52 -04:00
Juan Basso
db6d0a748b Fix for relative protocol on assets 2013-08-03 10:36:19 -04:00