Commit graph

347 commits

Author SHA1 Message Date
euromark
09d9efe235 spelling corrections (a url to an URL, unify URL) 2013-04-29 11:05:17 +02:00
mark_story
62186ac8da Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-04-28 17:00:30 -04:00
mark_story
c327bdc4bd Enforce model aliases when generating order by clauses.
Invalid SQL could be created by sorting on an invalid alias, with
a field that exists on the model.

Fixes #3797
2013-04-27 13:29:29 -04:00
ADmad
19f8274a95 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
Jose Lorenzo Rodriguez
db6dd18f86 Fixing case where it was possible to pass array data to FormAuthenticate
fields
2013-04-24 22:33:24 +02:00
ADmad
3db632732c Avoid unnecessary overhead if user record already available from session. 2013-04-23 01:35:04 +05:30
ADmad
06a5c509c0 Merge branch 'master' into 2.4 2013-04-21 19:15:55 +05:30
mark_story
efd86a498a Do type checks when looking for models in Controller::$uses.
This solves issues with models not being added when $uses = true.

Fixes #3774
2013-04-19 12:20:46 -04:00
ADmad
d809b1480e Fix CS errors 2013-04-01 02:16:52 +05:30
mark_story
3fc627c5f8 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
	lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
mark_story
ceb46b5d2c Try to fix random test failures on postgres.
Sorting in postgres is undefined and no based on the primary key when
sorting is not supplied.
2013-03-30 13:38:47 -04:00
ADmad
342bf65811 Ensure referrer is saved in session even when AuthComponent::$loginRedirect is set.
Clarified redirectUrl() docblock.
2013-03-27 15:11:02 +05:30
Ceeram
89ecd95e55 fix failing tests 2013-03-18 18:47:05 +01:00
ADmad
7becd58237 Add test for Auth.redirect session var clearing. 2013-03-15 17:50:05 +05:30
ADmad
8e299fc404 Move 'Auth.redirect' session value clearing from AuthComponent::shutdown() to prevent unnecessary session start.
Closes #3702
2013-03-14 12:42:21 +05:30
ADmad
b7834a2b16 Implemented stateless login for Auth 2013-03-10 00:11:35 +05:30
mark_story
d1c88ebf8a Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
ADmad
74b9cdb36f Fix failing tests caused by previous commit 2013-02-09 18:24:27 +05:30
ADmad
13029cc2bc Merge branch 'master' into 2.4 2013-02-09 02:20:16 +05:30
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
Rik van der Heijden
e331ae64ee Fix CrudAuthorizeTest, added Router::reload() in setUp 2013-01-29 21:35:29 +01:00
ADmad
04ec9dd614 Renamed AuthComponent::redirect() to AuthComponent::redirectUrl().
Closes #3268
2013-01-27 21:22:11 +05:30
mark_story
4af6039107 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
mark_story
0cdef75060 Fix failing tests.
I have no idea why the updated session test was expected to fail as the
data was written to the session.

Refs #3551
2013-01-21 21:13:35 -05:00
ADmad
676872d623 Allow AuthComponent::$unauthorizedRedirect to be an url.
Closes #3494
2013-01-12 11:25:13 +05:30
Mark Story
e7330fa585 Merge pull request #1067 from ceeram/paginatecount
Avoid calling paginateCount when there are no results.
2013-01-11 18:09:32 -08:00
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
Ceeram
d3f9cc10b5 fix failing test 2013-01-10 18:10:24 +01: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
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
ADmad
fd16b8a1e5 Throw exception if requested page number is out of range.
Closes #3459
2012-12-28 01:37:25 +05:30
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
ADmad
fce07bd5b8 Fix failing test 2012-12-23 03:32:25 +05:30
euromark
881127ef4d unify new lines at the end of the file 2012-12-05 15:00:24 +01:00
ADmad
1de8ed18de Avoiding specifying 'maxLimit' too when setting 'limit' greater than default 'maxLimit' in code. 2012-11-30 11:26:10 +05:30
mark_story
35d67bf4a8 Merge branch 'master' into 2.3 2012-11-28 21:00:30 -05:00
mark_story
966c69cb98 Fix missing plugin parameters in scaffolding.
Add missing plugin parameter to scaffolded associations.
This improves link generation and correctness overall.

Fixes #3396
2012-11-27 21:59:06 -05:00
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
euromark
8acdb129b2 unify object load/unload and loaded methods 2012-11-16 12:14:28 +01:00
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
mark_story
83d307e545 Try to set order on more things. 2012-10-24 22:38:15 -04:00
mark_story
9e0778951a Add some fixed orders.
Hopefully this makes tests in postgres more reliable.
2012-10-24 21:27:01 -04:00
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
ADmad
1c0492eb8b Allow throwing exception instead of redirecting upon unauthorized access attempt. Closes #591 2012-10-04 18:40:57 +05:30
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
mark_story
ea784f68dc Try skipping blowfish tests if hashes are wrong.
Another attempt at fixing failing tests on travisci.
2012-09-26 22:00:52 -04:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
mark_story
d3ba9703a5 Try to make some time related test failures go away. 2012-09-20 21:07:14 -04:00
euromark
2170d87488 check() for CookieComponent and Configure (similar to CakeSession::check()) 2012-09-04 01:04:48 +02: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
Heath Nail
d24bbcb255 Add BlowfishAuthenticate adapter. 2012-08-23 11:23:51 -04:00
mark_story
11227f5490 Fix coding standards. 2012-08-10 21:50:37 -04: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
Tigran Gabrielyan
617d470427 Renamed disabledActions to unlockedActions 2012-08-03 11:01:19 -07:00
Tigran Gabrielyan
df8ec17626 Added disabledActions feature to SecurityComponent 2012-08-02 18:27:52 -07:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00
Spencer Ellinor
6c1b05a5d4 Modify test case to show the issue. 2012-07-25 15:06:56 -04:00
José Lorenzo Rodríguez
a7865b5d1d Removing some new by reference calls 2012-07-19 14:24:12 -05:30
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
mark_story
3c6b50953b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
AD7six
2967a4db23 text/javascript is not the correct mime for js 2012-07-06 13:17:15 +02:00
Rachman Chavik
22373868bb if blackHoleCallback is set, requests _must_ get blackholed 2012-07-03 19:27:02 +07: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
AD7six
d5cf2765dd remove referencers to fixtures that don't exist 2012-06-18 16:40:37 +02:00
mark_story
8da42dfcfa Merge branch '2.1' into 2.2 2012-06-02 20:57:05 -04:00
mark_story
d1819dcabb Fix page 0 issue.
Refs #2929
2012-06-02 20:56:38 -04:00
mark_story
15a423ad70 Restrict page number passed to view.
Limit the page number to the max page number when passing data to the
view.  This prevents the helper from generating a huge number of links.

Fixes #2929
2012-06-02 20:26:09 -04:00
Ceeram
6c9b2a1fec Fix user() return value for nested data 2012-05-31 15:13:24 +02:00
mark_story
1c0f97ea67 Fix some minor code style issues. 2012-05-27 14:20:19 -04:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
mark_story
a3a2655fd5 Fix whitespace errors. 2012-05-11 21:38:21 -04:00
Frank de Graaf
2be9ac8888 Fixed HTTP status codes for non-redirects which were breaking AuthComponent. 2012-05-10 20:55:45 -04:30
Frank de Graaf
7bb56e7fc3 Fixed HTTP status codes for non-redirects which were breaking AuthComponent. 2012-05-04 16:58:51 +02:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -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
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
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
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
Ceeram
f0bd7386e2 created, modified and updated fields now use static timestamp in testcases 2012-04-21 17:38:49 +02:00
euromark
bc2cd00123 cake 2.2 test case fixes (assert corrections, correct class names) 2012-04-21 15:02:35 +02:00
Ceeram
a0d78edb71 require models.php to avoid fatal error when running AllComponentsTest 2012-04-20 17:16:11 +02:00
mark_story
fcb7714e2e Fix failing test. 2012-04-19 22:17:19 -04:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
mark_story
8639d5af84 Fix mistakes. 2012-04-15 22:54:13 -04:00
mark_story
72c3059d94 Add missing parent calls.
Fixes piles of failing tests.
2012-04-15 22:20:34 -04:00
Kyle Robinson Young
8bbe250bec Correct method descriptions and remove unused property 2012-04-11 07:50:54 -07:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
f8966a64f2 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
mark_story
c718a18218 Fix coding standards errors. 2012-04-08 21:01:25 -04:00
Ceeram
2b7fe21ee0 remove all Set::extract() from core and tests 2012-04-05 01:33:57 +02:00
mark_story
18296d2bf6 Fix a few coding standards errors. 2012-04-02 23:19:05 -04:00