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
Val Bancer
98cd278c02
improved performance of insertMulti() in Mysql
2016-09-05 21:28:07 +02:00
mark_story
e8d63725d8
Merge branch '2.x' into 2.next
2016-09-04 23:54:22 -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
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 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 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
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
bc73e928b6
Restore header() behavior inadvertantely removed.
...
In eaa2bbbcae#9229
2016-08-11 21:54:24 -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
nojimage
e71d83c612
TestShell passes the 'directive' option to PHPUnit correctly
2016-08-08 20:09:37 +09:00
Sebastien Barre
345375b6b6
add test
2016-08-07 23:08:55 -04:00
Juan I. Benavides
93db51cf10
Avoiding circular object reference in SmptTransport
...
This fixes a memory leak while sending multiple emails.
Fixes : #9198
2016-08-01 13:09:45 -05:00
Mark van Driel
5caac5f340
Prevent unnecessary joins / complex conditions in delete
2016-07-27 16:31:57 +02:00
Andrej Griniuk
147693618c
refs #9174 fix CakeSchema compare when changing field length to the default one
2016-07-26 23:39:09 +03:00
Mark van Driel
d6e45131ad
Prevent unnecessary joins / complex conditions in delete
2016-07-25 17:15:18 +02:00
Mark Story
b50c06423d
Merge pull request #9115 from biesbjerg/ticket-7488
...
Fire Controller.shutdown and Dispatcher.afterDispatch events when exceptions are thrown
2016-07-19 22:49:02 -04:00
Mark Story
876b508797
Merge pull request #9108 from cakephp/issue-9106
...
Don't split strings headers that lack a ':'.
2016-07-15 22:20:13 -04:00
Kim Biesbjerg
38cad279d1
Updated test method name and description
2016-07-14 04:57:25 +02:00
Kim Biesbjerg
c77b628841
Dispatch Controller.shutdown instead of calling afterFilter directly. Updated test
2016-07-14 04:51:49 +02:00
Kim Biesbjerg
a05639a30e
Don't save buffered output to var since it is not used
2016-07-14 00:20:33 +02:00
Kim Biesbjerg
5a63ee4e3e
Added tests to prove that Dispatcher.afterDispatch event is dispatched by exception renderer on error response
2016-07-14 00:17:02 +02:00
mark_story
4e1b601ed8
Don't split strings headers that lack a ':'.
...
Refs #9106
2016-07-12 22:46:47 -04:00
Philippe Saint-Just
b0e5e39e45
Added test case
2016-07-10 09:57:24 +01:00
Kim Biesbjerg
1d7a4da903
Fixed wrong assertion
2016-07-07 09:24:33 +02:00
Kim Biesbjerg
0ea315b2e0
Add assertion to prove session is not started on stateless login
2016-07-07 08:58:51 +02:00
Kim Biesbjerg
c63de8d9f5
Added test to prove stateless login sets user
2016-07-06 12:34:23 +02:00
mark_story
234f732d6d
Attempt to get tests passing on travis.
...
Also attempt to get stickler to ignore the 2.x branch.
2016-07-01 17:52:02 -04:00
mark_story
d816ea6e16
Add test showing that niceShort translates month names.
...
Refs #8968
2016-07-01 17:51:23 -04:00
nojimage
57e0a97483
refs #8654 FormHelper cleanup unlockFields key
2016-06-28 22:01:06 -04:00
mark_story
432eb9c432
Merge branch '2.x' into 2.next
2016-06-27 21:47:47 -04:00
mark_story
f28c21c7a7
Stop testing against SSL ciphers that emit warnings.
...
Testing that SSLv3 still works is causing test failures.
2016-06-27 21:47:37 -04:00
Mark Story
55e9638044
Merge pull request #8844 from icyrizard/add_http_patch_content_type_check
...
Add HTTP patch Content-Type check
2016-05-27 15:41:18 +02:00
Aloïs Thévenot
b737e9f732
#8844 Add test
2016-05-27 12:50:23 +00:00
mark_story
e78af35af7
Only clear the unlocked fields on end().
...
Doing this work on end() allows fields to be unlocked before the form is
created which can be helpful.
Refs #8880
2016-05-25 23:04:53 +02:00
Mark Story
b15560ea0c
Merge pull request #8880 from nojimage/form-unlockfields-2x
...
Reset FormHelper::$_unlockFields for 2.x
2016-05-25 22:59:25 +02:00
mark_story
d5d46e21bd
Fix indentation.
2016-05-22 16:39:49 -04:00
Mark Story
1a7e8c51e7
Merge pull request #8848 from xhs345/2.x
...
Add attribute 'fieldset' to Form->radio
2016-05-22 16:38:39 -04:00
nojimage
850305a384
fixes reset FormHelper::$_unlockFields
2016-05-21 13:33:20 +09:00
xhs345
eeefa03546
Updated Radio and Inputs form helper
...
Also added UnitTest for radio fieldset class-name
2016-05-19 17:28:47 -07:00
Mark Story
0fd3ad9b76
Merge pull request #8851 from MarkusBauer/v2.x/SqliteTestEnhancements
...
Sqlite testcase enhancements
2016-05-18 22:01:33 -04:00
Markus Bauer
2227e01990
Fixing Sqlite's handling of datetime/timestamp columns with current_timestamp default set
2016-05-19 00:21:43 +02:00
Markus Bauer
058809275c
Enable nested transactions before trying to test them
2016-05-18 23:46:51 +02:00
Markus Bauer
f75ebf8cb9
Make Sqlite Testcases compatible with Windows / NTFS file systems
2016-05-18 23:46:10 +02:00
Steampilot
723ed96fd6
Added sorting by modified time in Folder util
2016-05-12 16:28:04 +02:00
Juan Basso
fa6e74ca22
Improved apc calls
...
Instead of calling the call_user_func_array it does the call directly. It is a little bit more verbose, but performs better.
2016-05-07 14:26:09 -04:00
Juan Basso
4a61f7f23c
Supporting APCu on PHP 7
2016-05-07 03:46:21 -04:00
xhs345
4d65091d0c
Updated tests
2016-05-03 15:39:37 -07:00
mark_story
12c6fd4e22
Merge branch '2.x' into 2.next
2016-05-02 21:58:41 -04:00
mark_story
0912867b49
Minor formatting clean up.
...
Refs #8754
2016-05-02 21:58:20 -04:00
schrolli
e0682fc8a1
added testcases for time and datetime-fields
...
both have set their length field and should be displayed as text-inputs
2016-05-02 17:13:22 +02:00
Mark Sch
32cb25465f
Make CS tests pass.
2016-05-02 10:42:42 +02:00
mark_story
ade9d8a811
Restore backwards compatibility with old 2.x in FormHelper.
...
Restore the behavior of the string 'action' option to its former glory.
While we've deprecated this it needs to continue working as it did
before.
Refs #8628
2016-05-01 22:21:23 -04:00
Philippe Saint-Just
c2f028ab49
Fix spacing
2016-04-30 13:13:14 -04:00
Philippe Saint-Just
cd07850337
Merge branch 'backport-8741-8690' into 2.x
2016-04-30 13:11:34 -04:00
mark_story
af953700b8
Fix short array usage.
...
Refs FIVESMX-8723
2016-04-29 09:28:05 -04:00
mark_story
cf55767fa0
Backport range parsing resiliancy fixes from 3.x
...
Refs #8723
2016-04-28 22:27:37 -04:00
mark_story
9536a10d6d
Make schema import plugin friendly.
...
The changes in #8694 pointed out that schema importing doesn't play nice
with plugins. This corrects that.
2016-04-23 16:18:15 -04:00
mark_story
3a75e8aa72
Use import options when going through execute()
...
The `records` and `schema` options should work when using execute().
Previously they were not working. Furthermore, the records option did
a non-sensical thing where it both set import=>records and generated
static records from the live table. The `records` option now enables
the generation of static data from a live table, as I think this is
a more common scenario.
Refs #8693
2016-04-23 16:15:54 -04:00
Mark Story
be35880b2f
Merge pull request #8692 from garethellis36/dont-override-shell-loggers
...
Don't override already-configured loggers
2016-04-22 16:05:03 -04:00
Gareth Ellis
bfb6ebb049
PHPCS fixes
2016-04-22 19:21:47 +01:00
Gareth Ellis
bc3a1fb6c5
Makes ShellTest::testShellLoggersDoNotGetOverridden actually useful
2016-04-22 19:18:29 +01:00
Gareth Ellis
153f04a976
Changes behaviour of _useLogger so that already-configured loggers are not overridden
2016-04-22 13:56:26 +01:00
chinpei215
1826b4cb08
Add DboSource::flushQueryCache()
2016-04-19 00:01:06 +09:00
mark_story
8b5023282e
Randomly generate a salt when the salt is '' or null.
...
To prevent an issue where any value is accepted as a password when '' is
provided as the hashed password.
Refs #8650
2016-04-15 21:49:17 -04:00
mark_story
f451efa511
Attempt to fix tests in 2.x
...
Relying on tv.eurosport.com having a bad peer name is pretty fragile.
However, we can more easily rely on their cert coming from a CA we no
longer trust.
2016-04-14 15:28:34 -04:00
chinpei215
5006cc396a
Add a test case to make sure of backward compatibility
2016-04-11 00:43:35 +09:00
mscherer
e84ff5e0d5
Fix doc block param types.
2016-04-08 15:12:48 +02:00
mscherer
657b1a1029
Fix doc block param types.
2016-04-08 15:02:03 +02:00
mscherer
bae4a11e5e
Rename test file.
2016-04-08 14:40:30 +02:00
mscherer
dda9e83ab6
Refactor Object to CakeObject for future PHP7 comp.
2016-04-08 14:33:26 +02:00
mark_story
79db545b69
Fix PHP 5.4 syntax.
2016-04-02 21:45:02 -04:00
mark_story
1333cc4b3e
Merge branch 'postlink-token' into 2.x
...
Fix inline postLink() calls corrupting the containing form's tampering
token.
Refs #8387
2016-04-01 23:08:41 -04:00
mark_story
c551faad46
Add tests for changes in #8387
...
Add tests covering the new behavior.
2016-04-01 23:08:31 -04:00
mark_story
84fc9498b5
Allow N11 exchange numbers as valid.
...
The previous code and commit (fa3d4a0bb5#8567
2016-03-31 22:38:16 -04:00
mark_story
1926d40d40
Fix possibility for spoofed files to pass validation.
...
Use `is_uploaded_file` to prevent crafty requests that contain bogus
files from getting through. A testing stub class was necessary to avoid
making significant changes to the test suite.
2016-03-28 22:10:36 -04:00
Gareth Ellis
a6702b70d4
Extracts error trace in ErrorHandler to a helper function to allow customization
2016-03-23 19:05:23 +00:00
mark_story
f57f038c09
Fix for PHP 5.3
2016-03-16 21:17:42 -04:00
mark_story
745f3a33e6
Fix boolean values in select widgets.
...
Boolean `false` should be treated like `0` when comparing option values.
Refs #8468
2016-03-15 22:59:03 -04:00
mark_story
af046fc7d6
Merge branch 'request-ip' into 2.x
2016-03-13 23:00:47 -04:00
mark_story
fef3090717
Fix incorrectly inheriting permissions.
...
When child inherits from a deny parent the '*' permission should reflect
permissions on all nodes not just the leaf node. Previously once a node
with all permissions set to inherit was found, the check would pass.
Instead it should cascade to the parent nodes and look for explicit
allow/deny.
Refs #8450
2016-03-11 23:18:50 -05:00
mark_story
48af49ddde
Don't trust CLIENT_IP
...
The client_ip header can easily be forged. In 'safe' modes we should
only trust the remote_addr which comes from the sapi. Remove support for
http_clientaddress as I can't seem to find where this ever came from in
PHP on the http specs.
2016-03-10 22:04:13 -05:00
Mark Story
18b0334890
Merge pull request #8384 from garas/mailtransport-log-subject
...
Email log missing Subject and To headers when using MailTransport
2016-03-02 21:29:13 -05:00
mark_story
3ad68db5eb
Tweak fix from #8359
...
This fixes a regression introduced in that change that we didn't
previously have tests for. The issue fixed in #8359 was related to
PHP7.0, whereas PHP5 didn't have an issue. Now both versions will work
the same.
2016-03-02 12:30:48 -05:00
Edgaras Janušauskas
2386a86adc
Include Subject and To in email log when using MailTransport
2016-03-01 22:21:14 +02:00
mark_story
3ed321dff4
Handle negative numbers in Redis correctly.
...
Update number sniff to handle negative numbers. We need to do number
sniffing so we can maintain compatbility between write() and
increment()/decrement().
Refs #8364
2016-02-27 00:07:58 -05:00
Mark Story
eae7a8926b
Merge pull request #8345 from cakephp/issue-8330
...
Fix parsing empty header values.
2016-02-26 23:01:59 -05:00
Mark Story
31b3f39b67
Merge pull request #8310 from cakephp/secure-random
...
2.x - Secure random
2016-02-25 22:05:08 -05:00
mark_story
1a170e1eec
Fix parsing empty header values.
...
Replace the complex and somewhat unfixable regexp based parser for
a parser that handles each line individually. Normalize multi-line
headers to replace multiple spaces with a single one. Section 4.2 of the
HTTP1.1 standard states
> Any LWS that occurs between field-content MAY be replaced with
> a single SP before interpreting the field value or forwarding the
> message downstream.
This makes me somewhat confident that we can safely normalize
multi-line HTTP header values.
Refs #8330
2016-02-24 22:25:58 -05:00
mark_story
9c0da41858
Skip test on PHP7 as the warning is not consistent.
2016-02-23 20:54:16 -05:00
Mark Story
ff6cdd4b73
Merge pull request #8279 from cakephp/issue-8114
...
Fix inherited permissions when checking the '*' permission.
2016-02-22 14:48:58 -05:00
