Commit graph

16229 commits

Author SHA1 Message Date
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
Mark Story
c7da60de08 Merge pull request #834 from dereuromark/2.3-missing-appuses
added missing App::uses('Hash', 'Utility');
2012-09-13 14:37:05 -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
ADmad
c4458a9e72 Merge pull request #830 from dogmatic69/string-code-format
fixing the missing space on the if
2012-09-12 23:41:23 -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
Mark Story
5ddb61be92 Merge pull request #829 from dogmatic69/string-simplify-code
this change did make wonky uuids
2012-09-12 18:13:14 -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
Mark Story
0d7db89a43 Merge pull request #824 from dogmatic69/string-simplify-code
simplify the code in the string class
2012-09-12 11:49:40 -07: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
José Lorenzo Rodríguez
b227ff486e Merge pull request #822 from rchavik/2.3
enable PluginDot for routeClass parameter
2012-09-12 08:04:44 -07: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