mark_story
ac9a212d44
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/Utility/String.php
2015-01-11 15:25:18 -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
Mark Story
c4f9727720
Merge pull request #5576 from istvanp/2.7
...
Prevent NULL value on NOT NULL column when value is an empty string
2015-01-06 21:23:53 -05:00
euromark
389f745d16
Stop goofy formatting when newlines are present already.
2015-01-06 13:13:33 +01:00
Istvan Pusztai
22b0275a58
Prevent NULL value on NOT NULL column when value is an empty string (MySQL)
2015-01-05 12:04:24 -05: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
euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
euromark
63093e1d30
More String CakeText replacements and a BC class.
2015-01-05 00:55:23 +01:00
euromark
274b78e44c
Rename test case.
2015-01-05 00:54:36 +01:00
euromark
722e54279c
Rename String to CakeText.
2015-01-05 00:53:32 +01:00
Mark S.
b76fbd8da1
Merge pull request #5557 from cakephp/2.7-configure-backport
...
Backport of 3.0 Configure corrections.
2015-01-04 23:57:56 +01:00
Gerd Katzenbeisser
bf3ff8e2ad
Avoid connection to default for mocked models
...
Fixes #5565
2015-01-04 16:53:00 +01:00
euromark
394da88d23
Stay 100% BC for 2.7
2015-01-04 10:52:18 +01:00
euromark
dabf55785f
Simplify test assert.
2015-01-04 02:30:11 +01:00
euromark
a947958dc9
Fix cs
2015-01-04 02:27:40 +01:00
euromark
d848c5f327
cs
2015-01-04 02:22:37 +01:00
euromark
b936a34471
Backport of 3.0 Configure corrections.
2015-01-04 01:57:06 +01:00
euromark
39e0ce415d
Backport of 3.0 Session API hardening and clear().
2015-01-04 01:40:09 +01:00
mark_story
4cd2c8fdcb
Merge branch 'master' into 2.7
2015-01-03 14:34:55 -05: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
Mark Story
7bbc3dfd90
Merge pull request #5470 from cakephp/2.7-session
...
Backport Session consume() to 2.x
2014-12-26 12:22:20 -05:00
Mark S.
c7940f57ac
Merge pull request #5469 from cakephp/2.7-configure
...
Backport Configure::consume() to 2.x
2014-12-25 22:23:44 +01: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
eba6105a52
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
...
Conflicts:
lib/Cake/TestSuite/ControllerTestCase.php
2014-12-23 11:30:29 -05:00
mark_story
d21ae178bf
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-23 11:29:57 -05:00