Commit graph

18790 commits

Author SHA1 Message Date
mark_story
bea2ac7965 Start 2.10.0 development. 2016-09-18 22:23:34 -04:00
mark_story
ad5130cd31 Merge branch '2.next' into 2.x 2016-09-18 22:22:56 -04:00
mark_story
73dcbf2aa3 Update version number to 2.8.9 2016-09-18 22:18:18 -04:00
Mark Story
63533d8f2d Merge pull request #9454 from cakephp/revert-9368-2.x-test-fixtures
Revert "CakeFixtureManager: Truncate tables only if not dropped."
2016-09-17 12:25:24 -04:00
mark_story
835c709dfd Add code fencing on example. 2016-09-16 19:17:08 -04:00
Mark Story
a696d33bb0 Merge pull request #9464 from ravage84/2.x-actsas-docblock
Minor DocBlock improvement
2016-09-16 19:16:15 -04:00
Marc Würth
1b101f73a6 Minor DocBlock improvement 2016-09-16 13:02:55 +02:00
mark_story
bcb2eaee31 Update version number to 2.8.8 2016-09-14 21:40:56 -04:00
José Lorenzo Rodríguez
ad08e94235 Merge pull request #9458 from cakephp/issue-9455
The _lastAction property should not double include the base path.
2016-09-14 16:46:35 +02:00
mark_story
4f70bdb3b8 The _lastAction property should not double include the base path.
FormHelper should not run URLs through Router twice when determining the
the form's lastAction attribute. However, because we're using the helper
method (see #9414) we do need to HTML decode the URL before using it in
form token generation.

Refs #9455
2016-09-13 22:21:01 -04:00
mark_story
109cfbcf95 Fix whitespace. 2016-09-13 21:46:28 -04:00
Mark Story
925a45b6b1 Merge pull request #9450 from cakephp/issue-8225
Allow datasource access in constructors of mocked models.
2016-09-13 14:08:03 -04:00
Mark Story
35c6f2c771 Revert "CakeFixtureManager: Truncate tables only if not dropped." 2016-09-13 11:00:32 -04:00
mark_story
dc2fa498ef PHPCS. 2016-09-12 23:19:08 -04:00
mark_story
9d1fbb95b3 Allow datasource access in constructors of mocked models.
When mock objects are created from models that access their datasource
in the constructor, an exception would be raised for the missing default
datasource. By changing how configuration data is handled in the mock
creation we can avoid this issue and not reopen #4867

Refs #8225
2016-09-12 22:15:55 -04:00
mark_story
d0041f155d Update version number to 2.8.7 2016-09-09 23:07:15 -04:00
Mark Story
9a66137e65 Merge pull request #9414 from bancer/secure-form-url
Secure form url
2016-09-06 12:42:34 -04:00
Mark Story
7993835f93 Merge pull request #9412 from bancer/insert-multi-performance
Mysql insertMulti() performance improvement
2016-09-06 12:41:59 -04:00
mark_story
0c189b555f Update version number to 2.9.0-RC1 2016-09-05 22:18:21 -04:00
Val Bancer
5253f0b3bd fixes postLink form last action
https://github.com/cakephp/cakephp/issues/9392
2016-09-05 23:14:43 +02:00
Val Bancer
427d928d10 minor code style improvements 2016-09-05 21:53:10 +02:00
Val Bancer
98cd278c02 improved performance of insertMulti() in Mysql 2016-09-05 21:28:07 +02:00
Val Bancer
0feb93f7a0 added Eclipse paths to gitignore 2016-09-05 21:01:12 +02:00
mark_story
e8d63725d8 Merge branch '2.x' into 2.next 2016-09-04 23:54:22 -04:00
Mark Story
c303a92fcf Merge pull request #9368 from cakephp/2.x-test-fixtures
CakeFixtureManager: Truncate tables only if not dropped.
2016-08-29 21:56:37 -04:00
mark_story
2ffde69d5b Skip test that always fails on PHP5.3 2016-08-29 21:56:30 -04:00
mark_story
d1cfe203c4 Fix PHPCS error. 2016-08-29 21:53:47 -04:00
mscherer
d52b9fc826 CakeFixtureManager: Truncate tables only if not dropped. 2016-08-29 12:08:57 +02:00
Mark Story
51963ab8fc Merge pull request #9349 from cakephp/2.x-sort-locale
2.x sort locale backport
2016-08-26 11:13:21 -04:00
Mark Story
1a4631b9cd Merge pull request #9348 from ndm2/backport-9341
2.x - Backport `Folder::inPath()` changes.
2016-08-26 10:55:11 -04:00
Mark Sch
ee319baec1 Backport skip 2016-08-26 16:15:39 +02:00
mscherer
03df288e78 Re-add spacing. 2016-08-26 14:45:59 +02:00
mscherer
dab4b85596 Backport Hash::sort() support for type locale. 2016-08-26 14:32:21 +02:00
ndm2
87d86aaed9 Fix/tighten Folder::inPath() checks.
The current checks are way too relaxed, and are more like testing
for a substring, which makes it easy for invalid paths to slip
trough, for example `/foo/var/www` is falsely tested to reside in
`/var/www`.

Passing an empty path never worked properly, it was triggering a
warning, didn't worked on Windows, and the behavior that the current
top level directory would be assumed for empty paths wasn't
documented.

Similar is true for relative paths. While they did match at one point,
this was incorrect behavior, and matching actual path fragments seems
out of scope for this method.

This change makes the `$path` argument required, requires it to be an
absolute path, and throws an exception in case a non-absolute path is
being passed.
2016-08-26 13:45:45 +02:00
Mark Story
0565081db6 Merge pull request #9314 from mvdriel/add-support-for-confirm-option-to-submit-in-formhelper
Added support for confirm (message) option to submit in FormHelper
2016-08-22 09:18:30 -04:00
Mark Sch
b096005561 Fix CS 2016-08-21 20:31:45 +02:00
Mark van Driel
e3b0aca95e Removed bug fix for Helper::_confirm to keep the code compatible 2016-08-21 17:09:43 +02:00
Mark van Driel
34afc377ec Added support for confirm (message) option to submit in FormHelper 2016-08-20 12:51:13 +02:00
Mark Sch
d66011d0fa Merge pull request #9300 from ken880guchi/fix-php-doc
fix php document of File::write()
2016-08-18 20:56:38 +02:00
Kenya Yamaguchi
777e39531e fix php document of File::write() 2016-08-19 02:52:44 +09:00
José Lorenzo Rodríguez
3937a4f02e Merge pull request #9255 from cakephp/issue-9229-restore
Restore header() behavior inadvertantely removed.
2016-08-15 09:51:10 +02:00
mark_story
3e16f8911d Add tests covering basic use of <> in deleteAll()
Refs #9253
2016-08-13 22:48:02 -04:00
mark_story
a10bdb226a Document the ext/memcached version requirements.
Refs #9252
2016-08-13 19:38:31 -04:00
mark_story
bc73e928b6 Restore header() behavior inadvertantely removed.
In eaa2bbbcae I changed the behavior to
now use the TitleCased name as I didn't understand the intended behavior
or how apache was working in the reporter's specific case.

Refs #9229
2016-08-11 21:54:24 -04:00
Mark Story
5019cbddfe Merge pull request #9249 from ravage84/2.x-docblocks-superfluous
Remove superfluous "Class" from doc blocks
2016-08-10 16:22:46 -04:00
Marc Würth
f2638b3e38 Remove superfluous "Class" from doc blocks 2016-08-10 12:22:09 +02:00
mark_story
61b3fbd605 Merge branch '2.x' into 2.next 2016-08-09 22:12:26 -04:00
mark_story
eaa2bbbcae Merge branch 'auth-header' into 2.x
Refs #9229
2016-08-09 22:07:46 -04:00
mark_story
20a2af8c16 Fix casing issues with Authorization header.
We need to check the upper case versions of headers in $_SERVER.
Also fix lint issues.
2016-08-09 22:06:49 -04:00
Mark Story
dd6191186e Merge pull request #9231 from nojimage/patch-testshell
Improve TestShell
2016-08-08 09:21:03 -04:00