Commit graph

18867 commits

Author SHA1 Message Date
Richard van den Berg
f8e7634131 Use hostname of request instead of hostname of proxy for SNI 2015-11-10 10:54:36 +01:00
José Lorenzo Rodríguez
65b84107a1 Merge pull request #7673 from cakephp/issue-7661
In CLI mode default the error handlers to Console flavors.
2015-11-10 09:38:35 +01:00
mark_story
89d5449270 In CLI mode default the error handlers to Console flavors.
In the somewhat rare case where an error or exception occurs during
application bootstrap, we should not emit HTML to the stdout.

Refs #7661
2015-11-09 21:47:16 -05:00
Mark Scherer
8c5f78bc58 Remove another type hint 2015-11-10 00:32:48 +01:00
Mark Scherer
7982b6b078 Allow ParseError as exception and remove typehint. 2015-11-10 00:14:04 +01:00
Mark Scherer
ddfb7d649e Enable PHP7.0 in travis 2015-11-10 00:11:48 +01:00
mark_story
df3c786f57 Update version number to 2.7.6 2015-11-05 22:30:43 -05:00
mark_story
1a6f733286 Merge branch '27-pages-fix' into 2.7 2015-11-05 22:30:25 -05:00
Jose Lorenzo Rodriguez
18544c5aaa Fix validation allowing arrays.
Accepting arrays can cause a number of adverse effects. While this may
be a breaking change the alternatives are worse.
2015-11-04 21:35:05 -05:00
Mark Story
e7eeafcddd Merge pull request #7642 from steinkel/issue/missing-flash-bake-and-scaffold
add Flash back to Controller, fix Scaffold to use Flash instead
2015-11-04 21:27:26 -05:00
Jorge González
5845cad93f fix phpcs 2015-11-04 16:37:21 +00:00
Jorge González
cb6a17c34e add Flash back to Controller, fix Scaffold to use Flash instead 2015-11-04 10:41:35 +00:00
mark_story
5e60cc5d18 Fix plugin view names being able to escape the plugin root directory.
Remove the ability to specify completely arbitrary view files. This is
possibly a breaking change. However, I feel the risks out weigh the
benefits in this situation. Now absolute paths must be located *within*
a configured view path.
2015-11-01 22:04:15 -05:00
Mark Story
aa66293310 Merge pull request #7624 from rchavik/2.8-redis-cache-fix
Workaround for Cache::write() call from DboSource::__destruct()
2015-10-30 21:58:05 -04:00
ADmad
90c9ead8cd Fix CS error 2015-10-30 09:28:03 +05:30
ADmad
b9dc89acff Update docblock 2015-10-30 09:24:22 +05:30
Rachman Chavik
c1b6f89b23 Workaround for Cache::write() call from DboSource::__destruct()
Closes #7559
2015-10-30 10:14:16 +07:00
Mark Story
9c804186af Merge pull request #7614 from ravage84/2.7-timehelper-engine-type-hint
Specify type hint
2015-10-27 20:56:27 -04:00
Mark Scherer
820fc2286f Correct doc block. 2015-10-27 21:17:10 +01:00
Marc Würth
58316b3a58 Specify type hint
Plus fix two typos.
2015-10-27 16:47:48 +01:00
mark_story
bc977544c5 Use a more stable timezone.
Regina does not observe DST meaning this test won't fail twice a year.
2015-10-26 22:28:00 -04:00
Mark Story
b583a59264 Merge pull request #7610 from cakephp/2.8-pagination
Make sure direction values are lowercased to be consistent.
2015-10-26 20:23:10 -04:00
Mark Scherer
8287981855 Make sure direction values are lowercased to be consistent. 2015-10-26 23:20:30 +01:00
mark_story
a99766c897 Merge pull request #7577 into 2.8
Backport Validation::uploadedFile() to 2.x.
2015-10-20 21:09:20 -04:00
mark_story
c26b7bbffe Fix PHPCS errors and failing test.
Refs #7577
2015-10-20 21:08:57 -04:00
vanquang9387
0cdfed0aee Add more test on UploadedFileSize validation 2015-10-20 09:00:32 +07:00
vanquang9387
13132cd113 Fix using php 5.4 array [ ] 2015-10-19 15:52:10 +07:00
vanquang9387
8b3bba3341 Reformat Validation class 2015-10-19 15:47:33 +07:00
vanquang9387
af8c992655 2.x uploadedFile validation (backported from #4524) 2015-10-19 15:15:28 +07:00
mark_story
8c404ad6a7 Merge branch '2.7' into 2.8 2015-10-17 21:00:26 -04:00
mark_story
d220616b5a Merge branch 'flash-plugin' into 2.7
Fixes the plugin option not working with `__call` on FlashComponent as
documented.

Fixes #7570
2015-10-17 20:59:47 -04:00
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