Commit graph

19605 commits

Author SHA1 Message Date
Mark Story
cd6fba1361 Revert "Takes into account the current recursive value in deleteAll()." 2017-07-24 00:09:01 -04:00
mark_story
fef1029f98 Update version number to 2.10.0 2017-07-22 15:06:53 -04:00
mark_story
aa6770fa45 Merge branch '2.x' into 2.next 2017-07-22 14:59:41 -04:00
Mark Story
314a2c0c4f Merge pull request #10863 from bancer/paginator-i18n-not
Pagination 'NOT' notation fails with i18n
2017-07-22 13:33:43 -04:00
Mark Story
1eb4b0fdf7 Merge pull request #10916 from tenkoma/2.x-console-unknown-option
2.x Console: Display error message when unknown option is specified
2017-07-21 21:47:22 -04:00
Val Bancer
5765f4e72a adjusted phpunit version in composer config 2017-07-20 22:25:56 +02:00
Val Bancer
7dae9e24da improved loading of composer autoload 2017-07-20 22:21:01 +02:00
Koji Tanaka
7e50fc9ee6 Add test for shell unknown option 2017-07-21 00:46:02 +09:00
Val Bancer
31489a75d6 Adjusted phpunit version in composer.json 2017-07-19 23:51:27 +02:00
Val Bancer
5e92034ad8 improved code style 2017-07-18 22:31:28 +02:00
Koji Tanaka
65841081e9 2.x Console: Display error message when unknown option is specified 2017-07-18 00:27:39 +09:00
Val Bancer
15f0fe31b1 Fixed PHPUnit 5.7 warnings 2017-07-16 16:02:31 +02:00
Val Bancer
7ba52d0c53 Fixed code style. 2017-07-16 00:27:20 +02:00
Val Bancer
93696b65e4 Fixed indefinite loop in getMock(). 2017-07-16 00:09:36 +02:00
Val Bancer
eefd3ac847 adapter for the getMock() depricated in phpunit 2017-07-15 23:23:14 +02:00
Mark Story
3b286f7ff3 Merge pull request #10902 from bancer/tests
makes the test more stable
2017-07-12 20:43:49 -04:00
Val Bancer
d1c3cca924 makes the test more stable 2017-07-12 20:42:06 +02:00
Mark Story
04acd5b92e Merge pull request #10899 from bancer/tests
Some tests refactored. Skipped non-compartible tests in MySQL ONLY_FULL_GROUP_BY mode.
2017-07-12 10:52:45 -04:00
Val Bancer
d71bc4acae Fixed code style 2017-07-12 01:00:33 +02:00
Val Bancer
5cc0d7a5cf Some tests refactored. Skipped non-compartible tests in MySQL
ONLY_FULL_GROUP_BY mode.
2017-07-12 00:46:02 +02:00
mark_story
0d68007e5c Revert changes in 2290b612f8
I think they broke the builds in our CI environments.

Refs #10894
2017-07-11 10:01:08 -04:00
Mark Story
9a101c2c1c Merge pull request #10894 from bancer/tests
added composer scripts like in cake 3
2017-07-10 21:00:03 -04:00
Val Bancer
16acacfa27 process-timeout set to 0 in composer to let the tests run as much as
necessary
2017-07-11 00:31:41 +02:00
Val Bancer
2290b612f8 set order in HABTM in unit tests to make it stable in mysql 5.7 2017-07-11 00:14:08 +02:00
Val Bancer
bdb8e9b6d5 added composer scripts like in cake 3 2017-07-10 23:12:35 +02: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
Val Bancer
d9f2117436 more unit tests 2017-07-07 00:41:04 +02:00
Val Bancer
76ab1f4537 more unit tests 2017-07-06 00:03:00 +02:00
Val Bancer
85e0ebd7fd more unit tests added 2017-07-05 23:22:58 +02:00
Val Bancer
50334679d6 added a unit test 2017-07-05 22:40:41 +02:00
Mark Story
edcea59334 Merge pull request #10857 from bancer/paginator-i18n-not
Pagination 'NOT' notation fails with i18n
2017-07-05 09:35:23 -04:00
Val Bancer
31fd4217b1 more PaginatorComponent unit tests 2017-07-04 23:01:17 +02:00
mark_story
1d1a762a37 Merge branch 'issue-10830' into 2.x
Fix current_timestamp() handling in MariaDB
2017-07-02 11:07:59 -04:00
mark_story
32f6b96060 Fix formatting. 2017-07-02 11:06:39 -04:00
Kurre Ståhlberg
4ec195f9c8 Fix error when default value is reported as CURRENT_TIMESTAMP() with parenthesis 2017-06-27 11:46:51 +03:00
mark_story
fb42b15ce8 Update version number to 2.10.0-RC1 2017-06-26 22:02:00 -04:00
mark_story
aaa37fa809 Merge branch '2.next' of github.com:cakephp/cakephp into 2.next 2017-06-26 21:51:55 -04:00
mark_story
2032fef772 Merge branch '2.x' into 2.next 2017-06-26 21:51:41 -04:00
Mark Story
8cd930d19e Merge pull request #10764 from bancer/translate-inner-joins
Add left join support in TranslateBehavior
2017-06-26 21:40:42 -04:00
Val Bancer
5b37d42f97 joinType moved from $settings to $runtime 2017-06-26 23:02:06 +02:00
Mark Story
2b8447dc5b Merge pull request #10766 from cakephp/issue-10763
Fix encoding of addreses contain comma & unicode
2017-06-16 21:37:54 -04:00
Mark Story
05d30a6f05 Merge pull request #10749 from ikuwow/2.next-fix-broken-cookie
Fix broken cookie issue
2017-06-15 21:15:13 -04:00
Mark Story
52790443e8 Merge pull request #9705 from CakeDC/feature/backport-paginate-multiple-queries
2.next - Backport multiple paginators
2017-06-14 21:41:13 -04:00
mark_story
c4766d667b Fix PHPCS error. 2017-06-14 09:38:06 -04:00
Mark Story
8289b367f9 Merge pull request #10698 from lucasferreira/2.next
Cake 2.x - Some fix into Paginator component for order / sort classic sintax
2017-06-14 00:13:00 -04:00
Val Bancer
0bfb19f126 left join support in TranslateBehavior 2017-06-12 21:41:35 +02:00
mark_story
738b20a19b Fix encoding of addreses containin comma & unicode
Email addresses that contain both unicode and commas will not be
correctly encoded by mime_encode_header if the comma precedes the
unicode. In this scenario we have to quote the encoded address.

Refs #10763
2017-06-12 10:58:44 -04:00