mark_story
d7d8b90986
Merge branch '2.6' into 2.7
2015-05-28 19:34:59 -04:00
mark_story
523597df43
Update version number to 2.6.7
2015-05-28 19:30:33 -04:00
mark_story
65691836be
Fix syntax errors in PHP <5.4
2015-05-28 17:39:52 -04:00
mark_story
b66c1ce53c
Update version number to 2.6.6
2015-05-28 09:50:27 -04:00
mark_story
995d8d22c6
Disable reading XML files and URLs when handling user data.
...
Allowing users to load arbitrary files/URLs with Xml is not desirable
when handing user input.
2015-05-27 09:45:53 -04:00
mark_story
dddc504f87
Merge branch 'issue-6635' into 2.6
...
Fixes FormHelper generating invalid ID attributes when multibyte values
are used.
2015-05-26 22:51:13 -04:00
mark_story
733ddc7ff4
Use mb* functions in Inflector humanize/underscore.
...
Use the mbstring shims we already provide to make Inflector more robust
than it currently is. This solves the invalid ID attribute generation in
a way that never varies between environments.
Refs #6635
2015-05-26 22:51:00 -04:00
Igor Padovan da Silva
bf550d13ce
preventing error on trying to delete unexiting buffer
2015-05-26 17:46:08 -04:00
nojimage
c6e4208bda
refs #6635 Inflector::underscore, humanize support multibyte string inputs
2015-05-26 13:29:05 +09:00
nojimage
8ebc9cdd87
refs #6635 FormHelper::radio() return collect id attributes with multibyte
2015-05-25 22:10:50 +09:00
mark_story
15f88533e8
Update version number to 2.6.5
2015-05-24 21:01:09 -04:00
mark_story
9626f0e726
Exclude deprecated validators from bake.
...
Don't include deprecated validators in bake.
Refs #6581
2015-05-22 22:03:32 -04:00
mark_story
4a3b2e2a03
Fix failing test in SQLite.
...
SQLite does not handle subqueries in virtual fields well. However, the
original issue was that the generated query was invalid which
find(first) will still catch.
2015-05-21 21:58:12 -04:00
mark_story
52a0d642ec
Fix incorrectly quoted table aliases in virtual fields.
...
DboSource::_quoteFields() is already a bit of a mess, and while I'm not
happy about having to add more regex replacement, it seems to be the
only reasonable solution given that the code is already 'parsing' SQL
to apply identifier quoting.
Fixes #6602
2015-05-20 22:40:47 -04:00
Marc Würth
508b9d1443
Rename test methods after notBlank change
...
Was a left-over from #6579
2015-05-19 15:13:28 +02:00
Mark Scherer
29747995dc
Add missing minimizable HTML attributes
2015-05-18 18:10:02 +02:00
Mark Scherer
f742fa51fe
Dont include deprecated options for bake
2015-05-17 23:24:23 +02:00
Mark Scherer
4f3602ad5f
Adjust bake, docblocks and tests for notBlank.
2015-05-17 22:27:16 +02:00
Mark Scherer
866242643f
Deprecate notEmpty in favor of notBlank.
2015-05-17 22:13:04 +02:00
mark_story
6ffc9670d2
Document missing option in loadAll().
2015-05-13 22:37:52 -04:00
ndm2
323e8d8d76
Add underscore support for multi word irregulars.
...
Underscore separated words were not catched by the irregular regex,
tests however didn't fail as the default rules matched the tested words
too. The added test should ensure that this won't happen again.
Fixes the gap left by the previous #6538 fix.
2015-05-12 14:33:15 +02:00
mark_story
d4740c9c09
Fix incorrect handling of irregular values.
...
When inflecting irregular values, both plural and singular forms were
generated incorrectly.
Fixes #6538
2015-05-11 21:35:08 -04:00
ovidiupruteanu
a55685c278
Replace preg_replace with basename in SchemaShell
2015-05-11 14:52:31 +03:00
ovidiupruteanu
4b3386c16f
Replace rtrim with preg_replace in SchemaShell
...
The second parameter of rtrim is a character mask, not a string to be replaced. It was breaking file names ending in one or more 'p' or 'h' characters.
2015-05-11 14:35:20 +03:00
mark_story
6cb21e6dc8
Change default value to allow code coverage on non-app files.
...
Don't default to app, as it prevents generating code coverage for core
and plugin files.
Fixes #6533
2015-05-10 21:34:08 -04: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
8e618ed9e6
Fix documentation regarding attributes
2015-05-02 14:31:38 +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_story
032c01d18c
Add other key types to {*} test.
2015-05-01 22:41:41 -04:00
mark_story
5e9d4893a8
Add the {*} matcher to Hash::extract()
...
This matcher will match anything and is useful when you just want to
traverse through data and you're not too picky.
I've also refactored the conditions to use a case as it is slightly more
readable and uses fewer lines of code.
Refs #6447
2015-05-01 22:03:40 -04:00
Mark Story
bcb403078d
Merge pull request #6455 from cakephp/2.6-status-code-429
...
Backport #6431
2015-04-30 20:13:36 -04:00
Mark Scherer
adf2eb03f2
Backport jsonOptions
2015-04-30 15:51:13 +02:00
Mark Scherer
309aee9fe5
Backport #6431
2015-04-30 15:18:28 +02:00
mark_story
345d8d8390
Merge branch '2.6' into 2.7
2015-04-29 19:54:53 -04:00
Mark Scherer
c31fcd6f39
Correct default value to false.
2015-04-21 14:32:34 +02:00
Mark Scherer
8cdf222cc0
Also fix hour()
2015-04-20 22:04:33 +02:00
mark_story
096a2ebb72
Merge branch '2.6' into 2.7
...
Conflicts:
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
lib/Cake/VERSION.txt
2015-04-20 15:42:54 -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 Scherer
a9ae7fd5bb
Fix year form field when magic input wrapper is used.
...
s
2015-04-20 18:31:00 +02:00
mark_story
f925511a54
Update version number to 2.6.4
2015-04-19 21:10:15 -04:00
Marc Würth
b19b76b9f2
Fix parameter type annotation
...
https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L265
https://github.com/cakephp/cakephp/blob/2.6.3/lib/Cake/Utility/Hash.php#L293
2015-04-13 18:20:16 +02:00
mark_story
5f2aa4c307
Fix errors when testing controllers that use file()
...
Fix errors related to ob_end_clean() closing PHPUnit's output buffer
when testing controller methods that use response->file().
2015-04-09 20:38:37 -04:00
mark_story
a6aefdd4d3
Fix null path in Hash::get() causing exceptions.
...
This was a regression introduced in 2.6.x
Refs #6297
2015-04-09 07:50:29 -04:00
Mark van Driel
4a7344ae80
Keep only test for null value as path
2015-04-09 07:49:35 -04:00
Mark van Driel
900fd3e7e5
Test to demonstrate issue with non-string paths in Hash::get
2015-04-09 07:47:25 -04:00
mark_story
f55111bdc1
Allow empty headers to be read.
...
Allow headers with '' and '0' as their values to be read.
Fixes #6299
2015-04-08 16:33:28 -04:00
mark_story
b2958dad79
Re-add call to parent destructor.
...
In 762ebd4
a destructor was added to DboSource, this accidentally
removed the rollback on destruct that Datasource provides. Restoring
this via a parent call allows pending transactions to be rolled back at
the end of a request.
Fixes #6251
2015-04-01 20:37:06 -04:00