mark_story
48450e71fa
Merge branch '2.7' into 2.8
2015-11-11 22:53:45 -05:00
chinpei215
726699ee7a
Magic call with custom finders
...
Now we can use findListBy, etc - closes #7674
2015-11-11 22:43:19 +09:00
mark_story
1a6f733286
Merge branch '27-pages-fix' into 2.7
2015-11-05 22:30:25 -05:00
Jose Lorenzo Rodriguez
18544c5aaa
Fix validation allowing arrays.
...
Accepting arrays can cause a number of adverse effects. While this may
be a breaking change the alternatives are worse.
2015-11-04 21:35:05 -05:00
Jorge González
cb6a17c34e
add Flash back to Controller, fix Scaffold to use Flash instead
2015-11-04 10:41:35 +00:00
mark_story
5e60cc5d18
Fix plugin view names being able to escape the plugin root directory.
...
Remove the ability to specify completely arbitrary view files. This is
possibly a breaking change. However, I feel the risks out weigh the
benefits in this situation. Now absolute paths must be located *within*
a configured view path.
2015-11-01 22:04:15 -05:00
mark_story
bc977544c5
Use a more stable timezone.
...
Regina does not observe DST meaning this test won't fail twice a year.
2015-10-26 22:28:00 -04:00
Mark Scherer
8287981855
Make sure direction values are lowercased to be consistent.
2015-10-26 23:20:30 +01:00
mark_story
c26b7bbffe
Fix PHPCS errors and failing test.
...
Refs #7577
2015-10-20 21:08:57 -04:00
vanquang9387
0cdfed0aee
Add more test on UploadedFileSize validation
2015-10-20 09:00:32 +07:00
vanquang9387
af8c992655
2.x uploadedFile validation (backported from #4524 )
2015-10-19 15:15:28 +07:00
mark_story
8c404ad6a7
Merge branch '2.7' into 2.8
2015-10-17 21:00:26 -04:00
mark_story
dea32345c8
Add failing test for #7570
...
Documented behavior that exists in 3.x is not working in 2.x
2015-10-17 20:54:40 -04:00
mark_story
707915e693
Merge branch '2.7' into 2.8
2015-10-15 22:10:56 -04:00
mark_story
94aeee438b
Merge branch pull request #7496 into 2.7
...
Adds ssl_ context options to SmtpTransport via CakeSocket. Both
CakeSocket and SmtpTransport can now use all the SSL context options
with the same syntax as HttpSocket.
2015-10-12 22:07:40 -04:00
mark_story
3a4facbf8d
Remove allowSelfSigned() method.
...
This method is no longer needed as the low level socket understands the
`ssl_*` options now.
Refs #7496
2015-10-12 21:58:55 -04:00
mark_story
cc3531d288
Move SSL context options into CakeSocket.
...
Having all the options consolidated in one places enables all the SSL
context options to be used in the SmtpTransport instead of just allowing
self_signed as proposed in #7496
2015-10-12 21:56:20 -04:00
mark_story
29490eb84f
Add tests for #7516
2015-10-10 22:32:41 -04:00
Ian den Hartog
5dfb780970
Change names
2015-10-06 10:10:34 +02:00
Ian den Hartog
bb7e7850ae
Add test for Self-signed certificates
2015-10-02 16:17:26 +02:00
mark_story
506051f688
Correct input generation for postgres numeric types.
...
Numeric types in postgres are treated like decimals, except they can
have no length, precision or scale components defined.
IE does not accept 1.00000 as a valid step attribute so we'll default to
any when we encounter decimal types with no length.
Refs #7497
2015-10-01 21:46:21 -04:00
Ian den Hartog
e2c303b2b9
Add support for Self Signed certificates with smtp
2015-10-01 23:02:43 +02:00
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
mark_story
7f6ab82c9b
Merge branch '2.7' into 2.8
2015-07-25 21:49:03 -04:00
Mark Story
de4b44a37b
Merge pull request #7077 from dereuromark/2.7-static
...
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-23 22:27:37 -04:00
mark_story
418dcfd7f8
Consistently remove plugin names in object collections.
...
We were sometimes removing plugin prefixes (set, and some subclass
methods). But many other methods were missing the pluginSplit() feature.
This change makes all of the methods in ObjectCollection strip plugin
prefixes, which increases consistency across the framework.
Refs #7098
2015-07-23 21:46:21 -04:00
Marc Würth
b412b405f9
Make fixture import from table aware of records found
2015-07-23 18:03:42 +02:00
antograssiot
94b2ea29a6
enable colors for windows ConEmu user
...
backport of #7090
2015-07-23 05:49:15 +02:00
Mark Story
e19f621314
Merge pull request #7086 from cakephp/issue-7069
...
Fix issues saveMany & saveAssociated with boolean values.
2015-07-22 22:01:39 -04:00
Yoshiyuki Kinjo
e25be3a47e
Add failing test for FormHelper::input
...
FormHelper::input does not respect 'value' option when form is of date/time type.
Signed-off-by: mark_story <mark@mark-story.com>
Backport fixes from #7082 to 2.7
2015-07-22 21:59:44 -04:00
mark_story
c6e5026767
Fix issues saveMany & saveAssociated with boolean values.
...
For non-atomic, save operations that include models with boolean fields.
The first false value would cause the save to abort. This regression was
introduced in #6947 . Instead of checking the data from save() we should
be boolean casting save() to capture the success/failure.
Refs #7069
2015-07-22 00:41:10 -04:00
mark_story
e4b2428735
Fix PHPCS errors.
2015-07-21 16:28:17 -04:00
Yoshiyuki Kinjo
0e0775559c
Add failing test for FormHelper::input
...
FormHelper::input does not respect 'value' option when form is of date/time type.
2015-07-21 22:58:50 +09:00
Mark Scherer
52e79987a2
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-21 10:22:53 +02:00
mark_story
bd23fdeebf
Simplify code and reduce test redundancy.
...
We don't need the additional parameter, and some of the tests weren't
covering unique scenarios.
Refs #7040
2015-07-20 22:16:50 -04:00
Chris Valliere
7b2d7ad748
Test Case for Hash::maxDimensions
...
Added test case for Hash::maxDimensions using the example array in pull request #7040 .
2015-07-20 22:07:58 -04:00
mark_story
9b313f86e4
Add tests for #7034
...
These tests ensure that redirect() is never called which ensures the
Location header is never set. Ajax requests when no loginElement is
defined should get an empty response with a 403 status code.
2015-07-16 23:00:20 -04:00
Mark Story
6fa3195de1
Merge pull request #7005 from wnasich/pot-without-references
...
Generate .pot files without references
2015-07-15 21:34:38 -04:00
Walter Nasich
9d74bb289c
Fixing a coding standars issue
2015-07-14 00:04:04 -03:00
Walter Nasich
80896cef2a
Replacing param --locations by boolean flag --no-location
2015-07-13 19:47:26 -03:00
Mark Scherer
d98e7d8d27
Fix tests.
2015-07-13 08:37:11 +02:00
Mark Scherer
2eea245491
Backport utf fix for CakeText::tokenize().
2015-07-13 08:23:05 +02:00
Walter Nasich
06b8cb0c30
Renaming option 'headers' to 'locations'
2015-07-13 00:54:11 -03:00
Walter Nasich
67d81e499e
Removing trivial asserts from UT
2015-07-12 23:30:14 -03:00
Walter Nasich
44756eaac5
Adding a new option to i18n shell to generate .pot files without sentence references
2015-07-12 23:08:50 -03:00
mark_story
47378427e3
Merge branch '2.6' into 2.7
2015-07-11 21:25:26 -04:00
Marc Würth
4a131bdcbf
Capitalize Windows, the OS
2015-07-09 15:54:03 +02:00
Mark Story
97656d8edb
Merge pull request #6965 from dy-dx/backport-csv-mapping
...
Don't map text/plain to csv. Backport from 3.0. Refs #1696
2015-07-07 22:07:02 -04:00
mark_story
7613e720e7
Fix PHPCS errors.
2015-07-07 22:06:47 -04:00
mark_story
59a18e7709
Merge branch '2.6' into 2.7
2015-07-07 22:05:56 -04:00
Chris Kim
94fbc6e5f2
Don't map text/plain to csv. Backport from 3.0. Refs #1696
...
Jquery sets accepts header similar to "text/plain, */*; q=0.01" by
default for xhr requests. Due to this RequestHandler used to set
extension to csv thereby causing View class to look for views under
non-existent csv folders.
2015-07-07 15:19:45 -04:00
mark_story
4102961cb5
Add tests for #6879
...
I wasn't able to reproduce the issue the reporter had, but we have more
robust tests now.
2015-07-06 22:43:52 -04:00
hiromi2424
deb62c8887
#6935 Fix deep saving for hasMany could not handle validation errors correctly
2015-07-04 06:10:58 +00:00
mark_story
cbd45f702d
Make FlashComponent/FlashHelper more backwards compatible.
...
Merge branch 'issue-6874' into 2.7.
Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
2015-06-26 22:05:32 -04:00
mark_story
97c5463387
Fix failing tests.
...
FlashHelper uses `Message` not flash now. This is more backwards
compatible with 2.x
Refs #6874
2015-06-26 22:04:00 -04:00
mark_story
e651d15df5
Add tests for less greedy field parsing in SQLite.
...
Refs #6887
2015-06-25 22:21:38 -04:00
mark_story
ae2ea1ea6c
Merge branch '2.6' into 2.7
2015-06-25 21:50:47 -04:00
Highstrike
a9d77d26f0
fix failing tests
...
fixing...
2015-06-25 13:40:50 +03:00
mark_story
2f616a9e0c
Fix greedy regex operators in Postgres driver.
...
`*` is greedy in regex, and needs to be escaped so that SQL operators
don't cause invalid SQL conditions to be created.
Refs #6877
2015-06-24 23:39:26 -04:00
Mark Scherer
1c56c723f5
Backport param() access.
2015-06-25 00:52:33 +02:00
Highstrike
58983f717a
2.7.0-RC Auth doesn't use the new Flash component
...
Changed 'Flash.' to 'Message.' and also provided backwards compatibility
in FlashHelper->render
2015-06-24 14:06:35 +03:00
Mark Story
0841c04351
Merge pull request #6853 from cakephp/2.6-template
...
Cleanup method calls.
2015-06-22 10:53:32 -04:00
Mark Scherer
fc57e43a5b
Adjust tests.
2015-06-21 12:13:09 +02:00
Humberto Pereira
77150eb6f6
fixed tests cases to print html
2015-06-20 22:19:08 -04:00
mark_story
26b3713bd6
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
2015-06-20 10:03:24 -04:00
mark_story
664ba53c89
Merge branch '2.6' into 2.7
2015-06-20 10:03:14 -04:00
Mark Scherer
ccac3b3e06
Allow deep options for radio() just as for select().
2015-06-16 13:23:51 +02:00
Mark Story
65b64e0348
Merge pull request #6816 from cakephp/2.6-fix-validation-multiple
...
Fix Validation::multiple() regarding 0 value.
2015-06-15 12:20:13 -04:00
mark_story
97be9b9696
Fix PHPCS errors.
2015-06-15 12:19:20 -04:00
Mark Scherer
86c358f3f9
Fix Validation::multiple() regarding 0 value.
2015-06-15 16:35:27 +02:00
Mark Story
32fe09835b
Merge pull request #6809 from ravage84/2.7-code-coverage
...
Explicit definition of the code coverage
2015-06-15 10:13:12 -04:00
mark_story
947262e754
Fix PHPCS errors.
2015-06-14 21:56:48 -04:00
Marc Würth
f3099fefdf
Define code coverage explicitly
2015-06-15 00:56:09 +02:00
mark_story
c47196fe08
Merge branch '2.6' into 2.7
2015-06-07 15:45:26 -04:00
mark_story
6d60e6a4db
Backport 7eec48268ebb6a17656df4a059f9e7b43991472f to 2.x
...
Backport fixes to base path generation that prevent issue when a URL
contains // it can circumvent the base path generation, which results in
unwanted user data in the base/webroot paths. This creates an
opportunity for CSS manipulation in old versions of IE, and newer ones
via iframe inheritance.
2015-06-07 15:45:16 -04:00
mark_story
0e6fcc02b8
Add/correct some tests for humanize.
...
The arguments for assertEquals() were backwards. While there are many
more flipped assertions I will change the others separately.
2015-06-05 10:31:29 -04:00
mark_story
239c83938f
Fix regression in camelize().
...
The input should not be lowercased before camelizing, as this can cause
inputs that were previously camelized to create incorrect results.
Refs #6735
2015-06-05 10:20:51 -04:00
mark_story
df0f2295c3
Fix issue with overlapping irregular inflections.
...
When irregular inflections overlap we should choose the longest match,
not the shortest.
Refs #6659
2015-06-02 23:09:29 -04:00
Mark Scherer
4ad001b9ca
Use options array.
2015-06-01 16:12:45 +02:00
Mark Scherer
670d93b6f6
Extract formatTreeList() from generateTreeList().
2015-06-01 12:36:20 +02:00
mark_story
d7d8b90986
Merge branch '2.6' into 2.7
2015-05-28 19:34:59 -04:00
mark_story
65691836be
Fix syntax errors in PHP <5.4
2015-05-28 17:39:52 -04:00
mark_story
995d8d22c6
Disable reading XML files and URLs when handling user data.
...
Allowing users to load arbitrary files/URLs with Xml is not desirable
when handing user input.
2015-05-27 09:45:53 -04:00
nojimage
c6e4208bda
refs #6635 Inflector::underscore, humanize support multibyte string inputs
2015-05-26 13:29:05 +09:00
nojimage
8ebc9cdd87
refs #6635 FormHelper::radio() return collect id attributes with multibyte
2015-05-25 22:10:50 +09:00
mark_story
9626f0e726
Exclude deprecated validators from bake.
...
Don't include deprecated validators in bake.
Refs #6581
2015-05-22 22:03:32 -04:00
mark_story
4a3b2e2a03
Fix failing test in SQLite.
...
SQLite does not handle subqueries in virtual fields well. However, the
original issue was that the generated query was invalid which
find(first) will still catch.
2015-05-21 21:58:12 -04:00
mark_story
52a0d642ec
Fix incorrectly quoted table aliases in virtual fields.
...
DboSource::_quoteFields() is already a bit of a mess, and while I'm not
happy about having to add more regex replacement, it seems to be the
only reasonable solution given that the code is already 'parsing' SQL
to apply identifier quoting.
Fixes #6602
2015-05-20 22:40:47 -04:00
Marc Würth
508b9d1443
Rename test methods after notBlank change
...
Was a left-over from #6579
2015-05-19 15:13:28 +02:00
Mark Scherer
4f3602ad5f
Adjust bake, docblocks and tests for notBlank.
2015-05-17 22:27:16 +02:00
Mark Scherer
866242643f
Deprecate notEmpty in favor of notBlank.
2015-05-17 22:13:04 +02:00
ndm2
323e8d8d76
Add underscore support for multi word irregulars.
...
Underscore separated words were not catched by the irregular regex,
tests however didn't fail as the default rules matched the tested words
too. The added test should ensure that this won't happen again.
Fixes the gap left by the previous #6538 fix.
2015-05-12 14:33:15 +02:00
mark_story
d4740c9c09
Fix incorrect handling of irregular values.
...
When inflecting irregular values, both plural and singular forms were
generated incorrectly.
Fixes #6538
2015-05-11 21:35:08 -04:00
Mark Scherer
4915e802c1
Fix tableCells()
2015-05-02 16:52:51 +02:00
Mark Scherer
f510dac32a
fix cs
2015-05-02 16:16:27 +02:00
Mark Scherer
cdbf5a0dec
Correct brackets.
2015-05-02 14:26:57 +02:00
Mark Scherer
ed21f84236
Backport _xmlOptions
2015-05-02 14:24:02 +02:00
mark_story
032c01d18c
Add other key types to {*} test.
2015-05-01 22:41:41 -04:00
mark_story
5e9d4893a8
Add the {*} matcher to Hash::extract()
...
This matcher will match anything and is useful when you just want to
traverse through data and you're not too picky.
I've also refactored the conditions to use a case as it is slightly more
readable and uses fewer lines of code.
Refs #6447
2015-05-01 22:03:40 -04:00
Mark Story
bcb403078d
Merge pull request #6455 from cakephp/2.6-status-code-429
...
Backport #6431
2015-04-30 20:13:36 -04:00
Mark Scherer
adf2eb03f2
Backport jsonOptions
2015-04-30 15:51:13 +02:00