mark_story
c2b8778ce8
Merge branch 'master' into 2.5
2013-12-14 17:45:49 -05:00
Mark Story
384c3a815d
Merge pull request #2350 from tuffz/formatting_app_uses_blocks
...
formatting app::uses blocks
2013-12-14 12:37:02 -08:00
Mark Story
e61ac62bfa
Merge pull request #2458 from bar/2.5-model-typehints
...
Add Model type hints, and ease testing for Model.
2013-12-14 12:34:58 -08:00
mark_story
79701af501
Make Hash::numeric() accept more numeric things.
...
Negative numbers and other stringy forms of numbers should be accepted.
The name Hash::numeric implies is_numeric which it now uses.
Fixes #2478
2013-12-12 17:41:38 -05:00
Jose Lorenzo Rodriguez
fc6edf4d9c
Fixed small coding standard error
2013-12-12 09:07:00 +01:00
ADmad
87440bba87
Fixed docblock. Closes #2476
2013-12-12 11:00:29 +05:30
mark_story
3b867a048e
Add test for saveMany + validate=false.
...
Closes #2468
2013-12-11 12:43:18 -05:00
Mark Story
8e6d26773c
Merge pull request #2438 from bar/2.5-console-options-format
...
Set console options in the same fashion for every shell/task.
2013-12-10 19:53:54 -08:00
Ber Clausen
2d67604182
Add more Model type hints, and ease the model testing replacing is_object() for '!== null'.
2013-12-10 00:20:12 -03:00
Ber Clausen
63a192ea39
Update DboSource::group():
...
* Update documentation.
* Add Model type hint.
* Bail early when fields are empty.
2013-12-10 00:18:19 -03:00
Ber Clausen
5c595b90d2
Remove is_object() calls when the test subject is already type hinted as a Model.
2013-12-10 00:18:18 -03:00
Ber Clausen
2f24de81cb
Model objects should be in CamelCase.
...
Add a Model type hint.
2013-12-10 00:18:18 -03:00
Mark Story
19122414fc
Merge pull request #2459 from bar/2.5-patch
...
Test for self join only when needed.
2013-12-09 18:55:31 -08:00
Mark Story
cf3cf551a6
Merge pull request #2457 from bar/2.5-getconstraint
...
Make getConstraint() a tiny bit more readable.
2013-12-09 18:53:40 -08:00
Ber Clausen
b7527c6c3b
Test for a self join only when needed.
2013-12-09 23:11:42 -03:00
Ber Clausen
2366e7c7b5
Make getConstraint() a tiny bit more readable.
2013-12-09 22:25:03 -03:00
Mark Story
a2f043d2a3
Merge pull request #2445 from young-steveo/2.5
...
CakeFixtureManager::load now calls CakeTestFixture::truncate
2013-12-09 09:23:02 -08:00
mark_story
2a58e529b7
Merge branch 'glorand-master'
...
Fix Hash::extract() operating on non-array data.
Closes #2433
2013-12-09 12:17:36 -05:00
mark_story
edcfe2d3a8
Add tests for #2433
2013-12-09 12:17:25 -05:00
José Lorenzo Rodríguez
6358741944
Merge pull request #2449 from cakephp/fix-session-cyclic-error
...
Fixed error in CakeSession that would call start() in an infinite loop
2013-12-09 02:18:21 -08:00
mark_story
48d2618c62
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Routing/Router.php
2013-12-08 21:25:59 -05:00
mark_story
abf4af14a8
Change quotes to keep postgres happy.
2013-12-08 11:58:26 -05:00
mark_story
530c95725f
Attempt to fix errors with postgres tests.
2013-12-08 11:46:17 -05:00
Jose Lorenzo Rodriguez
3a2c497206
Fixed failing test
2013-12-08 14:08:57 +01:00
José Lorenzo Rodríguez
dff8e0175a
Merge pull request #2450 from rchavik/2.4-delete-all-regression
...
2.4 delete all regression
2013-12-08 04:46:48 -08:00
Jose Lorenzo Rodriguez
70d5c37834
Ensuring session is configured before trying to destory it
2013-12-08 13:44:16 +01:00
Rachman Chavik
2d5a153c0d
Set 'order' to false to prevent issues with postgres
...
See: https://github.com/cakephp/cakephp/pull/2421#issuecomment-30074971
2013-12-08 16:40:22 +07:00
Rachman Chavik
98e645a1ea
Add test to prove issues with deleteAll with $order set
2013-12-08 16:39:56 +07:00
Jose Lorenzo Rodriguez
848a0ce217
Fiexed error in CakeSession that would call start() in an infinite loop
...
when the session is marked as invalid
2013-12-07 22:25:33 +01:00
Stephen Young
8645e05ab1
Removed leading underscores from ReflectionProperty variables in test case
2013-12-07 12:10:03 -05:00
Stephen Young
f0036b3ebc
CakeFixtureManager::load now calls CakeTestFixture::truncate
2013-12-07 09:47:06 -05:00
Mark Story
9aa40819db
Merge pull request #2444 from ADmad/2.4-auth-finduser
...
Fixed edge case which allowed login with empty password.
2013-12-07 06:05:58 -08:00
ADmad
738d0e2277
Fixed edge case which allowed login with empty password.
...
Ensure skipping call to FormAuthenticate::_checkFields() does not allow
logging in with empty password. Closes #2441 .
2013-12-07 18:40:08 +05:30
Mark Story
7cd370e745
Merge pull request #2440 from beporter/feature/bake-test-marktestincomplete
...
Baked test methods are marked incomplete.
Fixes #2437
2013-12-06 05:14:34 -08:00
Brian Porter
bfdc41e8bb
Baked test methods are marked incomplete.
...
Previously empty (and "passing") test methods now include PHPunit's `markTestIncomplete()` to better reflect the truth of the resulting file: The test methods are stubbed out, but are not yet complete and passing.
It is much easier when _running_ tests to locate incomplete test methods.
Fixes 2437.
2013-12-05 22:54:26 -06:00
Ber Clausen
5c08c77b93
Set console options in the same fashion for every shell/task.
2013-12-05 22:59:01 -03:00
Gombos Lorand
764e368dc3
Check if the item is an array.
2013-12-05 12:03:07 +02:00
mark_story
85a9132c9b
Append / to the start/end of the mapResources prefix.
...
This makes the method easier to use and less error prone.
Fixes #2431
2013-12-04 21:46:59 -05:00
Mark Story
58317d312c
Merge pull request #2427 from EliuFlorez/patch-3
...
Cast implemented events to an array when detaching listeners.
This makes it much simpler to work with mocks, and avoids warnings caused by developer error.
2013-12-04 11:26:35 -08:00
Eliu Florez
6ee5277c9f
Update CakeEventManager.php
...
Cast resultados de implementedEvents a una matriz.
e6f2c92005
2013-12-04 14:26:02 -04:30
mark_story
e6f2c92005
Cast results of implementedEvents to an array.
...
This makes using mocks much easier with event listeners as they don't
need to provide a returnValue for implementedEvents.
Refs #2333
2013-12-03 22:39:14 -05:00
Mark Story
a57c46ff93
Merge pull request #2421 from ADmad/2.4-bugfix-deleteall
...
Fixed bug where deleteAll tried to delete same id multiple times.
2013-12-03 10:22:16 -08:00
ADmad
f3900e89fd
Fixed bug where deleteAll tried to delete same id multiple times.
...
Ensure find done in deleteAll only returns distinct ids. A wacky
combination of association and conditions can sometimes generate
multiple rows per id.
2013-12-03 22:18:17 +05:30
mark_story
8578708e76
Merge branch 'master' into 2.5
2013-12-01 21:37:37 -05:00
Mark Story
b8268cd055
Merge pull request #2408 from ADmad/2.4-paginator-exception
...
Moved exception throwing to after paging info it set for request.
Fixes #2402
2013-11-30 14:17:12 -08:00
ADmad
c72def4840
Moved exception throwing to after paging info it set for request.
...
This fixes the regression caused in 2096d3f632
. When catching exception
thrown by PaginatorComponent::paginate() in controller, developer again
has access to paging info in request object.
Closes #2402
2013-11-30 19:00:08 +05:30
mark_story
a9ca1bdc58
Add tests and fix other cases where autoLinkEmail would fail.
...
Refs #2403
2013-11-29 22:57:43 -05:00
mark_story
7c66d0db50
Fix autoLink() when URLs contain email addresses.
...
Add whitespace lookbehind to ensure the email address is preceded by
whitespace, this obviously means that emails starting with word/symbols
are not detected, however those symbols are generally valid in an email
address anyways, and will form the local part.
Fixes #2403
2013-11-29 22:24:03 -05:00
mark_story
bbe4c659aa
Add tests for TextHelper::autoLink()
...
Add tests for email addresses embedded in urls.
Refs #2403
2013-11-29 21:57:08 -05:00
ADmad
155c7585e0
Fixed docblock
2013-11-29 00:14:43 +05:30