Mark Scherer
1b81323462
Use strict check
2015-06-17 12:06:56 +02:00
Mark Story
32fe09835b
Merge pull request #6809 from ravage84/2.7-code-coverage
...
Explicit definition of the code coverage
2015-06-15 10:13:12 -04:00
mark_story
c3080873b9
Update version number to 2.7.0-RC
2015-06-14 22:50:05 -04:00
mark_story
0d3057bb77
Re-remove 5.2 from travis.yml
...
There are a bunch of failing tests in the JsonView and HttpSocket
classes, both these failures are caused by annoying differences in PHP
that I don't think are really worth working around.
2015-06-14 22:17:22 -04:00
mark_story
5f9473eb61
Merge branch '2.6' into 2.7
2015-06-14 22:00:37 -04:00
mark_story
0b20f6d334
PHP5.2 has no composer.
2015-06-14 22:00:29 -04:00
mark_story
947262e754
Fix PHPCS errors.
2015-06-14 21:56:48 -04:00
mark_story
ebb01f0fac
Merge branch '2.6' into 2.7
2015-06-14 21:52:53 -04:00
Marc Würth
f3099fefdf
Define code coverage explicitly
2015-06-15 00:56:09 +02:00
mark_story
90da605cc8
Re-enable 5.2 as travis still supports it for now.
2015-06-13 15:48:27 -04:00
mark_story
56143c663e
Update doc blocks for CakePlugin::load().
...
Refs #5665
2015-06-11 22:17:18 -04:00
mark_story
c47196fe08
Merge branch '2.6' into 2.7
2015-06-07 15:45:26 -04:00
mark_story
6d60e6a4db
Backport 7eec48268ebb6a17656df4a059f9e7b43991472f to 2.x
...
Backport fixes to base path generation that prevent issue when a URL
contains // it can circumvent the base path generation, which results in
unwanted user data in the base/webroot paths. This creates an
opportunity for CSS manipulation in old versions of IE, and newer ones
via iframe inheritance.
2015-06-07 15:45:16 -04:00
mark_story
0e6fcc02b8
Add/correct some tests for humanize.
...
The arguments for assertEquals() were backwards. While there are many
more flipped assertions I will change the others separately.
2015-06-05 10:31:29 -04:00
mark_story
239c83938f
Fix regression in camelize().
...
The input should not be lowercased before camelizing, as this can cause
inputs that were previously camelized to create incorrect results.
Refs #6735
2015-06-05 10:20:51 -04:00
Mark Story
b8b524392d
Merge pull request #6723 from cakephp/issue-6659
...
Fix issue with overlapping irregular inflections.
2015-06-03 22:10:06 -04:00
mark_story
df0f2295c3
Fix issue with overlapping irregular inflections.
...
When irregular inflections overlap we should choose the longest match,
not the shortest.
Refs #6659
2015-06-02 23:09:29 -04:00
José Lorenzo Rodríguez
9d1db96fa0
Merge pull request #6704 from cakephp/2.7-tree
...
Extract formatTreeList() from generateTreeList().
2015-06-01 21:00:29 +02:00
Mark Scherer
0524eb95ae
Documentation update
2015-06-01 16:14:15 +02:00
Mark Scherer
4ad001b9ca
Use options array.
2015-06-01 16:12:45 +02:00
Mark Scherer
670d93b6f6
Extract formatTreeList() from generateTreeList().
2015-06-01 12:36:20 +02:00
Mark Scherer
2a5cbb8037
Add missing static keyword.
2015-05-31 13:40:22 +02:00
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
Mark Story
0c9fea8523
Merge pull request #6645 from igorpadovan/2.6
...
Preventing error when trying to delete unexisting buffer
2015-05-26 20:16:01 -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
José Lorenzo Rodríguez
8299906f35
Merge pull request #6619 from cakephp/issue-6581
...
Exclude deprecated validators from bake.
2015-05-23 09:18:14 -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
d236cffb72
Merge pull request #6605 from cakephp/issue-6602
...
Fix incorrectly quoted table aliases in virtual fields.
2015-05-22 11:36:44 -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
Mark Story
138adf0972
Merge pull request #6591 from ravage84/2.7-testnotblank
...
Rename test methods after notBlank change
2015-05-19 11:50:46 -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 Story
83e542542c
Merge pull request #6579 from cakephp/2.7-validation-depr
...
Deprecate notEmpty in favor of notBlank.
2015-05-18 20:55:34 -04:00
Mark Story
d18748a50d
Merge pull request #6584 from cakephp/2.6-html-attributes
...
2.6 Add missing HTML minimize attributes
2015-05-18 19:26:48 -04: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
Mark Story
918c20c4cd
Merge pull request #6544 from ndm2/2.6-multi-word-irregulars
...
Add underscore support for multi word irregulars.
2015-05-12 12:16:10 -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
