Commit graph

19215 commits

Author SHA1 Message Date
Mark Sch
0e07b74d46 Merge pull request #10596 from ravage84/patch-1
Really correct return type
2017-04-29 01:07:16 +02:00
Marc Würth
6321d5612a Really correct return type 2017-04-29 00:49:28 +02:00
Nicola Beghin
09a981ba38 code style fix as requested 2017-04-23 18:44:42 +02:00
Nicola Beghin
99d02a8698 fix permission 2017-04-23 18:41:45 +02:00
Nicola Beghin
a1eb067c71 bugfix basic to Basic 2017-04-23 18:27:09 +02:00
mark_story
043b320358 Update version number to 2.9.8 2017-04-21 21:26:39 -04:00
Mark Story
43487d3393 Merge pull request #10560 from liviascapin/patch-2
Added documentation for App.base
2017-04-19 11:44:15 -04:00
Livia Scapin
ce9f33314d Added documentation for App.base
As discussed in https://github.com/cakephp/docs/issues/4895
2017-04-19 17:12:24 +02: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
c1f1d79f10 Merge pull request #10526 from cakephp/issue-10521
Fix notBlank() to pass on -0.0
2017-04-17 20:33:15 -04: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
Mark Story
f08d96306b Merge pull request #10525 from ndm2/2.x-fix-controller-test-case-base-incompatibility
Fix argument order - #10517 follow-up
2017-04-15 21:17:25 -04:00
ndm2
d9059b6d3b Fix array_intersect_key() argument order, the source comes first. 2017-04-15 21:27:29 +02:00
Mark Story
cefbcf33f0 Merge pull request #10517 from ndm2/2.x-fix-controller-test-case-base-incompatibility
2.x - Fix `ControllerTestCase::testAction()` incompatibility with `App.base`.
2017-04-13 14:57:55 -04: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
Michael van Tricht
10052edb20 Make test suite compatible with PHPUnit 5. 2017-04-06 23:06:17 +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
c74d2e0860 Split conditional TLS versions into a separate method
Having a separate method gives a nicer home to the inline comments. I've
had to disable coding standards checks as the constants provided by PHP
do not follow the UPPER_CASE conventions.
2017-04-06 10:00:47 -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
4475cc06fd Update tls_client and tls_server to include newer TLS versions.
Refs #10445
2017-04-04 23:17:30 -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
01abf29bed Merge pull request #10469 from ravage84/2.x-cakeplugin-docblocks
Improve punctuation & code examples in doc blocks
2017-04-03 09:18:40 -04:00
Mark Story
b2f430b346 Merge pull request #10468 from ravage84/2.x-loadall
Use more readable variable names
2017-04-03 09:17:22 -04:00
Marc Würth
192a4c5ef0 Improve punctuation & code examples in doc blocks 2017-04-03 12:30:24 +02:00
Marc Würth
9be647cefd Use more readable variable names 2017-04-03 12:17:32 +02:00
mark_story
6cdb2d2905 Update version number to 2.9.7 2017-04-01 22:09:17 -04:00
Mark Story
a0722792d1 Merge pull request #10460 from gemal/2.x
Fixing locale names
2017-03-30 06:37:10 -04:00
Henrik Gemal
240c8477b8 Fixing locale names 2017-03-30 09:40:17 +02:00
Mark Story
afcb540536 Merge pull request #10356 from sebastienbarre/duplicate_primary
fix duplicate primary keys for tables without models
2017-03-28 09:53:14 -04:00
Sébastien Barré
7335bcab0c Merge pull request #2 from cakephp/issue-10356
Update schema reflection for postgres.
2017-03-27 20:08:01 -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
Mark Story
68432f77de Merge pull request #10405 from chinpei215/2.next-phpunit4.8
[2.next] Make test suites compatible with PHPUnit 4.8
2017-03-25 10:31:54 -04:00
Sebastien Barre
e285df4f82 optimization, break early 2017-03-25 09:30:34 -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
19e95e2fb2 Add PHPUnit 4.8 to test matrix 2017-03-25 17:58:22 +09:00
chinpei215
70926fbb7f Fix XML output of HelpFormatter
Backport from #10339
2017-03-25 17:58:21 +09:00
chinpei215
23080c443e Make test suites compatible with PHPUnit 4.8 2017-03-25 17:58:20 +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
Nicola Beghin
7cd9d4381a typo 2017-03-18 14:44:44 +01:00
Nicola Beghin
ca6ca9376e refactoring to avoid tampering with $_SERVER 2017-03-18 13:34:26 +01: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
c0f11dd206 Merge pull request #10424 from cakephp/issue-10422
Unset the active user data on logout.
2017-03-17 22:44:28 -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
Nicola Beghin
ff210b04d7 code style 2017-03-15 17:32:47 +01:00