mark_story
a6a699b4b9
Merge branch '2.7' into 2.8
2015-09-28 21:17:45 -04:00
mark_story
13f147940f
Correct inflection of virus.
...
Instead of viri, it should be viruses.
Refs #7466
2015-09-28 21:04:23 -04:00
mark_story
ae83e197dc
Merge branch '2.8' of github.com:cakephp/cakephp into 2.8
2015-09-27 11:13:12 -04:00
mark_story
8a57d78dba
Merge branch '2.7' into 2.8
2015-09-27 11:12:55 -04:00
Marc Würth
a6d62cb6a8
Removed $stringClean
...
Resfs: https://github.com/cakephp/cakephp/pull/7448#discussion_r40450663
2015-09-25 20:10:47 +02:00
Marc Würth
1ede742d92
Various improvements to the CakePHP test files
...
Mostly CS, doc blocks and unused variables.
2015-09-25 17:22:00 +02:00
Mark Story
b8b7282264
Merge pull request #7436 from cakephp/2.8-fix-order-merge
...
Only array-wrap 'order' if it's not already an array.
2015-09-22 12:24:02 -04:00
Marc Würth
5b41a9b52d
Swallow the "--quiet" shell parameter before calling PHPUnit.
...
PHPUnit does not provide a silent or quiet mode, so we cannot pass it along:
https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions
Resolves #7432
2015-09-22 14:25:53 +02:00
Mark Scherer
8909b2ed42
Fix remaining test.
2015-09-22 14:21:04 +02:00
Mark Scherer
81cbb52f74
Only array-wrap 'order' if it's not already an array.
2015-09-22 13:04:28 +02:00
mark_story
c14d1ffe93
Add tests for #7428
2015-09-21 21:39:51 -04:00
Mark Scherer
97b6f8674c
Fix CS
2015-09-21 13:45:18 +02:00
Mark S.
c87de2a069
Fix CS
2015-09-17 11:33:59 +02:00
mark
e7d6319d59
Skip test for versions of < MySQL5.6.
2015-09-17 10:43:43 +02:00
mark
d8a55ad065
Allow CURRENT_TIMESTAMP for datetime columns - MySQL5.6+.
2015-09-16 14:16:58 +02:00
mark_story
e4cce7a441
Fix errors in PHP <5.4
2015-09-06 22:14:04 -04:00
mark_story
60d7bbaa10
Always update updated/modified columns when a fieldList is used.
...
When a fieldList is used, and updated is not in the fieldList, the
column should continue to be updated even if the column has a value from
the user. Because the field is not in the fieldList, we must assume that
the intent is for the field to update automatically, as it would have if
the updated column was not present in the save data.
Refs #7076
2015-09-05 22:01:33 -04:00
mark_story
9b910dff31
Merge branch '2.8-hash-sort-ignore-case' into 2.8
...
Refs #7217
2015-08-25 21:46:08 -04:00
mark_story
a9ef1f8aea
Simplify branching and add default options.
...
Use fewer conditionals by merging defaults and avoid exceptions
by setting defaults as well.
Refs #7217
2015-08-25 21:39:02 -04:00
mark_story
51d8f74c50
Merge branch '2.7' into 2.8
2015-08-23 16:29:07 -04:00
mark_story
143c34bdc1
Handle case where a visible input shares a name with an invisible one.
...
If a visible input is created *after* a hidden input was created, the
form would always blackhole unless the visible input had the same value
as the hidden input.
Refs #7274
2015-08-22 23:10:44 -04:00
Jose Lorenzo Rodriguez
3c7f022fa8
Merge branch '2.7-tz-abbr' of https://github.com/rchavik/cakephp into rchavik-2.7-tz-abbr
2015-08-21 10:56:48 +02:00
Jose Lorenzo Rodriguez
40d628530a
Merge branch '2.7' into 2.8
2015-08-21 10:54:30 +02:00
Rachman Chavik
e6acacac03
CakeTime::listTimezones(): Add option to Display timezone abbreviations
...
Useful for countries that do not have many of its cities, even major ones,
listed. For eg: Indonesia, only have 4 cities listed.
For backward compatibility, abbreviations will not be shown.
Note: You might need to update timezonedb for PHP 5.3
Closes #7271
2015-08-21 10:54:33 +07:00
Mark Story
d05727b6df
Merge pull request #7265 from mattmemmesheimer/issue-7048
...
Issue 7048
2015-08-20 22:32:39 -04:00
ndm2
8fe953548c
Fix path traversal check for Windows based systems
...
On Windows based systems, both, backward as well as forward
slashes are supported as path separators, thus checking for `DS`
only, would allow to slip in `../` fragments.
refs #5905 , cad57dcc28
2015-08-19 16:47:53 +02:00
mattmemmesheimer
d4467f9acf
Fixing unit tests.
2015-08-18 22:14:10 -05:00
James Tancock
5b92c900e6
Missing test fix ModelIntegration
2015-08-18 13:32:16 +01:00
James Tancock
fdb41e01bb
Alter Model::exists() to return false with no table
2015-08-18 13:07:30 +01:00
James Tancock
2f7cc052d2
Typo in tests docblock
2015-08-17 13:15:35 +01:00
James Tancock
fd198ce0fa
Edits to tests to cover the changes to Model::exists
2015-08-17 12:19:02 +01:00
Adrian Gunawan
2eafcc0f72
Use array() instead of the short notation []
2015-08-14 14:55:44 +10:00
Adrian Gunawan
bf6574c3b2
Use array() instead of the short notation []
2015-08-14 14:26:01 +10:00
Adrian Gunawan
b89d8d5efa
Use array() instead of the short notation []
2015-08-14 14:15:00 +10:00
Adrian Gunawan
f23e6589d0
Overload $type parameter instead of adding another parameter for case insensitive sort
2015-08-13 11:16:32 +10:00
Adrian Gunawan
a217556c13
Ability for Hash::sort to sort case-insensitively
2015-08-12 14:35:11 +10:00
Marc Würth
f3e590acfb
Annotate test coverage
2015-08-11 16:36:09 +02:00
Marc Würth
4330335940
Correct title of testAdd methods
2015-08-10 12:06:19 +02:00
mark_story
a5ff7ecaa3
Merge branch 'memcached-add-method' into 2.8
...
Refs #7165
2015-08-09 15:29:33 -04:00
Nick Cinger
41d0e1df19
Cache add() method added for all Cache engines.
2015-08-09 15:32:02 +02:00
mark_story
ca19b63a32
Merge branch '2.7' into 2.8
2015-08-07 22:04:46 -04:00
mark_story
07c2047984
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
2015-08-06 21:43:40 -04:00
mark_story
b7c9ac913d
Backport fixes for comparison() and range() to 2.x
...
These fixes were released as a security update for 3.x, they also belong
in 2.x
2015-08-06 21:36:39 -04:00
mark_story
056f24a774
Forbid direct prefix access with mixed casing.
...
Changing the casing up should not allow prefix method access.
2015-08-05 23:05:30 -04:00
mark_story
9f20330d17
Fix fatal error on null subject.
...
Refs #7176
2015-08-05 22:20:39 -04:00
Mark Story
58bede76d1
Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware
...
Make fixture import from table aware of records found
2015-08-03 16:01:35 -04:00
mark_story
a73fc25657
Fix incorrectly parsed mo file context.
...
The context from mo files should be parsed correctly.
Refs #7118
2015-07-30 22:28:55 -04:00
José Lorenzo Rodríguez
355eb1859c
Merge pull request #7106 from cakephp/issue-7098
...
Consistently remove plugin names in object collections.
2015-07-28 15:58:41 +02:00
mark_story
58ea40e32c
Don't stop reading when only a '0' has been read.
...
Make tests simpler by using onConsecutiveCalls() instead of trying to
maintain mock method indexes.
Refs #7121
2015-07-27 22:40:27 -04:00
Mark Scherer
a239324a0d
use constant PHP_SAPI
2015-07-26 15:35:03 +02:00
