aoki ken
2a19badae0
tweak typo perfomance -> performance
2018-06-26 13:42:50 +09:00
Mark Story
a1203409aa
Merge pull request #12218 from WrDX/WrDX-session-write-doc
...
2.x Updated docs for CakeSession
2018-06-12 10:54:22 -04:00
Wouter
6c86981858
Make docs compatible with CakeSession
2018-06-12 10:24:24 +02:00
Wouter
9ef47b49cc
Update CakeSession.php
2018-06-12 10:21:37 +02:00
Mark Story
b5c9d1f860
Merge pull request #12212 from bancer/2.x-documentation
...
Improved property documentation
2018-06-11 14:36:16 -04:00
Val Bancer
3de5913cda
Improved property documentation
2018-06-11 10:20:40 +02:00
Mark Story
a68d1fb2ef
Merge pull request #12162 from trenshaw/issue-11827
...
Fix # 11827: Replace use of each() in DboSource::order for PHP 7.2 compatibility
2018-06-07 11:06:03 -04:00
mark_story
99d63752d0
Fix failing tests.
2018-06-06 22:29:49 -04:00
Mark Story
afe7225c1d
Merge pull request #12196 from WrDX/WrDX-patch-order-param-array
...
The $order param allows both a string and array
2018-06-06 12:05:28 -04:00
Wouter
a57b4c3432
The $order param allows both a string and array
2018-06-06 12:10:53 +02:00
Mark Story
cc9d2fcaa3
Fix phpcs issue.
2018-05-31 20:14:12 +00:00
Trent Renshaw
adefb973aa
Replaced is_array() check and set of $keys in array with cast to array of $keys in array_filter()
...
Replaced assignment of $key and $dir through list() with each() with simply key() and current() per tenkoma's suggestion. Resolves # 11827
each() advances the pointer similar to next() but is being negated this particular case by array_shift() which resets the pointer
2018-05-31 15:46:28 +10:00
mark_story
fc061a55c4
Update version number to 2.10.10
2018-05-11 22:06:44 -04:00
mark_story
ab5578dbc9
Allow expression objects in virtual fields.
...
Merge branch 'issue-11871' into 2.x
Refs #11871
2018-04-03 12:00:04 -04:00
mark_story
7a3b66b238
Fix doc block indentation.
2018-04-03 11:59:39 -04:00
Mark Story
157c38169a
Merge pull request #11883 from cakephp/ADmad-patch-1
...
Add Luxembourgish language.
2018-03-31 02:03:28 +00:00
ADmad
07c72e0166
Add Luxembourgish language.
2018-03-30 20:25:35 +05:30
Philippe Gibert
292dc17fc2
Fix #11870 Correct tests expressions for Dbo VirtualFields
2018-03-28 13:49:45 +02:00
mark_story
461c5dc9fa
Update version number to 2.10.9
2018-03-24 11:41:37 -04:00
Philippe Gibert
98bc995623
fixes #11870 Add DboSource::expression support for Dbo VirtualFields
2018-03-23 17:19:41 +01:00
Mark Story
d63c847b61
Merge pull request #11825 from cakephp/dereuromark-patch-2
...
Fix notice when passing false.
2018-03-14 17:32:59 +00:00
Mark Sch
b68f1cbb1f
Fix notice when passing false.
2018-03-14 17:07:08 +01:00
Mark Sch
68de980972
Merge pull request #11809 from WrDX/WrDX-removing-non-existing-rule
...
Don't break on removing a non-existing rule
2018-03-14 17:01:46 +01:00
Wouter
b225443166
Test removing a rule on a previously removed field
2018-03-14 11:32:58 +01:00
Mark Story
5d7f3a67c5
Merge pull request #11811 from Khigashiguchi/fix/issue-11810
...
[2.x]In getMockForModel, place useDbConfig test_xxx
2018-03-10 13:55:35 +00:00
Kazuki Higashiguchi
0e4a1d76ab
test modified getMockForModelSecondaryDatasource
2018-03-10 12:59:10 +09:00
Kazuki Higashiguchi
722a2b3286
In getMockForModel, place useDbConfig test_xxx
2018-03-10 10:51:30 +09:00
Wouter
1f0c973681
Don't break on removing a non-existing rule
2018-03-09 16:51:08 +01:00
ADmad
fb5c3ecd71
Merge pull request #11756 from tenkoma/patch-1
...
[2.x]Fix typo in PhpDoc
2018-02-25 15:08:47 +05:30
Koji Tanaka
61f608abc7
Fix typo
2018-02-25 16:52:34 +09:00
mark_story
8744e53d0e
Update version number to 2.10.8
2018-02-24 22:32:53 -05:00
Mark Story
e0e4a3b0d6
Merge pull request #11643 from chinpei215/2.x-make-mcrypt-optional
...
[2.x] Make mcrypt optional
2018-02-25 01:57:10 +00:00
chinpei215
a6b0271560
Remove Security::engine()
...
We disscussed and decided to avoid auto selecting which extension to use.
Instead, call Configure::write('Security.useOpenSsl', true) manually.
2018-02-24 12:17:51 +09:00
Mark Story
f1db01395b
Merge pull request #11695 from bancer/issue-11694-web-test-runner
...
Issue 11694 web test runner
2018-02-05 16:59:52 +00:00
Val Bancer
1b11fa7a7a
Constructs the default fixture manager if 'fixtureManager' parameter is an empty string.
2018-02-05 16:07:33 +01:00
Val Bancer
f0abce55f2
Merge pull request #6 from cakephp/2.x
...
sync with 2.x upstream
2018-02-05 16:00:07 +01:00
Mark Sch
df9c7fd96e
Merge pull request #11616 from cakephp/issue-11186
...
Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer.
2018-02-05 14:48:22 +01:00
mark_story
5816143493
Fix usage of non-existant property.
...
Use the declared `_result` property instead. I would normally add
a test, but getting to this path requires a query to fail which is not
simple to simulate in the test harness.
Fixes #11615
2018-02-04 11:48:31 -05:00
mark_story
49725a8f86
Merge branch 'issue-11661' into 2.x
2018-01-24 21:18:17 -05:00
mark_story
5d9a3cb2ba
Fix phpcs error.
2018-01-24 21:17:52 -05:00
Mark Story
46dacd597b
Merge pull request #11660 from davidyell/2.x-phpunit37
...
2.x - Change PHPUnit version as requested by test shell
2018-01-24 13:38:17 -05:00
David Yell
bcae20029c
Fixed the PHPCS warnings
2018-01-24 10:33:45 +00:00
David Yell
230066a14b
Added a test case for the helper with no params. Relates to #11658
2018-01-24 10:13:56 +00:00
David Yell
5c5ec45215
Fixed PHP Unit version so running tests using the Console works
2018-01-24 10:01:03 +00:00
mark_story
41e3bd82d8
Update version number to 2.10.7
2018-01-20 18:55:27 -05:00
Mark Story
1e87526a16
Merge pull request #11619 from tenkoma/2.x-build-php72
...
2.x Build and Pass with PHP7.2
2018-01-19 13:18:42 -05:00
chinpei215
fc397bd481
Pass MCRYPT_DEV_URANDOM to mcrypt_create_iv() explicitly
2018-01-20 00:25:35 +09:00
chinpei215
5289aae64e
Change Security::randomBytes() to fallback to mcrypt_create_iv()
2018-01-19 23:54:58 +09:00
chinpei215
d7ed0339b1
Make mcrypt optional
...
Now Security::encrypt() and Security::decrypt() works with openssl
if the mcrypt extension is unavailable.
Note that Security::rijndael() doesn't work with openssl.
2018-01-19 23:54:53 +09:00
Koji Tanaka
2a14e65b43
Fixed: use $var === null instead of is_null($var)
2018-01-19 13:39:35 +09:00
