Commit graph

15349 commits

Author SHA1 Message Date
mark_story
659715664d Check for the methods that will be called.
Check the same methods that are called. Without this diffs are not
printed for failures.

Fixes #3503
2013-01-01 14:25:34 -05:00
Mark Story
2e4bde017e Merge pull request #1054 from chronon/2.3
Updating version number in test suite header.
2012-12-30 17:12:35 -08:00
Gregory Gaskill
b6b40b1196 Updating version number in test suite header. 2012-12-30 13:50:05 -08:00
mark_story
83abced287 Add tests for save() and multiple locales.
Refs #3498
2012-12-29 11:57:52 -05:00
mark_story
4c98e39c1f Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Controller/Component/SecurityComponent.php
2012-12-29 11:44:59 -05:00
mark_story
1117ad2f1c Blackhole requests when the action is the blackhole callback.
When a user requests the blackhole callback as an action we should
blackhole that request. The blackhole callback should not be URL
accessible.

Fixes #3496
2012-12-29 11:43:06 -05:00
Mark Story
ec264fc81d Merge pull request #1052 from majna/2.3-update-cc
Code cleanup
2012-12-28 15:26:29 -08:00
Majna
6d75d90c25 Code cleanup
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
2012-12-28 23:37:58 +01:00
José Lorenzo Rodríguez
5551727a4b Merge pull request #1051 from ADmad/2.3-paginatorcomponent
Throw exception if requested page number is out of range.
2012-12-28 05:52:55 -08:00
mark_story
f97fe05e65 Merge branch 'master' into 2.3 2012-12-27 20:59:06 -05:00
mark_story
2ba117eeda Handle MissingViewExceptions better.
When Router::parseExtensions() is enabled for a file extension
that does not map to a view an infinite loop of attempting to render
View/$ext/error500.ctp will be entered. When catching
a MissingViewException check if we were trying to render an
error500. If we were, revert to safe rendering as we might enter a loop.
2012-12-27 20:58:49 -05:00
ADmad
594a19c4e1 Fix docblock 2012-12-28 02:02:05 +05:30
ADmad
fd16b8a1e5 Throw exception if requested page number is out of range.
Closes #3459
2012-12-28 01:37:25 +05:30
Graham Weldon
a9293aa385 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Console/Templates/skel/Config/core.php
2012-12-27 22:42:18 +09:00
Graham Weldon
604898ad0b Added check for HHVM in Debugger, 2012-12-27 22:38:43 +09:00
Jose Lorenzo Rodriguez
9cc4371246 Revert "Merge pull request #1050 from rynop/2.3"
This reverts commit f3f1e1ab52, reversing
changes made to 9fc4678fa3.
2012-12-27 13:55:25 +01:00
Ceeram
f792136c26 adding a note about custom error handler classes 2012-12-27 13:18:52 +01:00
mark_story
965f0e87c5 Fix SQL errors in TreeBehavior.
SQL errors were caused by escapeField() usage in TreeBehavior. Quoted
fields were not correctly unquoted.

Fixes #3491
2012-12-26 20:55:07 -05:00
Mark Story
f3f1e1ab52 Merge pull request #1050 from rynop/2.3
Fix testClear() case
2012-12-26 16:39:30 -08:00
Ryan
1881ff1664 Fix testClear() case
After clear of memcache config, all keys should be gone. So a read on a key should return false.
2012-12-26 16:34:23 -06:00
mark_story
9fc4678fa3 Merge branch 'zoghal-fix-tree-condidtions' into 2.3
Refs #GH-1049
2012-12-26 14:10:58 -05:00
Saleh Souzanchi
ed761320df Disabled callbacks in _getMax() & _getMin()
This fixes issues where model/behavior callbacks append into the query
conditions without checking that its an array. Disabling callbacks
should also improve performance a tiny bit.

Refs #GH-1049
2012-12-26 14:09:45 -05:00
Mark Story
79c6cbd929 Merge pull request #1048 from dereuromark/2.3-inflection
cookie is not uninflected but irregular
2012-12-25 08:30:21 -08:00
euromark
500a9805b7 cookie is not uninflected but irregular 2012-12-25 00:21:12 +01:00
ADmad
367463f4c1 Added disabledTag option.
Closes #3108
2012-12-24 20:48:44 +05:30
ADmad
bacfa5a977 Fix missing controller error 2012-12-24 00:29:22 +05:30
Mark Story
4aea44fbd0 Merge pull request #1035 from ceeram/2.3-pmd
remove unused local variables and a few improvements
2012-12-23 07:35:19 -08:00
Ceeram
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
Jose Lorenzo Rodriguez
f25f35353d Making getMockForModel actually useful 2012-12-23 00:30:27 +01:00
Jose Lorenzo Rodriguez
bcda684ad7 Copying changes doe to cake executable to skel files 2012-12-23 00:23:01 +01:00
José Lorenzo Rodríguez
693be600f8 Merge pull request #1044 from dereuromark/2.3-doc-blocks
double spaces to single ones
2012-12-22 14:58:32 -08:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678 Merge pull request #961 from dereuromark/2.3-unify-object-collection
2.3 unify object collection
2012-12-22 14:24:26 -08:00
José Lorenzo Rodríguez
bd69979deb Merge pull request #982 from shama/editorconfig
Add .editorconfig file
2012-12-22 14:21:06 -08:00
ADmad
fce07bd5b8 Fix failing test 2012-12-23 03:32:25 +05:30
José Lorenzo Rodríguez
29f6e13a28 Merge pull request #1007 from dereuromark/2.3-response-charset
not just json should send the charset
2012-12-22 14:00:58 -08:00
José Lorenzo Rodríguez
9f5549a7eb Merge pull request #1037 from ADmad/2.3-formhelper
Added "required" attribute to input element based on validation rules fo...
2012-12-22 13:51:40 -08:00
ADmad
5aa9c26fdf Update doctypes to html5 2012-12-23 02:57:30 +05:30
Mark Story
f61b052a51 Merge pull request #1042 from ADmad/2.3-cakenumber
Added support for php.ini style values
2012-12-22 13:15:38 -08:00
ADmad
a340c19c08 Added support for php.ini style values 2012-12-23 02:25:59 +05:30
Bob Fanger
13dc397172 Added unittest for REQUEST_URI with multiple FQDNs. 2012-12-21 19:59:55 +01:00
ADmad
8ef2c22c29 Added "required" attribute to input element based on validation rules for field 2012-12-21 23:20:40 +05:30
Bob Fanger
b7b6859c27 Fixes corrupted CakeRequests when a $_GET value contains "://" 2012-12-21 16:12:51 +01:00
Ceeram
5f9a371d58 phpcs violations will now fail travis builds 2012-12-21 16:06:06 +01:00
Ceeram
6672eafe53 fix whitespace errors 2012-12-21 16:05:32 +01:00
ADmad
75857b5e36 Merge pull request #1038 from ravage84/patch-1
Fix manual link
2012-12-21 06:10:56 -08:00
ravage84
bd71f8aa25 Update lib/Cake/Model/Model.php
Corrected an unlogic link from Model:find to an appropriate page in the docs
2012-12-21 15:06:43 +01:00
euromark
910e21e65e a few more application contents should send the charset
adding content type tests as dataprovider
2012-12-21 12:32:32 +01:00
Mark Story
69248dfb1a Merge pull request #1001 from dogmatic69/refactor-uuid-checks
Refactor uuid checks into a method
2012-12-20 17:46:07 -08:00
Mark Story
e524f7b470 Merge pull request #1036 from dereuromark/2.3-cleanup
code cleanup
2012-12-20 17:38:47 -08:00