Commit graph

3512 commits

Author SHA1 Message Date
mark_story
e4b2428735 Fix PHPCS errors. 2015-07-21 16:28:17 -04:00
Mark Scherer
52e79987a2 Replacing self with static due to PHP5.3+. Following #7040. 2015-07-21 10:22:53 +02:00
mark_story
bd23fdeebf Simplify code and reduce test redundancy.
We don't need the additional parameter, and some of the tests weren't
covering unique scenarios.

Refs #7040
2015-07-20 22:16:50 -04:00
Chris Valliere
7b2d7ad748 Test Case for Hash::maxDimensions
Added test case for Hash::maxDimensions using the example array in pull request #7040.
2015-07-20 22:07:58 -04:00
mark_story
9b313f86e4 Add tests for #7034
These tests ensure that redirect() is never called which ensures the
Location header is never set. Ajax requests when no loginElement is
defined should get an empty response with a 403 status code.
2015-07-16 23:00:20 -04:00
Mark Scherer
d98e7d8d27 Fix tests. 2015-07-13 08:37:11 +02:00
Mark Scherer
2eea245491 Backport utf fix for CakeText::tokenize(). 2015-07-13 08:23:05 +02:00
mark_story
47378427e3 Merge branch '2.6' into 2.7 2015-07-11 21:25:26 -04:00
Marc Würth
4a131bdcbf Capitalize Windows, the OS 2015-07-09 15:54:03 +02:00
Mark Story
97656d8edb Merge pull request #6965 from dy-dx/backport-csv-mapping
Don't map text/plain to csv. Backport from 3.0. Refs #1696
2015-07-07 22:07:02 -04:00
mark_story
7613e720e7 Fix PHPCS errors. 2015-07-07 22:06:47 -04:00
mark_story
59a18e7709 Merge branch '2.6' into 2.7 2015-07-07 22:05:56 -04:00
Chris Kim
94fbc6e5f2 Don't map text/plain to csv. Backport from 3.0. Refs #1696
Jquery sets accepts header similar to "text/plain, */*; q=0.01" by
default for xhr requests. Due to this RequestHandler used to set
extension to csv thereby causing View class to look for views under
non-existent csv folders.
2015-07-07 15:19:45 -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
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
e651d15df5 Add tests for less greedy field parsing in SQLite.
Refs #6887
2015-06-25 22:21:38 -04:00
mark_story
ae2ea1ea6c Merge branch '2.6' into 2.7 2015-06-25 21:50:47 -04:00
Highstrike
a9d77d26f0 fix failing tests
fixing...
2015-06-25 13:40:50 +03: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 Scherer
1c56c723f5 Backport param() access. 2015-06-25 00:52:33 +02: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 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
mark_story
26b3713bd6 Merge branch '2.7' of github.com:cakephp/cakephp into 2.7 2015-06-20 10:03:24 -04: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
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
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
947262e754 Fix PHPCS errors. 2015-06-14 21:56:48 -04:00
Marc Würth
f3099fefdf Define code coverage explicitly 2015-06-15 00:56:09 +02: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
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 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_story
d7d8b90986 Merge branch '2.6' into 2.7 2015-05-28 19:34:59 -04:00
mark_story
65691836be Fix syntax errors in PHP <5.4 2015-05-28 17:39:52 -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
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
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
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
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
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_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_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_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
José Lorenzo Rodríguez
405e725767 Merge pull request #6238 from cakephp/issue-6224
Fix maxDimensions() for empty/1 dimensional arrays.
2015-04-01 09:26:50 +02:00
Justin Yost
f32d1c1362 Updates Inflector For Irregular Case Sieves
Sieves incorrectly singualrized as sief.
Adds sieve, sieves as an irregular case and test cases to
match for the Inflector class.
Closes Issue #6240 in CakePHP 2.6 Branch

Signed-off-by: Justin Yost <justin.yost@yostivanich.com>
2015-03-31 22:21:05 -07:00
mark_story
69971505a2 Fix maxDimensions() for empty/1 dimensional arrays.
maxDimensions() should not emit warnings or mis-calculate an array's
dimensions.

Fixes #6224
2015-03-31 22:21:15 -04:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
Richard van den Berg
1d0d20e974 Account for SNI changes in HttpSocketTest 2015-03-23 22:31:08 -04:00
mark_story
5a6a74e2f8 Fix failing tests.
The test was taking the wrong index when creating mock path choices.

Refs #6125
2015-03-20 20:35:43 -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
Walther Lalk
359c0ab816 Fix issue with memcache and domains starting with letter "u" 2015-03-19 11:42:14 +02: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
mark_story
827465fa30 Merge branch 'postgres_altercolum_error' into master
Merge changes from #5512 into master. This fixes changing columns in
postgres to integer from string types.
2015-03-14 22:23:43 -04:00
mark_story
c32e5559bb Add test to ensure column was converted to integer.
Refs #5512
2015-03-14 22:23:17 -04: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
43f16f38f0 Merge pull request #5905 from davidsteinsland/fix_file_response_dots
Fix file response dots
2015-03-09 21:54:02 -04:00
mark_story
a9519d39f7 Fix whitelist being empty during afterSave.
whitelist should only be reset after afterSave event.

Refs #6028
2015-03-08 13:51:46 -04:00
Mark van Driel
ed5da19d10 Fixed return type of toQuarter in CakeTime and TimeHelper 2015-03-02 12:08:11 +01:00
José Lorenzo Rodríguez
a6ceec149a Merge pull request #5981 from cakephp/issue-5973
Make maxLimit and limit settings independent.
2015-03-01 19:48:26 +01:00