Commit graph

18636 commits

Author SHA1 Message Date
mark_story
925647ae2b Simplify code used to generate plugin flash messages. 2015-10-17 20:59:02 -04:00
gmponos
fd50d1976a Flash Component was not handling plugin option 2015-10-17 20:55:52 -04:00
mark_story
dea32345c8 Add failing test for #7570
Documented behavior that exists in 3.x is not working in 2.x
2015-10-17 20:54:40 -04:00
José Lorenzo Rodríguez
d0e7a2fd38 Merge pull request #7552 from cakephp/issue-7546
Fix error when Memcached::getAllKeys() fails.
2015-10-17 15:46:33 +02:00
mark_story
e2a1094e69 Define variables before they are used.
Refs #7563
2015-10-16 23:07:25 -04:00
mark_story
bfec911661 Merge branch '2.7' into 2.8 2015-10-16 22:09:21 -04:00
mark_story
fea6fd7d30 Fix incorrect doc tag. 2015-10-16 22:09:12 -04:00
mark_story
707915e693 Merge branch '2.7' into 2.8 2015-10-15 22:10:56 -04:00
Mark Story
a409a3d8c5 Merge pull request #7555 from AshleyPinner/patch-2
Remove censoring of schema and prefix from debug()
2015-10-15 09:44:08 -04:00
Ashley Pinner
83b904bc7b Remove censoring of schema and prefix from debug()
As per discussion in #cakephp the other day, `debug()` will automatically censor out a list of keys, including `prefix` and `schema`. These are useful to see in output for debugging prefix routing, and should not automatically be considered sensitive information.
2015-10-15 12:55:32 +01:00
mark_story
e8a0726737 Fix error when Memcached::getAllKeys() fails.
Refs #7546
2015-10-14 21:56:01 -04:00
mark_story
e0d2c45d9a Fix PHPCS error. 2015-10-12 22:20:15 -04:00
mark_story
94aeee438b Merge branch pull request #7496 into 2.7
Adds ssl_ context options to SmtpTransport via CakeSocket. Both
CakeSocket and SmtpTransport can now use all the SSL context options
with the same syntax as HttpSocket.
2015-10-12 22:07:40 -04:00
mark_story
3a4facbf8d Remove allowSelfSigned() method.
This method is no longer needed as the low level socket understands the
`ssl_*` options now.

Refs #7496
2015-10-12 21:58:55 -04:00
mark_story
cc3531d288 Move SSL context options into CakeSocket.
Having all the options consolidated in one places enables all the SSL
context options to be used in the SmtpTransport instead of just allowing
self_signed as proposed in #7496
2015-10-12 21:56:20 -04:00
mark_story
29490eb84f Add tests for #7516 2015-10-10 22:32:41 -04:00
mark_story
7bf6768066 Merge pull request #7516 into 2.7
PaginatorHelper::meta() skips url parameters (passed and named) which
results in urls not respecting defined routes.  It means
PaginatorHelper::meta() does not generate same urls as
PaginatorHelper::prev() & PaginatorHelper::next().

Refs #7516
2015-10-10 22:31:15 -04:00
Mark Story
69cde3617f Merge pull request #7528 from ravage84/2.7-void-mixed
Do not mix void with other return types
2015-10-10 21:43:30 -04:00
Marc Würth
ed410dd12c Do not mix void with other return types
Inspired by #7527
2015-10-10 15:49:00 +02:00
ADmad
f50efd7595 Merge pull request #7521 from ravage84/2.7-field-return-value
Add false as return value of field()
2015-10-08 20:15:49 +05:30
Marc Würth
de8aed534f Add false as return value of field()
+ improve DocBlocks
2015-10-08 16:31:01 +02:00
Mohsen
f57cdb7568 PaginatorHelper::meta() skips url parameters and disrespects defined routes
PaginatorHelper::meta() skips url parameters (passed and named) which results in urls not respecting defined routes.
It means PaginatorHelper::meta() does not generate same url as PaginatorHelper::prev() & PaginatorHelper::next().
2015-10-07 15:07:37 +03:30
Ian den Hartog
5dfb780970 Change names 2015-10-06 10:10:34 +02:00
Mark Story
19ad6dcef2 Merge pull request #7508 from ravage84/2.7-index
Minor improvements to the front controller
2015-10-04 10:15:27 -04:00
Marc Würth
86da57d2be Minor improvements to the front controller 2015-10-04 15:38:48 +02:00
Mark Story
681956408d Merge pull request #7500 from cakephp/issue-7497
Correct input generation for postgres numeric types.
2015-10-02 21:47:12 -04:00
Ian den Hartog
bb7e7850ae Add test for Self-signed certificates 2015-10-02 16:17:26 +02:00
Ian den Hartog
5c722c6665 Fix peer verification 2015-10-02 10:18:07 +02:00
mark_story
506051f688 Correct input generation for postgres numeric types.
Numeric types in postgres are treated like decimals, except they can
have no length, precision or scale components defined.

IE does not accept 1.00000 as a valid step attribute so we'll default to
any when we encounter decimal types with no length.

Refs #7497
2015-10-01 21:46:21 -04:00
mark_story
3fa5c4ff94 Update version number to 2.7.5 2015-10-01 21:03:56 -04:00
Ian den Hartog
e2c303b2b9 Add support for Self Signed certificates with smtp 2015-10-01 23:02:43 +02:00
mark_story
17c3358d77 Revert part of the changes in 1ede742d92
These variables are used by the HTML test reporter.
2015-09-29 21:41:33 -04:00
mark_story
a6a699b4b9 Merge branch '2.7' into 2.8 2015-09-28 21:17:45 -04:00
mark_story
0502e0731a Update version number to 2.7.4 2015-09-28 21:13:09 -04:00
mark_story
13f147940f Correct inflection of virus.
Instead of viri, it should be viruses.

Refs #7466
2015-09-28 21:04:23 -04:00
Mark Story
5a8a7800ae Merge pull request #7469 from cakephp/issue-7465
Load config file before checking class existence.
2015-09-28 15:43:53 -04:00
ADmad
c3e08fde30 Load config file before checking class existence.
Closes #7465
2015-09-28 22:52:51 +05:30
Mark Story
dad9eaab90 Merge pull request #7463 from cakephp/ADmad-patch-1
Update debugkit links to 2.x compatible branch
2015-09-28 12:32:48 -04:00
José Lorenzo Rodríguez
8e82993904 Merge pull request #7464 from ravage84/2.7-debugkit-link
Link to DebugKit 2.2 branch
2015-09-28 14:18:13 +02:00
Marc Würth
26a05a4e87 Update another link to DebugKit 2.2 branch 2015-09-28 12:51:30 +02:00
Marc Würth
7b20c804f4 Use caret operator for depending on DebugKit 2015-09-28 12:48:40 +02:00
Marc Würth
2d82a120af CS 2015-09-28 12:47:25 +02:00
Marc Würth
f1160b7401 Update link to DebugKit 2.2 branch
Refs https://github.com/cakephp/debug_kit/issues/372
2015-09-28 12:47:14 +02:00
ADmad
ab7e8f8491 Update debugkit links to 2.x compatible branch
Refs cakephp/debug_kit#372
2015-09-28 09:48:50 +05:30
mark_story
ae83e197dc Merge branch '2.8' of github.com:cakephp/cakephp into 2.8 2015-09-27 11:13:12 -04:00
mark_story
8a57d78dba Merge branch '2.7' into 2.8 2015-09-27 11:12:55 -04:00
Mark Story
0da9c4976d Merge pull request #7448 from ravage84/2.7-tests-improved
Various improvements to the CakePHP test files
2015-09-25 18:00:14 -04:00
Marc Würth
a6d62cb6a8 Removed $stringClean
Resfs: https://github.com/cakephp/cakephp/pull/7448#discussion_r40450663
2015-09-25 20:10:47 +02:00
Mark Story
3aec527fad Merge pull request #7449 from ravage84/2.7-app-skel-sync
App & skel folder sync + some improvements
2015-09-25 12:49:20 -04:00
Mark Story
c6c88fe0a7 Merge pull request #7446 from ravage84/patch-3
Add cakephp/cakephp-codesniffer as dev dependency
2015-09-25 12:47:57 -04:00