Commit graph

1452 commits

Author SHA1 Message Date
Mark Story
c2df84c701
Merge pull request #12503 from bancer/code-style
Improve documentation
2018-08-29 13:49:00 -07:00
Val Bancer
e13d44be87 Initialize $map to empty array 2018-08-26 14:20:38 +02:00
Val Bancer
df1c25f4cf Fix documentation of resultSet method 2018-08-26 02:23:29 +02:00
Val Bancer
2aa8fac574 Fix resultSet() method signature 2018-08-26 01:58:56 +02:00
Val Bancer
290bccedb4 Add missing method definitions 2018-08-25 23:19:26 +02:00
Val Bancer
957b4e566a Move declaration of $map to DboSource 2018-08-25 22:39:26 +02:00
Val Bancer
f768689bd0 Improve documentation 2018-08-25 19:34:29 +02:00
Val Bancer
5105c49668 Improve documentation 2018-08-25 19:15:30 +02: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
9f16d2e515
Merge pull request #12378 from mma/tests
Fixes #12376 bindTranslation restore fields
2018-07-30 15:05:32 -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
1aa0108354 Issue #12376 2018-07-19 20:28:53 +03: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
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
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
Philippe Gibert
98bc995623 fixes #11870 Add DboSource::expression support for Dbo VirtualFields 2018-03-23 17:19:41 +01:00
Mark Sch
b68f1cbb1f
Fix notice when passing false. 2018-03-14 17:07:08 +01:00
Wouter
1f0c973681
Don't break on removing a non-existing rule 2018-03-09 16:51:08 +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
Koji Tanaka
f4315d8ba4 When the PHP version is 7.2 or higher ini_set('session.save_handler', 'user') can't be executed, so delete. 2018-01-17 02:30:04 +09:00
mark_story
45695b6b5c Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer.
Refs #11186
2018-01-09 17:01:00 -05:00
chinpei215
6ad30946d8 Fix CS 2017-12-04 23:31:32 +09:00
dereuromark
eaf7454628 Clarify migration path to 3.x 2017-11-29 19:57:01 +01:00
chinpei215
4ae9f13dfd Fix 'order' not working with a single expressions 2017-11-29 00:17:57 +09:00
Mischa ter Smitten
d7b9e55e98 Fix indent 2017-11-23 14:12:13 +01:00
Mischa ter Smitten
05954ff405 Consistency changes 2017-11-23 10:09:25 +01:00
Mischa ter Smitten
4faac8e09a Improved readability 2017-11-23 10:06:14 +01:00
Mischa ter Smitten
bc1678cf2a Add option to make _validAgentAndTime 3.x compatible 2017-11-23 10:02:38 +01:00
Mark Story
d3a4ce1216 Merge pull request #11284 from kolorafa/patch-1
msSQL - also handle offset as string
2017-10-13 21:55:21 -04:00
Clemens Weiß
61eddc6bde Fixed formatting 2017-10-07 11:11:45 +02:00
Clemens Weiß
7f64ea37f9 Restored formatting 2017-10-06 17:11:09 +02:00
Clemens Weiß
5d5e791a31 Check for session.use_trans_sid and session ID in URL in case cookies are disabled (backport of cakephp/cakephp#10828 for 2.x) 2017-10-06 17:04:53 +02:00
kolorafa
22d2564de9 msSQL - also handle offset as string
When doing pagination you could get offset not as a int(eg. 10) but string(eg. "10") and it will not paginate at all.

For example DataTables plugin pass offset from params and all params from http request are strings wrapped in numbers.
Adding ctype_digit($offset) will also check the case.
2017-10-05 11:45:33 +02:00
LustyRain
0f00d73c70 Fix delete space, restored return 2017-10-04 21:02:48 +09:00
LustyRain
31b13edf8a Fix: phpdoc miss
## did
- void unReturn
- miss return void
- add return type
- type miss typing
- add param type and return type
  - string → string|array
- change ClassName
2017-10-04 00:22:42 +09:00
Mike Fellows
0b658697f2 Sqlserver DboSource does not allow the persistent option to be true.
This is backported from CakePHP 3.  The SQL Server PHP PDO driver does not
support the PDO::ATTR_PERSISTENT attribute.  So throw an exception if the
'persistent' option is set in the database config.  Also removes that
option from the Sqlserver base config.
2017-08-16 11:23:42 -07:00
Mark Story
cd6fba1361 Revert "Takes into account the current recursive value in deleteAll()." 2017-07-24 00:09:01 -04:00
mark_story
aa6770fa45 Merge branch '2.x' into 2.next 2017-07-22 14:59:41 -04:00
Val Bancer
d72c2d7e0e fixed code style, skipped pgsql and sqlite incompartible tests 2017-07-09 20:05:53 +02:00
Val Bancer
794ce22f37 fixed unit tests and docs 2017-07-09 19:24:51 +02:00
Val Bancer
f0bbcb3ffc fixed parsing of conditions with 'NOT' in TranslateBehavior 2017-07-08 16:51:32 +02:00
Val Bancer
3440615323 Refactroing in TranslateBehavior. Some code was moved to protected
methods, simplified the coditions.
2017-07-07 01:20:09 +02:00
mark_story
32f6b96060 Fix formatting. 2017-07-02 11:06:39 -04:00