Commit graph

8020 commits

Author SHA1 Message Date
Mark Story
c5229c2037
Merge pull request #12913 from bancer/2.x
Add unit test for timezone conversion
2019-01-31 22:20:11 -05:00
bancer
bb20b4f419 Change private method to protected 2019-01-31 09:49:41 +01:00
bancer
e94183c6d8 Give a better name to a new function 2019-01-29 09:16:48 +01:00
mark_story
7da7a9fab4 Update version number to 2.10.15 2019-01-25 21:41:55 -05:00
bancer
ec5bac5e52 Fix timezone adjustment in CakeTime::nice and CakeTime::niceShort 2019-01-25 13:56:50 +01:00
bancer
e845e8876d Add unit test 2019-01-25 13:04:41 +01:00
bancer
c855ef874b Simplify i18nFormat 2019-01-25 12:25:26 +01:00
bancer
009d69b3f7 Fix code style errors 2019-01-25 12:21:34 +01:00
bancer
044e8f24af Fix timezone conversion 2019-01-25 12:05:44 +01:00
bancer
7911bb9052 Remove unnecessary timezone offset manipulation 2019-01-24 15:43:11 +01:00
Val Bancer
c269ae29e6
Add timezone conversion unit test 2019-01-20 21:54:41 +01:00
bancer
4eb42e0b05 Add unit test for timezone conversion 2019-01-18 17:07:05 +01:00
Mark Story
73de35c119
Merge pull request #12906 from akeiper/2.x
resolving ini_set error in php 7.2

Fixes #12678
2019-01-16 21:57:13 -05:00
mark_story
a13abcf97b Fix tests. 2019-01-16 21:53:42 -05:00
andrew.keiper
38074f72e9 adding support for PHP 5.3 by adding function_exists for session_status 2019-01-16 15:28:35 -05:00
andrew.keiper
06269b3fba resolving session issues for php 7.2 2019-01-16 10:43:04 -05:00
kicaj
bcbe5fdcf0
Fix #12885 2019-01-11 13:20:09 +01:00
bancer
71ea302336 Improve documentation 2018-12-28 14:19:26 +01:00
Joseph Zidell
6ed88922a5 Fixes docblock for View::set() (#12837)
* Fixes docblock for View::set()
2018-12-23 00:09:44 +04:00
mark_story
1dc3219f22 Update version number to 2.10.14 2018-12-19 20:45:32 -05:00
Mark Story
0471d7a9ca
Merge pull request #12808 from bancer/2.x-issue-12804-generate-shell-enum
Improve support of enum data type
2018-12-16 19:30:21 -08:00
Joseph Zidell
44f4fe27bf
Fixes docblock for Folder constructor 2018-12-12 22:45:41 -05:00
bancer
7788c60f58 Adjust enum related unit tests 2018-12-12 14:31:55 +01:00
bancer
cf6c8d511f Improve support of enum data type 2018-12-12 12:40:20 +01:00
Mark Story
acb0436cb6
Merge pull request #12736 from bancer/2.x-documentation
Improve documentation and code style
2018-12-11 12:59:19 -08:00
Val Bancer
0f2bbf505d
Adjust the check according to review comments 2018-12-11 16:36:32 +01:00
Yaser Naderi
3d224639d9 Add the functionality to accept enum MySQL datatype storing the Integer values as String (#12715)
Fix a bug in enum MySQL datatype storing Integers when enum contains
integer string values. Now strings will always be used for enum values.
2018-11-30 21:27:58 -05:00
Martin Stücklschwaiger
a9e20c39be
Fix @return value 2018-11-29 20:37:03 +01:00
Val Bancer
addd538526 Fix invalid condition 2018-11-18 22:48:34 +01:00
Val Bancer
c00579153b Cast var to int for comparison 2018-11-18 18:22:19 +01:00
Val Bancer
cb1d80fda1 Improve documentation 2018-11-18 17:13:11 +01:00
Val Bancer
92e9277d20 Improve code style 2018-11-18 16:24:25 +01:00
Val Bancer
509accc421 Improve code style 2018-11-17 20:55:42 +01:00
Val Bancer
261a99c0e3 Improve documentation and code style 2018-11-17 20:27:05 +01:00
Val Bancer
320cdf98ee Add undocumented properties (#12717)
See https://book.cakephp.org/2.0/en/controllers/request-response.html#accessing-request-parameters and https://api.cakephp.org/2.10/source-class-UpgradeShell.html#345-403

* Initialize $params to null
* Document more magic properties, trigger deprecated notices
* Use $controller->request->params instead $controller->params
* Remove unused variable
* Improve documentation, add type checks.
* It seems like $this->uses can also be of type false; however, parameter
$array of array_unshift() does only seem to accept array.
* Declare undeclared property
* Add extra type checks
* Adjust type check
* Improve documentation, initiate uninitialized variables.
* Improve documentation, reset variable
2018-11-15 20:41:57 -05:00
Val Bancer
22b0386fd5 Move failing assertion to a new test method 2018-11-11 17:53:28 +01:00
Val Bancer
2f5467e8e8 Move failing assertion to a new test method 2018-11-11 17:36:10 +01:00
Val Bancer
0f0cedec14 Move failing assertion to a new test method 2018-11-11 17:18:18 +01:00
Val Bancer
d5ac7aa0b2 Simplify assertions in tests 2018-11-11 17:00:55 +01:00
Val Bancer
90ddb43632 Fix some PHP 7.3 errors 2018-11-11 16:15:55 +01:00
Mark Story
b1a93df604
Merge pull request #12692 from bancer/model-exists-without-id
Add model id to all `exists()` method calls
2018-11-01 21:21:27 -04:00
bancer
58ebf6a303 Remove id property from bake template 2018-10-31 09:46:01 +01:00
Mark Story
89005c4440
Merge pull request #12680 from bancer/issue-12636-tests-constants
Replace hard coded test directory paths with constants, fixes #12636
2018-10-30 14:28:49 -04:00
bancer
d8d65027ac Adjust unit tests with id parameter for exists() method 2018-10-30 11:02:42 +01:00
bancer
3ea39d96b4 Add model id to all exists() method calls,
Related issue - https://github.com/dereuromark/cakephp-shim/issues/25
2018-10-30 10:39:16 +01:00
mark_story
33ac2b2537 Update version number to 2.10.13 2018-10-27 22:01:42 -04:00
bancer
ee1b1a10df Defines TESTS also after app bootstrap.php is loaded, #12636 2018-10-26 15:52:39 +02:00
bancer
85cc215293 Improve documentation 2018-10-26 14:23:30 +02:00
bancer
53e3df20d0 Replace hard coded test directory paths with constants, fixes #12636
The `TESTS` constant definition is moved from bootstrap.php in order
to make it possible to set the constant in test.php or in the project's
bootstrap file so that CakePHP would detect tests in a different folder.
2018-10-26 13:49:53 +02:00
Val Bancer
3c9d46864e
Improve documentation
The parameter description is copied from `CakeLog::write` method.
2018-10-26 09:54:23 +02:00
Val Bancer
527b9fe640
Improve documentation 2018-10-22 10:11:01 +02:00
Val Bancer
e825823e9a
Improve documentation 2018-10-22 10:02:51 +02:00
Mark Story
2bdc04e53c
Merge pull request #12653 from begnini/fix_describe_pgsql_function
limiting the regex to consume only words in default value in pgsql
2018-10-21 02:30:44 +00:00
mark_story
ffde7ee32a Don't break UNC file paths
Blindly replacing // causes network paths and paths with protocols to
break. Relying on correct input allows the user to get what they want
without the framework interfering.

Refs #12657
2018-10-19 22:08:39 -04:00
Val Bancer
b97530977d
Improve documentation 2018-10-19 16:54:05 +02:00
Val Bancer
8e8fbae78c
Improve documentation 2018-10-19 16:45:21 +02:00
Humberto Pereira
23e38aeaf0 limiting the regex to consume only words in default value in PostgreSQL after ::
added tests showing the old behavior was broken.
2018-10-18 17:16:29 -04:00
Joseph Zidell
59fe9f55c2
Augment docblock for Hash::combine()
Adds array as possible types for `Hash::combine()` for `$keyPath` and `$valuePath` params.
2018-09-20 22:00:03 -04:00
Val Bancer
d7b5cda0ea Fix PHP 5.3 syntax 2018-09-12 18:14:24 +02:00
Val Bancer
a7a49c5f8e Fix syntax 2018-09-12 17:32:00 +02:00
Val Bancer
1a62c147fe
Improve handling of CURRENT_TIMESTAMP default value
Resolves https://github.com/cakephp/cakephp/issues/12553.
2018-09-12 16:45:01 +02:00
mark_story
4aa0df8370 Fix tests to run when database name is not cakephp_test 2018-09-09 13:03:36 -04:00
Mark Story
2bea29d07c
Merge pull request #12487 from josephzidell/php_7.3_issues
Fixes: a few issues found when running PHP 7.3
2018-09-09 12:50:23 -04:00
mark_story
29f89c5aa7 Update version number to 2.10.12 2018-09-03 12:37:15 -04:00
Joe
34bfeba15d Fixes failing tests 2018-09-03 00:45:34 -04:00
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
c5d78b6302 Remove duplicate connect method from the unit test stub 2018-08-26 01:24:18 +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
Joe
013ecc3f9f Rebuilds the solution 2018-08-22 11:40:41 -04:00
Joe
1fca92fb4e Fixes issue raised by @garas 2018-08-22 00:40:28 -04:00
Joe
af516eebb0 Cleanup fix 2018-08-21 15:29:48 -04:00
Joe
8e7bc7701c Combine variable defaults 2018-08-21 15:29:04 -04:00
Joe
a4e71b3b40 Fixes:
* Issue with preg_match()
* Undefined variables
2018-08-21 14:46:58 -04:00
Val Bancer
a05c09c1f4
Improve code style 2018-08-14 12:33:49 +02:00
Val Bancer
e56452b2c5
Improve code style 2018-08-14 12:31:58 +02:00
Val Bancer
f5bf22e1e3
Do not unset $this->fixtures 2018-08-13 17:13:47 +02:00
Val Bancer
0e02af091a
Move unset to the proper place 2018-08-13 15:28:10 +02:00
Val Bancer
727aac1713
Move unset to the proper place 2018-08-13 15:06:19 +02:00
Val Bancer
cb23bf9223
Remove whitespace 2018-08-13 14:38:54 +02:00
Val Bancer
b45fe026f5
Unset more properties to free more memory 2018-08-13 14:20:29 +02:00
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
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
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 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
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
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 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
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
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
Val Bancer
9185fb10e2
fixes Error: Class 'PHP_CodeCoverage' not found error 2018-02-23 16:21:33 +01:00
Val Bancer
1b11fa7a7a
Constructs the default fixture manager if 'fixtureManager' parameter is an empty string. 2018-02-05 16:07:33 +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
5d9a3cb2ba Fix phpcs error. 2018-01-24 21:17:52 -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
mark_story
41e3bd82d8 Update version number to 2.10.7 2018-01-20 18:55:27 -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
Koji Tanaka
d3d0501414 Uncountable null convert to array(), revert ControllerTask::bake() signature for backward compatibility. 2018-01-18 15:25:41 +09:00
Koji Tanaka
e1897a8498 Pass PaginatorComponentTest::testPaginateExtraParams() 2018-01-17 23:27:20 +09:00
Koji Tanaka
7099c9d513 Fix Multibyte::strtolower() 2018-01-17 23:02:13 +09:00
Koji Tanaka
aa14c68497 Fix some count() Error in PHP 7.2 2018-01-17 03:35:00 +09: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
Koji Tanaka
701519c637 Execute CakeSession::destroy() on a tearDown with implicit use session test 2018-01-16 00:47:34 +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
Mark Story
ab272b09c7
Merge pull request #11581 from bancer/issue-11131-long-cache-key
Hash group cache keys to prevent key overflows in some cache engines
2018-01-06 22:05:39 -05:00
Mark Story
83928f9d74
Merge pull request #11590 from cakephp/issue-11588
Buffer contents of HtmlReporter.
2017-12-31 21:13:28 -05:00
Koji Tanaka
400d45f56c fix code style 2017-12-31 17:05:26 +09:00
Koji Tanaka
74a8611eef [2.x]Fix can't load aliased component on ControllerTestCase 2017-12-31 15:44:05 +09:00
mark_story
d2c4bf2bb2 Buffer contents of HtmlReporter.
Collect HTML output into a buffer so we can provide compatibility across
PHPUnit 3.x and 4.x

Refs #11588
2017-12-30 23:47:11 -05:00
Val Bancer
0f51c75157
replaced vsprintf to implode 2017-12-28 16:15:14 +01:00
Val Bancer
7ae84e3d5d
Makes the cache key shorter by using md5() 2017-12-28 10:02:35 +01:00
mark_story
51206d7358 Update version number to 2.10.6 2017-12-18 21:15:48 -05:00
Mark Story
3bf93b7f76
Merge pull request #11526 from cakephp/post-conditions
Make postConditions() less permissive.
2017-12-15 14:36:38 -05:00
mark_story
340059be15 Check model names for bad characters as well. 2017-12-13 00:01:09 -05:00
mark_story
a9618f67f7 Use a permitted list instead of a ban list.
This should be safer as we are more confident on what is coming in.
2017-12-13 00:01:05 -05:00
Koji Tanaka
fba7f1c617
Fix Phpdoc for CakeObject::log() 2017-12-12 20:00:21 +09:00
mark_story
f66dec8a96 Make postConditions() less permissive.
We were notified by `ooooooo_q` that postConditions() is vulnerable to
SQL injection if used without SecurityComponent tampering prevention.

This change attempts to make postConditions() safer by exploding in
unsafe scenarios.
2017-12-10 21:44:47 -05:00
chinpei215
6ad30946d8 Fix CS 2017-12-04 23:31:32 +09:00
chinpei215
9f65402d2c Fix CakeRequest::referer(true) returning scheme-relative URLs
Backport of #11503 (and #8795)
2017-12-04 21:18:27 +09:00
dereuromark
eaf7454628 Clarify migration path to 3.x 2017-11-29 19:57:01 +01:00
Mark Story
abec95d3ea
Merge pull request #11469 from db-bogdan/issue11468
fixes #11468 sending user data on basic auth in API environment
2017-11-28 21:52:59 -05:00
chinpei215
4ae9f13dfd Fix 'order' not working with a single expressions 2017-11-29 00:17:57 +09:00
db-bogdan
e824346cca extra fix 2017-11-28 11:43:55 +02:00
db-bogdan
94e06dfeb3 add unit test 2017-11-28 11:31:46 +02:00
db-bogdan
5695fef46f fixes #11468 2017-11-27 11:59:34 +02: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
Val Bancer
a2cc9843e4
added missing ob_end_flush() call 2017-11-21 15:20:14 +01:00
mark_story
10fcd7633d Update version number to 2.10.5 2017-11-20 21:09:55 -05:00
mark_story
f788c90b3c Fix typo 2017-11-05 22:34:47 -05:00
Mark Story
b175270f62
Merge pull request #11404 from ynaderi/2.x
- DigestAuthenticate modification for cakephp 2.X
2017-11-05 22:34:17 -05:00
Yaser Naderi
26a683f36f - DigestAuthenticate modification for cakephp 2.X 2017-11-03 14:53:54 -04:00
Milan van As
7de5ae4438 Force email domain lookups to work in fallback case. 2017-10-25 08:45:57 +02:00
saeideng
b59b64db29 replace tab with space 2017-10-21 22:44:15 +03:30
mark_story
549c181926 Update version number to 2.10.4 2017-10-18 21:54:49 -04:00
chinpei215
19bbb7da17 Simplify CookieComponent::read()
Also, this commit fixes an issue of when the second level key is empty.
Previously, read('foo.0') returned incorrect result.
2017-10-16 21:01:19 +09:00
chinpei215
bbea91090d Fix CookieComponent::delete() not working for deep children 2017-10-16 20:55:00 +09:00
mark_story
e85f489c1f Add test for #11284 2017-10-13 21:55:56 -04: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
Mark Story
fb44035177 Merge pull request #11299 from tenkoma/2.x-fix-cc-number-jcb-pattern
[2.x]Fix Credit card number pattern(JCB) is wrong
2017-10-08 10:09:19 -04:00
Koji Tanaka
7d2d902b57 [2.x]Fix Credit card number pattern(JCB) is wrong 2017-10-08 16:15:10 +09:00
Mark Story
e889535e41 Merge pull request #11288 from mensler/session-without-cookies-2.x
Check for session.use_trans_sid and session ID in URL when cookies are disabled (2.x)
2017-10-07 12:17:30 -04:00
Clemens Weiß
61eddc6bde Fixed formatting 2017-10-07 11:11:45 +02:00
Mark Story
a71cad0420 Merge pull request #11283 from chinpei215/2.x-cookie-component-1
[2.x] Fix fatal error thrown when replacing scalar with array
2017-10-06 16:45:38 -04: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
chinpei215
deac8f9109 Backport #7080, #8233 and #11060 2017-10-06 22:02:37 +09:00
chinpei215
ccf634e5f3 Docblock update 2017-10-06 21:59:48 +09:00
chinpei215
959f45a6c6 Fix fatal error thrown when replacing scalar with array
Refs #11280
2017-10-06 13:43:32 +09: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
e1e5a292f2 Fix: revert return 2017-10-05 00:09:51 +09:00
LustyRain
0f00d73c70 Fix delete space, restored return 2017-10-04 21:02:48 +09:00
LustyRain
1f09318724 Fix delete space, restored return 2017-10-04 20:40:57 +09:00