Ceeram
c5b19b658a
Merge commit '74a0bd98c28991664fc0a3b0e8b34dc4f9dbf009' into 2.2
2012-06-15 09:42:22 +02:00
Ceeram
74a0bd98c2
throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype
2012-06-14 19:01:41 +02:00
AD7six
d01f0e9f67
correct tests to match desired behavior
...
by default we don't want fixtures pulled in from a different scope than
that of the test being baked
2012-06-14 13:38:17 +02:00
mark_story
5413143178
Don't modify app/Config/bootstrap when running tests.
2012-06-12 22:10:55 -04:00
euromark
ba62ecd21a
whitespace
2012-06-12 16:59:16 +02:00
euromark
b32edfe378
fix double-encoding of external urls
2012-06-12 16:30:37 +02:00
Kyle Robinson Young
54745aada9
Fix custom validation methods with CakeValidationSet
2012-06-11 23:28:45 -07:00
mark_story
f6b50a948e
Small fixes for validation formatting.
...
* Remove additional out() calls.
* Remove extra punctuation.
* Fix code standards.
* Fix failing test.
2012-06-10 21:57:15 -04:00
mark_story
76dd49145a
Merge branch '2.1' into 2.2
2012-06-10 20:34:20 -04:00
mark_story
b2e82871f1
Attempt to fix failing build.
2012-06-10 20:08:17 -04:00
mark_story
7ae660c779
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Cache/Engine/XcacheEngine.php
2012-06-10 20:05:25 -04:00
mark_story
0a182b918f
Fix $depth being decremented by 2.
...
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.
Fixes #2946
2012-06-10 20:00:34 -04:00
mark_story
454fae9bd0
Fix Validation::ip() not respecting type.
...
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.
Fixes #2944
2012-06-10 19:37:44 -04:00
ADmad
9ce216b09d
Revert "Fix missing view variables."
...
Commit 7416c53
shows error message from last exception instead of first one
and also displays framework specific error messages instead of generic ones with debug off.
We don't want either.
This reverts commit 7416c530a2
.
2012-06-11 02:36:51 +05:30
Jose Lorenzo Rodriguez
5ba5f906e6
Adding new test case for ModelValidator
2012-06-09 15:27:22 -04:30
Jose Lorenzo Rodriguez
0d013f8da5
Fixing CakeTime, the actual params for format() is $date and $format,
...
and not the other way around :)
2012-06-09 08:28:39 -04:30
Jelle Henkens
c8e58b50ba
Adding cake core message extraction in cake extract
2012-06-07 23:55:36 +01:00
AD7six
2335ef1a13
remove pseudo-mock code
...
Not required, not used by any committed code
2012-06-06 23:08:40 +02:00
AD7six
a56ec8d6cf
Correct TestTask tests
...
there will not be a setUp function for Controller tests
there will not be a tearDown
there will be no returned constructor logic from generateConstructor
all because for a controller test - you'd ordinarilly just call this->testAction
2012-06-06 23:04:18 +02:00
AD7six
b509bdb04b
Automatically handle PUT requests
...
make the following "just work"
curl -X PUT -d foo=bar http://...
2012-06-06 22:59:37 +02:00
Jose Lorenzo Rodriguez
51635c2ca6
Merge remote-tracking branch 'origin/2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e
Fixing yet another issue related to beforeValidate and
...
validateAssociated
2012-06-06 10:07:01 -04:30
Rachman Chavik
8966f1b324
create CakeRequest in View instead of in CakeEmail
2012-06-04 22:21:41 +07:00
Rachman Chavik
e821c27f54
remove unnecessary lines
2012-06-04 09:18:36 +07:00
Rachman Chavik
9bafc5a3bb
CakeEmail: create request object before rendering
...
Closes #2931
2012-06-04 09:18:29 +07:00
mark_story
fceb028499
Fix code style errors.
2012-06-03 21:11:34 -04:00
mark_story
8da42dfcfa
Merge branch '2.1' into 2.2
2012-06-02 20:57:05 -04:00
mark_story
d1819dcabb
Fix page 0 issue.
...
Refs #2929
2012-06-02 20:56:38 -04:00
mark_story
15a423ad70
Restrict page number passed to view.
...
Limit the page number to the max page number when passing data to the
view. This prevents the helper from generating a huge number of links.
Fixes #2929
2012-06-02 20:26:09 -04:00
Ceeram
4c6453501e
Merge branch '2.1' into 2.2
2012-06-02 01:47:21 +02:00
Jelle Henkens
e5eb7b490e
Preventing cache collisions by adding the the datasource key
2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605
Replacing crc32 with md5 for less collisions in method caching
2012-06-01 10:42:26 +01:00
Rachman Chavik
07d9a75fcb
Helpers in custom CakeErrorController are lost
...
Since many exceptions do not have its own 'template' file, customized
APP/Controller/CakeErrorController with its own list of helpers could be
ignored.
This happens becase ExceptionRenderer is forced to to use _outputMessageSafe
when a template is missing. This causes Controller::$helpers to be reset with
default values.
2012-06-01 15:28:06 +07:00
Rachman Chavik
483d7124dd
debug() may output path that is incorrectly truncated
...
This happens when debug is called in core source files that resides in
a different directory to the app.
2012-06-01 15:28:06 +07:00
mark_story
55c4ad3c1c
Fix coding standards errors.
...
Also remove count() calls in TreeBehavior.
2012-05-31 21:20:11 -04:00
Mark Story
085ad0bb42
Merge pull request #672 from sitedyno/cookie-encryption-#471
...
Add stronger encryption, and make it available in cookiecomponent.
Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
2012-05-31 17:44:49 -07:00
Ceeram
6c9b2a1fec
Fix user() return value for nested data
2012-05-31 15:13:24 +02:00
Mark Story
119377422e
Merge pull request #674 from colares/ticket-2787
...
Add table attributes per column
Fixes #2787
2012-05-30 18:29:56 -07:00
mark_story
01b3135a63
You should be able to regex match null/''
...
Fixes #2926
2012-05-30 21:28:18 -04:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
fb0cc50700
Allow Set::extract() to match null.
...
Fixes #2926
2012-05-30 21:19:46 -04:00
Tigran Gabrielyan
1367e5b927
Fixed failing test case
2012-05-30 15:26:59 -07:00
Ceeram
acbb2bebc9
adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions
2012-05-30 21:29:05 +02:00
Heath Nail
304d001dfb
Implement rijndael optional cookie encryption.
2012-05-30 03:49:25 -04:00
Thiago Colares
fad7b0705f
Increasing testTableHeaders case
2012-05-29 23:30:06 -03:00
Jelle Henkens
ab1f336e21
Adding timeout and port options to the redis cache engine
2012-05-29 23:39:56 +01:00
Ceeram
25c7a27495
fixing XmlView, XmlException: Invalid input was raised when _serialize is string and data is numerically indexed.
2012-05-29 09:46:00 +02:00
mark_story
0bfcd49249
Fix unbindTranslation not unbinding.
...
There were documented use cases that have never worked. Fix that.
Also rename a method so it better describes what it does.
Fixes #2913
2012-05-27 21:25:55 -04:00
José Lorenzo Rodríguez
06476a22da
Fixing failing tests caused by adding new validator, blind editing... hoping for the best
2012-05-27 19:48:46 -05:30
José Lorenzo Rodríguez
18c3fa79c9
Merge pull request #671 from burzum/2.2-validation
...
2.2 validation methods
2012-05-27 18:09:03 -07:00