Commit graph

18929 commits

Author SHA1 Message Date
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
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
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
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
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
fc28eced6b Merge pull request #10403 from tenkoma/2.x-update-url-in-docs
Update URL in Docs and composer.json (2.x branch)
2017-03-11 22:41:37 -05:00
Mark Story
8f6cf96cca Merge pull request #10389 from cakephp/issue-10385
Hash::filter() should not exclude 0.0
2017-03-11 13:10:13 -05:00
Koji Tanaka
bea806e98a Update URL in *.md, *.json 2017-03-12 03:04:59 +09:00
mark_story
173f927ef3 Try again to get apcu install step working. 2017-03-11 12:33:11 -05:00
mark_story
8559403c17 echo not print. 2017-03-11 08:07:31 -05:00
mark_story
c4aac6234d Try apcu install again. 2017-03-10 21:22:10 -05:00
mark_story
92aac61830 Attempt to fix apcu install issues. 2017-03-10 20:58:31 -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
25d597910f Code cleanup 2017-03-08 23:19:37 +01: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
3849df0f2f fix duplicate primary keys for tables without models 2017-03-05 21:47:00 -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
mark_story
03e7fa0710 Update version number to 2.9.6 2017-02-28 22:27:17 -05:00
Mark Story
6648ee0a3c Merge pull request #10322 from kanonji/fix
Fix FormHelper to get work fine with numeric label of optgroup
2017-02-28 20:46:31 -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
c5828eecca Merge pull request #10251 from tersmitten/phan-fixes
PHPDoc fixes
2017-02-17 15:57:33 -05:00