Val Bancer
dbbc8400b6
Free some memory in unit tests
2018-08-13 13:09:22 +02:00
Val Bancer
8bfdcdb637
Free some memory in unit tests
2018-08-13 12:26:26 +02:00
Val Bancer
87677d7004
Merge pull request #7 from cakephp/2.x
...
Sync 2.x with upstream
2018-08-13 12:22:57 +02:00
Mark Story
34092f049d
Merge pull request #12433 from ptica/patch-2
...
Avoid undefined index: null (update action)
2018-08-06 09:32:30 -04:00
Jan Ptacek
d292a83407
Avoid undefined index: null (update action)
...
Avoid Notice (8): Undefined index: null [APP/Vendor/cakephp/cakephp/lib/Cake/Model/Datasource/DboSource.php, line 2180]
also discussed here: 22b0275#diff-b8a4043bec5d20830b77d240ae8fdef5R2087
fix for previous instance if same bug already merged here: cakephp#12411
(sorry for overlooking this second use-case :( )
2018-08-06 12:15:41 +02:00
Mark Story
1f1cd775c1
Merge pull request #12430 from bancer/2.x-documentation
...
Fix param documentation in App::import
2018-08-05 21:41:10 -04:00
Val Bancer
494913648d
Restore property deleted by accident
2018-08-05 15:34:12 +02:00
Val Bancer
377cd09062
Fix param documentation in App::import
2018-08-05 15:32:12 +02:00
Mark Story
252f3a0e44
Merge pull request #12420 from mma/tests
...
2.x Enchament to CakeEmail error message
2018-08-01 16:08:24 -04:00
AlexAlexandru
c44113af66
code style
2018-08-01 21:50:38 +03:00
AlexAlexandru
44c0d73391
code style
2018-08-01 21:04:50 +03:00
AlexAlexandru
8c3982b192
fixes #11424 Enchament to email class error message
2018-08-01 20:54:53 +03:00
Mark Story
9f16d2e515
Merge pull request #12378 from mma/tests
...
Fixes #12376 bindTranslation restore fields
2018-07-30 15:05:32 -04:00
Mark Story
a1a1983a7a
Merge pull request #12411 from ptica/patch-1
...
Avoid undefined index: null
2018-07-30 14:46:07 -04:00
Jan Ptacek
ca59191d5c
Avoid undefined index: null
...
Avoid Notice (8): Undefined index: null [APP/Vendor/cakephp/cakephp/lib/Cake/Model/Datasource/DboSource.php, line 1013]
also discussed here: 22b0275a58 (diff-b8a4043bec5d20830b77d240ae8fdef5R2087)
2018-07-30 11:17:24 +02:00
AlexAlexandru
a58eb706dc
added tests
2018-07-19 21:14:18 +03:00
AlexAlexandru
1aa0108354
Issue #12376
2018-07-19 20:28:53 +03:00
Mark Story
ee02d4274f
Merge pull request #11750 from bancer/11528-code-coverage
...
fixes Error: Class 'PHP_CodeCoverage' not found error
2018-07-13 13:24:19 -04:00
mark_story
98c7fa1c97
Update version number to 2.10.11
2018-07-01 15:05:15 -04:00
Mark Story
fd568e7c79
Fix method casing.
...
Closes #12241
2018-06-30 14:55:37 -04:00
Mark Sch
130714f4b2
Merge pull request #12293 from aokiken/patch-1
...
tweak typo perfomance -> performance
2018-06-26 08:58:38 +02:00
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
