Mark Story
5d4a6fd6b6
Merge pull request #856 from ceeram/2.3-cakenumber
...
Simplify and improve fromReadableSize().
2012-09-18 10:55:28 -07:00
euromark
e8cfac0eec
adding query() for CakeRequest
2012-09-18 19:38:53 +02:00
Ceeram
ff676b5ea4
allow for lowercase as well, also strip the unit part off before pow()
2012-09-18 17:15:33 +02:00
Mark Story
144761c0b2
Merge pull request #852 from cakephp/2.3-reset-sequence
...
Implement resetSequence()
Fixes #3206
2012-09-18 07:42:11 -07:00
Dave
46035cfd73
Update lib/Cake/View/Helper/FormHelper.php
2012-09-18 10:56:36 -03:00
Dave
990d5f89f0
Update lib/Cake/View/Helper/FormHelper.php
2012-09-18 10:51:24 -03:00
Tigran Gabrielyan
d30e092966
Fixed test case
2012-09-18 00:46:06 -07:00
Tigran Gabrielyan
f1a344eee4
Added test case for view block default value
2012-09-18 00:41:33 -07:00
Tigran Gabrielyan
6d98069f13
Added ability to set default view block content
2012-09-18 00:41:30 -07:00
Ceeram
90c32add9c
opmitisation of fromReadableSize
2012-09-18 09:34:05 +02:00
Mark Story
07c5102de5
Merge pull request #850 from ceeram/2.2-filesize
...
Add CakeNumber::fromReadableSize() and Validation::filesize()
2012-09-17 17:55:23 -07:00
mark_story
55dcb9c3b3
Implement resetSequence()
...
This is an optional method in DboSource that allows datasources to
resetSequence values in tables. This is useful for datasources like
Postgres, and makes using fixtures much easier.
Fixes #3026
2012-09-17 20:50:05 -04:00
Ceeram
9530e68ae6
add default return value as parameter to use when size can not be determined
2012-09-17 13:21:50 +02:00
Mark Story
cdfead0feb
Merge pull request #849 from dogmatic69/rijndael-fatal-error
...
skipping the rijndael test if mcrypt_encrypt() is not available
2012-09-15 18:00:07 -07:00
dogmatic69
26934236b1
skipping the rijndael test if mcrypt_encrypt() is not available
2012-09-15 11:43:39 +01:00
dogmatic69
d0bb8a94b4
die() to exit()
2012-09-15 11:20:51 +01:00
dogmatic69
4899b5b91b
changing is_writeable() to is_writable()
2012-09-15 11:17:35 +01:00
dogmatic69
aa87791432
replacing is_integer() with is_int()
2012-09-15 11:15:01 +01:00
dogmatic69
a38a616cba
changing join() to implode() for consistency
2012-09-15 11:06:02 +01:00
mark_story
ccd33782da
Fix whitespace errors.
2012-09-14 22:37:39 -04:00
mark_story
d6e2b6f83e
Re-format long lines.
2012-09-14 22:08:52 -04:00
Mark Story
89c98233b5
Merge pull request #843 from dereuromark/2.3-ticket-3172
...
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
euromark
6d3e0a25b2
save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call
2012-09-15 02:33:05 +02:00
Mark Story
a5481f1c2c
Merge pull request #839 from dogmatic69/cleanup-request-handler
...
Cleaning up the RequestHandlerCompoent
2012-09-14 12:36:39 -07:00
dogmatic69
f5a8eb6bbf
ADmads comments
2012-09-14 19:57:51 +01:00
dogmatic69
cfadc4dbb0
strict type checks and removing some duplicate count() calls by setting a variable
2012-09-14 19:26:00 +01:00
dogmatic69
5cc03ca805
converting if($foo == true) to if($foo)
2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
dogmatic69
e09bf02467
Cleaning up the RequestHandlerCompoent
...
removing redundant code and shifting a few things around so there
are less nested ifs and making things easier to follow.
Removing some variable setting, returning function calls instead.
2012-09-14 17:19:40 +01:00
Mark Story
ec4333de29
Merge pull request #845 from dogmatic69/security-component-cleanup
...
You cant pass func_get_args() in PHP < 5.3
2012-09-14 08:17:11 -07:00
dogmatic69
c7faad9f78
You cant pass func_get_args() in PHP < 5.3
2012-09-14 15:29:48 +01:00
dogmatic69
6f3e6c10a1
Adding a check to the object before use
...
For some reason that I have not been able to figure out yet the object is
returned as null. This is causing some exceptions when trying to access
properties that dont exist.
FatalErrorException: "Call to a member function getAssociated() on a non-object"
Test still pass with the added check.
2012-09-14 14:54:10 +01:00
mark_story
0282194c20
Make permission denied redirects host relative.
...
This helps fix infinite redirect loops when HTTP_X_FORWARDED_HOST is
set, and fixes redirects back to external domains on authentication
errors.
Fixes #3207
2012-09-14 09:39:45 -04:00
Renan Gonçalves
d33f676ddd
Handling a fatal error on console should call Shell::_stop(1).
...
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
2012-09-14 14:17:07 +02:00
mark_story
7d2cbec79d
Revert "Fix null not stopping model callbacks."
...
This reverts commit 82a8400def
.
The previous change broke a number of tests as existing tests expect
that a return value of null will not stop events.
2012-09-13 22:49:17 -04:00
mark_story
82a8400def
Fix null not stopping model callbacks.
...
Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks. This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.
Fixes #3123
2012-09-13 22:11:46 -04:00
Mark Story
1fe791353f
Merge pull request #840 from dogmatic69/cleanup-auth-component
...
Cleaning up the AuthComponent
2012-09-13 18:21:51 -07:00
mark_story
c13ed3366b
Fix whitespace errors.
2012-09-13 21:06:14 -04:00
Mark Story
5081be171f
Merge pull request #821 from dereuromark/2.3-folder-merge
...
allow Folder to merge recursivly and add scheme option
2012-09-13 18:00:02 -07:00
mark_story
921c2c67ab
Fix strict error in 5.4
2012-09-13 20:59:17 -04:00
dogmatic69
2c70319d27
Cleaning up the AuthComponent
...
Simplify if statements, return early and less variable use
2012-09-14 01:50:24 +01:00
mark_story
ec54fa57c5
Merge branch 'simplify-cake-time' into 2.3
...
Conflicts:
lib/Cake/Utility/CakeTime.php
2012-09-13 20:45:59 -04:00
Mark Story
51e0715001
Merge pull request #838 from dogmatic69/security-component-cleanup
...
cleaning up the code, removing extra variables set and un-needed else
2012-09-13 14:50:37 -07:00
Mark Story
f22d4c016e
Merge pull request #837 from dogmatic69/paginator-component-cleanup
...
Cleaning up the paginator component by removing extra else statements and shifting code around.
2012-09-13 14:48:33 -07:00
Mark Story
31ca237709
Merge pull request #831 from dogmatic69/sanitize-regex-cleanup
...
adjusting the way the regex is done so its easier to read
2012-09-13 14:41:36 -07:00
Mark Story
0f8262ec45
Merge pull request #833 from dogmatic69/simplify-class-registry
...
Simplify the ClassRegistry by removing else, and adding early returns
2012-09-13 14:39:37 -07:00
Mark Story
051362a734
Merge pull request #836 from dogmatic69/simplify-object-collection
...
PHP 5.4 strict error fix
2012-09-13 14:37:40 -07:00
dogmatic69
95b895b19a
Simplify the cake time class
...
Removed a lot of nested ?: code and nested if/else statements broken down
with early return. Moving a few variables lower down the function calls as
there are times when they are not even needed.
Also removed setting variables that are returned on the next line.
2012-09-13 22:17:01 +01:00
dogmatic69
bf18fc4dda
cleaning up the code, removing extra variables set and un-needed else
2012-09-13 22:10:57 +01:00
dogmatic69
eb98fed1e3
Cleaning up the paginator component by removing extra else statements and shifting code around.
2012-09-13 21:49:21 +01:00
dogmatic69
173524ade2
PHP 5.4 strict error fix
2012-09-13 21:12:04 +01:00
dogmatic69
50333a2866
adjusting the way the regex is done so its easier to read
2012-09-13 21:03:38 +01:00
euromark
288fb120b5
added missing App::uses('Hash', 'Utility');
2012-09-13 17:20:26 +02:00
dogmatic69
dc3995f939
Simplify the ClassRegistry by removing else, early returns
2012-09-13 14:00:51 +01:00
José Lorenzo Rodríguez
395e5bab58
Merge pull request #832 from dogmatic69/cake-time-unused-var
...
adding the timezone as it was not being used
2012-09-13 00:10:22 -07:00
dogmatic69
cf361040a4
adding the timezone as it was not being used
2012-09-13 06:45:44 +01:00
dogmatic69
b1db2aeb31
fixing the missing space on the if
2012-09-13 06:24:36 +01:00
mark_story
cf4a9f420f
Tidy doc block.
2012-09-12 22:56:46 -04:00
mark_story
fb9360767e
Make connection exceptions more helpful.
...
Fixes #3204
2012-09-12 22:31:07 -04:00
Mark Story
25b447149d
Merge pull request #827 from dogmatic69/simplify-object-collection
...
simplify the code for object collection
2012-09-12 18:36:28 -07:00
Mark Story
5d8ca79b00
Merge pull request #825 from dogmatic69/sanitize-simplify-code
...
Simplify the code for sanitize class
2012-09-12 18:23:10 -07:00
dogmatic69
b84224804e
that change did make wonky uuids
2012-09-12 23:52:04 +01:00
dogmatic69
91c09d87bc
simplify the code for object collection
...
Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
2012-09-12 21:56:59 +01:00
dogmatic69
44f8f84cd7
Simplify the code for sanitize class
...
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
2012-09-12 21:29:40 +01:00
dogmatic69
f886d874a6
simplify the code in the string class
...
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
2012-09-12 18:10:50 +01:00
Rachman Chavik
0cae19a14e
enable PluginDot for routeClass parameter
2012-09-12 21:24:56 +07:00
mark_story
99a9cc9669
Fix required field detection.
...
Fix required field detection to match documentation and behavior when
validating. Having `allowEmpty` in the first validation rule, makes the
field not 'required' as the field is allowed to be empty.
Fixes #3194
2012-09-11 21:59:46 -04:00
mark_story
2bbf6bd568
Forward model option to PaginatorHelper::link().
...
Fixes #3193
2012-09-11 21:47:41 -04:00
euromark
2d9d400ecb
correct spelling
2012-09-10 23:08:14 +02:00
euromark
f7acab7cae
doc block update
2012-09-10 19:20:15 +02:00
euromark
37068539bd
allow Folder to merge recursivly and add scheme option
2012-09-10 10:23:52 +02:00
Ceeram
ce1b387de2
fix incorrect docblock
2012-09-10 09:17:29 +02:00
mark_story
4f637ed4c4
Revert "Fix failing tests in PHPUnit 3.7.0-RC2"
...
This reverts commit d26040e3aa
.
This change causes tests to fail in PHPUnit 3.6, this will have to wait
until 3.7.0 stable.
2012-09-09 21:36:33 -04:00
mark_story
d26040e3aa
Fix failing tests in PHPUnit 3.7.0-RC2
2012-09-09 21:25:53 -04:00
mark_story
e8c1140fc8
Fix notice error.
2012-09-09 21:08:21 -04:00
mark_story
a934f700f1
Fix parsing '0' as a url.
...
Fixes #3198
2012-09-09 20:56:40 -04:00
Jose Lorenzo Rodriguez
9ac5cbed36
Added MailTransport test class refs #2824
2012-09-09 15:48:14 +02:00
Ceeram
0b0d83f261
remove cookie reading in startup
2012-09-07 00:04:03 +02:00
AD7six
99b798fa9a
make it possible to override all of basics.php
2012-09-06 10:19:06 +02:00
Mark Story
93004fcf2f
Merge pull request #818 from shama/patch-unused-vars
...
Remove unused variables and code
2012-09-05 17:50:06 -07:00
Mark Story
c8cb3ae75f
Merge pull request #810 from schrolli/patch-2
...
Update lib/Cake/Configure/IniReader.php
2012-09-05 17:45:43 -07:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
a214fcd992
Remove never reached code in Debugger::trimPath and test more results
2012-09-05 15:57:53 -07:00
Kyle Robinson Young
602240c08e
Fix $readReceipt variable in EmailComponent::send
2012-09-05 12:49:09 -07:00
mark_story
c7647b775f
Attempt to fix build error in travis.
2012-09-04 17:25:02 -04:00
Kyle Robinson Young
200dd2dc9b
Code standards fixes, unneeded break statements
2012-09-04 11:30:52 -07:00
ADmad
28951865c6
Hidden divs created by FormHelper can now be customized.
2012-09-04 23:56:30 +05:30
mark_story
5b641287e9
Make schema errors clearer.
...
When a schema fails because of the name, the error should display
the name & file name that it attempted to load. This gives people
a slightly better chance of figuring things out.
2012-09-03 21:06:48 -04:00
mark_story
0d826528e1
Supress fewer errors.
...
PHPUnit raises exceptions on errors, there isn't much point in
supressing all these errors.
2012-09-03 20:13:30 -04:00
mark_story
771cfde196
Fix coding standards.
2012-09-03 20:09:13 -04:00
mark_story
bacd8afde3
Remove duplicated header.
2012-09-03 19:55:29 -04:00
euromark
2170d87488
check() for CookieComponent and Configure (similar to CakeSession::check()
)
2012-09-04 01:04:48 +02:00
Mark Story
eb33929829
Merge pull request #731 from dereuromark/2.3-fix-rss-test
...
2.3 fix rss test
2012-09-03 15:03:44 -07:00
mark_story
3cb501f1c5
Fix issue created in [ e8b5d81fd7
]
...
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.
Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
583bb37df0
Fix typo.
2012-09-03 13:10:27 -04:00
euromark
387a974396
avoid path being made absolute twice
2012-09-03 13:16:40 +02:00
brq
fca98e39f9
Allow postLink() to support other HTTP methods; it defaults to POST
2012-09-02 12:57:35 -05:00
schrolli
83c05c24b3
Update lib/Cake/Configure/IniReader.php
...
Updated docblock and set NULL as the default value of $path
2012-09-02 14:23:26 +03:00
schrolli
a4c382b23a
Update lib/Cake/Configure/IniReader.php
...
Copied standard path from PhpReader
2012-09-02 06:02:30 +03:00
mark_story
f155687cfa
Update version number to 2.2.2
2012-09-01 18:28:03 +01:00
mark_story
21a51a374a
Revert "Make test a bit more solid."
...
This reverts commit 072991d0da
.
2012-09-01 14:43:11 +01:00
mark_story
072991d0da
Make test a bit more solid.
2012-09-01 14:34:10 +01:00
mark_story
571c8bc08c
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
474e42cc08
Switch File::info() tests to use a different file.
...
text/php files are not detected reliably across platforms. Use a plain
text file instead. This should fix builds on travis.ci
2012-09-01 12:40:05 +01:00
mark_story
d3105332dc
Fix coding standards errors.
2012-09-01 12:14:15 +01:00
mark_story
e8b5d81fd7
Fix quoting of field names containing -
.
...
Fixes #3165
2012-08-31 14:25:02 +01:00
Maggion Emmanuel
03f6f041b2
Fix typo
2012-08-31 09:50:22 +03:00
mark_story
894fc1256a
Add test cases for strings containing quotes.
...
Show that both double and single quoted strings are
handled correctly by ExtractTask.
Closes #3155
2012-08-30 23:48:32 +01:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
d92ff9cc10
Merge branch '2.3' of github.com:cakephp/cakephp into 2.3
2012-08-30 19:42:46 +01:00
mark_story
e64f5f15e2
Fix big int lengths on SQLserver
...
SQLserver big ints aren't as big as other database servers.
2012-08-30 19:18:25 +01:00
mark_story
d4ee62be61
Add support for biginteger on SQLserver.
2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d
Add bigint support for Sqlite.
...
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e
Add bigint support for postgres
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
ec35e3158c
added tests for bigints
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
68116f7017
BIGINTs can also be primary keys
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
15555a7309
added schema support for mysql bigints
2012-08-30 14:48:59 +01:00
mark_story
6a95b5746a
Remove un-necessary parameter.
2012-08-30 14:48:13 +01:00
mark_story
19c2a58185
Fix strict errors.
2012-08-30 14:46:29 +01:00
Kyle Robinson Young
ee9a545c7d
Correct docblock see tags to ViewBlock
...
Fixes http://cakephp.lighthouseapp.com/projects/43067/tickets/97-about-api-description-of-viewassign
2012-08-29 21:53:29 -07:00
Juan Basso
fd2f3aed46
Changed to accept language do not return the qualifiers and order the values by the qualifier. Also, making the test case insensitive
2012-08-28 23:52:05 -04:00
mark_story
4fdd5e5d45
Ignore non-scalar values for length.
...
Fixes #3159
2012-08-28 21:58:32 -04:00
Mark Story
f97d8f9bb7
Merge pull request #800 from bar/master-validator-decimal
...
Refactor Validator::decimal() to be more flexible with decimal separators and PHP magic. Lots of testing added.
2012-08-28 13:41:40 -07:00
Ber Clausen
63548267e9
Refactor Validator::decimal() to be more flexible with decimal
...
separators and PHP magic.
Lots of testing added.
2012-08-27 23:25:17 -03:00
mark_story
b27c8a05bd
Make invalid short option error more helpful.
...
Refs #3157
2012-08-27 22:12:05 -04:00
mark_story
fba17cffe9
Move OptionParser initialization out of try block.
...
This allows exceptions that result from creating the optionparser to
display to the developer, making debugging easier.
Fixes #3157
2012-08-27 22:07:28 -04:00
Mark Story
7135ff29fb
Merge pull request #773 from bar/master-fix-inireader
...
Add plugin support to IniReader, and harden tests.
2012-08-27 12:36:57 -07:00
mark_story
988a847f49
Fix unescaped entities.
2012-08-27 14:48:07 -04:00
Ber Clausen
bdac857293
Add plugin support to IniReader, and harden tests.
...
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
2012-08-27 10:04:26 -03:00
Ceeram
f1ce3f9ae5
remove settings parameter from initialize as this is not being passed. only the constructor gets settings passed
2012-08-27 11:42:57 +02:00
mark_story
cbb64bd082
Fix blackhole requests with empty select boxes.
...
When a select box was entirely empty (no option element)
secured form submission should not fail.
Fixes #3153
2012-08-26 22:53:48 -04:00
mark_story
934838f77c
Fix whitespace.
2012-08-26 22:17:36 -04:00
mark_story
028795eb2e
Clarify docs.
2012-08-26 22:17:02 -04:00
mark_story
b68a2ed84d
Update API docs.
2012-08-26 22:15:18 -04:00
Ceeram
abe74adf8a
partial remove onlyAllow from baked code, only keep in delete to be rfc compliant
2012-08-26 15:00:49 +02:00
Mark Story
a553142a0a
Merge pull request #796 from MrRio/ticket-3152
...
Fix Email test fails when not running on port 80
Fixes #3152
2012-08-25 18:18:50 -07:00
James Hall
20baeb83db
Change to match coding standards
2012-08-26 02:11:43 +01:00
James Hall
a3b5065f8a
Make sure the environment variable is set
2012-08-26 00:33:32 +01:00
James Hall
6c4ba233ba
Fix testSendRenderWithImage when non running on port 80
2012-08-26 00:23:32 +01:00
mark_story
7966c00700
Merge branch 'master' of github.com:cakephp/cakephp
2012-08-25 17:53:22 -04:00
James Hall
7484007fa7
Fix #3148 MediaView does not support Microsoft Office default formats
2012-08-25 17:51:48 -04:00
Jose Lorenzo Rodriguez
f6278488af
Ensuring list of behavior methods are refreshed between calls of
...
validates() in the model, fixes #3071
2012-08-25 14:05:19 +02:00
Jose Lorenzo Rodriguez
60eb228ddf
Fixing issues with validation rules not being reset after calling
...
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
2012-08-25 13:29:16 +02:00
Ceeram
27d83eedfe
use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included
2012-08-25 09:38:40 +02:00
Paul Redmond
a993a7a50d
Fixing typo in view property during unset()
2012-08-24 23:11:25 -07:00
mark_story
17ba713651
Simplify code.
2012-08-24 22:52:02 -04:00
Tigran Gabrielyan
0441c9f6c3
Added tests for bake shell cache prefix generation
2012-08-24 22:52:02 -04:00
Tigran Gabrielyan
8e818c89b6
Added $prefix
generation in core.php
for cake bake
shell
2012-08-24 22:52:02 -04:00
mark_story
d66d37c92b
Merge branch 'master' into 2.3
2012-08-24 22:50:29 -04:00
mark_story
b2f62f46c5
Fix failing tests in postgres.
2012-08-24 22:37:23 -04:00
Ber Clausen
b75a6b440a
Treat float numbers with trailing zeroes removed by PHP, accordingly.
...
Revert #2800 (28bd6880df
) regex changes. Also add more tests.
Signed-off-by: mark_story <mark@mark-story.com>
2012-08-24 22:22:12 -04:00
Thom Seddon
f3ba2bdb7d
Remove legacy test for all actions allowed (*) in startup and tidy code
2012-08-24 19:30:25 +01:00
mark_story
24b68ec1db
Ensure = is removed from generated salt values.
2012-08-24 09:35:33 -04:00
Ceeram
f06ce1324d
Merge branch '2.2-habtmmerge'
2012-08-24 10:45:45 +02:00
mark_story
dcc5a95482
Only split on ; for TABLE related statements.
...
Fixes #3142
2012-08-23 23:11:00 -04:00
Ceeram
cb80338c7d
avoid duplication in return value when saving habtm
2012-08-24 00:50:46 +02:00
Mark Story
064fef1a15
Merge pull request #779 from dereuromark/2.3-ellipsis-html
...
use html ellipsis if possible
2012-08-23 13:20:38 -07:00
Mark Story
fe3d99cdfc
Merge pull request #775 from sitedyno/BlowfishAuthenticate
...
Add BlowfishAuthenticate adapter.
2012-08-23 13:16:34 -07:00
Heath Nail
d24bbcb255
Add BlowfishAuthenticate adapter.
2012-08-23 11:23:51 -04:00
Ceeram
c5ebbc991c
Revert "Merge pull request #784 from ceeram/habtmmerge"
...
This reverts commit fa5aa6278f
, reversing
changes made to 88604ac757
.
2012-08-23 16:00:41 +02:00
ceeram
973670ca1c
Merge pull request #749 from ceeram/2.3-allow
...
Add allowed() to CakeRequest, to check if the request method matches the...
2012-08-22 16:44:11 -07:00
Ceeram
d730acba59
Add onlyAllow() to CakeRequest, to check if the request method matches the allowed ones.
...
Throws exception if not matched, using the required Allow response header.
2012-08-22 17:23:24 +02:00
Ceeram
e7dc23b920
Ensure callbacks are triggered when using Xml/Json view with view templates.
...
PaginatorHelper for instance needs this to correctly set options
2012-08-22 13:13:49 +02:00
Ceeram
fb0053753e
avoid duplication in returned results for habtm
2012-08-22 13:03:47 +02:00
mark_story
88604ac757
Replace is_a with instanceof.
2012-08-21 08:47:58 -04:00
Renan Gonçalves
172e4bed5d
Fix STRICT warnings on PHP 5.4
2012-08-21 13:08:43 +02:00
mark_story
62dd39133b
Fix lint errors + comment content.
2012-08-20 16:21:59 -04:00
mark_story
d5333a2ff1
Merge branch 'master' into 2.3
2012-08-20 16:20:27 -04:00
mark_story
00f3e7e441
Fix silent failures.
...
Fixes #3133
2012-08-20 16:19:34 -04:00
mark_story
e75fdd21ee
Add tests to show caseinsensitive nature of detectors.
...
Closes #3132
2012-08-20 11:43:10 -04:00
Stephen Cuppett
7e5f326300
Fix STRICT warnings on PHP 5.4
2012-08-19 17:00:26 -04:00
euromark
07d92ef678
correcting test
2012-08-17 14:02:20 +02:00
euromark
7969062614
legacy support with test cases
2012-08-17 13:57:47 +02:00
euromark
40398429ff
coding standards
2012-08-17 13:37:04 +02:00
euromark
f201684873
use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length)
2012-08-17 13:31:01 +02:00
Mark Story
9e96c473f4
Merge pull request #752 from dereuromark/2.3-truncate-tail
...
String::tail()
2012-08-16 11:02:06 -07:00
Mark Story
08e4362d40
Merge pull request #772 from bar/master-fix-phpreader
...
The actual config file must always have .php extension.
2012-08-16 11:00:27 -07:00
mark_story
8146cc4db4
Update mime types of various powerpoint extensions.
...
Fixes #3121
2012-08-15 23:14:57 -04:00
mark_story
c83e941497
Merge branch 'master' into 2.3
2012-08-15 21:00:49 -04:00
mark_story
73f29069de
Fix issue where omitting a base class would break test generation.
...
Fixes #3115
2012-08-15 20:59:56 -04:00
mark_story
b0f2cfd1d1
Fix coding standards.
2012-08-15 20:19:08 -04:00
ADmad
7ac01154f7
Merge branch '2.2-configure'
2012-08-15 20:09:25 +05:30
ADmad
18c5a4aee5
Make file extension optional for Configure reader adapter's dump function.
2012-08-15 19:38:58 +05:30
mark_story
cdc70fc427
Make RequestHandlerComponent better simulate GET requests.
...
Modify the global state to simulate a GET request. This avoids issues
where PUT data would be processed during simulated redirect.
Fixes #3113
2012-08-14 12:46:47 -04:00
mark_story
e183e91b17
Make CakeRequest work with content-type headers that include a charset.
...
Refs #3113
2012-08-14 12:42:05 -04:00
ber clausen
0dec093f48
The actual config file must always have .php extension.
2012-08-13 23:50:58 -03:00
euromark
e1fbfcef00
fix contain for find method
2012-08-13 08:10:51 +02:00
ADmad
65e63c51c8
More missing parent calls.
2012-08-12 02:28:12 +05:30
ADmad
802f00b6e3
Adding missing calls to parent.
2012-08-12 02:13:10 +05:30
ADmad
4a483b4897
If cache is disabled in app and js cache file is not written don't return script tag with file url.
...
Instead return script block with inline js content.
2012-08-12 01:08:05 +05:30
mark_story
11227f5490
Fix coding standards.
2012-08-10 21:50:37 -04:00
mark_story
0bbf61ce3d
Add removed getDataSource() call.
...
This fixes an issue where the wrong datasource could potentially be used
for getting the full table name.
2012-08-10 21:48:22 -04:00
Mark Story
7dae12456a
Merge pull request #759 from dereuromark/2.3-cake-schema
...
2.3 cake schema
2012-08-10 18:11:50 -07:00
Ceeram
ab7dd99e43
add missing docblock, remove unneeded code
2012-08-10 11:05:19 +02:00
Ceeram
7ea1a59035
adding test for viewClass mapping
2012-08-10 10:33:37 +02:00
Ceeram
21431cba64
Add viewClass map method to RequestHandler component, to map content types to viewclass.
2012-08-10 09:54:22 +02:00
Ceeram
e2e42ee185
move serialization to separate method, for easier overriding in subclasses
2012-08-10 09:54:05 +02:00
mark_story
e5ad204265
Ignore standards for PHP defined constants.
2012-08-09 20:54:04 -04:00
mark_story
6f7557898d
Fix whitespace and comment errors.
2012-08-09 20:51:29 -04:00
mark_story
4487673060
Merge branch 'master' into 2.3
2012-08-09 20:43:47 -04:00
Mark Story
0322e808a7
Merge pull request #760 from zoghal/fix-2-3-full-url
...
Full url prefix is better defined before auto loading
2012-08-09 17:37:40 -07:00
ceeram
ebb0ceb6a0
Merge pull request #764 from ceeram/2.2-2998
...
2.2 2998
2012-08-09 09:21:42 -07:00
Ceeram
d4986b5f24
add responseHeader() method to new base exception class, ExceptionRenderer will pass the headers to the response.
...
Tests added.
2012-08-09 14:52:05 +02:00
José Lorenzo Rodríguez
596f2c0d91
Merge pull request #734 from steinkel/feature/smtp-tls
...
Adding TLS support to SmtpTransport
2012-08-08 23:36:13 -07:00
mark_story
b29cc6a9b6
Try again at fixing errors in 5.2
2012-08-08 23:09:44 -04:00
mark_story
c94a684be8
Try to fix recursion issues in PHP5.2.
2012-08-08 22:42:44 -04:00
mark_story
dca050fbd6
Fix errors with recursion in debug()
...
Fixes #3102
2012-08-08 22:30:27 -04:00
Saleh Souzanchi
36243b45f8
Full url prefix is better defined before auto loading
2012-08-09 06:42:24 +04:30
euromark
5190b9f2c9
asserting that under_scored names result in valid ClassNames
2012-08-08 16:35:59 +02:00
euromark
bed5453be0
correcting order
2012-08-08 14:44:38 +02:00
euromark
62dee78ca5
adding models for schema generate
2012-08-08 14:15:28 +02:00
euromark
5e0e850733
reduce 5-level if cases to 2 levels
2012-08-08 13:42:40 +02:00
Justin A. Barnes
476bd80644
Fix cake bake project always finding CakePHP libs in php include_path.
...
Cake shell was adding the CakePHP libs to php include_path resulting in
producing baked projects without hardcoded CAKE_CORE_INCLUDE_PATH when
hardcoded CAKE_CORE_INCLUDE_PATH is needed.
Refs #GH-755
Signed-off-by: mark_story <mark@mark-story.com>
2012-08-07 20:52:37 -04:00
José Lorenzo Rodríguez
1ff63758ad
Merge pull request #750 from tigrang/security-component-enhancement
...
Added `disabledActions` feature to SecurityComponent
2012-08-06 12:05:17 -07:00
mark_story
57c495f53a
Enabled Debugger::exportVar() to display private & protected properties.
...
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
2012-08-06 13:32:52 -04:00
Nicholas de Jong
d4fa5d000c
Allow an App to define its own LOGS and CACHE paths outside TMP
2012-08-05 14:55:22 +10:00
ADmad
8931b74ba2
Removed variable escaping in CakeErrorController::beforeRender(). Closes #3074
2012-08-05 02:36:29 +05:30
mark_story
b32273e713
Fix whitespace errors.
2012-08-04 15:57:04 -04:00
euromark
2a570e639c
ellipsis instead of ending/beginning for core wide consistency
2012-08-04 19:58:23 +02:00
mark_story
dbe3234b56
Refactor help to show up on console -h as well.
2012-08-04 13:57:14 -04:00
mark_story
d7f1bf52b1
Fix route commands in ConsoleShell.
...
Apply patch from 'Ludovic Pouzenc' to fix route features in the console
shell.
Fixes #3096
2012-08-04 13:44:35 -04:00
mark_story
73b1c0ac1c
Fix off by one error.
...
Fixes #3094
2012-08-03 23:34:44 -04:00
mark_story
e59555a66f
Merge branch 'master' into 2.3
2012-08-03 22:45:56 -04:00
mark_story
788cf52572
Fix saving empty values for translated fields with multiple locales
2012-08-03 22:40:38 -04:00
Christopher Vrooman
bbd0b9dd8b
Tweaked DocBlocks
...
Set property and return to boolean for DocBlocks of the CallbackPostTestModel class.
2012-08-03 22:40:28 -04:00
Christopher Vrooman
de1450763b
Added a failing test to testSavePartialFields
...
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
2012-08-03 21:19:44 -04:00
Tigran Gabrielyan
617d470427
Renamed disabledActions to unlockedActions
2012-08-03 11:01:19 -07:00
euromark
853fa7d95b
doc block correction
2012-08-03 10:54:16 +02:00
mark_story
e620433680
Update doc block.
2012-08-02 21:35:06 -04:00
mark_story
e38c149880
Decompose complex nested conditionals.
...
Refs #808
2012-08-02 21:35:06 -04:00
euromark
a208eb6cb1
fixes disabled attribute for multiple checkboxes
2012-08-02 21:35:05 -04:00
Tigran Gabrielyan
df8ec17626
Added disabledActions
feature to SecurityComponent
2012-08-02 18:27:52 -07:00
mark_story
c96e364cbb
Fix incorrect expiry of sessions.
...
Fixes #3088
2012-08-02 21:03:53 -04:00
euromark
917d912a43
String::tail()
2012-08-02 13:21:31 +02:00
euromark
64ba8c6b6e
remove debug statement
2012-08-02 10:18:14 +02:00
mark_story
cffc36e4e0
Fix notice error when impossible conditions are created.
...
Fixes #3084
2012-08-01 23:05:56 -04:00
Mark Story
2728c6253e
Merge pull request #728 from boast/patch-2
...
TreeBehavior: Changed $Model->alias . '.' . $field to $Model->escapeField($field)
2012-08-01 19:41:04 -07:00
euromark
57bf15a415
multiple strpos to preg_match
2012-08-01 20:42:27 +02:00
euromark
319658e9d3
asserting escaped output for sms protocol
2012-08-01 12:48:21 +02:00
euromark
b6fe8af701
adding sms as protocol
2012-08-01 12:38:06 +02:00
euromark
2a674fc461
adding a test for the yet untested javascript protocol
2012-08-01 12:14:46 +02:00
euromark
f0ffe098d3
adding html helper tests for special protocols
2012-08-01 12:11:05 +02:00
euromark
b73be3139f
allowing tel protocol for mobile devices
2012-08-01 12:02:50 +02:00
Ceeram
2a0a5f2afa
Use the returned response instance from the event
2012-07-31 18:39:05 +02:00
mark_story
9b94133f0d
Fix uncaught exceptions when generating view cache files
...
Fixes #3016
2012-07-30 21:27:21 -04:00
Schlaefer
af8c5716fc
Added test for RSS to allow namespace tags if namespace is specified
...
If a namespace prefix is defined it's prefix should not be stripped
from the tag: `<dc:creator>` stays `<dc:creator>`.
Other prefixes are still stripped from the tag name.
This test is missing in 19f0e72d58
2012-07-30 10:10:19 +02:00
mark_story
4541510e26
Fix notice error when a missing action error is hit.
2012-07-29 22:37:41 -04:00
mark_story
7b939186a1
Fix ( and ) not being correctly handled by autoLinkUrls
...
Fixes #3077
2012-07-29 21:18:33 -04:00
Schlaefer
19f0e72d58
fix #2858 RSS helper bug with namedspaced keys
...
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
2012-07-29 14:24:46 +02:00
Rachman Chavik
5413b672eb
use is_subclass_of instead of comparing Acl.classname
2012-07-28 15:00:17 +07:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
mark_story
27e2132a13
Generated SQL should not contain multi-column primary keys
...
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.
Fixes #3069
2012-07-27 22:31:49 -04:00
ADmad
99813e97b3
Implemented feature to allow individual "empty" values for date time select elements
2012-07-28 01:47:21 +05:30
mark_story
f963e378b5
Fix coding standards errors.
2012-07-26 21:22:50 -04:00
mark_story
6e0cf0dab7
Fix failing test.
2012-07-26 21:19:20 -04:00
Kyle Robinson Young
cbf5328b33
Fix failing test with controller task listAll
2012-07-25 22:12:55 -07:00
Mark Story
4dd532d3a9
Merge pull request #724 from SimonEast/h_encoding
...
Prevent booleans from being encoded (converted to strings) by h() function
2012-07-25 18:17:12 -07:00
Mark Story
a03166c5b6
Merge pull request #739 from tigrang/router-validate-route-fix
...
Fixed issue where restoring the default route class would cause an exception.
2012-07-25 18:16:21 -07:00
Mark Story
b99be9878a
Merge pull request #738 from zpencerq/authcomponentproblem
...
Auth Component can't return false from user($key)
2012-07-25 16:05:29 -07:00
Tigran Gabrielyan
851aa8bef4
Fixed issue in _validateRouteClass where setting defaultRouteClass back to CakeRoute would throw an exception
2012-07-25 14:13:25 -07:00
José Lorenzo Rodríguez
255705a81e
Merge pull request #714 from shin1x1/pr_server_shell_2.3
...
Added ServerShell for PHP Built-in Server into 2.3 branch.
2012-07-25 14:10:28 -07:00
Spencer Ellinor
8a41fb0c34
Fix issue and remove unneccesary code. The (fixed) conditional doesn't do anything, since if Hash::get returns null, the function still returns null.
2012-07-25 15:09:22 -04:00
Spencer Ellinor
6c1b05a5d4
Modify test case to show the issue.
2012-07-25 15:06:56 -04:00
Jorge González
7418be04d3
fixing translation domain to cake_dev
2012-07-25 19:20:30 +01:00
mark_story
7d74f3e598
Increase context depth in error messages.
...
Fixes #3063
2012-07-24 23:39:48 -04:00
mark_story
70c714d600
Fix incorrect context being used for excerpt.
...
Fixes #3064
2012-07-24 23:37:37 -04:00
euromark
2a553dcfd1
unified doctype for browser related layout templates
2012-07-24 18:06:39 +02:00
Jorge González
f9f380d401
using annotations for catching exceptions in tests
2012-07-24 14:09:48 +01:00
Jorge González
d7f93f5bcf
adding a related message to the enableCrypto InvalidArgumentException
2012-07-24 14:08:54 +01:00
mark_story
162d3bcb29
Fix whitespace errors.
2012-07-23 22:44:05 -04:00
mark_story
66b296527f
Add type check to prevent errors related to Hash::get()
...
Fixes #3041
2012-07-23 22:33:58 -04:00
David Thalmann
f926ae7637
Clean up string concatenations and refactored some reused strings into variables.
...
Refs #GH-729
Signed-off-by: mark_story <mark@mark-story.com>
2012-07-23 22:30:28 -04:00
mark_story
35bf3097cd
Fixing missing imports in generated tests.
...
Fixes #3059
2012-07-23 21:25:55 -04:00
Jorge González
17db6f9d23
Merge branch '2.3' of https://github.com/cakephp/cakephp into feature/smtp-tls
2012-07-23 22:24:10 +01:00
mark_story
2359fb7e2e
Simplify number formatting.
2012-07-22 21:28:49 -04:00
Heath Nail
434d3a7137
Add bcrypt support to Security::hash()
2012-07-22 21:15:00 -04:00
mark_story
ed19821168
Merge branch 'master' into 2.3
2012-07-22 21:01:28 -04:00
mark_story
e6ef218600
Fix associated translations being inserted.
...
Due to changes introduced in [1c0b6c076a
]
associated translations would incorrectly be saved with a value of ''.
Fixes #3057
2012-07-22 20:59:24 -04:00
euromark
15cf55d444
different approach on the failing test
2012-07-22 03:59:59 +02:00
euromark
93957bc3e4
fix for windows. the check seems to be the wrong way. at least compared to the one in the rss class itself
2012-07-22 03:55:13 +02:00
Mark Story
f77bebcc38
Merge pull request #730 from dereuromark/2.3-missing-app-uses
...
another correction for app uses
2012-07-21 18:50:52 -07:00
euromark
93eb8c2c58
another correction for app uses
2012-07-22 03:38:39 +02:00
mark_story
71507796c7
Add docs.
2012-07-21 21:35:45 -04:00
mark_story
6ce4a3a1ec
Add tests for contentDisposition flag.
...
Fixes #3042
2012-07-21 21:22:04 -04:00
Joey Jan
9deb966657
Add ability to disable content-disposition for email attachments.
...
This solves issues with outlook and text/calendar attachments.
Refs #3042
2012-07-21 21:01:45 -04:00
mark_story
468302b526
Merge branch 'master' into 2.3
2012-07-21 20:59:56 -04:00
mark_story
6286b43329
Make tests pass on windows.
...
Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.
Refs #3055
2012-07-21 20:59:05 -04:00
mark_story
a27e171f0f
Invert default log configuration.
...
Windows only has 4 log levels instead of 8. This causes notice errors
when trying to use 'alert' and a few other levels.
Fixes #3055
2012-07-21 20:42:46 -04:00
mark_story
ab6fab6675
Add missing import.
2012-07-21 20:42:46 -04:00
David Thalmann
78de6e276a
Removed inline method calls in curly braced string concat's.
2012-07-22 03:40:49 +03:00
Jorge González
f1250a3609
Merge branch '2.3', remote-tracking branch 'origin' into feature/smtp-tls
2012-07-21 20:49:46 +01:00
Jorge González
55c92065c6
adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010
2012-07-21 20:28:38 +01:00
David Thalmann
d9b5ec1a3a
Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field).
2012-07-21 22:07:51 +03:00
euromark
01f1b0dadc
correcting previously added app uses statements
2012-07-21 20:29:49 +02:00
mark_story
2e71ef8f26
Add CakeSession Fixture
...
CakePHP should provide a fixture for the default session table name so
developers don't need to add the same fixture to each application.
Fixes #3054
2012-07-21 14:08:10 -04:00
Mark Story
f858ea3007
Merge pull request #726 from dereuromark/2.3-html-reporter-fix
...
only try to get comparison failure for the appropriate object
2012-07-21 07:02:34 -07:00
euromark
6557e3bafe
only try to get comparison failure for the appropriate object
2012-07-21 15:23:54 +02:00
Jorge González
27a895d7d8
adding enableCrypto() method to CakeSocket class
2012-07-21 14:23:47 +01:00
euromark
4fe1ab1bf6
missing app uses statements
2012-07-21 13:34:33 +02:00
Simon East
1ea457e40e
Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9
2012-07-20 12:48:57 +10:00
José Lorenzo Rodríguez
a7865b5d1d
Removing some new by reference calls
2012-07-19 14:24:12 -05:30
Mark Story
f65b52bf11
Merge pull request #722 from uzyn/bugfix/url-validation
...
Fix URL validation to allow underscores in subdomain.
2012-07-19 12:40:30 -07:00
Christian Winther
bce82a2322
Better custom find for pagination
...
Instead of shuffling the paginator settings you can now simply add a new "findType" key and it will automatically change the find() type accordingly
2012-07-19 15:57:51 +02:00
U-Zyn Chua
e7c4064a69
Fix URL validation to allow underscores in subdomain.
2012-07-19 20:51:33 +08:00
mark_story
473d55f091
Allow 1 second of slip.
2012-07-18 22:22:57 -04:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
mark_story
7979ee5fa0
Remove test that is no longer needed for validation.
2012-07-17 23:18:25 -04:00
Mark Story
83cef3ef9a
Merge pull request #718 from dereuromark/2.3-fix-validation-error-message
...
2.3 fix validation error message
2012-07-17 19:57:16 -07:00
mark_story
3b46cd43f1
Add logging and error when fixture creation fails.
...
This helps people find and solve issues faster/easier.
Fixes #3044
2012-07-17 22:48:50 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
euromark
e1357ca8aa
indentation in templates
2012-07-18 03:24:55 +02:00
mark_story
a63dd9ee9d
Fix incorrect formatting in TreeBehavior.
...
Fixes #3045
2012-07-17 21:06:41 -04:00
euromark
760cf33ce3
make sure a missing validation rule always triggers a warning (in productive mode this will be logged in the log files)
2012-07-17 10:47:20 +02:00
mark_story
928de97338
Add additional tests for error triggering on missing validator.
...
Closes #3039
2012-07-15 19:47:28 -04:00
mark_story
2f7f5e1322
Use file cache as the default cache engine.
...
Too many people had issues using APC by default as its often configured
in strange ways, and works poorly on inexpensive hosting.
Fixes #2995
2012-07-15 09:11:27 -04:00
mark_story
cc44130fc0
Update version number to 2.2.1
2012-07-14 16:42:59 -04:00
mark_story
fb92bde0fe
Loosen exception types.
2012-07-14 16:18:21 -04:00
mark_story
22d4cb3794
Allow warnings for Xml entities.
...
For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
2012-07-14 16:08:54 -04:00
mark_story
a7c79e5da2
Fix warnings when deleting records that do not exist.
...
Fixes #3037
2012-07-14 15:54:07 -04:00
mark_story
6c905411ba
Fix XML decoding attack via external entities.
2012-07-14 11:53:37 -04:00
shin1x1
32d5f113d3
fixed phpcs errors.
2012-07-14 16:47:33 +09:00
mark_story
46f8de72a2
Fix web runner showing fails as passes when show_passes is on.
...
Fixes #3035
2012-07-13 22:58:07 -04:00
shin1x1
dd524c96e1
Added ServerShell for PHP Built-in Server.
2012-07-13 02:29:42 +09:00
mark_story
8fc5726920
Remove trailing whitespace.
2012-07-11 21:39:32 -04:00
mark_story
3baaecc81c
Type check before unset()
...
Calling unset() on string indices fails fatally on 5.3.x and lower.
Fixes #3027
2012-07-11 15:54:24 -04:00
mark_story
b7415525c8
Fix missing line breaks.
...
Fixes #3028
2012-07-11 15:51:07 -04:00
Jose Lorenzo Rodriguez
db247558b0
Correctly passing ellipsis options to all internal method calls insie
...
PaginatorHelper::numbers(), under some combinations of modulus/limit
it would not get passed even though there are pages in between to show
2012-07-10 20:46:56 -04:30
Jose Lorenzo Rodriguez
39715bcd89
Adding missing afterValidate callback to behaviors, Fixes #3024
2012-07-10 20:35:26 -04:30
ADmad
69eba678f4
Deprecated MediaView and updated MediaView::render() to use CakeResponse::file()
2012-07-11 01:40:42 +05:30
ADmad
c5d1260421
Added CakeResponse::file() for serving files as response
2012-07-11 01:24:00 +05:30
Ilie Pandia
73d44c5f6b
Fixed some typos in the comments in this file. This helps with type
...
hinting in IDEs that support that.
2012-07-08 07:33:14 +03:00
mark_story
5e680cb292
Add tests for translate + partial fields.
...
Refs #3009
2012-07-07 12:03:29 -04:00
Thomas von Hassel
1c0b6c076a
Update afterSave to ensure created entires have all translated fields present
...
Without all fields being present, find() will be unable to find the
translated records.
Fixes #3009
2012-07-07 12:03:29 -04:00
mark_story
369bbcc964
Fix failing tests.
...
* New properties on view caused fails in Debugger.
* Element cache keys have changed with the new refactoring.
2012-07-07 01:08:39 -04:00
Jose Lorenzo Rodriguez
ed4493da0c
Automatic console logging streams were not respecting --quiet
2012-07-06 16:05:15 -04:30
AD7six
2967a4db23
text/javascript is not the correct mime for js
2012-07-06 13:17:15 +02:00
AD7six
790a53d794
Revert "sort the mimeTypes map alphabetically"
...
This reverts commit 90ae2df38e
.
The mime type is used by CakeResponse::mapType to determine which mime
type maps to which alias. As this is done in the order of the mimetype
map the mimetype map is order sensitive.
2012-07-06 12:23:20 +02:00
mark_story
591022f182
Make test case use SERVER_NAME conditionally.
2012-07-05 22:56:45 -04:00
mark_story
f528bb29ba
Fix lint error.
2012-07-05 22:50:54 -04:00
Mark Story
ae01d473c3
Merge pull request #707 from SimonEast/fix_CakeEmailTest
...
Fix for CakeEmailTest.php that failed unless using 'localhost'
2012-07-05 19:40:54 -07:00
Rodrigo Moyle
e10f6f57a3
Fix notice error when parsing input data.
...
Prevent error in CakeRequest from parsing input data in
PUT and DELETE requests.
Fixes #3002
Signed-off-by: mark_story <mark@mark-story.com>
2012-07-05 22:06:02 -04:00
Simon East
de703a2692
Fix for CakeEmailTest.php that failed unless using 'localhost'
2012-07-06 11:59:39 +10:00
Florian Krämer
83903cd5b4
Changing the signature of View::_elementCache()
2012-07-06 02:13:34 +02:00
Florian Krämer
b2bb7bf2ae
Fixing a few issues within the new methods
2012-07-06 00:22:39 +02:00
Florian Krämer
ca9ff0283c
Refactoring View::element()
2012-07-04 11:48:10 +02:00
mark_story
e61f636bc7
Fix double base dir in image() with fullBase.
...
Fixes #2991
2012-07-03 20:48:17 -04:00
AD7six
90ae2df38e
sort the mimeTypes map alphabetically
...
except for html which is at the top. Easier maintainance
2012-07-03 16:12:48 +02:00
AD7six
8a09b3d454
update mimetype map
...
References:
http://www.iana.org/assignments/media-types/application/index.html
http://www.iana.org/assignments/media-types/audio/index.html
https://github.com/h5bp/html5-boilerplate/blob/master/.htaccess#L86
2012-07-03 16:07:57 +02:00
Rachman Chavik
22373868bb
if blackHoleCallback is set, requests _must_ get blackholed
2012-07-03 19:27:02 +07:00
Ceeram
18b860ed1a
keeping methods BC, load() now returns false again when configname not default and not configured
2012-07-03 12:43:33 +02:00
Ceeram
19ba09286d
Make load() and dump() more consistent with each other, create new PhpReader for default if not configured yet.
...
Fixes #2998
2012-07-03 12:20:00 +02:00
Rachman Chavik
86a74e3887
fix: windows console may not have ansi color support
2012-07-03 12:41:29 +07:00
mark_story
31033239bd
Add missing urlencoding to nested named parameters.
...
Fixes #2988
2012-07-02 23:34:53 -04:00
Ceeram
4db909bd2d
update version.txt to 2.3.0-dev
2012-07-02 12:19:00 +02:00
Jose Lorenzo Rodriguez
4b3a8ea348
Update version number to 2.2.0
2012-07-01 18:25:14 -04:30
Jose Lorenzo Rodriguez
ec7ec73b66
Merge branch '2.1' into 2.2
2012-07-01 17:35:24 -04:30
mark_story
87677e4cdf
Fix possible notice errors.
2012-06-26 23:31:22 -04:00
Alberto Leal
7d93c57bd3
Use the diff style provided by PHPUnit in the webrunner.
...
Displaying actual vs expected messages when the result is an array or string.
Fixes #GH-699
2012-06-26 19:53:49 -04:00
José Lorenzo Rodríguez
476209df03
Changing docs in CakeRequest:accepts() as they were misleading, you are required to pass a correct mimetype and not an alias
2012-06-26 14:38:07 -05:30
Ceeram
6ec0afcf5d
Add CakeNumber::fromReadableSize() and Validation::filesize()
2012-06-26 12:17:25 +02:00
ADmad
76f93178a8
Tweaked Validation::extension()
2012-06-25 19:15:52 +05:30
mark_story
ad5345887a
Refactor tests.
...
Use generators to reduce some duplication.
2012-06-24 21:57:00 -04:00
mark_story
3f78216e96
Revert changes in behavior made to timeAgoInWords()
...
Changes made in [0729aca706
] changed
the generated text to not match the behavior in 2.1.
2012-06-24 20:54:47 -04:00
mark_story
eb7b66b37c
Revert default value of allowEmpty.
...
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods. Move some tests around and update tests that
probably should have been failing before.
Fixes #2983
2012-06-24 20:06:14 -04:00
ADmad
b2ccdd46e5
Fixed test failing when server's timezone is not UTC
2012-06-24 23:11:52 +05:30
mark_story
503bc06c70
Mark fixtures as created if they exist.
...
Fixes #2905
2012-06-24 12:57:54 -04:00
Juan Basso
ecdf0e6c6c
Optimization for Hash method
2012-06-24 12:47:30 -04:00
mark_story
3e28326d9c
Fix Controller::beforeRedirect() and array return.
...
Array return values from Controller::beforeRedirect() would be
incorrectly handled causing wrong URL's to be generated.
Fixes #2973
2012-06-24 12:03:31 -04:00
mark_story
35e0984bec
Fix fatal error when E_STRICT is enabled.
...
If you have E_STRICT enabled and have a strict error in your files, you
would see a fatal error related to Debugger missing. PHP won't autoload
classes if you are currently in an autoload call, and an error is
triggered. Preloading Debugger + String in dev mode lets you see the
correct error.
2012-06-24 12:03:31 -04:00
Jelle Henkens
db7d5426ec
CakeTime no longer sets the timezone out of its scope on the date object
2012-06-24 11:10:55 +01:00
mark_story
e2781a536a
Fix whitespace error.
2012-06-23 21:03:15 -04:00
mark_story
5e54be4e5a
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Error/exceptions.php
2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303
better error message in MissingConnectionException when driver is not enabled
2012-06-23 11:42:26 +02:00
mark_story
13077a8f2f
Add tests for previous commit.
2012-06-22 21:44:37 -04:00
Matt Hamann
a7ef245de5
Added 'helpers' to _applyConfig.
...
Allows default Helpers to be modified by EmailConfig setup.
Conflicts:
lib/Cake/Network/Email/CakeEmail.php
2012-06-22 21:44:17 -04:00
mark_story
eb4056625d
Re-add the sort option
...
Even though it does nothing, it should stick around as providing
it causes the shell to fail.
2012-06-22 20:53:53 -04:00
dogmatic69
058f48fc7b
Showing the list of shells grouped by plugin
...
The option to sort has been removed and the list of shells is now
sorted and grouped by plugin and then by command.
Core and app shells are always listed last.
2012-06-22 20:53:44 -04:00
Ceeram
55f3cbe1f6
remove unneeded line
2012-06-22 14:44:47 +02:00
Ceeram
2f5f1b28bc
Merge branch '2.2-validatorrules' into 2.2
2012-06-20 15:01:26 +02:00
Ceeram
71112d1225
No need to create new instance of ModelValidator when one is already created
2012-06-20 14:57:56 +02:00
Ceeram
60c611fa47
Parse rules in getField()
2012-06-20 14:54:32 +02:00
Jose Lorenzo Rodriguez
3908f0602c
Update version number to 2.2.0-RC2
2012-06-19 21:02:39 -04:30
Jose Lorenzo Rodriguez
03d31b57f7
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-06-19 19:28:20 -04:30
Ceeram
cd209ce099
Avoid using LC_ALL, on some installs this would cause error:
...
"setlocale(): Specified locale name is too long"
2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69
Merge branch '2.1' into 2.2
2012-06-19 18:35:36 +02:00
Ceeram
8b94d9e9e7
Only change locale for LC_NUMERIC instead of LC_ALL, on some installs this woudl cause an error:
...
"setlocale(): Specified locale name is too long"
2012-06-19 18:33:51 +02:00
Ceeram
cf18e8d38b
avoid unneeded query in delete()
2012-06-19 16:08:36 +02:00
mark_story
89b2eddf0b
Try regexp as not all locales are available.
2012-06-18 23:45:44 -04:00
mark_story
6a1e9e80b2
Try LC_ALL instead.
2012-06-18 23:31:10 -04:00
mark_story
81611956f5
Update doc blocks.
...
Add missing @throws
2012-06-18 23:29:28 -04:00
mark_story
77fc8a9d33
Switch to de_DE
...
nl_NL doesn't seem to exist on the ci server.
2012-06-18 23:25:42 -04:00
mark_story
001e89bf3f
Fix formatting with locales using , as decimal separator
...
Fixes #2958
2012-06-18 23:13:09 -04:00
mark_story
f9ddc9c64c
Move error disabling to the error controller.
2012-06-18 22:08:39 -04:00
mark_story
3c824b586f
Use $this->bootstrap.
...
$this->boostrap makes the output match the file changed.
2012-06-18 21:38:08 -04:00
AD7six
d5cf2765dd
remove referencers to fixtures that don't exist
2012-06-18 16:40:37 +02:00
AD7six
a6954a7abc
Bark if a fixture file is missing
...
A missing fixture file would previously be silently ignored
2012-06-18 15:28:00 +02:00
Ceeram
0df1e90eed
show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925
2012-06-18 14:20:53 +02:00
mark_story
7ef83b89f5
Merge branch '2.1' into 2.2
...
h origin especially if it merges an updated upstream into a topic branch.
2012-06-17 20:54:59 -04:00
mark_story
fec6c1c6cb
Fix security component causing black holes on error pages.
...
Fixes #2966
2012-06-17 20:50:00 -04:00
mark_story
54679023f9
Add support for DELETE + form encoded data.
...
Much like PUT, DELETE requests will automatically parse
form-urlencoded request bodies and set them as $this->data.
2012-06-17 20:03:45 -04:00
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
AD7six
23c37efc71
Load fixtures from a consistent location
...
If a test is baked for a plugin - it should by default look for fixtures in the
same plugin, otherwise it creates potentially complex inter-plugin/app
dependencies.
2012-06-14 13:28:35 +02:00
mark_story
5413143178
Don't modify app/Config/bootstrap when running tests.
2012-06-12 22:10:55 -04:00
mark_story
f625742a12
Make CakeSession use httponly by default.
...
Fixes #2955
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
Nick Baker
ae990cc0c6
Code cleanup, break if found, no reason to go through entire vendor list overwriting if found on first try. No reason to create variables we don't need.
2012-06-11 12:40:53 -06:00
Nick Baker
42809512f0
No longer suppress the include path to PHPUnit/Autoload.php as Autoload.php require_once() on two files, if either of them aren't there the shell exits without message. Explanation of issue here: http://www.webtechnick.com/wtn/blogs/view/247/Fixing_PHPUnit_for_CakePHP_2_x_testing_on_Mac_OS_X
2012-06-11 12:22:26 -06: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
Fitorec
1bcb8daf21
Adding case 'datetime' to validation guesses.
...
In ModelTask->fieldValidation added option "datetime"
2012-06-10 21:56:43 -04:00
Fitorec
c090845117
Fixing coding style.
2012-06-10 21:56:43 -04:00
Fitorec
207b918b59
Removing the case
2012-06-10 21:56:39 -04:00
Fitorec
fa2a75c3f1
Add the numbers format console menus, showing the validation options in 2 columns.
2012-06-10 21:56:30 -04:00
mark_story
76dd49145a
Merge branch '2.1' into 2.2
2012-06-10 20:34:20 -04:00
mark_story
c31858635f
Don't OR options together.
...
By default FILTER_VALIDATE_IP does both.
2012-06-10 20:29:48 -04:00
mark_story
963f1ca449
Don't |= with null.
2012-06-10 20:21:59 -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
ADmad
fa0d1c7997
Fix layout path value causing View to generate layout paths with extra slash at end
2012-06-10 22:19:39 +05:30
Jose Lorenzo Rodriguez
5ba5f906e6
Adding new test case for ModelValidator
2012-06-09 15:27:22 -04:30
Jose Lorenzo Rodriguez
2a90baae0c
Forgot to include complete patch in last commit :(
...
Note: It's not good to commit while watching tv
2012-06-09 15:01:27 -04:30
Jose Lorenzo Rodriguez
d13deb7da2
Fixing param usage introduced in previous commit
2012-06-09 14:52:03 -04:30
Jose Lorenzo Rodriguez
a2c2902dd6
Renaming param in CakeTime::format() to make its purpose more obvious,
...
added some examples in doc block
2012-06-09 08:45:46 -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
José Lorenzo Rodríguez
56b2b8a8da
Merge pull request #687 from fiblan/xcache_cli
...
Xcache is not available for php-cli
2012-06-08 04:35:29 -07:00
fiblan
d2ac734da6
Xcache is not available for php-cli
2012-06-08 11:14:22 +02:00
Jelle Henkens
c8e58b50ba
Adding cake core message extraction in cake extract
2012-06-07 23:55:36 +01:00
AD7six
43b37cd608
Revert "actually, just ensure the path is slash terminated"
...
This reverts commit e88a2bcdbb
.
2012-06-07 23:32:43 +02:00
AD7six
e88a2bcdbb
actually, just ensure the path is slash terminated
...
that way we're all good
2012-06-07 23:29:49 +02:00
AD7six
72a36a0929
correct path in error message for a missing component
...
PluginNameController/Component
becomes
PluginName/Controller/Component
2012-06-07 23:05:32 +02:00
AD7six
33c112b353
doesn'st need to be a verbose level message
...
other create mesages are output normally
2012-06-07 23:03:53 +02:00
AD7six
488ba9ef85
Make baking a plugin more user friendly.
...
Changed the text when the plugin already exists to indicate that the task stops
intentionally.
If there are folder errors - report them in the cli.
Choose the last plugin path by default
Modify the app's bootstrap file if it's not being (obviously) loaded already.
This means it is now possible to do:
Console/cake bake plugin MyPlugin
Console/cake bake model MyPlugin.MyModel
Previously the above would result in an error (which only if you know), you'd
fix by editing your Config/bootstrap.php file by hand before retrying to bake
your model.
2012-06-07 09:04:02 +02:00
mark_story
f3464b002f
Remove duplicate code.
...
Use a shutdown function to close the session off.
This removes a bit of icky code and continues to allow
objects to be used as session handlers.
2012-06-06 21:01:16 -04: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
AD7six
d1475b1fd3
initialize $construct variable
2012-06-06 22:24:15 +02:00
AD7six
a5fabcc1dc
No startup and teardown for controller tests
...
and.. no startup/teardown functions unless they are actually going to do more
than just call parent
2012-06-06 21:06: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
AD7six
ad7b5bfb88
fix whitespace
...
tabs for indentation
spaces for alignment
2012-06-06 14:32:43 +02:00
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
Jelle Henkens
0e34bd4b1d
Suggest current path in bake project if dir is empty
2012-06-03 14:01:03 +01: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
mark_story
157e243eee
Change named capture group syntax.
...
This increases compatibility with really old version of
PCRE used on CentOS.
Refs #GH-681
2012-06-02 10:09:58 -04:00
Ceeram
4c6453501e
Merge branch '2.1' into 2.2
2012-06-02 01:47:21 +02:00
Ceeram
048dc8d254
casting schema to array, fixes error for array_keys when return is null
2012-06-02 01:39:53 +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
Thiago Colares
6262a074f6
Breaking tableHeaders description in two lines
2012-05-30 09:34:10 -03: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
Thiago Colares
c65d4318cf
Enhancement in HtmlHelper > tableHeaders. Each tablename also can be a key that points to an array with a set of attributes to its specific tag
2012-05-29 23:28:57 -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
mark_story
115b2c1495
Rename joined to _joined to hopefully prevent issues.
2012-05-27 20:43:15 -04:00
Florian Krämer
fea4ae6523
Changing File->info() to File->mime() in Validation::mimeType()
2012-05-28 00:48:22 +02:00
Florian Krämer
e3a6e9e169
Adding uploadError() and mimeType() to the Validation class
2012-05-28 00:32:30 +02:00
Majna
364c293e16
Add test for belongsTo and hasOne optimization.
2012-05-27 23:16:20 +02:00
Majna
ce2fc6c83d
Improve belongsTo and hasOne for unneeded queries when recursive > 1.
...
Reuse already joined data for 'belongsTo' and 'hasOne' associations instead of running unneeded queries for each record.
Fixes #47
2012-05-27 23:15:20 +02:00
mark_story
1c0f97ea67
Fix some minor code style issues.
2012-05-27 14:20:19 -04:00
mark_story
9232df839d
Fix failing tests because of new validator.
2012-05-27 14:17:34 -04:00
mark_story
233e7d6c6b
Fix coding standards error.
2012-05-27 14:06:29 -04:00
Mark Story
4485f597b7
Merge pull request #662 from jellehenkens/2.2-validation-natural-number
...
Adding validation rule for natural numbers
2012-05-27 11:01:31 -07:00
AD7six
5bcb1346ab
allow loading namespaced classes
...
This permits, e.g.
App::uses('Ns\Foo', 'Plugin.Lib');
...
new Ns\Foo();
new \Ns\Foo(); // Or
to work
2012-05-27 19:59:07 +02:00
mark_story
4b8c469004
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
Rachman Chavik
907b3221ed
logging: fix failing tests when called via webrunner
2012-05-25 23:52:33 +07:00
Rachman Chavik
3f6593311b
logging: console support/format for new log types
2012-05-25 23:52:33 +07:00
Jelle Henkens
5656461025
Adding overwrite option to the i18n extract task
2012-05-25 17:01:56 +01:00
AD7six
af4a2efc33
allow baking tests for controllers with uses
...
if a controller has
public $uses => array('MyPlugin.MyModel')
in their controller - the bake controller task will fail because `$controller->MyPlugin.MyModel`
doesn't exist
2012-05-25 13:09:52 +02:00
Jelle Henkens
f6a6e3381e
Fixing typo in the docblock
2012-05-24 20:07:48 +01:00
mark_story
6725a30fe2
Fix funny warning.
2012-05-23 22:46:18 -04:00
mark_story
b27a3aab7b
Set session.gc_maxlifetime by default.
...
In the default case of using files for sessions, files could
be garbage collected earlier than expected based on other session
settings. Always set session.gc_maxlifetime so session files are
garbage collected correctly.
Fixes #2901
2012-05-23 22:25:19 -04:00
mark_story
ea9eee4c77
Fix array arguments being translated.
...
Fixes #2902
2012-05-23 21:02:41 -04:00
mark_story
aa85451159
Fix incorrect return type.
2012-05-23 19:52:29 -04:00
José Lorenzo Rodríguez
33eb46cd87
Merge pull request #666 from boast/patch-1
...
Fixed XmlArticle and XmlUser Models associations.
2012-05-22 21:41:04 -07:00
David Thalmann
81fedbba9c
Fixed XmlArticle and XmlUser Models associations. Fixes failing testWithModel
test and does no longer try to use the 'default' datasource.
2012-05-23 07:19:06 +03:00
mark_story
5270721ade
Remove bonus intval()
...
It caused issues when getting numeric keys that
exceeded PHP_INT_MAX.
Fixes #2897
2012-05-22 22:33:46 -04:00
mark_story
f414aae5d7
Update version number to 2.2.0-RC1
2012-05-22 21:43:17 -04:00
mark_story
c26df7001b
Update version number to 2.1.3
2012-05-22 21:37:45 -04:00
mark_story
a393b20931
Add some doc blocks.
2012-05-22 21:14:26 -04:00
José Lorenzo Rodríguez
ed15634ccb
Merge pull request #663 from jellehenkens/api-docs-mixed-params
...
Updating @param mixed docblock lines to proper multi type @param's
2012-05-22 08:38:23 -07:00
Jelle Henkens
ecd869d4e3
Changing int to integer
2012-05-22 16:34:07 +01:00
Jelle Henkens
7d080ea2d1
Adding an assert to check for zero prefixed numbers
2012-05-22 16:32:16 +01:00
mark_story
0ed6752110
Fix coding standards.
2012-05-21 20:29:00 -04:00
Norio Suzuki
f816f6ae1b
Supported japanese legacy charset and changed to use upper case charset in Content-Type line
2012-05-21 20:28:59 -04:00
Tigran Gabrielyan
671c31218f
Making FormHelper::inputDefaults() code more readable
2012-05-21 13:56:51 -07:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
ADmad
e58e3c5314
Fix regex for failing test on 5.2
2012-05-21 19:48:47 +05:30
Jelle Henkens
7546be6394
Adding a validation rule for checking natural numbers
2012-05-21 13:39:31 +01:00
Mark Story
4fd45c07f5
Merge pull request #660 from jellehenkens/2.2-http-socket-duplicate-code
...
Removing an unnecessary if statement in HttpSocket
2012-05-20 18:02:40 -07:00
José Lorenzo Rodríguez
bb368c569c
Merge pull request #659 from tigrang/inputDefaults-setter
...
Input defaults setter for FormHelper
2012-05-20 16:40:20 -07:00
Jose Lorenzo Rodriguez
9cceb1553f
Improving ModelValidator::add() to allow multiple rules to be defined at once
2012-05-20 18:51:00 -04:30
Tigran Gabrielyan
57ad5e2573
Made FormHelper::inputDefaults() alawys return inputDefaults array
2012-05-20 15:51:48 -07:00
Jelle Henkens
327f809016
Removing duplicate if statement
2012-05-20 23:12:50 +01:00
ADmad
cfd9d8a815
Added CakeTime::listIdentifiers()
2012-05-21 03:05:42 +05:30
Tigran Gabrielyan
fd0dd7ec04
Updating FormHelper::create to use new inputDefaults() method
2012-05-20 13:44:54 -07:00
Tigran Gabrielyan
1d77ad393c
Added FormHelper::inputDefaults setter/getter method
2012-05-20 13:41:55 -07:00
mark_story
024e30eb42
Fix coding standards errors.
...
Adding a private property allows fixing of 4 naming standards
errors.
2012-05-20 16:06:41 -04:00
mark_story
16a1a0ee79
Fix coding standards.
2012-05-20 15:51:09 -04:00
Jose Lorenzo Rodriguez
2ad406ab64
Merge branch '2.2-validator' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-05-20 14:27:35 -04:30
mark_story
ad31caeb0e
Merge branch '2.1' into 2.2
2012-05-20 14:53:41 -04:00
Kyle Robinson Young
3f7cbf561b
Update PHPUnit install instructions
2012-05-19 22:06:45 -07:00
Jose Lorenzo Rodriguez
16847b0d97
Backporting changes form 2.2 to fix some edge cases on deep saving. Fixes #2879
2012-05-19 21:14:23 -04:30
Jose Lorenzo Rodriguez
dc8c731ccb
Fixed failing test case
2012-05-19 19:59:32 -04:30
Jose Lorenzo Rodriguez
b22c50d8b6
Merge branch '2.1' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/models.php
2012-05-19 15:39:44 -04:30
Ceeram
7dbd6bc3a2
make sure model data is moved to alias, even when first key in data is assoc model
...
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
2012-05-19 14:41:16 -04:30
mark_story
7107cd6631
Fix fatal error when checking for PHPUnit.
...
Doubly including PHPUnit/Autoload.php causes fatal errors.
Having access to one of the PHPUnit classes means phpunit exists as
well.
Fixes #2890
2012-05-19 11:35:55 -04:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
Jelle Henkens
5fe22cfc8d
Adding support for DateTime objects in the CakeTime Utility class
2012-05-17 19:31:30 +01:00
Rachman Chavik
f89bc6503a
CakeTime::format crashed when timezone is passed
2012-05-17 19:05:45 +07:00
mark_story
4dc07b6d39
Merge branch '2.1' into 2.2
2012-05-16 21:08:06 -04:00
mark_story
c6258fa68c
HTML escape context variables.
...
When creating HTML or js errors the context should be
escaped, as it is very possible that the context vars will contain
HTML.
Clean up some internals in Debugger::outputError(). There were
a few duplicate data structures, and $$ variables.
Fixes #2884
2012-05-16 21:07:45 -04:00
Mark Story
fd216c4dda
Merge pull request #655 from jellehenkens/2.2-app-dir-tests
...
Updating CakeSchema test case to test non standard app folder names
2012-05-16 09:52:17 -07:00
Rachman Chavik
c9b801b96d
making CakeLog to work with bogus $type and $scope
...
closes #2881
2012-05-16 08:16:20 +07:00
mark_story
a37bdba8fe
Revert accidental change.
2012-05-15 21:07:43 -04:00
mark_story
7d9f441020
Add documentation.
2012-05-15 21:00:18 -04:00
Jelle Henkens
110536d575
Fixing CakeSchema to test APP_DIR with different names than all lowercase
2012-05-15 21:41:11 +01:00
mark_story
0faaedfff5
Split up tests.
...
Fix API usage in tests.
2012-05-14 21:32:31 -04:00
mark_story
cbd6cafed7
The event manager should be re-used.
...
View::__construct() gets the controller's event manager,
only to override it the first time getEventManager() is called.
Don't overwrite the Controller's event manager as it allows plugins
to more easily hook into the view process.
2012-05-14 21:18:09 -04:00
Rachman Chavik
6bb29ea03b
changing CakeLog::_autoConfig for better bc
...
closes #2880
2012-05-15 08:16:55 +07:00
Jelle Henkens
ef270b95c7
Fixing test assert for APP_DIR scenarios with non standard folder names
2012-05-13 18:12:31 +01:00
Jelle Henkens
0d9506fa2e
Fixing issue where nice and niceShort did not use the timezone if no dateString is passed
2012-05-13 13:43:06 +01:00
Rachman Chavik
6ede36f8e0
removing unneeded LOG_* constant checks
2012-05-13 18:51:57 +07:00
Rachman Chavik
e6860fb856
changing LOG_ERROR to LOG_ERR in core files
2012-05-13 18:51:57 +07:00
Rachman Chavik
595cad84b3
ensure that plain CakeLogInterface still works
2012-05-13 18:51:57 +07:00
Rachman Chavik
8e8763d69d
change to match syslog levels & customizable levels
2012-05-13 18:51:57 +07:00
Jelle Henkens
dbd826f794
Removing extra space in the extract() calls
2012-05-13 10:37:50 +01:00
mark_story
64f03acd4c
Fix code standards errors.
2012-05-12 23:28:43 -04:00
mark_story
d9244048b6
Fix hard coded date.
2012-05-12 23:25:11 -04:00
mark_story
579aff5ad3
Fix error with options.
2012-05-12 22:35:49 -04:00
mark_story
176ec2df0c
Add documentation on additional options.
2012-05-12 22:26:34 -04:00
mark_story
683146de14
Add a few more tests.
2012-05-12 22:26:34 -04:00
mark_story
0edbe0a123
Fix more whitespace.
2012-05-12 22:26:34 -04:00
mark_story
14bfd83dad
Reduce complexity in timeAgoInWords.
...
All the special cases were handled by the deeply
nested if.
2012-05-12 22:26:34 -04:00
mark_story
ca8046bfea
Fix whitespace and formatting.
2012-05-12 22:26:33 -04:00
mark_story
a80a7dadf8
Re-factor element generation.
...
Add the ability for arbitrary attributes.
Use built-in methods for attribute generation.
Add tests for element generation.
2012-05-12 22:26:33 -04:00
mark_story
4f12f254f4
Add test for element.
2012-05-12 22:26:33 -04:00
mark_story
fd5a8a8d6b
Fix code standards.
...
Remove failing test, and fix coding standards.
2012-05-12 22:26:33 -04:00
Magnus Johansson
352fbde2ec
Move out HTML logic to Helper/TimeHelper.php. The Utility/CakeTime.php timeAgoInWords() now returns a string with the time, while the same function in Helper/TimeHelper.php may return an HTML element.
2012-05-12 22:26:33 -04:00
Magnus Johansson
9fa531d6e3
Added test cases for new features.
2012-05-12 22:26:33 -04:00
Magnus Johansson
0729aca706
Added some more intelligence to the CakeTime class
2012-05-12 22:25:48 -04:00
ADmad
14b7210d2b
Fixed server offset calculation
2012-05-13 06:20:29 +05:30
mark_story
9628910c86
Merge branch '2.1' into 2.2
2012-05-12 20:26:36 -04:00
mark_story
8103eae9f1
Make input prompt clearer in extract task.
...
Make the prompt display the paths that will be scanned. Hopefully
this makes the shell a bit easier to use and understand. Also
make the shell not accept 0 paths as a correct answer.
Fixes #2877
2012-05-12 20:26:11 -04:00
Jelle Henkens
c2920aa3bf
Fixing small variable typo
2012-05-12 18:43:39 +01:00
mark_story
a3a2655fd5
Fix whitespace errors.
2012-05-11 21:38:21 -04:00
Mark Story
5d3291ba19
Merge pull request #645 from huoxito/2.2
...
Make controller test template extends ControllerTestCase instead of CakeTestCase
2012-05-11 17:35:34 -07:00
ADmad
eeff950cf9
Removing default null value for $data parameter. Refs GH pull request #646
2012-05-12 00:18:47 +05:30
Washington
287c7b432a
fix broken tests for TestTask class
2012-05-11 15:30:47 -03:00
Washington
c651bf25d3
remove stub class from controller tests template and mock condition to
...
make it extends ControllerTestCase
2012-05-11 14:51:56 -03:00
Rachman Chavik
335f3558a9
fixing null request returned by Router::getRequest()
...
fixes issues for Router::getRequest() called in a Plugin/Foo/routes.php
during bootstrap.
2012-05-11 22:16:17 +07:00
Rachman Chavik
e5b33627d5
minor updates to the logging changeset
...
- change usage of Set to Hash
- updating bootstrap.php
- adding docblocks
- avoid silencing unlink errors in tests
2012-05-11 21:19:45 +07:00
Rachman Chavik
be9bcfd4b5
adding convenience methods for CakeLog
2012-05-11 12:37:01 +07:00
Rachman Chavik
6040d96710
adding scoped logging
2012-05-11 12:37:01 +07:00
Rachman Chavik
a269a123c4
reorder constant definitions
2012-05-11 12:37:01 +07:00
Rachman Chavik
05243a1c0a
updating Shell tests related to Console logging
2012-05-11 12:37:01 +07:00
Rachman Chavik
e11f6b7fe4
adding tests for ConsoleLog engine
2012-05-11 12:37:01 +07:00
Rachman Chavik
70177e4dbd
updating tests for CakeLog
...
- ObjectCollection operations
- Selective logging
2012-05-11 12:37:01 +07:00
Rachman Chavik
68b49950af
fix ErrorHandlerTest
2012-05-11 12:37:01 +07:00
Rachman Chavik
bb090c54cf
changing Shell to use ConsoleLog
2012-05-11 12:37:00 +07:00
Rachman Chavik
d10727797b
new ConsoleLog logging engine
2012-05-11 12:37:00 +07:00
Rachman Chavik
5c4f741529
add default logging config in Config/bootstrap.php
2012-05-11 12:37:00 +07:00
Rachman Chavik
b71e814191
selective logging by scope
2012-05-11 12:37:00 +07:00
Rachman Chavik
49bc818d36
new base class Log/Engine/BaseLog
2012-05-11 12:37:00 +07:00
Rachman Chavik
aab1eb6c37
refactor to use ObjectCollection
2012-05-11 12:37:00 +07:00
Rachman Chavik
edb44aadea
Merge branch '2.1' into 2.2
2012-05-11 12:34:26 +07:00
Jose Lorenzo Rodriguez
fe659c0c33
Refactored FormHelper to take advantage of the new validator object
2012-05-10 23:14:26 -04:30
Jose Lorenzo Rodriguez
217bf85537
Implemented new method isEmptyAllowed in CakeValidationRule
2012-05-10 23:13:45 -04:30
Jose Lorenzo Rodriguez
785cf8354c
Fixing merge artifacts to make all tests pass
2012-05-10 22:36:55 -04:30
Jose Lorenzo Rodriguez
307197da9e
Merge branch '2.2' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-05-10 22:19:35 -04:30
Jose Lorenzo Rodriguez
efc3536adb
Fixing a couple errors introduced in previous commit
2012-05-10 22:04:55 -04:30
Jose Lorenzo Rodriguez
2b7c2ad691
Fixing doc blocks for CakeValidationRule and changing visibility for some methods
2012-05-10 21:51:54 -04:30
Jose Lorenzo Rodriguez
34531d9d7c
Cahnging doc in header for CakeValidationSet
2012-05-10 21:41:42 -04:30
Jose Lorenzo Rodriguez
c4202b7b22
Improving docs for CakeValidationSet
2012-05-10 21:39:53 -04:30
Jose Lorenzo Rodriguez
8c9c6b4a5a
Improving docs for ModelValidator
2012-05-10 21:27:01 -04:30
Rachman Chavik
15a74722b3
use LOGS constant
2012-05-11 08:33:53 +07:00
Jose Lorenzo Rodriguez
280893155a
Renaming CakeRule to CakeValidationRule
2012-05-10 21:01:44 -04:30
Rachman Chavik
539fa3a131
fixing method signature in test models
2012-05-10 20:55:47 -04:30
Rachman Chavik
a96e4397be
check extension before passing to addTestFile()
2012-05-10 20:55:47 -04:30
Rachman Chavik
89959afa63
fix incorrect __construct params for mock object
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
f06fbb0075
Making validateAssociated overwrite data consistently with validateMany
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
82e87791f6
Ugly hack to fix saveAll deep and beforeValidate callbacks changing model data
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
1481f82ec1
Added warning messages in doc block for validateMany and validateAssociated about first param being passed by reference
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
7db2b97f87
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
e4c88d8cf9
Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit 0f54758e5a
, reversing
changes made to b4a42e4a03
.
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
2cea668755
Revert "Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit b4a42e4a03
, reversing
changes made to 6bd7da36e7
.
2012-05-10 20:55:46 -04:30
Christian Winther
ad4e46150a
Fixing saveMany
2012-05-10 20:55:46 -04:30
Christian Winther
fbd2132300
Another fix for Pull request 642
2012-05-10 20:55:46 -04:30
Jelle Henkens
484c3ec688
Adding support for a trailing & or & in the existing queryString
2012-05-10 20:55:46 -04:30
Christian Winther
7a1275a1b1
Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable
...
This allow changes in beforeValidate to be saved
2012-05-10 20:55:46 -04:30
mark_story
7592eb94ac
Fix test cases with postgres.
...
Setting id values confuses postgres' sequences.
2012-05-10 20:55:46 -04:30
mark_story
d9bf3cf987
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-10 20:55:46 -04:30
Jelle Henkens
e53074dab9
Fixing order inconsistency in queryString and bug with string based existing querystring
2012-05-10 20:55:46 -04:30
mark_story
d73bc6b867
Fix error in Sqlite tests.
2012-05-10 20:55:45 -04:30
mark_story
8334ebebed
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-10 20:55:45 -04:30
Phally
c9e59c3b51
Removed triple nested condition.
2012-05-10 20:55:45 -04:30
Frank de Graaf
2be9ac8888
Fixed HTTP status codes for non-redirects which were breaking AuthComponent.
2012-05-10 20:55:45 -04:30
mark_story
7695da637c
Use correct argument order.
2012-05-10 20:55:45 -04:30
Washington
a238116734
make controller test template extends ControllerTestCase
2012-05-10 20:34:30 -03:00
AD7six
6933b31be5
include plugin name in model tests
2012-05-11 00:33:10 +02:00
AD7six
6aca8036f4
baked tests match code standard by default
2012-05-10 23:51:22 +02:00
AD7six
08c3008874
load app classes automatically for plugins
...
Otherwise baking a test for a plugin model (example) fails
2012-05-10 23:51:09 +02:00
Rachman Chavik
73c66e2df4
fixing method signature in test models
2012-05-10 19:47:10 +07:00
Rachman Chavik
2598d17670
check extension before passing to addTestFile()
2012-05-10 19:06:04 +07:00
Rachman Chavik
5b67534acc
fix incorrect __construct params for mock object
2012-05-10 13:35:01 +07:00
Jose Lorenzo Rodriguez
b54dc69f64
Making validateAssociated overwrite data consistently with validateMany
2012-05-10 00:52:54 -04:30
Jose Lorenzo Rodriguez
6da2fe8323
Ugly hack to fix saveAll deep and beforeValidate callbacks changing model data
2012-05-10 00:47:35 -04:30
Jose Lorenzo Rodriguez
00a34f14fe
Added warning messages in doc block for validateMany and validateAssociated about first param being passed by reference
2012-05-10 00:07:05 -04:30
Jose Lorenzo Rodriguez
0fb025f6dc
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-09 23:51:27 -04:30
mark_story
2c1b5d978d
Optimize the content type search.
...
Move most commonly used types to the top
of the list. This reduces the time spent
iterating content types.
2012-05-09 22:53:54 -04:00
Mark Story
37d235fa16
Merge pull request #594 from tigrang/auth-ext
...
Added `contain` option to AuthComponent's Authentication objects
2012-05-09 17:48:44 -07:00
Mark Story
a4bbfc0cea
Merge pull request #638 from jellehenkens/2.1-router-querystring-bugfix
...
Router::queryString() order inconsistency and bug with appending to a string instead of array
2012-05-09 17:11:19 -07:00
AD7six
39a53fe0e2
updating model bake tempalte to meet code standards
2012-05-10 00:44:03 +02:00
AD7six
5b507636c7
baked controller code generates no errors
2012-05-10 00:37:51 +02:00
Jose Lorenzo Rodriguez
12ae03b876
Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit 0f54758e5a
, reversing
changes made to b4a42e4a03
.
2012-05-09 17:58:08 -04:30
Jose Lorenzo Rodriguez
07bf73e88f
Revert "Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit b4a42e4a03
, reversing
changes made to 6bd7da36e7
.
2012-05-09 17:57:48 -04:30
Christian Winther
e8fce37a65
Fixing saveMany
2012-05-09 23:59:02 +02:00
AD7six
8060dd57d3
don't dump indexes all on the same line
2012-05-09 23:38:30 +02:00
AD7six
3a5e00fa53
var_export dumps null as NULL
...
correct for that so code standards are met with the results
2012-05-09 23:38:30 +02:00
AD7six
5ef2a0100b
code standard fix
...
the baked test must have a blank line inbetwen the last function and the
end of the class
2012-05-09 23:38:29 +02:00
AD7six
0c4613fdd2
prevent NULL in fixture files
2012-05-09 23:38:29 +02:00
AD7six
d1f522e53a
attempt to get baked code output closer to phpcs standard
2012-05-09 23:38:29 +02:00
Christian Winther
3b154fa325
Another fix for Pull request 642
2012-05-09 23:34:37 +02:00
Jelle Henkens
07735069fa
Adding support for a trailing & or & in the existing queryString
2012-05-09 22:32:57 +01:00
Christian Winther
45a86a8b20
Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable
...
This allow changes in beforeValidate to be saved
2012-05-09 22:57:21 +02:00
Norio Suzuki
05bcc4fe58
Delete a space between ! and empty
2012-05-09 00:16:17 +09:00
mark_story
597913aa5b
Fix test cases with postgres.
...
Setting id values confuses postgres' sequences.
2012-05-07 22:10:17 -04:00
mark_story
fbba3621b5
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-07 21:36:28 -04:00
Norio Suzuki
db20600d02
Fix SMTP Transparency (RFC5321 4.5.2. first line period)
2012-05-07 22:34:14 +00:00
Jelle Henkens
45a96ae588
Fixing order inconsistency in queryString and bug with string based existing querystring
2012-05-07 21:48:58 +01:00
Ceeram
fe0c7d348a
add strict parameter to inList() and multiple()
2012-05-07 16:29:13 +02:00
Jose Lorenzo Rodriguez
52c7b2383c
Added afterValidate callback to maintain consistency across all other callbacks in the model layer
2012-05-06 23:38:29 -04:30
mark_story
a1e06b9c8b
Fix error in Sqlite tests.
2012-05-06 23:39:02 -04:00
Jose Lorenzo Rodriguez
d4511af27b
Implemented add and remove in ModelValidator
2012-05-06 23:06:28 -04:30
Jose Lorenzo Rodriguez
a7222bccd6
Implemented removeRule in CakeValidationSet
2012-05-06 22:30:07 -04:30
mark_story
6c5255ac73
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-06 22:48:15 -04:00
Jose Lorenzo Rodriguez
1ff1af35b3
Fixing typo
2012-05-06 20:45:50 -04:30
Jose Lorenzo Rodriguez
ff91a0909a
Implemented countable interface for CakeValidationSet
2012-05-06 01:07:13 -04:30
Jose Lorenzo Rodriguez
989a8b8398
Implementing IteratorAggregate for CakeValidationSet
2012-05-05 21:13:09 -04:30
Jose Lorenzo Rodriguez
6f16a66b83
Implmenting ArrayAcces in CakeValidationSet
2012-05-05 21:00:40 -04:30
Jose Lorenzo Rodriguez
877e6c0f66
Removing the need for first param in CakeRule constructor
2012-05-05 19:41:48 -04:30
Kim Egede Jakobsen
d180f6c3e5
Changed some of the doc-block links.
...
!But think there is a mistake somewhere with the links!
Camel-case or lowercase?
doc block content -> working link
(Model.php)
\#useTable -> \#usetable
\#displayField -> \#displayfield
\#cacheQueries -> \#cachequeries
\#sortByKey -> \#sortByKey (equals - basic.php)
2012-05-06 01:44:27 +02:00
Jose Lorenzo Rodriguez
3199b9029b
Implemented countable interface for ModelValidator
2012-05-05 17:46:09 -04:30
Jose Lorenzo Rodriguez
81c0c3d91d
Implementing IteratorAggregate interface for ModelValidator
2012-05-05 17:34:35 -04:30
Jose Lorenzo Rodriguez
d35f8e6b00
Implementing ArrayAccess in ModelValidator
2012-05-05 15:52:02 -04:30
Jose Lorenzo Rodriguez
b6c8a345e7
Renaming CakeField to CakeValidationSet
2012-05-05 13:44:12 -04:30
Jose Lorenzo Rodriguez
843d95bb77
Renaming some methods ands removing others
2012-05-05 13:34:14 -04:30
mark_story
7416c530a2
Fix missing view variables.
...
When rendering a exception caught when rendering
an exception, some view variables were missing causing fatal
errors.
Fixes #2843
2012-05-05 13:30:18 -04:00
mark_story
efe836480b
Fix error when rendering fatal error page.
...
If you included parse errors in AppController, the fatal error
page would not correctly display.
2012-05-05 12:54:41 -04:00
Mark Story
17a00eb2e9
Merge pull request #633 from Phally/2.1
...
Redirect check is breaking AuthComponent redirect status codes
2012-05-05 08:15:00 -07:00
Phally
985d6809f1
Removed triple nested condition.
2012-05-05 17:09:43 +02:00
Jose Lorenzo Rodriguez
68823daaef
Merge remote-tracking branch 'http/2.1' into 2.1
2012-05-04 19:28:03 -04:30
Jose Lorenzo Rodriguez
6f9b26fe58
Again using same serialization strategy for cached view files, as in some environments file is corrupted
2012-05-04 19:27:08 -04:30
AD7six
ef9c5bc004
ClassRegistry::getDataSource doesn't exist
2012-05-04 20:15:04 +02:00
Frank de Graaf
7bb56e7fc3
Fixed HTTP status codes for non-redirects which were breaking AuthComponent.
2012-05-04 16:58:51 +02:00
mark_story
ed1a64ca04
Use correct argument order.
2012-05-04 08:16:43 -04:00
mark_story
7b5e45b965
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Datasource/DataSource.php
lib/Cake/VERSION.txt
2012-05-03 21:06:35 -04:00
mark_story
4ab6d37abb
Update assertions.
...
Use assertXmlStringEqualsXmlString() it gives
better error reporting. Also update string concat
into heredocs.
2012-05-03 21:00:52 -04:00
mark_story
73b0345ff4
Fix issue with non-sequential array keys.
...
Xml::fromArray() should not cause errors with non-sequential
numeric array keys.
Fixes #2580
2012-05-03 20:35:01 -04:00
Ceeram
3a18384929
fix failing testcase
2012-05-03 10:13:18 +02:00
mark_story
1b288b74d9
Merge branch '2.2-configure' into 2.2
2012-05-02 21:21:43 -04:00
mark_story
b57489f3f1
Remove duplicate template.
...
Also remove double creating the home.ctp file.
Fixes #2842
2012-05-02 20:54:50 -04:00
ADmad
49f8e73ab3
Allow bulk storing/updating of mime types. Closes #2844
2012-05-03 01:39:12 +05:30
mark_story
e18200ad87
Fix assertion.
2012-05-01 21:45:06 -04:00
mark_story
e7153b5333
Add more tests
...
Fix an issue in IniReader and add tests
to ensure that dumped files can be re-read.
2012-05-01 21:43:01 -04:00
mark_story
7c4b7a2cbe
Fix mistake in path.
...
Remove incorrectly added file.
2012-05-01 21:06:24 -04:00
mark_story
d43e0aa0db
Update dump() to allow partial dumps.
2012-05-01 21:00:42 -04:00
mark_story
6ba923d20f
Make the configure adapters responsible for persistence.
...
Each adapter should be handling persistence. This allows
different adapters to handle saving config files in different ways
or places.
2012-05-01 21:00:41 -04:00
mark_story
9f37277dab
Add Configure::dump().
2012-05-01 21:00:41 -04:00
mark_story
578dac9259
Add dump() to PhpReader.
2012-05-01 21:00:41 -04:00
mark_story
c703a633bd
Add dump() method to IniReader.
2012-05-01 21:00:41 -04:00
Rachman Chavik
e7fa2a526f
remove whitespace at eol
2012-05-01 21:35:48 +07:00
mark_story
128c719bd0
Add no-op method to base class.
...
Fixes #2839
2012-04-30 20:52:17 -04:00
mark_story
004bc5b6e7
Fix overwriting of GET/POST
...
ControllerTestCase was overwriting GET and POST and not
restoring them at the end of testAction.
Fixes #2841
2012-04-30 20:36:19 -04:00
Graham Weldon
c77c6f3b57
Removed unncessary line to fix coding standards
2012-05-01 09:51:22 +10:00
Jose Lorenzo Rodriguez
7fd19551db
Update version number to 2.1.2
2012-04-29 21:07:12 -04:30
Jose Lorenzo Rodriguez
f14f18f0d7
Update version number to 2.2.0-beta
2012-04-29 21:03:38 -04:30
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Jose Lorenzo Rodriguez
05abff6ecd
Fixing faling test case
2012-04-29 19:58:22 -04:30
Jose Lorenzo Rodriguez
72e8992c25
Improving test coverage for CakeRule
2012-04-29 19:56:24 -04:30
Jose Lorenzo Rodriguez
d348bf6807
Refactoring again CakeRule, making all tests pass
2012-04-29 18:11:51 -04:30
mark_story
f6b33db02c
Add test for accept header.
...
Refs #2828
2012-04-29 14:48:45 -04:00
AD7six
9444af2f81
classify the first cli argument for this task
...
the $type is used to lookup in the $classTypes property what kind of
entity is being baked. if it's underscored, getRealClassName will bail
on it's first condition of "is it in the $classTypes property" producing
mostly useless test stubs for everything except models
2012-04-29 17:20:14 +02:00
AD7six
6a744b277e
create tests for baking a test for a component, behavior and helper
2012-04-29 17:20:14 +02:00
AD7six
6b6fdd2b84
don't dump fatal errors as html on the cli
2012-04-29 16:25:07 +02:00
Jose Lorenzo Rodriguez
94040859b2
Correctly calling method to not depend on functon call order
2012-04-29 02:57:10 -04:30
Jose Lorenzo Rodriguez
deedd7a3ce
Even more tests passing now, almost there
2012-04-29 02:40:08 -04:30
Jose Lorenzo Rodriguez
66a568be89
More tests passing now
2012-04-29 01:09:36 -04:30
Jose Lorenzo Rodriguez
8700f3c7a2
Fixed some validation tests
2012-04-29 01:06:24 -04:30
Jose Lorenzo Rodriguez
30761f9153
Removed more redundant lines in ModelValidation tests
2012-04-29 00:46:56 -04:30
Jose Lorenzo Rodriguez
18c26119f3
Removing redundant code, cleaning up some sentences
2012-04-29 00:39:43 -04:30
Jose Lorenzo Rodriguez
c31f87b7a1
Refactored getMethods, got rid of validationErrors property in ModelValidator, made validateAssociated and many tests
...
pass
2012-04-29 00:24:35 -04:30
Jose Lorenzo Rodriguez
b83f936e83
General refactor on ModelValidation to decrease class coupling and increase readability
2012-04-28 23:25:05 -04:30
Jose Lorenzo Rodriguez
573d292ffa
Fixed more refereces to old method
2012-04-28 20:12:20 -04:30
Jose Lorenzo Rodriguez
4519ba1221
Fixed variable reference
2012-04-28 20:05:41 -04:30
Jose Lorenzo Rodriguez
3ea2d7bca5
Removing validatior construction in model constructor
2012-04-28 20:04:33 -04:30
Jose Lorenzo Rodriguez
f54eb0cdee
following coding standards and simplifying some logic
2012-04-28 19:38:18 -04:30
Jose Lorenzo Rodriguez
8eb02d0539
Simplifying options for setting/getting a model validator. Adding loading support for validators is was simplified into
...
requiring custom validators to extend core ModelValidator
2012-04-28 19:20:22 -04:30
José Lorenzo Rodríguez
d80b1ef7f6
Merge pull request #630 from shama/patch-typos
...
Typos in Test Cases
2012-04-27 07:42:40 -07:00
Tigran Gabrielyan
77f6d88a9e
Fixed bug in model validation translate
2012-04-26 21:24:22 -07:00
Kyle Robinson Young
eb059d3fa6
Fix typos in test cases
2012-04-26 20:14:52 -07:00
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
mark_story
46bce1a00f
Merge branch '2.1' into 2.2
2012-04-26 22:27:44 -04:00
mark_story
6bb8b22cdb
Fix space indented code.
2012-04-26 22:27:34 -04:00
Mark Story
1876b2f579
Merge pull request #627 from dereuromark/2.2-utf8-test-cases
...
2.2 utf8 test cases
2012-04-26 18:14:58 -07:00
Juan Basso
333ea29805
Renamed variable name from nested transaction
2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0
Renamed method to check if the driver supports nested transaction.
2012-04-26 20:58:25 -04:00
euromark
ba8a3c5f07
added missing utf8_encode to pass tests on windows
2012-04-27 02:39:32 +02:00
Mark Story
f150ebb9cc
Merge pull request #623 from dereuromark/2.2-bake-theme-order
...
Correct order of bake themes so app and plugin precede core ones
Fixes #2825
2012-04-26 09:43:53 -07:00
Thomas Ploch
daa695b4d3
Added NotImplementedException with status code 501
2012-04-25 15:44:48 +02:00
Ceeram
ec9966ec6b
Adding tests for Validator
2012-04-25 09:38:58 +02:00
Thomas Ploch
324684c14f
Moving all validation logic into a new ModelValidator object.
2012-04-25 08:53:31 +02:00
ADmad
061483d03e
Added missing keyword
2012-04-25 11:03:26 +05:30
Juan Basso
10a4b87979
Fixed tests with nested transaction in DboSource.
2012-04-24 22:28:47 -04:00
Juan Basso
5bec15d3e1
Added file that was missing in previous commit.
2012-04-24 21:43:43 -04:00
Juan Basso
5f722cb3d4
Update nested transaction test to use InnoDB table in MySQL.
2012-04-24 21:42:32 -04:00
Juan Basso
f6288a491a
Disabled the default nested configuration. MySQL use MyISAM as default and it can affect many applications.
2012-04-24 21:42:32 -04:00
mark_story
eefb2e81fa
Fix issue where prefixes mid action would be truncated.
...
If a prefix occured mid action name it would be removed,
corrupting the action name.
Fixes #2831
2012-04-24 20:48:23 -04:00
mark_story
ef1da3146e
Fix scaffold delete messages with uuids.
...
Fixes #2826
2012-04-24 20:11:58 -04:00
mark_story
4ffca8457e
Fix coding standards.
2012-04-24 20:09:39 -04:00
Juan Basso
12392b6285
Fixed variable name.
2012-04-24 20:03:43 -04:00
Juan Basso
4e480eaca5
Disabling nested transaction for fixtures.
2012-04-24 20:01:22 -04:00
Rachman Chavik
2f87992d15
File::create() does not need to change umask
...
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.
FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.
Refs: f9f1c4df5
Cherrypicked from 2.2 branch.
2012-04-24 23:35:32 +07:00
Rachman Chavik
74830b9b93
File::create() does not need to change umask
...
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.
FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.
Refs: f9f1c4df5
2012-04-24 23:17:28 +07:00
Ceeram
0785ace172
fix error caused by non-existent fixture
2012-04-24 14:01:59 +02:00
Jose Lorenzo Rodriguez
6f909480e8
Merge remote-tracking branch 'origin/2.2' into 2.2
2012-04-24 00:14:13 -04:30
Juan Basso
b95f367bef
Disabled nested transactions for fixtures.
2012-04-24 00:34:28 -04:00
Jose Lorenzo Rodriguez
5674e9fd17
Another micro-optimization, sorry
2012-04-23 23:42:57 -04:30
Jose Lorenzo Rodriguez
e7a7a177cc
Merge remote-tracking branch 'origin/2.2' into 2.2
2012-04-23 23:34:45 -04:30
Jose Lorenzo Rodriguez
63c0c2c75f
Very random micro-optimizations
2012-04-23 23:29:32 -04:30
mark_story
7e38f9d79f
Fix more coding standards errors.
2012-04-23 22:27:27 -04:00
mark_story
7240286adc
Fix coding standards errors.
2012-04-23 22:01:45 -04:00
mark_story
b6de177ffa
Merge branch '2.1' into 2.2
2012-04-23 21:50:36 -04:00
mark_story
9e3fe633bb
Remove double encoding on addresses in EmailComponent.
...
CakeEmail should be handling all the encoding now, duplicating it is
silly.
Fixes #2797
2012-04-23 21:41:31 -04:00
mark_story
13468937cc
Fix singularization of databases.
...
Fixes #2822
2012-04-23 21:01:03 -04:00
euromark
acd06d6499
fixing test case
2012-04-24 02:46:20 +02:00
euromark
6353558622
bame themes now in correct order: app -> plugin -> default
2012-04-24 02:40:42 +02:00
Rachman Chavik
36275129d7
i18n: consider real path of APP to handle symlinks
...
When extracting model validation messages, Reflection::getFileName is used
to obtain the the model filename. The returned value is actual physical
path and may differ to what APP is. Adding the realpath(APP) to $paths
variable allows str_replace() to correctly generate the correct value for
$occurences.
2012-04-24 07:29:26 +07:00
Till Claassen
3f7e2f536f
CakeTestSuite::addTestDirectory() ignore non-php
...
CakeTestSuite::addTestDirectory() and addTestDirectoryRecursive()
now ignore any files that do not end in .php
This avoids any stray non-php files being parsed, especially
tilde-style backup files that end in .php~
Improves #2031
Signed-off-by: mark_story <mark@mark-story.com>
2012-04-23 12:15:29 -04:00
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +02:00
Kyle Robinson Young
89d3221adc
Update available App::build settings in bootstrap
2012-04-22 21:16:00 -07:00
Juan Basso
7fe333ce4e
Merge branch '2.2-nested-transaction' into 2.2
2012-04-22 23:04:32 -04:00
Jose Lorenzo Rodriguez
ed0c5a4746
Merge branch '2.2-lazy-helpers' into 2.2
2012-04-22 20:40:11 -04:30
Jose Lorenzo Rodriguez
53a4de7774
More coding standard fixes
2012-04-22 20:34:19 -04:30
Jose Lorenzo Rodriguez
02d222a349
Adhering to coding standards
2012-04-22 20:33:07 -04:30
Jose Lorenzo Rodriguez
042221bbf6
Merge branch '2.2-redis-engine' into 2.2
2012-04-22 19:14:24 -04:30
Jose Lorenzo Rodriguez
9f415d012c
Merge branch '2.2-cache-groups' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
2012-04-22 18:59:22 -04:30
Jose Lorenzo Rodriguez
4b2804bb42
Fixing broken test and coding standard
2012-04-22 17:39:45 -04:30
Jose Lorenzo Rodriguez
8465538800
Merge branch '2.2-middleware' into 2.2
2012-04-22 17:17:36 -04:30
ADmad
b1e7164d1a
Implemented translation of validation rule arguments in validation error messages. Closes #2816
2012-04-22 23:25:07 +05:30
Tigran Gabrielyan
49eac06d89
Fixed bug in Router::normalize()
2012-04-21 18:37:58 -07:00
mark_story
7846254c63
Remove more copy + paste in tests.
2012-04-21 21:31:24 -04:00
mark_story
88465cbb47
Remove copy + paste in tests.
2012-04-21 21:17:28 -04:00
Juan Basso
a233460c7f
Adding file lock when use cache function. It will avoid errors when view cache is created by 2 threads concurrently.
2012-04-21 21:01:58 -04:00
ADmad
3800029c9a
Fix docblock
2012-04-22 02:22:48 +05:30
ADmad
d26f869455
Added function to get timezone object
2012-04-22 01:59:26 +05:30
ADmad
058d57a85a
Added function to convert time from user timezone to server timezone.
2012-04-22 01:59:26 +05:30
ADmad
a96de99388
Tweak docblocks
2012-04-22 01:59:26 +05:30
ADmad
ebf304927b
Added "Config.timezone" config param to avoid having to specify timezone in each function call.
2012-04-22 01:59:26 +05:30
ADmad
d34f0c2bd8
CakeTime functions can now use timezone string or DateTimeZone object for user offsets. (Passing numeric offsets has been kept for BC)
2012-04-22 01:59:08 +05:30
Ceeram
f0bd7386e2
created, modified and updated fields now use static timestamp in testcases
2012-04-21 17:38:49 +02:00
euromark
8a52a77cbc
correct argument order for phpunit asserts
2012-04-21 15:19:57 +02:00
euromark
bc2cd00123
cake 2.2 test case fixes (assert corrections, correct class names)
2012-04-21 15:02:35 +02:00
mark_story
2480ee1beb
Fix coding standards.
2012-04-20 20:52:10 -04:00
Mark Story
76e724e161
Merge pull request #617 from dereuromark/2.2-test-cases-fix-for-windows
...
2.2 test cases fix for windows
2012-04-20 17:03:13 -07:00
Ceeram
a0d78edb71
require models.php to avoid fatal error when running AllComponentsTest
2012-04-20 17:16:11 +02:00
euromark
da3b424838
Fixed several fails in the tests concerning windows. Especially in AllConsole
2012-04-20 16:38:50 +02:00
mark_story
fcb7714e2e
Fix failing test.
2012-04-19 22:17:19 -04:00
euromark
a5c323064f
domain configurable for mailing in CLI environment
2012-04-20 03:38:26 +02:00
Jose Lorenzo Rodriguez
fd8971ba06
Adding smart header checking to return 304 response in AssetDispatcher filter
2012-04-19 00:00:32 -04:30
mark_story
dec67ef259
Add proper charset to web test runner.
...
Fixes #2804
2012-04-18 22:45:55 -04:00
mark_story
c49da62c23
Update content_for_layout to use fetch()
...
Fixes #2803
2012-04-18 22:23:18 -04:00