Mark Story
69cde3617f
Merge pull request #7528 from ravage84/2.7-void-mixed
...
Do not mix void with other return types
2015-10-10 21:43:30 -04:00
Marc Würth
ed410dd12c
Do not mix void with other return types
...
Inspired by #7527
2015-10-10 15:49:00 +02:00
ADmad
f50efd7595
Merge pull request #7521 from ravage84/2.7-field-return-value
...
Add false as return value of field()
2015-10-08 20:15:49 +05:30
Marc Würth
de8aed534f
Add false as return value of field()
...
+ improve DocBlocks
2015-10-08 16:31:01 +02:00
Mohsen
f57cdb7568
PaginatorHelper::meta() skips url parameters and disrespects defined routes
...
PaginatorHelper::meta() skips url parameters (passed and named) which results in urls not respecting defined routes.
It means PaginatorHelper::meta() does not generate same url as PaginatorHelper::prev() & PaginatorHelper::next().
2015-10-07 15:07:37 +03:30
Ian den Hartog
5dfb780970
Change names
2015-10-06 10:10:34 +02:00
Mark Story
19ad6dcef2
Merge pull request #7508 from ravage84/2.7-index
...
Minor improvements to the front controller
2015-10-04 10:15:27 -04:00
Marc Würth
86da57d2be
Minor improvements to the front controller
2015-10-04 15:38:48 +02:00
Mark Story
681956408d
Merge pull request #7500 from cakephp/issue-7497
...
Correct input generation for postgres numeric types.
2015-10-02 21:47:12 -04:00
Ian den Hartog
bb7e7850ae
Add test for Self-signed certificates
2015-10-02 16:17:26 +02:00
Ian den Hartog
5c722c6665
Fix peer verification
2015-10-02 10:18:07 +02:00
mark_story
506051f688
Correct input generation for postgres numeric types.
...
Numeric types in postgres are treated like decimals, except they can
have no length, precision or scale components defined.
IE does not accept 1.00000 as a valid step attribute so we'll default to
any when we encounter decimal types with no length.
Refs #7497
2015-10-01 21:46:21 -04:00
mark_story
3fa5c4ff94
Update version number to 2.7.5
2015-10-01 21:03:56 -04:00
Ian den Hartog
e2c303b2b9
Add support for Self Signed certificates with smtp
2015-10-01 23:02:43 +02:00
mark_story
17c3358d77
Revert part of the changes in 1ede742d92
...
These variables are used by the HTML test reporter.
2015-09-29 21:41:33 -04:00
mark_story
a6a699b4b9
Merge branch '2.7' into 2.8
2015-09-28 21:17:45 -04:00
mark_story
0502e0731a
Update version number to 2.7.4
2015-09-28 21:13:09 -04:00
mark_story
13f147940f
Correct inflection of virus.
...
Instead of viri, it should be viruses.
Refs #7466
2015-09-28 21:04:23 -04:00
Mark Story
5a8a7800ae
Merge pull request #7469 from cakephp/issue-7465
...
Load config file before checking class existence.
2015-09-28 15:43:53 -04:00
ADmad
c3e08fde30
Load config file before checking class existence.
...
Closes #7465
2015-09-28 22:52:51 +05:30
Mark Story
dad9eaab90
Merge pull request #7463 from cakephp/ADmad-patch-1
...
Update debugkit links to 2.x compatible branch
2015-09-28 12:32:48 -04:00
José Lorenzo Rodríguez
8e82993904
Merge pull request #7464 from ravage84/2.7-debugkit-link
...
Link to DebugKit 2.2 branch
2015-09-28 14:18:13 +02:00
Marc Würth
26a05a4e87
Update another link to DebugKit 2.2 branch
2015-09-28 12:51:30 +02:00
Marc Würth
7b20c804f4
Use caret operator for depending on DebugKit
2015-09-28 12:48:40 +02:00
Marc Würth
2d82a120af
CS
2015-09-28 12:47:25 +02:00
Marc Würth
f1160b7401
Update link to DebugKit 2.2 branch
...
Refs https://github.com/cakephp/debug_kit/issues/372
2015-09-28 12:47:14 +02:00
ADmad
ab7e8f8491
Update debugkit links to 2.x compatible branch
...
Refs cakephp/debug_kit#372
2015-09-28 09:48:50 +05:30
mark_story
ae83e197dc
Merge branch '2.8' of github.com:cakephp/cakephp into 2.8
2015-09-27 11:13:12 -04:00
mark_story
8a57d78dba
Merge branch '2.7' into 2.8
2015-09-27 11:12:55 -04:00
Mark Story
0da9c4976d
Merge pull request #7448 from ravage84/2.7-tests-improved
...
Various improvements to the CakePHP test files
2015-09-25 18:00:14 -04:00
Marc Würth
a6d62cb6a8
Removed $stringClean
...
Resfs: https://github.com/cakephp/cakephp/pull/7448#discussion_r40450663
2015-09-25 20:10:47 +02:00
Mark Story
3aec527fad
Merge pull request #7449 from ravage84/2.7-app-skel-sync
...
App & skel folder sync + some improvements
2015-09-25 12:49:20 -04:00
Mark Story
c6c88fe0a7
Merge pull request #7446 from ravage84/patch-3
...
Add cakephp/cakephp-codesniffer as dev dependency
2015-09-25 12:47:57 -04:00
Mark Story
12f5aee5a2
Merge pull request #7447 from ravage84/2.7-lib-improvements
...
Various improvements to the CakePHP lib files
2015-09-25 12:14:00 -04:00
Marc Würth
41abccc062
Update param annotation
...
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444634
2015-09-25 18:12:20 +02:00
Marc Würth
1267586f23
Re-add closing tags to ctp files
...
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444715
2015-09-25 18:10:18 +02:00
Marc Würth
f7c472ea1e
Add note to param
...
Refs: https://github.com/cakephp/cakephp/pull/7447#discussion_r40444483
2015-09-25 18:03:36 +02:00
Marc Würth
bd461910e9
Correct return type
...
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444444
2015-09-25 18:02:44 +02:00
Marc Würth
5eedc0f2bb
Fix broken test
2015-09-25 17:55:01 +02:00
Marc Würth
dbfd2c44e9
App & skel folder sync + some improvements
...
Mostly CS, doc blocks and some CSS
2015-09-25 17:25:35 +02:00
Marc Würth
1ede742d92
Various improvements to the CakePHP test files
...
Mostly CS, doc blocks and unused variables.
2015-09-25 17:22:00 +02:00
Marc Würth
e690662f0e
Various improvments to the CakePH Plib files
...
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
Marc Würth
fd2dd41330
Add cakephp/cakephp-codesniffer as dev dependency
2015-09-25 16:51:47 +02:00
Mark Story
b8b7282264
Merge pull request #7436 from cakephp/2.8-fix-order-merge
...
Only array-wrap 'order' if it's not already an array.
2015-09-22 12:24:02 -04:00
Mark Story
872f7b9b07
Merge pull request #7437 from ravage84/2.8-quiet-testshell
...
Swallow the "--quiet" shell parameter before calling PHPUnit.
2015-09-22 12:22:51 -04:00
Marc Würth
5b41a9b52d
Swallow the "--quiet" shell parameter before calling PHPUnit.
...
PHPUnit does not provide a silent or quiet mode, so we cannot pass it along:
https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions
Resolves #7432
2015-09-22 14:25:53 +02:00
Mark Scherer
8909b2ed42
Fix remaining test.
2015-09-22 14:21:04 +02:00
Mark Scherer
81cbb52f74
Only array-wrap 'order' if it's not already an array.
2015-09-22 13:04:28 +02:00
mark_story
c14d1ffe93
Add tests for #7428
2015-09-21 21:39:51 -04:00
Mark Story
9208a0857e
Merge pull request #7428 from burriko/fix-dbo-connection-issues
...
Fix use of $_connection in DboSource in 2.x
2015-09-21 21:38:20 -04:00
