Commit graph

3944 commits

Author SHA1 Message Date
Koji Tanaka
74a8611eef [2.x]Fix can't load aliased component on ControllerTestCase 2017-12-31 15:44:05 +09:00
Mark Story
3bf93b7f76
Merge pull request #11526 from cakephp/post-conditions
Make postConditions() less permissive.
2017-12-15 14:36:38 -05:00
mark_story
340059be15 Check model names for bad characters as well. 2017-12-13 00:01:09 -05:00
mark_story
a9618f67f7 Use a permitted list instead of a ban list.
This should be safer as we are more confident on what is coming in.
2017-12-13 00:01:05 -05:00
mark_story
f66dec8a96 Make postConditions() less permissive.
We were notified by `ooooooo_q` that postConditions() is vulnerable to
SQL injection if used without SecurityComponent tampering prevention.

This change attempts to make postConditions() safer by exploding in
unsafe scenarios.
2017-12-10 21:44:47 -05:00
chinpei215
9f65402d2c Fix CakeRequest::referer(true) returning scheme-relative URLs
Backport of #11503 (and #8795)
2017-12-04 21:18:27 +09:00
Mark Story
abec95d3ea
Merge pull request #11469 from db-bogdan/issue11468
fixes #11468 sending user data on basic auth in API environment
2017-11-28 21:52:59 -05:00
chinpei215
4ae9f13dfd Fix 'order' not working with a single expressions 2017-11-29 00:17:57 +09:00
db-bogdan
e824346cca extra fix 2017-11-28 11:43:55 +02:00
db-bogdan
94e06dfeb3 add unit test 2017-11-28 11:31:46 +02:00
chinpei215
19bbb7da17 Simplify CookieComponent::read()
Also, this commit fixes an issue of when the second level key is empty.
Previously, read('foo.0') returned incorrect result.
2017-10-16 21:01:19 +09:00
chinpei215
bbea91090d Fix CookieComponent::delete() not working for deep children 2017-10-16 20:55:00 +09:00
mark_story
e85f489c1f Add test for #11284 2017-10-13 21:55:56 -04:00
Mark Story
fb44035177 Merge pull request #11299 from tenkoma/2.x-fix-cc-number-jcb-pattern
[2.x]Fix Credit card number pattern(JCB) is wrong
2017-10-08 10:09:19 -04:00
Koji Tanaka
7d2d902b57 [2.x]Fix Credit card number pattern(JCB) is wrong 2017-10-08 16:15:10 +09:00
Mark Story
a71cad0420 Merge pull request #11283 from chinpei215/2.x-cookie-component-1
[2.x] Fix fatal error thrown when replacing scalar with array
2017-10-06 16:45:38 -04:00
chinpei215
deac8f9109 Backport #7080, #8233 and #11060 2017-10-06 22:02:37 +09:00
chinpei215
959f45a6c6 Fix fatal error thrown when replacing scalar with array
Refs #11280
2017-10-06 13:43:32 +09:00
Ionut-Mihai Burlacu
31ed2d5dfb Test Case 2017-09-22 11:45:38 +03:00
Ionut-Mihai Burlacu
5540569fcc Test Case 2017-09-22 11:39:39 +03:00
Jeremy Harris
f9f06e68b1
Stacking messages in SessionComponent::setFlash 2017-08-30 10:06:56 -05:00
Jeremy Harris
2e75f12a4f
Fixed SessionHelper not handling stacked messages 2017-08-22 10:06:37 -05:00
mark_story
be534eacef Fix hiddenField option not working for radio.
The hiddenField option was not working as documented for radio buttons.
Instead of using the provided value, the hidden input's value was
hardcoded to ''

Refs #11002
2017-08-08 22:02:07 -04:00
bclay
8f92a87558 remove extra whitespace 2017-08-04 09:22:16 -04:00
bclay
38161917eb Address CakeEmail regression when data is defined with no mimetype 2017-08-03 17:00:58 -04:00
Val Bancer
ac227f35a7 Merge pull request #1 from cakephp/2.x
2.x to phpunit-5.7
2017-07-28 09:18:37 +02:00
mark_story
aa6770fa45 Merge branch '2.x' into 2.next 2017-07-22 14:59:41 -04:00
Mark Story
314a2c0c4f Merge pull request #10863 from bancer/paginator-i18n-not
Pagination 'NOT' notation fails with i18n
2017-07-22 13:33:43 -04:00
Koji Tanaka
7e50fc9ee6 Add test for shell unknown option 2017-07-21 00:46:02 +09:00
Val Bancer
15f0fe31b1 Fixed PHPUnit 5.7 warnings 2017-07-16 16:02:31 +02:00
Val Bancer
d1c3cca924 makes the test more stable 2017-07-12 20:42:06 +02:00
Val Bancer
d71bc4acae Fixed code style 2017-07-12 01:00:33 +02:00
Val Bancer
5cc0d7a5cf Some tests refactored. Skipped non-compartible tests in MySQL
ONLY_FULL_GROUP_BY mode.
2017-07-12 00:46:02 +02:00
mark_story
0d68007e5c Revert changes in 2290b612f8
I think they broke the builds in our CI environments.

Refs #10894
2017-07-11 10:01:08 -04:00
Val Bancer
2290b612f8 set order in HABTM in unit tests to make it stable in mysql 5.7 2017-07-11 00:14:08 +02:00
Val Bancer
d72c2d7e0e fixed code style, skipped pgsql and sqlite incompartible tests 2017-07-09 20:05:53 +02:00
Val Bancer
794ce22f37 fixed unit tests and docs 2017-07-09 19:24:51 +02:00
Val Bancer
f0bbcb3ffc fixed parsing of conditions with 'NOT' in TranslateBehavior 2017-07-08 16:51:32 +02:00
Val Bancer
d9f2117436 more unit tests 2017-07-07 00:41:04 +02:00
Val Bancer
76ab1f4537 more unit tests 2017-07-06 00:03:00 +02:00
Val Bancer
85e0ebd7fd more unit tests added 2017-07-05 23:22:58 +02:00
Val Bancer
50334679d6 added a unit test 2017-07-05 22:40:41 +02:00
Val Bancer
31fd4217b1 more PaginatorComponent unit tests 2017-07-04 23:01:17 +02:00
mark_story
aaa37fa809 Merge branch '2.next' of github.com:cakephp/cakephp into 2.next 2017-06-26 21:51:55 -04:00
mark_story
2032fef772 Merge branch '2.x' into 2.next 2017-06-26 21:51:41 -04:00
Mark Story
8cd930d19e Merge pull request #10764 from bancer/translate-inner-joins
Add left join support in TranslateBehavior
2017-06-26 21:40:42 -04:00
Val Bancer
5b37d42f97 joinType moved from $settings to $runtime 2017-06-26 23:02:06 +02:00
Mark Story
2b8447dc5b Merge pull request #10766 from cakephp/issue-10763
Fix encoding of addreses contain comma & unicode
2017-06-16 21:37:54 -04:00
Mark Story
52790443e8 Merge pull request #9705 from CakeDC/feature/backport-paginate-multiple-queries
2.next - Backport multiple paginators
2017-06-14 21:41:13 -04:00
mark_story
c4766d667b Fix PHPCS error. 2017-06-14 09:38:06 -04:00
Mark Story
8289b367f9 Merge pull request #10698 from lucasferreira/2.next
Cake 2.x - Some fix into Paginator component for order / sort classic sintax
2017-06-14 00:13:00 -04:00
Val Bancer
0bfb19f126 left join support in TranslateBehavior 2017-06-12 21:41:35 +02:00
mark_story
738b20a19b Fix encoding of addreses containin comma & unicode
Email addresses that contain both unicode and commas will not be
correctly encoded by mime_encode_header if the comma precedes the
unicode. In this scenario we have to quote the encoded address.

Refs #10763
2017-06-12 10:58:44 -04:00
Marc Würth
a99f60fb75 Revert URl change in test 2017-06-11 01:11:32 +02:00
Marc Würth
1ce2389069 Fix broken tests 2017-06-11 01:02:49 +02:00
Marc Würth
d03a682eeb Use HTTPS for the bakery.cakephp.org URL 2017-06-11 00:27:59 +02:00
Marc Würth
da8414e13b Use HTTPS for the opensource.org MIT license URL 2017-06-11 00:23:22 +02:00
Marc Würth
04efc7ba50 Use HTTPS for the book.cakephp.org URL 2017-06-11 00:15:36 +02:00
Marc Würth
10b89b51a9 Use HTTPS for the cakefoundation.org URL 2017-06-11 00:10:59 +02:00
Marc Würth
17314baa15 Use HTTPS for the cakephp.org URL 2017-06-10 23:40:28 +02:00
mark_story
ef45d24134 Fix tests that failed because of CONFIG dir change. 2017-06-10 17:31:29 -04:00
Mischa ter Smitten
ddbdf170e6 Fix discrepancy in Model::field when Model::id is null
When using ClassRegistry::init for instance
2017-06-08 20:22:29 +02:00
Lucas Ferreira
3258199193 Remove personal comments for pull request 2017-05-31 08:33:41 -03:00
mark_story
cf679a3233 Merge branch '2.x' into 2.next 2017-05-27 21:47:22 -04:00
Lucas Ferreira
ee1980b8f5 - Tests for array order syntax fix 2017-05-26 18:36:50 -03:00
Mark Story
57ddc24b35 Merge pull request #10647 from josephzidell/2.next-custom-config-dir-loc
Add constant specifying the location of the Config dir
2017-05-14 21:41:09 -04:00
Joe
70ead28a1d Redo commits on 2.next branch 2017-05-12 02:02:36 -04:00
chinpei215
a97bd234ee Fix _validatePost returns true when empty form is submitted
Backport of #10625
2017-05-06 21:59:29 +09:00
mark_story
5e35064a0b Read basic auth credentials from Authorization header
Merge branch 'issue-9365' into 2.x

Refs #9365
2017-04-28 21:49:47 -04:00
mark_story
275385d676 Add test covering basic auth reading from headers.
In some FastCGI setups basic auth values will only be present in the
header. Fallback to reading that value if the PHP_AUTH super globals are
empty.

Refs #9365
2017-04-28 21:49:27 -04:00
Mark Story
eb937e3c79 Merge pull request #10557 from ndm2/2.x-fix-controller-test-case-base-incompatibility
2.x - Fix query string data in URL arrays not being passed anymore (#10517 follow-up)
2017-04-18 20:01:38 -04:00
ndm2
efb3474420 Fix query string data in URL arrays not being passed anymore.
refs #10555, #10517, #5473
2017-04-18 20:54:34 +02:00
mark_story
ea05b04193 Add additional test for -0.0
In PHP5 `-0.0` doesn't work. Include the other way of making -0 for
PHP5.

Refs #10521
2017-04-16 23:00:31 -04:00
mark_story
9007a7fe58 Fix notBlank() to pass on -0.0
Copy the implementation from 3.x as it works with -0.0 already.

Refs #10521
2017-04-16 09:57:36 -04:00
ndm2
d9059b6d3b Fix array_intersect_key() argument order, the source comes first. 2017-04-15 21:27:29 +02:00
ndm2
7d74818d9a Fix ControllerTestCase::testAction() incompatibility with App.base.
When using array URLs with `testAction()`, the generated URL possibly
contains the configured `App.base` path, which needs to be stripped when
set on the request object, as otherwise routes cannot be matched
correctly.

When passing the URL as an option to the `CakeRequest` constructor, the
it will be set as-is, unlike when the URL is being generated by
`CakeRequest::_url()`, which grabs the URL from the environment, and
strips the possible base path.
2017-04-13 14:15:32 +02:00
Mark Story
0a378021a0 Merge pull request #10482 from cakephp/issue-10232
Fix CakeSocket not being able to connect to TLS1.2 only servers
2017-04-06 15:35:45 -04:00
mark_story
fa68c93c2d Fix failing test.
This test merges config funny.
2017-04-06 10:08:17 -04:00
mark_story
5685c031e2 Disable autocomplete on CSRF/Security token fields.
New versions of Safari will overwrite these fields when a user uses the
back button. If one-time CSRF tokens are in use the request will be
blackholed.

Refs #10486
2017-04-05 13:02:17 -04:00
mark_story
7dbc71df8c Conditionally define TLS constants & add test for new types.
Only map the new TLS constants if they exist.
2017-04-04 22:59:05 -04:00
mark_story
0b6c23d04f Update schema reflection for postgres.
Use the schema reflection query from 3.x to provide access to the serial
column attributes. These attributes give a more reliable way to access
primary key data than comparing the primary key of the model. The old
approach failed when schema was generated and concrete model's were
missing.

Refs #10356
2017-03-26 22:23:41 -04:00
Sebastien Barre
02a946b17b Merge branch '2.x' of https://github.com/cakephp/cakephp into duplicate_primary 2017-03-25 09:28:11 -04:00
chinpei215
3b75bd2dea Fix risky tests
- Fix CakeTestCase::run() to restore original output buffering level
- Fix an undefined variable warning in missing_controller.ctp
- Fix ViewTest (backport of 92bd86274b64c31ef6034caa74bb168be041b5e0)
- Fix ThemeViewTest
2017-03-25 20:24:31 +09:00
chinpei215
70926fbb7f Fix XML output of HelpFormatter
Backport from #10339
2017-03-25 17:58:21 +09:00
chinpei215
31a1837c1d Merge branch '2.x' into 2.next
Conflicts:
	lib/Cake/Test/Case/View/Helper/FlashHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FlashHelper.php
2017-03-25 17:12:28 +09:00
Mark Story
83e5ae522e Merge pull request #10378 from mvdriel/make-error-class-in-formhelper-configurable
Make error class of div in FormHelper::input configurable
2017-03-17 22:48:50 -04:00
mark_story
ccc9006620 Unset the active user data on logout.
When using stateless authentication the current user should be cleared
after logout to maintain consistency with session based authentication.

Refs #10422
2017-03-16 11:31:20 -04:00
mark_story
c5e31e590d Revise test case based on feedback in #10418
Try and change the test around to trigger the issue. I'm still not able
to reproduce the issue.
2017-03-15 21:33:19 -04:00
mark_story
9dbeeaa1fa Add test for #10418
Show that find(list) does not drop keys with values = 0.

Refs #10418
2017-03-15 15:58:54 -04:00
Sebastien Barre
3ad91204b9 Merge branch '2.x' of https://github.com/cakephp/cakephp into duplicate_primary 2017-03-14 11:11:14 -04:00
mark_story
c3f88c350e Add default value generation for all integer types.
This resolves the bigint issue raised by @chinpei in 10347 and adds
default values for the new small & tiny integer types.
2017-03-11 21:46:14 -05:00
mark_story
b6372d63d9 Rename (small|tiny)int to (small|tiny)integer
Make the new types consistent with the biginteger.
2017-03-11 21:41:22 -05:00
Sebastien Barre
1ebdc61fdc clean up assertions now that we are dropping the fixture early 2017-03-09 23:11:17 -05:00
mark_story
e698891d09 Hash::filter() should not exclude 0.0
Refs #10385
2017-03-09 21:29:44 -05:00
Mark van Driel
c8aefeb495 Cs fixes 2017-03-08 14:16:08 +01:00
Mark van Driel
708e960968 Fixed tests 2017-03-08 13:43:40 +01:00
Mark van Driel
4728586365 Make error class of div in FormHelper::input configurable 2017-03-08 13:15:00 +01:00
Sebastien Barre
a0e023d3a9 fix coding standard, skip Postgres 2017-03-06 15:58:03 -05:00
Sebastien Barre
58078e77e1 more tinyint smallint tests in MySQL 2017-03-06 10:42:23 -05:00
Sebastien Barre
15a33eee06 update more tests, DatatypeFixture 2017-03-05 22:38:08 -05:00
Sebastien Barre
3849df0f2f fix duplicate primary keys for tables without models 2017-03-05 21:47:00 -05:00
Sebastien Barre
38101995b4 introduce new tinyint, smallint types for smaller storage requirements 2017-03-05 12:25:14 -05:00
Sebastien Barre
216ae0ec0c fix coding standard 2017-03-04 00:56:57 -05:00
Sebastien Barre
d01f3e8aed allow data sources to provide smaller integers based on storage requirements 2017-03-04 00:08:27 -05:00
Mark Story
8d0e1fadf7 Merge pull request #10113 from bancer/request-url-to-array
implemented Router::reverseToArray()
2017-03-02 23:07:40 -05:00
kanonji
3978f87c58 Stringify values to avoid trap of in_array() type juggling 2017-02-28 03:33:50 +09:00
Mark Story
beff1176b0 Merge pull request #10213 from cakephp/issue-10196
Allow false/true to be read as keys in Hash::get().
2017-02-20 11:54:17 -05:00
mark_story
34158407b2 Exit early if SMTP connection fails.
If the SMTP connection is disconnected (read() returns false) we should
exit early and not wait for the read timeout. This has the added benefit
of making the mocks much simpler.

Refs #10221
2017-02-13 22:37:44 -05:00
mark_story
3f10a0227a Allow false/true to be read as keys in Hash::get().
While these are not values within the documented types, there exist use
cases in CakeSession that necessitate these to be supported types.

Refs #10196
2017-02-13 21:50:51 -05:00
chinpei215
e18029064c Split tests of buildStatement() 2017-02-05 21:27:06 +09:00
chinpei215
abd7a257fe Fix mysql test 2017-02-03 21:13:51 +09:00
chinpei215
923b73a7ba Add support for having/lock options 2017-02-03 17:51:22 +09:00
chinpei215
7944f512ad Fix ModelTaskTest for tests passing 2017-01-30 03:22:50 +09:00
Mischa ter Smitten
6818268a27 New Validation::(min|max)ByteLength() addition 2017-01-30 03:22:48 +09:00
Val Bancer
0bf49966db fixed unit test 2017-01-26 22:39:38 +01:00
Val Bancer
e0b0da86bf fixed unit tests 2017-01-26 22:21:09 +01:00
Val Bancer
ebde8fdfb5 implemented Router::reverseToArray() 2017-01-26 21:52:26 +01:00
Cory Thompson
e1fac3bf5b Fix whitespace 2017-01-24 21:51:54 +11:00
Cory Thompson
55324c0b2a Allow SQL json selects without defining table name 2017-01-24 20:54:07 +11:00
Cory Thompson
990d0a962f Allow database JSON operations in conditions 2017-01-24 19:33:12 +11:00
Cory Thompson
82a64a3729 Merge remote-tracking branch 'doublemap/exclude-column-trailing-hyphen' into ticket-8872 2017-01-24 19:25:24 +11:00
mark_story
273a8a2d7d Add support for the parseHuge option.
Sometimes people need to load huge XML files. Add an option to enable
people to enable this flag.

Refs #10031
2017-01-13 21:26:54 -05:00
Mark Story
d40b39f18b Merge pull request #9970 from cakephp/issue-9962
Fix query string parsing on requestAction()
2017-01-06 13:47:42 -05:00
chinpei215
94d9bcd674 Fix FlashHelper::render() cannot render default messages
Fixes #9910
2017-01-05 19:00:52 +09:00
mark_story
304117d228 Fix query string parsing on requestAction()
This also fixes a long standing oddity around string URLs that include
a query string where the query string data would be duplicated.

Refs #9962
2017-01-04 22:34:19 -05:00
mark_story
1a8f2202c0 Merge branch '2.x' into 2.next 2017-01-03 11:01:04 -05:00
Shunsuke Takahashi
6f5b16b31f Allow the prepend the addCrumb method 2016-12-21 16:34:35 +09:00
mark_story
53bcc1550f Fix PHPCS error. 2016-12-13 22:50:07 -05:00
mark_story
4c3e9356ba Merge branch '2.next' of github.com:cakephp/cakephp into 2.next 2016-12-13 22:48:57 -05:00
mark_story
837741db66 Merge branch '2.x' into 2.next 2016-12-13 22:48:44 -05:00
mark_story
99af4bba83 Merge branch 'domingues-2x' into 2.x
Refs #9870
2016-12-13 22:48:12 -05:00
mark_story
3c44ddd10b Add tests for #9870 2016-12-13 22:47:57 -05:00
Mark Story
4a4c83c3e9 Merge pull request #9859 from cakephp/debugger-encoding
2.x - Debugger encoding
2016-12-13 19:26:52 -05:00
mark_story
ee7739a3bf Try another approach to get the same error in all php versions. 2016-12-13 00:46:13 -05:00
mark_story
69afeb08af Skip error encoding test in PHP5.3
Index errors work funny in PHP5.3, which makes testing them not work
like other versions of PHP.
2016-12-12 21:28:20 -05:00
mark_story
edfda47cf4 Fix missing HTML encoding in Debugger
Fix missing HTML encoding when error messages contain HTML. This can
happen when user data is used as an offset in an array in an unchecked
way.

Thanks to Teppei Fukuda for reporting this issue via the responsible
security disclosure process.
2016-12-10 08:47:13 -05:00
Mark Story
420336f536 Merge pull request #9843 from cakephp/php71
Add PHP7.1 to test matrix.
2016-12-07 21:40:54 -05:00
mark_story
12cdc247ac Fix PHPCS errors. 2016-12-07 00:38:55 -05:00
mark_story
0a2a400ea4 Fix type error tests to work in PHP5 & PHP7.1
Catch the TypeErrors that are raised and make the match the PHP5
behavior of a converted error.
2016-12-06 21:21:52 -05:00
Mark Story
9e6e08704e Merge pull request #9838 from cakephp/issue-9779
Fix CookieComponent erroring on corrupted data.
2016-12-05 16:44:24 -05:00
mark_story
e3221b1c38 Fix errors in php7.1
* The constructor of errors has changed in PHP 7.1
* mcrypt is no longer available in PHP 7.1 by default.
2016-12-05 16:14:33 -05:00
chinpei215
26731b93bf Use ternary operator 2016-12-04 21:55:29 +09:00
chinpei215
b7481096c8 Fix redirectUrl issue when loginRedirect is empty
Fixes #9819
2016-12-04 20:06:24 +09:00
mark_story
934bb00b36 Add tests showing recent changes fix #9784 2016-12-03 14:14:57 -05:00
mark_story
27f951fb41 Don't emit errors when operating on corrupted cookie data.
When deleting from corrupted cookie data, there shouldn't be any errors.

Refs #9779
2016-12-03 14:10:47 -05:00
chinpei215
74c2ded872 Fix directory traversal of .ctp files 2016-11-27 18:14:44 +09:00
mark_story
bbb87b3e87 Use null instead of false for failure.
null is better to indicate that a thing doesn't exist.
2016-11-26 10:38:28 -05:00
Mark Story
ba9f62a7a0 Merge pull request #9747 from tersmitten/cache-does-not-expose-configured-engines
Expose Cache engines
2016-11-26 10:16:20 -05:00
mark_story
e057b5572c Fix PHPCS. 2016-11-21 20:51:12 -05:00
mark_story
71b7d6211b Fix AclNode constructor.
It should forward the settings from ClassRegistry::init() so that
aliases can be customized as needed.

Refs #9766
2016-11-19 22:30:18 -04:00