Commit graph

2320 commits

Author SHA1 Message Date
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
euromark
48fa358260 Remove leftover param that is now wrongly triggering "strict" 2013-04-22 11:36:17 +02:00
spiliot
2d7f6fc707 Added tests 2013-04-22 03:42:19 +03:00
mark_story
c2c096428c Uncomment test.
I missed this earlier, because I'm a doofus.
2013-04-21 11:29:25 -04:00
ADmad
06a5c509c0 Merge branch 'master' into 2.4 2013-04-21 19:15:55 +05:30
mark_story
f6c3015705 Add additional tests and fix incorrect meridian selection
When dates around midnight were used with interval + 12hr formats, the
incorrect meridian was selected.

Refs #GH-1237
2013-04-20 14:39:47 -04:00
Majna
78ea4da681 Add test for time input with interval on first hour of the day 2013-04-20 17:51:50 +02:00
Ceeram
842b1802d9 add assert that habtm save does not return false 2013-04-19 19:37:23 +02:00
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
mark_story
0f3d28c6ea Fix condition parsing in mysql specific cases.
When using collation + array values the incorrect operator would be
used. IN should be used over =.

Fixes #3772
2013-04-18 21:52:22 -04:00
mark_story
4d8dd12449 Add support for key => value cookies.
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.

Fixes #3771
2013-04-18 21:22:50 -04:00
ADmad
79ad8ab95a Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
ADmad
ba56fb7064 Fixed issue where incorrect cached filesize was reported when appending to file. 2013-04-13 19:45:20 +05:30
mark_story
ed435870ae Fix secure field lists when select elements have custom name attributes.
When a select element had a custom name attribute the secured field name
was incorrect.

Fixes #3753
2013-04-12 12:30:05 -04:00
mark_story
8bd1980dd4 DateTime::getTimestamp() is PHP5.3+ 2013-04-11 13:39:05 -04:00
ADmad
548cccbbe2 "maxlength" is not a valid attribute for input element of type "number" in html5. 2013-04-11 21:06:52 +05:30
mark_story
5c83bc177d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-04-09 22:09:56 -04:00
mark_story
0e646a2a4d Fix incorrect timestamp values when using fromString()
When using fromString() on DateTime objects that were in the global
timezone, an incorrect value would be returned.

Fixes #3743
2013-04-09 21:30:20 -04:00
ADmad
e55877d171 Merge branch 'master' into 2.4 2013-04-06 00:57:46 +05:30
ADmad
431ab2aebd Fix CS errors 2013-04-04 17:37:51 +05:30
mark_story
d8d8e9644d Fix array('disabled') and array('disabled' => true) working differently.
The shortform should work the same as the longer form with regards to
disabling field locking with SecurityComponent.

Fixes #3734
2013-04-03 12:46:39 -04:00
Rémi Dewitte
c70a3868a9 schema update CREATEs non-existing tables instead of ALTER 2013-04-03 17:37:09 +02:00
Mark Story
bb776cfa72 Merge pull request #1213 from markstory/improve-request-is
Improve CakeRequest::is()

Fixes #3714
2013-04-02 10:20:13 -07:00
José Lorenzo Rodríguez
0b73c8b6ac Merge pull request #1171 from remidewitte/feature/filelog-mask2
Add mask setting to FileLog
2013-04-01 23:44:02 -07:00
mark_story
2d6ee3cdb1 Remove pointless code.
Add a missing call to parent::setUp() and remove code that it takes
care of.
2013-04-01 22:30:27 -04:00
mark_story
ce04d6afa1 Add CakeRequest::isAll().
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.

Refs #3714
2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f Add support for is() with multiple types.
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.

Refs #3714
2013-04-01 21:52:15 -04:00
ADmad
d809b1480e Fix CS errors 2013-04-01 02:16:52 +05:30
mark_story
d28c2f8e72 Fix code & tests for isPast() and isFuture()
The methods and tests now follow coding standards and work.
2013-03-30 22:24:14 -04:00
Roberto Frega
632c4feb5d Adds two new time testing methods: 'isFuture' and 'isPast'
TestCases included
2013-03-30 22:24:08 -04:00
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
ADmad
7b90542230 Fix CS error 2013-03-31 00:23:03 +05:30
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
Mark Story
84c0de7e2d Merge pull request #1203 from cincodenada/patch_httpsocket
Add a bit of backwards compatibility for specifying auth in the config.

Restore compatibility with older versions when providing auth data in the
request data.
2013-03-29 18:19:46 -07:00
Joel Bradshaw
ece6ac3663 Backwards compat for auth in the config array of HttpSocket::request()
Brings functionality back in line with docs as well
2013-03-29 15:46:42 -07:00
Renan Gonçalves
96c9174ee2 Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true.
Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
2013-03-29 15:24:08 +01:00
Mark
42ea6895b2 Merge pull request #1107 from TeckniX/patch-1
Added autoParagraph functionality to 2.4 Branch
2013-03-28 03:30:15 -07: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
mark_story
041c2d289f Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
José Lorenzo Rodríguez
8c9a16ab9f Merge pull request #1186 from ceeram/2.4-blacklist
2.4 blacklist
2013-03-26 07:35:43 -07:00
Ceeram
6bf9363217 Add option to skip exception types for logging.
add blacklisting for logging exceptions

add test for skipping exception logging, and fix typo and cs

add example to docblock in core.php for skipLog

remove app_error.php skips, those are no longer used in 2.x

use assertContains instead of assertRegExp

check for instanceof, instead of matching names
2013-03-26 15:11:39 +01:00
Loki
d260f4a5b3 Added autoParagraph to TextHelper with proper test cases and made it non-static 2013-03-25 11:00:37 -04:00
euromark
3a1ff36d5e correct coding standards 2013-03-25 13:06:38 +01:00
mark_story
a7708c914f Remove test case that is no longer useful.
It is impossible for the current test to ever fail in the test suite, as
PHPUnit will always be loaded.
2013-03-22 21:36:11 -04:00
José Lorenzo Rodríguez
c3222f746f Merge pull request #1185 from ceeram/2.4-unauthenticated
stop execution when unauthenticated, to prevent the page to show when ca...
2013-03-22 05:09:47 -07:00
mark_story
5d6a6fa203 Fix error when generating Xml.
Fix warnings/un-escaped entities with deeply nested elements.

Fixes #3718
2013-03-21 21:12:21 -04:00
Mark
a13f7e1f8a Merge pull request #1178 from dereuromark/2.4-bake-behaviors
Allow behaviors to be added for baked models
2013-03-21 06:16:19 -07:00
mark_story
729ef8fe58 Fix default null not being reflected by SqlServer
Apply patch from 'Josh Rehm' to fix null default values from being
stomped on when reflecting table schema.

Fixes #3615
2013-03-19 21:02:27 -04:00
mark_story
b821505014 Merge branch 'phantom-master'
Refs GH-1182
2013-03-18 21:40:14 -04:00
mark_story
37532389d6 Add test cases for GH-1182
Add tests for afternoon times with an interval and 12 hour time format.
2013-03-18 21:37:38 -04:00
Ceeram
89ecd95e55 fix failing tests 2013-03-18 18:47:05 +01:00
Ceeram
99fba8c601 more coding standards fixes, minor rectaoring of testcase 2013-03-18 11:38:50 +01:00
Ceeram
89100f9476 fix coding standards 2013-03-18 11:12:28 +01:00
mark_story
83de70efcf Tighten Canadian postal code validation.
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.

Fixes #3708
2013-03-17 18:14:56 -04:00
ADmad
7becd58237 Add test for Auth.redirect session var clearing. 2013-03-15 17:50:05 +05:30
euromark
dab0c5e753 Allow behaviors to be added to bake templates and improve doc blocks 2013-03-15 12:14:06 +01:00
mark_story
e97b3acebb Merge branch 'master' into 2.4 2013-03-14 20:54:42 -04:00
Mark Story
6d301394f4 Merge pull request #1183 from cincodenada/patch-1
Fix bug where differing key-ordering in fixtures causes errors.

When a fixtures first and last records differed data should be
inserted correctly.
2013-03-14 17:52:06 -07:00
Joel Bradshaw
9d7148e16f Restructuring Strings test so that it is compatible with this change 2013-03-14 14:51:54 -07:00
Mark Story
76ea0803d5 Merge pull request #1174 from psparrow/master
Fixed issue with including including PHPUnit's Autoload script.
2013-03-14 14:36:16 -07:00
mark_story
246c09ae40 Allow character classes in attribute patterns.
Fixes #3706
2013-03-14 12:55:03 -04:00
Mark Story
60f9131940 Merge pull request #1177 from yuya-takeyama/fix-alphaNumeric-validation
Fix alphaNumeric validation
2013-03-14 07:23:51 -07:00
Ceeram
18095ed42d fix failing test with webrunner 2013-03-14 12:44:11 +01:00
Yuya Takeyama
14c81fe052 Fix alphaNumeric validation 2013-03-14 20:10:17 +09:00
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
mark_story
0900c32c03 Merge branch 'master' into 2.4 2013-03-13 21:01:03 -04:00
mark_story
f1d192f282 Fix issue with midnight hour & 12hr formats.
No hour would be selected in the case of 12hr formats and a time like
00:xx:yy
2013-03-13 20:56:04 -04:00
mark_story
81dc4c1e85 Merge branch 'master' into 2.4 2013-03-13 20:30:25 -04:00
mark_story
274a146b24 Move tests around.
Try to fix timing issues in formhelper tests.
2013-03-13 20:29:45 -04:00
Ceeram
8374eb92cc fix failing tests. test and mocked sources would cause exceptions 2013-03-13 22:31:23 +01:00
José Lorenzo Rodríguez
abe6511d78 Merge pull request #1169 from ADmad/2.4-auth-take-2
Implemented stateless login for Auth
2013-03-13 14:22:18 -07:00
pjskeptic
9b9cf3d165 Fixed code formatting. 2013-03-13 12:18:32 -04:00
Ceeram
f6477d58df change formatOutput option name to pretty 2013-03-13 15:44:59 +01:00
pjskeptic
294dff7a26 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-13 10:13:48 -04:00
Ceeram
fc34d9fe7f Add formatoutput option to Xml::fromArray 2013-03-13 13:07:36 +01:00
pjskeptic
b17d8c9124 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-12 23:34:30 -04:00
euromark
f633241775 fix spacing error 2013-03-10 18:26:58 +01:00
euromark
a9bbaed3d6 fix coding standards 2013-03-10 18:11:50 +01:00
ADmad
b7834a2b16 Implemented stateless login for Auth 2013-03-10 00:11:35 +05:30
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
Rémi Dewitte
5b5180f661 code style in FileLog and FileLogTest 2013-03-08 09:32:46 +01:00
Rémi Dewitte
ab510d1700 Add settings array to connection parameters that executes SET statements once connected 2013-03-07 23:45:42 +01:00
Rémi Dewitte
278700677a Add mask setting to FileLog 2013-03-07 21:40:06 +01:00
Mark
b105318bcc Merge pull request #1148 from dereuromark/2.4-currency
Top 6 world currencies - UTF-8
2013-03-06 15:29:59 -08:00
euromark
eb874f87a3 Top 6 world currencies and make them utf8 per default 2013-03-06 23:35:18 +01:00
Mark Story
69f416da1e Merge pull request #1165 from cakephp/master-year-range
Fix FormHelper year range for ranges outside of 1901-2038
2013-03-05 17:36:47 -08:00
euromark
a07c9f0c3c Fix FormHelper year range for ranges outside of 1901-2038 2013-03-05 22:11:23 +01:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
mark_story
cfc10a7c68 Fix failing test and unskip tests in SchemaShell::create()
The tests were accidentally skipped when tests for --exclude were added
& fixed. Restore the gist of the previous tests.
2013-03-04 22:37:48 -05:00
mark_story
4a0df83783 Fix failing tests.
When the app did not have the correct models, tests would fail.
2013-03-04 22:13:45 -05:00
mark_story
4b13e0a5f2 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Alexander Hofbauer
c920209f58 SchemaShell: Implement "exclude" parameter
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652.
2013-03-04 22:37:44 +01:00
Jad Bitar
f1b815a9bb Add scope to email logging. 2013-03-01 22:24:02 -05:00
Renan Gonçalves
fd72f894ad Expanding year range based on the provided value.
This solves issues where editing a record with a year outside the year range would leave the year selection empty, as now it will expand to accomodate the value.
2013-03-01 13:45:55 +01:00
Kyle Robinson Young
85862bbb9f Lazy load models in shells. 2013-02-28 20:30:06 -08:00
mark_story
1d529c1dd2 Add type hints in SchemaShell.
I'm trying to figure out what's going on in the failing travis builds.
2013-02-28 22:54:31 -05:00
mark_story
00edc594bf Fix failing test. 2013-02-28 21:31:09 -05:00
mark_story
92d215df4d Merge branch 'pr-cli' into 2.4
From pull request 1142
2013-02-28 21:23:03 -05:00
mark_story
15d01bf901 Fix tests for cli runner. 2013-02-28 21:22:01 -05:00
mark_story
33bd7a571a Restore whitelist when save fails.
Fixes whitelist not being restored when save fails due to no data.

Fixes #3646
2013-02-25 20:57:56 -05:00
mark_story
3d0920a405 Fix failing tests.
Two buffers are needed now that handleFatalError() is blowing one up.
Related to pull request #1158
2013-02-25 14:19:13 -05:00
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
ADmad
b32e855a3d Fixing behavior prioritizing 2013-02-24 22:52:31 +05:30
Mark Story
51d2cb60fa Merge pull request #1139 from ADmad/2.3-dispatcher
Prevent response object being set as response body
2013-02-24 09:07:15 -08:00
Mark Story
b870d5d004 Merge pull request #1138 from ravage84/date-validation
Added 'ym'- & 'y'-date validation.
2013-02-21 19:21:47 -08:00
nojimage
84725993e5 Postgres datasource support regular expression operators. 2013-02-22 10:14:06 +09:00
mark_story
9f25da49ef Attempt to get more tests passing on travis ci. 2013-02-19 22:17:47 -05:00
mark_story
27dc666c8d Fix incorrect method names. 2013-02-19 22:04:44 -05:00
mark_story
3e34a09e8b Make skips more permissive.
Hopefully this fixes issues on travisci.
2013-02-19 21:05:05 -05:00
mark_story
341c0d17f0 Attempt to fix failures in travisci.
Network tests have recently started failing, make those skip conditions
instead. Convert SocketExceptions in Xml::build() into XmlExceptions.
This is the documented behavior so we should try to honour that.
2013-02-19 20:53:28 -05:00
ADmad
4ab27ca840 Implemented log file rotation. 2013-02-19 00:36:18 +05:30
ADmad
484801ecf4 Prevent response object being set as response body 2013-02-16 02:07:02 +05:30
Marc Würth
33fbace4c7 Added 'ym'- & 'y'-date validation
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
2013-02-15 14:35:20 +01:00
Mark
3b02013f7d Merge pull request #1127 from dereuromark/master-strict-comparison
Strict comparison for strings where applicable
2013-02-14 01:10:48 -08:00
mark_story
f104bd3504 Use simpler asserts.
Refs #3622
2013-02-13 22:43:18 -05:00
nojimage
fbb1a812dd Create rename field statements in postgres
Refs #3622
2013-02-13 22:24:21 -05:00
ADmad
f6215129f6 Fix type casting of string scopes to array in log engines 2013-02-13 00:10:32 +05:30
mark_story
0d9ef854ff Fix FULLTEXT column generation
Fixes #3618
2013-02-12 09:00:57 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Marc Würth
019c3aa721 Fixed small typo 2013-02-11 22:21:50 +01:00
euromark
23ef13f9c7 adding Kazakh and correcting some locales 2013-02-10 20:07:09 +01:00
mark_story
974ac44fb4 Use random iv values in rijndael.
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
2013-02-09 20:48:27 -05: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
ADmad
431e610317 Fix broken tests 2013-02-08 19:04:41 +05:30
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09:00
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
euromark
d522f412db Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105 2013-02-07 15:36:00 +01:00
mark_story
1ceb17589a Merge branch 'master' into 2.4 2013-02-06 21:05:03 -05:00
ADmad
0b46b042b9 Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script().
Closes #3593
2013-02-05 23:22:24 +05:30
ADmad
afb62959ef Added JSONP support for JsonView 2013-02-04 23:20:49 +05:30
mark_story
103bbbc375 Add CakeRequest::param()
This method gives a read accessor to the data in $request->params.
It removes the need to use isset() and empty().
2013-02-03 22:09:52 -05:00
Mark Story
e0ce0ac8e3 Merge pull request #1103 from perrywky/master
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery

Fixes #3579
2013-02-01 06:36:06 -08:00
Ceeram
fa1d22dc5e added test to disprove #3588 2013-01-31 16:21:01 +01:00
ADmad
fb7fbcf01b Added option to disable counter caches updating.
Closes #3109
2013-01-31 18:14:39 +05:30
ADmad
8ff59586f6 Merge branch 'master' into 2.4 2013-01-31 18:12:01 +05:30
Perry
5ac5e784de fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery 2013-01-31 17:01:59 +08:00
euromark
ee08fe5c1f BC fixes for disabled checkboxes
see: d504642
see: #3545

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-31 09:44:35 +07:00
Rachman Chavik
1cb24384cd Merge branch '2.2' 2013-01-31 09:42:55 +07:00
euromark
d504642c9b BC fixes for habtm. Closes #3545.
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-30 21:11:41 +07:00
mark_story
78b23d8e31 Fix issue with inputs() and plugin models.
inputs() should not trigger errors when generating inputs for plugin
models. Previously the internal state of FormHelper was incorrect as
model() returned the plugin name instead of the modelname.

Fixes #3571
2013-01-29 22:02:21 -05:00
Rik van der Heijden
e331ae64ee Fix CrudAuthorizeTest, added Router::reload() in setUp 2013-01-29 21:35:29 +01:00
ADmad
bb767408d3 Fix cs errors 2013-01-27 23:03:06 +05:30
ADmad
04ec9dd614 Renamed AuthComponent::redirect() to AuthComponent::redirectUrl().
Closes #3268
2013-01-27 21:22:11 +05:30
ADmad
422ceaff85 Added "tel" and "email" input type guessing.
Closes #3557
2013-01-27 08:59:54 +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
Mark Story
1fc9641af3 Merge pull request #1089 from majna/2.3-sort-natural
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
2013-01-25 18:49:16 -08:00
mark_story
ce7f85abe8 Fix Token fields being added to GET forms.
They are not used so there is not much point in appending them.

Fixes #3565
2013-01-25 15:21:16 -05:00
Mark Story
bc4db91b51 Merge pull request #864 from dereuromark/2.3-radio-multiple-between
allow between to be an array of strings

Fixes #2859
2013-01-25 12:06:55 -08:00
Majna
5250c92635 Fix Hash::sort() 'natural' type fallback on PHP < 5.4 2013-01-25 01:07:45 +01:00
mark_story
e4f241dd23 Merge branch 'pr-1075'
Merge changes in pull request 1075.
2013-01-23 21:19:53 -05:00
mark_story
0b659d513e Add tests for #3545
Fix included in GH-1075

Closes #3545
2013-01-23 21:19:37 -05:00
Mark Story
6ade91e83b Merge pull request #1083 from ceeram/2.3-pmdvars
Remove unused local vars.
2013-01-23 14:51:11 -08:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
ADmad
82f34c4cb3 Don't set "required" attribute for checkboxes (unless explicitly specified).
Adding it prevents user from submitting form with checkbox unchecked when the "boolean" validation rule is specified for the field.
Closes #3560
2013-01-23 20:38:24 +05:30
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
mark_story
75495705a6 Fix Hash::get($data, '0')
Fixes #3555
2013-01-21 20:50:46 -05:00
mark_story
7790bcacff Allow afterFind() to fully remove an associated record.
By returnning array() or unsetting the 0'th result an afterFind
callback should be able to fully remove data from the results.

Fixes #3541
2013-01-17 20:35:37 -05:00
mark_story
773666ddad Fix coding standards and save a function call. 2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f Merge pull request #1039 from bfanger/master
Fixes an issue with urls as GET parameters
2013-01-17 17:31:59 -08:00
Renan Gonçalves
23d4807933 Fixing expected value from find when it results in failure.
When a behavior callback (eg: beforeFind) stops the event, find will return null. False is really never returned from find().
2013-01-17 13:00:56 +01:00
Mark Story
70171f5403 Merge pull request #1073 from cakephp/issue-3533
Partially revert default niceShortFormat

The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format.

Fixes #3533
2013-01-16 18:08:44 -08:00
mark_story
95ed471c41 Reduce duplication in code.
This will result in all tests being skipped when any of the required
models pre-exists.
2013-01-16 12:59:13 -05:00
mark_story
5a6a45d0d1 Add support for --admin to bake controller all.
I missed this when originally implementing bake controller all.

Fixes #3536
2013-01-16 12:57:18 -05:00
mark_story
ad0d6644c4 Partially revert default niceShortFormat
In 9fa531d6e3 the default niceShortFormat
was changed, which has been interpreted as a regression in #3533.

This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.

Refs #3533
2013-01-14 21:12:11 -05:00
mark_story
9c29fab4a4 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Network/Http/HttpResponse.php
2013-01-14 20:24:56 -05:00
U-Zyn Chua
bcdbdc8108 Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531 2013-01-15 09:17:24 +08:00
ADmad
d8551c49e5 Improve messages logged for exceptions 2013-01-12 11:30:25 +05:30
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
José Lorenzo Rodríguez
d571b056f4 Merge pull request #1063 from ADmad/2.3-cakeplugin
Added feature to ignore include errors for CakePlugin
2013-01-11 15:13:54 -08:00
dogmatic69
bcb3eb89dc Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string
version while doing calculations will normally end up as floats.

This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.

	Number::currency(0.00, 'GBP') -> &#163;0.00
	Number::currency('0.00', 'GBP') -> 0p

Both versions will return `&#163;0.00` (or whatever 0 is configured to return).
2013-01-11 17:00:06 +00:00
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
Ceeram
92d9b11aee fix double semicolon 2013-01-11 11:15:15 +01:00
Ceeram
d3f9cc10b5 fix failing test 2013-01-10 18:10:24 +01:00
mark_story
7008b812be Fix string '0' not being exported correctly.
Fixes #3518
2013-01-09 23:04:58 -05:00
mark_story
735517ade1 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2013-01-08 22:27:17 -05:00
mark_story
e3692225ff Fix lint errors. 2013-01-08 22:26:43 -05:00
mark_story
d0d13acaf4 Merge branch 'master' into 2.3 2013-01-08 20:15:46 -05:00
mark_story
c2e087dc9b Add test for recursion issues in Hash::expand().
Refs #3080
2013-01-08 19:42:12 -05:00
ADmad
970fdca89d Added feature to ignore include errors for CakePlugin 2013-01-09 01:08:42 +05:30
euromark
a266d8bede add test case 2013-01-08 13:06:02 +01:00
mark_story
3f21d09c1d Fix radio() and boolean values.
Boolean values should be cast to integer equivalents, which allows
for correct handling of boolean columns and their string equivalents
used in form options.

Fixes #3512
2013-01-07 21:12:53 -05:00
mark_story
e132a7c856 Remove duplicated assertions.
These assertions are effectively duplicated in the next test method.
2013-01-07 21:00:14 -05:00
mark_story
6d743971e9 Consistently inflect theme names.
Themes should be consistently converted into CamelCase, this
makes the camelization consitent with the treatment in App::themePath().

Fixes #3508
2013-01-03 21:06:46 -05:00
mark_story
75f654b87b Fix double encoding in JsHelper request methods.
The urls were being HTML & URL encoded, this causes issues with URL's
containing query string parameters.  Remove HTML entities as they aren't
required in the Javascript context.

Fixes #3495
2013-01-02 23:09:37 -05: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
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
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
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
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
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
ADmad
367463f4c1 Added disabledTag option.
Closes #3108
2012-12-24 20:48:44 +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