Commit graph

6697 commits

Author SHA1 Message Date
Anne
b4b10e75ac Added return types in PHP documenation in basics.php, since it raises warning in ie. PHPStorm, like:
- Method _toString is not implemented for translated
2015-07-08 09:35:06 -04:00
mark_story
4102961cb5 Add tests for #6879
I wasn't able to reproduce the issue the reporter had, but we have more
robust tests now.
2015-07-06 22:43:52 -04:00
hiromi2424
deb62c8887 #6935 Fix deep saving for hasMany could not handle validation errors correctly 2015-07-04 06:10:58 +00:00
mark_story
c037e04ace Update version number to 2.6.8 2015-06-29 22:35:55 -04:00
mark_story
2f616a9e0c Fix greedy regex operators in Postgres driver.
`*` is greedy in regex, and needs to be escaped so that SQL operators
don't cause invalid SQL conditions to be created.

Refs #6877
2015-06-24 23:39:26 -04:00
Mark Story
0841c04351 Merge pull request #6853 from cakephp/2.6-template
Cleanup method calls.
2015-06-22 10:53:32 -04:00
Mark Scherer
fc57e43a5b Adjust tests. 2015-06-21 12:13:09 +02:00
Humberto Pereira
77150eb6f6 fixed tests cases to print html 2015-06-20 22:19:08 -04:00
Humberto Pereira
26630991a6 CakeShells should not print html in case of a error 2015-06-20 22:19:07 -04:00
Mark Scherer
6e5381a4e3 Cleanup method calls. 2015-06-20 23:27:32 +02:00
Mark Scherer
1d03d5bd59 Consolidate template whitespace 2015-06-20 05:10:35 +02:00
mark_story
705f44e30a Fix regression where attributes were created with no whitespace. 2015-06-19 22:00:27 -04:00
Mark Scherer
7dedf7f86d Refactor cleanly. 2015-06-17 11:38:42 +02:00
Mark Scherer
2d7487d33c img tag needs manual space 2015-06-17 11:34:03 +02:00
Mark Scherer
51d75bc2be Remove overhead whitespace in templates. 2015-06-17 11:04:04 +02:00
Mark Scherer
ccac3b3e06 Allow deep options for radio() just as for select(). 2015-06-16 13:23:51 +02:00
Mark Story
65b64e0348 Merge pull request #6816 from cakephp/2.6-fix-validation-multiple
Fix Validation::multiple() regarding 0 value.
2015-06-15 12:20:13 -04:00
mark_story
97be9b9696 Fix PHPCS errors. 2015-06-15 12:19:20 -04:00
Mark Scherer
86c358f3f9 Fix Validation::multiple() regarding 0 value. 2015-06-15 16:35:27 +02:00
mark_story
56143c663e Update doc blocks for CakePlugin::load().
Refs #5665
2015-06-11 22:17:18 -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
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
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
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 Scherer
29747995dc Add missing minimizable HTML attributes 2015-05-18 18:10:02 +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
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
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