Commit graph

16525 commits

Author SHA1 Message Date
Mark Story
54a65f98da Merge pull request #2499 from ADmad/2.5-cakeemail
By default use filter_var() to valid email addresses in CakeEmail.
2013-12-17 16:52:23 -08:00
ADmad
49a9d24ca7 By default use filter_var() to valid email addresses in CakeEmail.
Refs #2477
2013-12-18 01:07:40 +05:30
mark_story
30e139412d Fix input type inference when type=>checkbox
FormHelper should not infer types when the explicit type is checkbox.
Instead the provided type should be used.

Fixes #2491
2013-12-16 23:26:20 -05:00
Mark Story
81d14e4f1a Merge pull request #2494 from bcrowe/hotfix-configTimezone
Add Configure timezone to bootstrap
2013-12-16 19:01:37 -08:00
Bryan Crowe
20faace775 Clean up grammar in Configure timezone in bootstrap 2013-12-16 21:59:29 -05:00
Bryan Crowe
3a7650ad9b Remove smart quotes from Configure timezone in bootstrap 2013-12-16 21:51:36 -05:00
Bryan Crowe
4b28254319 Fix whitespace error in Validation utility 2013-12-16 21:40:46 -05:00
mark_story
44b7d013ae Fix whitespace error. 2013-12-16 21:39:06 -05:00
Bryan Crowe
708d462bf9 Add Configure timezone to boostrap 2013-12-16 21:14:32 -05:00
mark_story
01be15d654 Don't always wipe a Model's _schema property when calling setSource()
Only wipe the internal schema cache if listSources() returned a useful
list of sources. Otherwise retain the old schema. This lets datasources
that don't implement listSources to be combined with models that define
static schema properties.

Fixes #2467
2013-12-16 14:42:21 -05:00
José Lorenzo Rodríguez
b5d7628cbf Merge pull request #2484 from ADmad/2.5-cookiecomponent
Revert change done in 11f543f1f2.
2013-12-15 07:32:12 -08:00
ADmad
27979286b2 Revert change done in 11f543f1f2.
The change is unneeded now as Security::encrypt() no longer throws exception
for falsey values.
2013-12-15 20:29:41 +05:30
José Lorenzo Rodríguez
bba3e78219 Merge pull request #2483 from ADmad/2.5-security
Don't throw exception when trying to encrypt falsey value.
2013-12-15 06:53:19 -08:00
ADmad
8a666fb37e Don't throw exception when trying to encrypt falsey value. 2013-12-15 19:28:56 +05:30
mark_story
ef899f0c93 Make API docs easier to read. 2013-12-14 23:08:07 -05:00
mark_story
47497029bb Fix mixed tabs/spaces. 2013-12-14 23:03:34 -05:00
mark_story
e15d1652ed Relax the 'my' and 'ym' date validation formats.
All other formats that include 'y' allow 2006 or 06. These formats are
now conformant with the other formats available.

Closes #2436
2013-12-14 23:02:12 -05:00
Mark Story
bf96ea36d9 Merge pull request #2482 from zoghal/2.5-cookie-fix2
fix CookieComponent - when write null or empty string
2013-12-14 16:21:58 -08:00
mark_story
15c390586f Pull out some re-used subpatterns.
Having smaller segments makes reading the larger patterns simpler, and
allows for less duplication across the various patterns.

Refs #2436
2013-12-14 18:20:20 -05:00
mark_story
c2b8778ce8 Merge branch 'master' into 2.5 2013-12-14 17:45:49 -05:00
Saleh Souzanchi
11f543f1f2 fix CookieComponent - when write null or empty string 2013-12-15 02:15:36 +03:30
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