Commit graph

19349 commits

Author SHA1 Message Date
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
Mark Story
2acad7e94d
Merge pull request #12667 from bancer/patch-3
Improve documentation
2018-10-22 21:06:32 -04: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
001adaa8cd
Merge pull request #12660 from cakephp/issue-12657-2x
2.x - Don't break UNC file paths
2018-10-21 01:55:01 +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
Mark Story
240ae93b68
Merge pull request #12656 from bancer/patch-2
Improve documentation
2018-10-19 20:42:21 +00: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
Mark Story
5b57a1e926
Merge pull request #12579 from josephzidell/patch-1
Augment docblock for `Hash::combine()`
2018-09-21 12:01:13 -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
Mark Story
2273428dca
Merge pull request #12554 from bancer/patch-1
Improve handling of CURRENT_TIMESTAMP default value
2018-09-13 09:34:17 -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
Mark Story
bfdab3d11d
Merge pull request #12506 from bancer/dbosource-missing-methods
Add missing method definitions
2018-08-26 00:12:28 -04: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
Mark Story
4b71666255
Merge pull request #12466 from bancer/2.x-tear-down
Free some memory in unit tests
2018-08-14 14:36:42 -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
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