Commit graph

6583 commits

Author SHA1 Message Date
Mark Story
2a9f2d4b58 Merge pull request #5668 from cakephp/issue-5649
Fix numeric values not being quoted for MySQL set columns.
2015-01-15 21:29:57 -05:00
Mark Story
8969565526 Merge pull request #5675 from cakephp/master-docs
Correct CakeSocket docblocks.
2015-01-15 21:27:30 -05:00
mark_story
396d501d1e Fix / being handled incorrect by referer()
Backport changes in #4987 to 2.x. This solves issues with duplicate base
directories when redirecting back to '/'

Fixes #4812
2015-01-15 21:26:34 -05:00
mark_story
d4a6d3f6c0 Fix numeric values not being quoted for MySQL set columns.
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.

Refs #5649
2015-01-15 21:10:33 -05:00
Mark Scherer
2b1e487530 Correct CakeSocket docblocks. 2015-01-15 23:39:09 +01:00
David Steinsland
a5e1be7abf Fixed tests 2015-01-15 23:11:36 +01:00
David Steinsland
e5134986e6 Reset Exception.bail just in case 2015-01-15 20:10:48 +01:00
David Steinsland
ed3b15f13b Fixed phpcs 2015-01-15 20:04:06 +01:00
David Steinsland
f621bb7fe5 Fixed nesting when ExceptionRenderer throws exception 2015-01-15 19:20:28 +01:00
David Steinsland
687d0b44f5 Backport of https://github.com/cakephp/cakephp/issues/5667 2015-01-15 11:00:27 +01:00
mark_story
d39c744c28 Fix PHPCS error. 2015-01-12 21:37:34 -05:00
Mark S.
77e8661cb7 Merge pull request #5651 from bcrowe/copyright
Bump copyright year in license
2015-01-12 21:47:04 +01:00
Bryan Crowe
6a83e6b1de Bump copyright year in license 2015-01-12 15:18:04 -05:00
mark_story
cd58fa0b61 Backport changes from #5635 to 2.x
In case the path passed to the File class doesn't exists, this will
cause File::$path to be set to a partial path, that is the filename
of the passed path with a slash prepended, ex with

    $file = new File('/non/existent/file');

calling $file->pwd() will return/set /file, possibly causing that
file in the root to be accessed.
2015-01-11 15:20:34 -05:00
José Lorenzo Rodríguez
0a4141c78c Merge pull request #5614 from cakephp/issue-5595
Convert header_sent exception into a notice error.
2015-01-09 22:25:09 +01:00
Mark Story
1fee3c030e Merge pull request #5616 from cakephp/issue-5603
Fix radio buttons not being added to security hash.
2015-01-09 15:32:44 -05:00
mark_story
03d8c40d99 Fix PHPCS error. 2015-01-09 15:32:33 -05:00
mark_story
18f02bf5b3 Don't emit errors or trigger exceptions when headers have been sent.
After discussing it a bit, we've come to consensus that emitting errors
or throwing exceptions are both pretty disruptive and annoying to deal
with. Instead we'll revert to the previous 2.x behavior of doing
nothing.
2015-01-09 15:16:14 -05:00
antograssiot
c2f298a8b7 Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
mark_story
98909fb465 Fix radio buttons not being added to security hash.
When some but not all inputs were disabled radio buttons were omitted
from the security hash. This caused blackhole failures as the input was
unexpected.

Refs #5603
2015-01-08 23:25:34 -05:00
mark_story
a7aaa93131 Convert header_sent exception into a notice error.
Throwing an exception here, causes an infinite loop when handling fatal
errors, as the shutdown function sends headers automatically.

Refs #5595
2015-01-08 21:47:13 -05:00
dmromanov
eb414bdda1 Fix double encoding time strings (CakeTime)
Fix time strings being double encoded when mb_string is not installed.
2015-01-09 00:03:49 +03:00
Bryan Crowe
66a0e6226d Correct criterion inflection 2015-01-06 23:03:53 -05:00
euromark
389f745d16 Stop goofy formatting when newlines are present already. 2015-01-06 13:13:33 +01:00
José Lorenzo Rodríguez
f6975f5254 Merge pull request #5572 from cakephp/issue-5570
Improve error used when a cache configuation fails to start.
2015-01-05 10:15:35 +01:00
mark_story
d7bc73b1e3 Improve error used when a cache configuation fails to start.
Refs #5570
2015-01-04 19:54:58 -05:00
Gerd Katzenbeisser
bf3ff8e2ad Avoid connection to default for mocked models
Fixes #5565
2015-01-04 16:53:00 +01:00
euromark
dabf55785f Simplify test assert. 2015-01-04 02:30:11 +01:00
mark_story
9553c029c4 Merge branch 'autolink-brackets' into master
Fixes #5544
2015-01-03 14:34:30 -05:00
mark_story
b6029d7ad1 Add some additional tests for autoLink.
Refs #5544
2015-01-03 14:30:56 -05:00
Mark Story
0a4cffc603 Merge pull request #5501 from cakephp/2.6-hotfix-session-tmp-dir
Also autocreate session folder in debug mode
2015-01-02 11:36:53 -05:00
Rob McVey
76b7c8c594 More complex test case for GET params 2015-01-02 15:31:27 +00:00
Rob McVey
54e172b129 Regex modified to to not capture brackets
Modified the existing regex from th TLD onwards

Credit to @gruber for the regex info
https://gist.github.com/gruber/249502
2015-01-02 15:15:23 +00:00
Rob McVey
2bf41f3d85 Add missing double quote to link in test 2015-01-02 15:09:40 +00:00
Rob McVey
1ebcd9bf72 Test brackets are not autolinked inside href tag 2015-01-02 15:08:21 +00:00
José Lorenzo Rodríguez
fcb6520ef1 Merge pull request #5513 from cakephp/issue-4916
Don't set content-length when serving assets.
2014-12-30 10:12:19 +01:00
mark_story
a65354225e Don't set content-length when serving assets.
Setting content-length on assets causes long pauses when fetching assets
that contain PHP code. These assets are invariably larger than their
response bodies. By not setting a content-length, we can allow the
webserver to calculate it for us.

Refs #4916
2014-12-29 21:07:46 -05:00
mark_story
ec57fb4579 Fix length reflection in SQLServer
Don't reflect TEXT column lengths in SQLServer. Because SQLServer text
columns hold ~2GB of data there is no meaningful length to them.

Refs #5506
2014-12-29 16:47:50 -05:00
euromark
5aff618109 Also autocreate session folder in debug mode 2014-12-27 20:34:47 +01:00
José Lorenzo Rodríguez
8a4b0e8754 Merge pull request #5478 from tranfuga25s/HtmlCodeCoverageFix
Html Testing Renderer & Code Coverage Improvement
2014-12-27 00:09:01 +01:00
Esteban
fe3d2b938c Added conditional to do not show rerun link if is warning of no test present
CS Fix

Update CakeHtmlReporter.php

Removed spaces in array return
2014-12-26 15:50:25 -03:00
Esteban
21f3a51ebc Rerun only one test option adding
Changed scope of function and fix CS problem
2014-12-26 15:50:23 -03:00
Esteban
58eb7b80ab Added All options enabled when running test from webfrontend
Fix failing test

Fix CS problem with new code

Fix test for code coverage generator

Fix tests

Fix CS Errors

Removed spaces in tabulation
2014-12-26 15:49:42 -03:00
Edgaras Janušauskas
3ae61e9e16 Fix Extract task to correctly extract messages with context 2014-12-25 14:28:44 +02:00
Esteban
b7510d4883 Avoids problem with code coverage switch when are to equaly named files in a test 2014-12-23 17:23:12 -03:00
mark_story
02ca7f5fcb Update version number to 2.6.0 2014-12-23 11:26:27 -05:00
mark_story
f4b682d384 Revert version number.
I forgot to merge a few pull requests before releasing.
2014-12-23 11:25:54 -05:00
Mark Story
033d968766 Merge pull request #5468 from dereuromark/2.6-i18n
Allow apps to overwrite translation domains from third party plugins.
2014-12-23 11:25:10 -05:00
Mark Story
96c458f300 Merge pull request #5467 from cakephp/2.6-mediaview
Don't send response from view.
2014-12-23 11:24:47 -05:00
mark_story
8de2877573 Update version number to 2.6.0 2014-12-23 11:22:20 -05:00
mark_story
10717d9248 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-12-23 11:22:00 -05:00
mark_story
667e2be2d2 Update version number to 2.5.8 2014-12-23 11:21:16 -05:00
mark_story
5cf5fe53ee Clarify question.
Fixes #1870
2014-12-23 11:18:32 -05:00
euromark
22a4a2f5de Correct argument. Should not have a default string. 2014-12-23 15:36:25 +01:00
euromark
5c5fb59c8d Allow apps to overwrite translation domains from third party plugins. 2014-12-23 13:09:53 +01:00
mark_story
c540e2b798 Merge branch 'master' into 2.6 2014-12-22 21:38:58 -05:00
euromark
0a974dd59f Adjust tests 2014-12-22 22:07:51 +01:00
euromark
14073dc742 Don't send response from view. 2014-12-22 21:02:52 +01:00
Mark Story
484b114e9b Merge pull request #5384 from okinaka/fix-mysql-describe
2.5: Fixing Mysql::describe() for timestamp.
2014-12-21 21:27:27 -05:00
Rachman Chavik
45be270a7b Enable use of Containable with TreeBehaviors
This patch allows Containable use with:

- TreeBehavior::getParentNode()
- TreeBehavior::children()
- TreeBehavior::getPath()
2014-12-20 16:32:20 +07:00
Marc Würth
e778b5dce2 Corrected/Improved DocBlock 2014-12-19 18:20:48 +01:00
Mark Story
1651e7742c Merge pull request #5088 from sebastienbarre/ticket-5041
Ticket #5041: have Auth::login() send Auth.afterIdentify event
2014-12-18 00:12:22 -05:00
mark_story
4d6611b328 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
mark_story
2637d35543 Don't quit bake when a table is missing.
When a table is missing print a warning to stderr but don't exit. This
allows people to use `bake fixture all` with non-conventional tables.

Refs #5377
2014-12-15 21:28:55 -05:00
mark_story
ae8a540101 Remove trailing whitespace. 2014-12-14 18:05:20 -05:00
mark_story
f19916bccf Add comments for possibly confusing code. 2014-12-13 22:25:52 -05:00
mark_story
c58e7da667 Handle exception when RequestHandler::startup() fails.
In the case that there is a request data type parser raises an
exception, or startup() otherwise fails the error page should be created
correctly. While I'm not able to write a test case for this, manual
testing confirmed the fix.

Refs #5311
2014-12-13 15:04:11 -05:00
OKINAKA Kenshin
8c008ad97d Update. 2014-12-11 13:55:41 +09:00
mark_story
cf108dbff3 Remove duplicate order key.
This was a mistake made in 4b6dba0.

Fixes #5376
2014-12-10 22:32:59 -05:00
mark_story
23c4b7b7d5 Fix whitespace. 2014-12-10 22:17:02 -05:00
Mark Story
2228afda0e Merge pull request #5334 from tranfuga25s/master
Change output to show the difference between fixture data and fields
2014-12-10 22:16:33 -05:00
OKINAKA Kenshin
5cff6aa746 Fixing Mysql::describe() for timestamp. 2014-12-11 10:31:19 +09:00
mark_story
ac6d5cc70f Fix incorrect pluralization of Human.
Human should become humans, unlike other words ending in man.

Fixes #5370
2014-12-09 21:51:42 -05:00
Mark Story
1a1583a832 Merge pull request #5360 from ADmad/i18n-arabic
Fix plural calculation for Arabic
2014-12-09 12:54:02 -05:00
tranfuga25s
360346acd0 Added PHPCS fixes 2014-12-09 09:35:12 -03:00
tranfuga25s
674af51d6b Added PHPCS fixes 2014-12-09 09:16:34 -03:00
tranfuga25s
9ecdaf7965 Added PHPCS fixes and better array diff handling on fixture data count difference 2014-12-09 08:56:34 -03:00
Mark Story
0ce38029d0 Merge pull request #5362 from cakephp/master-sniff
Consolidate with conditions sniff.
2014-12-08 22:23:25 -05:00
euromark
1e6876b627 Fix tests 2014-12-09 03:43:35 +01:00
euromark
f63d955f73 Add additional test. 2014-12-09 03:43:35 +01:00
euromark
dc70da9d14 Only merge the _defaults keys. 2014-12-09 03:43:35 +01:00
euromark
dc41a1ff56 Fix paginator options when disabled. 2014-12-09 03:43:34 +01:00
euromark
e1c128bb99 Consolidate with conditions sniff. 2014-12-09 03:17:35 +01:00
mark_story
ef28b42b2b Update version number to 2.5.7 2014-12-08 20:50:35 -05:00
ADmad
31c7b01c3a Add reference links to docblock 2014-12-09 00:03:24 +05:30
ADmad
850edf47a0 Fix plural calculation for Arabic.
Refs #5348
2014-12-08 23:58:27 +05:30
euromark
2937ea9ba5 Make comparison stricter. 2014-12-08 11:39:15 +01:00
euromark
f302d8c4d3 Extract being less verbose until explicitly asked for. 2014-12-08 11:36:24 +01:00
mark_story
ad2d6edda9 Merge branch 'master' into 2.6 2014-12-06 21:28:59 -05:00
euromark
11981f80fa Correct doc block. 2014-12-06 04:54:22 +01:00
tranfuga25s
b0d0143b82 Fix PHPCS problems 2014-12-05 16:14:47 -03:00
tranfuga25s
ec2530ba58 Fix PHPCS problems and a better comparation of schema and data 2014-12-05 16:01:49 -03:00
tranfuga25s
fc756ac0b8 fix some small typo changing variables names 2014-12-05 15:34:53 -03:00
tranfuga25s
a2d04589a6 Change to output the difference between fixture data and fields 2014-12-05 15:23:48 -03:00
shin1x1
a5843dbe87 add binary protocol option in MemcachedEngine 2014-12-02 19:56:30 +09:00
mark_story
bbfe3170dc Fix incorrect hardcoded database name. 2014-12-01 23:03:47 -05:00
Guy Warner
327fcb4846 Fix some missed doc block issues 2014-11-30 14:50:11 -07:00
Guy Warner
fb61d9393b Add @trigger doc blocks of methods triggering CakeEvent 2014-11-30 14:45:40 -07:00
mark_story
543f05e3d0 Merge branch 'master' into 2.6 2014-11-29 22:00:00 -05:00
euromark
d0f75a03af Allow RLIKE in conditions. 2014-11-26 19:56:58 +01:00