adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-17 04:18:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
16075 commits 7 branches 0 tags 44 MiB
Commit graph

5294 commits

Author SHA1 Message Date
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 &amp; 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 &amp; 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
mark_story
b54c3b0308 Convert FILES processing to use recursion. 
Fixes issues with deeply nested file data issues.
Fixes #2796
 2012-04-17 22:28:08 -04:00
mark_story
c15259f49c Remove useless backups. 
PHPUnit does this for us.
Fix formatting and whitespace.
 2012-04-17 21:57:07 -04:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
mark_story
c871d85f2b Fix introspection on models in other plugins. 
Apply patch from 'Kim Biesbjerg'.  Fixes issues introspecting
models in associations from different plugins.

Fixes #2732
 2012-04-17 21:35:03 -04:00
mark_story
ca2c122c62 Make flaky tests less flaky. 
Off by one second errors are common here.
 2012-04-17 20:51:52 -04:00
mark_story
94e83fa81c Fix invisible buttons. 
Fixes #2802
 2012-04-17 20:46:19 -04:00
mark_story
e54e494b4b Syncing app/webroot/index.php + skel directory. 
Refs #GH-607
 2012-04-17 20:45:59 -04:00
Cauan Cabral
18aa5a040f Include test to .0 and .00 decimals 2012-04-17 20:22:32 -04:00
Cauan Cabral
28bd6880df Make Validation::decimal accept integers 
Fix #2800
Force locale of ValidationTests with en_US to ensure decimal dot separator
 2012-04-17 20:22:22 -04:00
Jose Lorenzo Rodriguez
826699a670 Extracting asset dispatcher and cache dispatcher into separate classes to provide examples on how to use Dispatcher 
Filters
 2012-04-17 00:42:18 -04:30
Jose Lorenzo Rodriguez
70f3cc579c Renaming a few things in dispatcher filters to maccht general naming style in CakePHP 2012-04-16 23:41:32 -04:30
Justin A. Barnes
2c0cd1f2dd Fixed doc typo in lib/Cake/View/View.php 2012-04-16 18:30:10 -05:00
Ceeram
388b20dd9d fix error in previous commit 2012-04-17 00:22:13 +02:00
Ceeram
a84597784d avoid warning when saveAll() data has empty hasMany data, fixes #2792 2012-04-16 22:46:58 +02:00
Ceeram
9556ff714d Avoid running validation again, when saveAll() is called with 'validate' => 'first' 2012-04-16 09:45:44 +02:00
Jose Lorenzo Rodriguez
565a58f784 Introducing dispatcher filters and adding tests for them 2012-04-16 00:36:08 -04:30
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
mark_story
d136fac219 Correct docs to match code. 
Fixes #2790
 2012-04-15 20:33:43 -04:00
Jose Lorenzo Rodriguez
05b88f3f0e Fixed another failing test case 2012-04-15 12:52:34 -04:30
Jose Lorenzo Rodriguez
f574e9644d Fixed failing test case 2012-04-15 12:51:33 -04:30
Jose Lorenzo Rodriguez
cfaa1ee37c Adding missing docblocks 2012-04-15 11:47:41 -04:30
Jose Lorenzo Rodriguez
d17a471451 Initial middelware implementation 2012-04-15 11:39:08 -04:30
mark_story
9fbd57331f Clear configure at the end of each test. 
Fixes #2767
 2012-04-14 23:33:08 -04:00
mark_story
f990ecfff3 Add Configure::clear() 
Refs #2767
 2012-04-14 23:32:29 -04:00
Juan Basso
37157806b9 Removing some dup code in nested transaction tests. 2012-04-14 16:46:47 -04:00
Juan Basso
7be5349b0c Added configuration to disable nested transaction, even if the db supports it. 2012-04-14 16:43:24 -04:00
Juan Basso
b0a3a1a5aa Added test to check when driver do not support nested support. 2012-04-14 16:25:23 -04:00
Juan Basso
79f7ca7d33 Oops, forgot one change in last commit. 2012-04-14 16:23:51 -04:00
Juan Basso
a512d46679 Sqlite is failing in PHP 5.2, re-adding the check for driver support. 2012-04-14 16:23:51 -04:00
Juan Basso
ffe0a18495 ReflectionMethod::setAccessible() is not compatible with PHP 5.2, causing fatal error in CI. Assuming that the db servers support nested transaction. 2012-04-14 16:23:51 -04:00
Juan Basso
22cd65b7d8 Added tests in each datasource to test the nested transactions. 2012-04-14 16:23:51 -04:00
Juan Basso
30258ac817 Added test for nested methods sequence. 2012-04-14 16:22:36 -04:00
Juan Basso
2c1cf29aa3 Added real support to nested transactions for Mysql, Postgres, Sqlite. 2012-04-14 16:21:42 -04:00
Juan Basso
2c9399a78a Removed unused attribute and moved getVersion to be reused in all PDO drivers. 2012-04-14 16:21:41 -04:00
Juan Basso
9beaa9602f Unified error handlers. Now the regular error handler will receive the fatal errors too. 2012-04-14 16:08:36 -04:00
Juan Basso
a72288c378 Fixing doc. 2012-04-14 16:08:36 -04:00
Juan Basso
a56f7b84e3 Setting the core fatal error handler if it is not configured. 2012-04-14 16:08:36 -04:00
Juan Basso
05cdae6d1a Renamed fatal error handler configuration for follow the same logic of consoleHandler name. 2012-04-14 16:08:36 -04:00
Juan Basso
eeec217992 Added tests to fatal error handler. 2012-04-14 16:08:35 -04:00
Juan Basso
1428659f88 Moved the fatal error detection to App::shutdown and keeping the fatal error handler cleaner. It helps to be extended by applications/plugins. 2012-04-14 16:08:35 -04:00
Juan Basso
440f0c38eb Added a handler for fatal errors, showing internal server error page when debug is disabled or a custom fatal error page when enabled. 2012-04-14 16:08:35 -04:00
mark_story
672735d7f7 Fix Coding standard error. 2012-04-14 12:20:05 -04:00
mark_story
f818caf47c Remove duplicate code / skipped tests. 2012-04-14 12:20:05 -04:00
Mark Story
6167529d4d Merge pull request #605 from shama/patch-datasource-test 
Add checks for startQuote & endQuote.

Fixes #2769
 2012-04-14 08:08:05 -07:00
mark_story
b9389c9da1 Fix comment's reference to version numbers. 2012-04-14 10:50:31 -04:00
mark_story
5bb8c3a942 Fix code standards. 2012-04-14 10:49:25 -04:00
Majna
17cbcf4406 Fix rendering element from plugin controller. 
Fixes #2661

Signed-off-by: mark_story <mark@mark-story.com>
 2012-04-14 10:24:54 -04:00
mark_story
0f2100767b Add failing test for #2661 2012-04-14 10:24:20 -04:00
mark_story
2fd15b6c7e Revert removal of session_cache_limiter() 
It was removed in [4a6159c9af].
The session_cache_limiter() is required for IE8 to correctly
hold onto sessions.

Fixes #2781
 2012-04-14 10:04:56 -04:00
ADmad
4e1a2670da Updating outdated layout file in skeleton 2012-04-14 19:22:52 +05:30
Renan Gonçalves
b0b36e8fba Defining default values for CakeRequest, those params are present anywhere except when there isn't a Route match. 2012-04-13 15:58:45 +02:00
Renan Gonçalves
bba66f6506 Fixing call to deprecated method, using startupProcess() which will initialize components. 2012-04-13 15:57:06 +02:00
mark_story
8eb913433f Move _attributeFormat and _minimizedAttributeFormat down. 
Both properties are referenced by Helper.  The properties
should be declared there as well.

Fixes #2771
 2012-04-13 07:48:09 -04:00
Jose Lorenzo Rodriguez
e73bb27450 Merge remote-tracking branch 'origin/2.2-redis-engine' into 2.2-redis-engine 2012-04-11 23:24:39 -04:30
Jose Lorenzo Rodriguez
d588758783 Removing extra space after boolean cast 2012-04-11 23:22:38 -04:30
Kyle Robinson Young
6cf73c763c Tests for a generic custom datasource 
Default startQuote and endQuote to avoid error with non-database datasources
 2012-04-11 10:08:45 -07:00
Kyle Robinson Young
8bbe250bec Correct method descriptions and remove unused property 2012-04-11 07:50:54 -07:00
mark_story
f677bfea7d Remove duplicated test code. 2012-04-10 22:26:33 -04:00
mark_story
a4f0399f74 Fix coding standards warnings. 2012-04-10 22:16:14 -04: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
e3b124516f Move where set is loaded. 
2.1 expects that Configure will load Set.
 2012-04-10 21:25:04 -04:00
mark_story
2333c8f33f Re-factor duplicated code. 2012-04-10 21:05:42 -04:00
mark_story
45e3414d49 Add test for query string encoding. 
Closes #2768
 2012-04-10 20:08:12 -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
81208d1fa7 Fix failing test. 2012-04-09 21:46:38 -04:00
mark_story
67743c8079 Fix missing Html escaping on string urls for assets. 
Add HTML escaping for asset paths provided as strings.
Split existing tests up.

Fixes #2766
 2012-04-09 21:20:11 -04:00
Mark Story
da9cbcf7bb Merge pull request #603 from luisarmando/queryCacheDoc 
Fix doc of DboSource->$_queryCache.
 2012-04-09 14:35:57 -07:00
Luís Armando
bb2286bc43 Fix doc of DboSource->$_queryCache. 2012-04-09 13:30:58 -03:00
mark_story
c718a18218 Fix coding standards errors. 2012-04-08 21:01:25 -04:00
mark_story
c6d62884c1 Fix whitespace errors. 2012-04-08 20:40:30 -04:00
ADmad
1949a20b5a Ensure L10n::get() consistently returns the set language. Closes #2737 2012-04-09 00:49:24 +05:30
ADmad
35b48c2c8c Fix indentation 2012-04-09 00:43:04 +05:30
mark_story
3c9e79737d Update doc blocks for CakeNumber. 2012-04-08 12:35:44 -04:00
mark_story
8d1b5c3f24 Fix notice errors with postgres. 2012-04-07 17:22:27 -04:00
mark_story
15c94dee4d Fix whitespace and remove duplicate method calls. 2012-04-07 14:42:25 -04:00
mark_story
eeec362741 Merge remote-tracking branch 'ceeram/2.2-hash' into 2.2-hash 2012-04-07 14:28:40 -04:00
mark_story
a24aca6ffc Fix a few code standards errors. 2012-04-06 22:56:01 -04:00
mark_story
ff35762e92 Fix coding standards warnings. 2012-04-06 22:34:29 -04:00
mark_story
38b7ae3c67 Coding standards cleanup. 
Fix coding standards
Simplify addition of empty.
Add doc block for new feature.
 2012-04-06 21:47:02 -04:00
Clément Hallet
613e3824e0 add tests for the 'empty radio option' feature 2012-04-06 21:37:19 -04:00
Clément Hallet
a7a55631d8 remove 'empty' option from once checked 2012-04-06 21:37:19 -04:00
Clément Hallet
00b2c49af2 FormHelper : use the empty option for radio buttons 2012-04-06 21:37:18 -04:00
mark_story
4eea72205b Merge branch '2.1' into 2.2 2012-04-06 21:34:11 -04:00
mark_story
fe1a6d7d7e Fragments should not be urlencoded() 
encoding them breaks fragments for client side
applications like backbone.js

Fixes #2755
 2012-04-06 21:32:37 -04:00
mark_story
b3419be0fb Fix issues loading response classes from plugins. 
Fixes #2759
 2012-04-06 20:38:14 -04:00
mark_story
790d9beeb7 Always reconfigure global state. 
Fixes issues wher the test suite with no fixtures could hit
a non test connection.

Fixes #2743
 2012-04-06 20:27:56 -04:00
Mark Story
d000b3aa97 Merge pull request #601 from luisarmando/infoUpgrade 
Outputs messages of which plugin is going to have locations upgrade.
 2012-04-06 17:12:09 -07:00
Luís Armando
5b324f8024 Outputs messages of which plugin is going to have locations upgrade. 2012-04-06 18:06:18 -03:00
ADmad
863094da58 Fixing eg. code in doc block 2012-04-07 00:28:59 +05:30
Ceeram
c2a8fca00c Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
 2012-04-05 23:27:21 +02:00
Ceeram
30268f6a08 Only check for existing method expresion() when it actually will be called. 
Datasources that use calculate() should not be forced to implement expression() as well
 2012-04-05 23:15:18 +02:00
ADmad
c6ce15720e Revert "Always use error layout when rendering error pages." 
This reverts commit 3495422ac5.
 2012-04-06 00:47:50 +05:30
Ceeram
8c631fa022 add test to show label options in inputDefaults 2012-04-05 17:47:08 +02:00
mark_story
5c590aad09 Add missing ClassRegistry import. 
Fixes #2757
 2012-04-05 08:33:12 -04:00
Ceeram
223604fb0d update docblock of AclComponent 2012-04-05 13:51:00 +02:00
Tigran Gabrielyan
3c4087da4f Fixing default value of contain 2012-04-04 19:06:54 -07:00
mark_story
83789915a3 Update docs about PHP5.4 constant. 2012-04-04 21:36:56 -04:00
mark_story
8497677e97 Fix notice error when there are no requests. 2012-04-04 21:32:51 -04:00
Tigran Gabrielyan
bf628c493c Added ability for Auth login to use contain 2012-04-04 18:09:38 -07:00
Ceeram
2b7fe21ee0 remove all Set::extract() from core and tests 2012-04-05 01:33:57 +02:00
Ceeram
7700a0261b only use and test SORT_NATURAL on PHP 5.4 2012-04-04 18:21:52 +02:00
ADmad
1cc5206442 Merge branch '2.1-dbosource' into 2.1 2012-04-04 19:58:48 +05:30
ADmad
93639a7c43 Fixed bug where associated model's afterfind was not triggered in particular case 2012-04-04 19:48:37 +05:30
Ceeram
d2098828c6 Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750 2012-04-04 15:07:45 +02:00
mark_story
77f698dbcd Fix which request is used for error pages. 
The most recent request in the request stack should be used,
as it is most likely the request containing an exception.

Fixes incorrect error pages generated inside requestAction() calls.

Fixes #2746
 2012-04-03 13:24:36 -04:00
mark_story
f09e5a36d2 Fix SessionComponent::id() not returning the id. 
When reading the id() with SessionComponent, the session should
auto start, otherwise you could get null back. This makes the return
more consistent.

Fixes #2749
 2012-04-03 13:21:52 -04:00
ADmad
7ed90c72ae Updating API docblock for Model::query() 2012-04-03 19:06:41 +05:30
mark_story
72cb96b727 Fix a few more coding standards errors. 2012-04-02 23:23:53 -04:00
mark_story
18296d2bf6 Fix a few coding standards errors. 2012-04-02 23:19:05 -04:00
Ceeram
34a730dfd8 ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709 2012-04-02 18:48:02 +02:00
mark_story
e5ca80b711 Add additional sort flag support. 
Add natural, numeric, and string sorting to Hash.
Fixes #1700
 2012-04-01 23:09:15 -04:00
mark_story
4e67698506 Fix issues with SQLServer + boolean columns. 
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.

Fixes #2439
 2012-04-01 22:10:05 -04:00
Norio Suzuki
26b93afc3c fixed CakeEmail::reset, no initialized charset and headerCharset property 2012-04-01 23:42:18 +00:00
mark_story
475a1596b7 Merge branch '2.1' into 2.2 2012-04-01 15:37:21 -04:00
mark_story
ee7a224639 Fix a code style warning. 2012-03-31 21:40:20 -04:00
mark_story
6677127c8e Fix coding standard error. 2012-03-31 21:38:39 -04:00
mark_story
432d00de19 Another small optimization. 2012-03-31 21:37:10 -04:00
mark_story
7d098fa5f0 Some small performance optimizations. 2012-03-31 21:25:02 -04:00
mark_story
6a9fdd841a Fix failing tests. 
Set::merge() accepts anything even non-array values.
 2012-03-31 13:38:09 -04:00
mark_story
990fbcdea0 Remove duplicated code backup. 
This restoration/backup is done in the parent class.
 2012-03-31 13:32:44 -04:00
Mark Story
54bfa4cc05 Merge pull request #587 from shama/patch-mb-number 
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
 2012-03-31 10:22:25 -07:00
mark_story
a463033ee9 Set -> Hash 2012-03-31 08:49:04 -04:00
ADmad
3495422ac5 Always use error layout when rendering error pages. 2012-03-31 12:42:17 +05:30
ADmad
04c30238cb Merge pull request #585 from shama/patch-auth-redirect 
Default to loginRedirect, if set, on authError in AuthComponent
 2012-03-30 23:19:22 -07:00
ADmad
1763219053 Adding tests for getting session id when using DatabaseSession. Disproves #2734 2012-03-31 00:40:44 +05:30
Ceeram
65f25ed910 test added to show pagination conditions will not result in incorrect count, refs #2736 2012-03-30 19:06:01 +02:00
José Lorenzo Rodríguez
4958f0ee5d Using a more specific function to check for numbers on redis engine read 2012-03-28 23:22:30 -05:30
José Lorenzo Rodríguez
e6a87bac40 Removing extra spaces 2012-03-28 23:18:32 -05:30
Jose Lorenzo Rodriguez
f105abde4e Implementing Redis cache engine 2012-03-28 23:30:33 -04:30
Jose Lorenzo Rodriguez
18b843467f Making lazy loader throw an exception for missing helpers 2012-03-28 22:12:46 -04:30
Ceeram
eba0b1f999 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-03-28 22:34:31 +02:00
Ceeram
7df6477526 add test to prove #2723 2012-03-28 22:24:02 +02:00
José Lorenzo Rodríguez
c67feb0629 Merge pull request #589 from shama/patch-substr-optimizations 
substr() optimizations throughout core
 2012-03-28 13:23:16 -07:00
Kyle Robinson Young
e2a46f76c7 substr() optimizations 2012-03-28 13:07:26 -07:00
ADmad
47558e8db5 Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723 
This reverts commit 96f73d6392, reversing
changes made to 9d017c2b5c.

Conflicts:

	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
 2012-03-29 01:33:21 +05:30
Kyle Robinson Young
33ab634aba Controller $name set optimization 2012-03-28 11:37:27 -07:00
Kyle Robinson Young
4370bf280a Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4 
Fixes #2602
 2012-03-28 10:46:31 -07:00
Rachman Chavik
6fa30db504 CakeEmail can use theme when rendering template 2012-03-28 22:01:30 +07:00
Kyle Robinson Young
319d154aee Default to loginRedirect, if set, on authError in AuthComponent 
Implements #2390
Based on the patch written by @dereuromark
 2012-03-27 22:51:47 -07:00
Jose Lorenzo Rodriguez
5a41024cf3 Removing hardcoded helper from PagesController in skel 2012-03-27 23:53:22 -04:30
Jose Lorenzo Rodriguez
f349c9e34c Removing hardcoded helpers from Controller and PagesController class since they are now lazy loaded 2012-03-27 23:45:01 -04:30
Jose Lorenzo Rodriguez
f688d5777e Implementing helper lazy loading 2012-03-27 23:44:23 -04:30
Jose Lorenzo Rodriguez
c270e7ffda Adding test for lazy loading helpers in views 2012-03-27 23:43:41 -04:30
Jose Lorenzo Rodriguez
f009e96a69 Adding test for lazy loading helpers using the collection 2012-03-27 23:36:16 -04:30
Kyle Robinson Young
c700fedbf8 Update test suite header version to 2.2 
Conflicts:

	lib/Cake/TestSuite/templates/header.php
 2012-03-27 19:52:58 -04:00
Mark Story
0443fe1507 Merge pull request #584 from shama/patch-inpath-test 
Add test/doc for reverse Folder::inPath()
 2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9 Add test/doc for reverse Folder::inPath() 2012-03-27 11:55:13 -07:00
Jose Lorenzo Rodriguez
4f6f041730 Using same serialization strategy for request object in cached views, this prevents some failing tests in environments 
with different charsets
 2012-03-27 00:57:15 -04:30
Jose Lorenzo Rodriguez
e5cc7d0f73 Fixed failing test 2012-03-27 00:20:35 -04:30
Jose Lorenzo Rodriguez
2a1e4a2aae Making clearGroup() a no-op method instead of abstract to ease migration to 2.2 2012-03-27 00:08:24 -04:30
Jose Lorenzo Rodriguez
2bb3dc6bf7 Reducing key length when using groups in WincacheEngine 2012-03-27 00:07:23 -04:30
Jose Lorenzo Rodriguez
afba5aafb7 Redcing key name when using groups in MemcacheEngine 2012-03-27 00:05:56 -04:30
Jose Lorenzo Rodriguez
27b90b0e47 Reducing key size when using groups in ApcEngine 2012-03-27 00:01:34 -04:30
Jose Lorenzo Rodriguez
2100a64ffd Prefixing group names in XcacheEngine 2012-03-27 00:00:52 -04:30
Jose Lorenzo Rodriguez
ffdd98be1b Prefixing group names in WincacheEngine 2012-03-26 23:35:15 -04:30
Jose Lorenzo Rodriguez
98b14ff144 Prefixing group names in MemcacheEgine 2012-03-26 23:34:03 -04:30
Jose Lorenzo Rodriguez
957322ec82 Prefixing group names with the cache enging prefix to avoid possible conflicts with shared servers 2012-03-26 23:02:26 -04:30
mark_story
c1531d3faa Fix a few small code standards issues. 2012-03-26 23:04:32 -04:00
mark_story
95d4549c9b Docs + coding standards. 2012-03-26 22:57:50 -04:00
mark_story
c087576f20 Port changes done to Set into Hash 
See #2722
 2012-03-26 22:39:13 -04:00
mark_story
6e0e15682f Remove duplication where possible. 2012-03-26 22:33:46 -04:00
mark_story
66eabe462a Copy Set::expand into Hash class. 2012-03-26 22:32:58 -04:00
mark_story
c7a9f3412f Add compatibility for 2.1. 
Set always needs to be loaded, as that's how 2.1 worked.
 2012-03-26 22:32:57 -04:00
mark_story
a76a926ac1 Fix more uses of Set -> Hash 2012-03-26 22:32:57 -04:00
mark_story
9015d78017 Port most recent changes in Set to Hash. 
See [68eeee80d8] and
[af575027da]
 2012-03-26 22:32:56 -04:00
mark_story
e55927c007 Update the doc links. 2012-03-26 22:32:56 -04:00
mark_story
ed32e0b39b Update another usage. 2012-03-26 22:32:56 -04:00
mark_story
17bfbbb9df Port over Set to Hash usage. 2012-03-26 22:32:55 -04:00
mark_story
0ef9adba93 Move and rename pushDiff onto Hash. 
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
 2012-03-26 22:32:54 -04:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
mark_story
29048b3bb7 Update to use Hash. 
Update CakeSession & Configure to use Hash.
 2012-03-26 22:25:41 -04:00
mark_story
8becc4c985 Fix misnamed method calls. 2012-03-26 22:25:40 -04:00
mark_story
2231087ba3 Rename Set2 -> Hash. 2012-03-26 22:25:40 -04:00
mark_story
5b4b936157 Make filter() more flexible. 2012-03-26 22:25:40 -04:00
mark_story
239f52c48c Move nest() over 
Make get() able to take arrays for $path.
 2012-03-26 22:25:40 -04:00
mark_story
afa0329330 Fix incomplete test. 2012-03-26 22:25:39 -04:00
mark_story
ae66682c35 Add apply(), map() and reduce() 
Add tests as well.
 2012-03-26 22:25:39 -04:00
mark_story
8cadac3ee5 Add tests for issue #104 2012-03-26 22:25:39 -04:00
mark_story
ff5e72c9a7 Move Set::format across. 
Remove the {0} style of formatting.  Custom formatting
syntax is a bit silly. sprintf() is more than expressive enough
for this method.
 2012-03-26 22:25:39 -04:00
mark_story
e4a505797d Move combine() across. 2012-03-26 22:25:39 -04:00
mark_story
aa4dca6c0c Move Set::check across. 2012-03-26 22:25:39 -04:00
mark_story
771efd950e Fix sort() not working. 2012-03-26 22:25:38 -04:00
mark_story
57d50cd018 Extract common method. 2012-03-26 22:25:38 -04:00
mark_story
3d8a955043 Add remove() and insert() 
Also add support for multi insert and multi remove.
 2012-03-26 22:25:38 -04:00
mark_story
6b69ed269a Extracting duplicate loops. 2012-03-26 22:25:38 -04:00
mark_story
e72127e359 WIP, adding sort() and remove() 2012-03-26 22:25:37 -04:00
mark_story
31181f58d6 Add attribute pattern matching. 2012-03-26 22:25:37 -04:00
mark_story
cbfa938303 Fix muliple attribute conditions. 2012-03-26 22:25:37 -04:00
mark_story
8ad4e66eba Making attributes work with any selector type. 
Attributes work with all base selectors.
 2012-03-26 22:25:37 -04:00
mark_story
9269a6dcde Added some more operators. 
Attribute + {n} is still not working.
 2012-03-26 22:25:36 -04:00
mark_story
6c87be97ef Implement presence and equality attributes. 2012-03-26 22:25:36 -04:00
mark_story
e87901ac6d Adding tests for {n} and {s} 2012-03-26 22:25:36 -04:00
mark_story
37181e99a8 Basic path selectors implemented for extract(). 2012-03-26 22:25:36 -04:00
mark_story
b3861c01dc Move numeric() into Set2. 2012-03-26 22:25:36 -04:00
mark_story
1315e0f1a1 Moving filter() into Set2. 2012-03-26 22:25:35 -04:00
mark_story
885d5dfd80 Make contains() non-recursive. 
Add a few more tests for contains().
 2012-03-26 22:25:35 -04:00
mark_story
d37e10a8a9 Move contains() across. 
Fix a few issues in contains() with nested needle values.
 2012-03-26 22:25:35 -04:00
mark_story
ad65098348 Move normalize() into Set2. 
Dropping the ability to 'normalize' string data.
 2012-03-26 22:25:34 -04:00
mark_story
e736ea3af9 Move merge() into Set2. 2012-03-26 22:25:34 -04:00
mark_story
51f45c0f28 Moving flatten() across. 
It is no longer recursive either.
 2012-03-26 22:25:34 -04:00
mark_story
51e3ee0425 Adding dimensions() and maxDimensions() 
Splitting the Set::countDim() into two methods.  This creates a simpler
API, as each method only does one job, and only has one argument.  Also
replacing recursion with iteration.
 2012-03-26 22:25:34 -04:00
mark_story
db3485d47c Add function prototypes. 2012-03-26 22:25:34 -04:00
mark_story
328513d35e Start Set2. 2012-03-26 22:25:33 -04:00
mark_story
6b045318d8 Merge branch '2.1' into 2.2 2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82 Fix Set::insert() not overwriting values. 
Set::insert() failed to overwrite values that were previously
defined as strings.  Remove test in SessionComponentTest that was
ensuring this bug stuck around.

Fixes #2722
 2012-03-26 21:50:53 -04:00
Thomas Ploch
ce8b10e46f Fixing cache group related test cases. 2012-03-26 14:30:01 +02:00
Jose Lorenzo Rodriguez
cf2b6acd71 Fixing some typos 2012-03-26 00:29:02 -04:30
Jose Lorenzo Rodriguez
945925bdb9 Implemented group cache delete in FileEngine 2012-03-25 23:33:37 -04:30
Jose Lorenzo Rodriguez
04ec41384b Implemented read/write support for groups in FileEngine 2012-03-25 23:00:28 -04:30
Jose Lorenzo Rodriguez
c5c99a7c29 Implemented group support in WincacheEngine 2012-03-25 22:34:04 -04:30
Jose Lorenzo Rodriguez
9c733b4420 Implementing group support for XcacheEngine 2012-03-25 22:20:39 -04:30
Jose Lorenzo Rodriguez
6f9d2c01db Implmented cache group clearing in Memcache engine 2012-03-25 21:23:27 -04:30
Jose Lorenzo Rodriguez
b373309ba9 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/VERSION.txt
 2012-03-25 21:18:58 -04:30
Jose Lorenzo Rodriguez
43cf2f0647 Update version number to 2.1.1 2012-03-25 21:00:26 -04:30
Jose Lorenzo Rodriguez
d0f7842f36 Added test for deleting kwys under a group in MemcacheEngine 2012-03-25 20:10:04 -04:30
Jose Lorenzo Rodriguez
411bd85900 Implementing group read/write support to MemcacheEngine 2012-03-25 20:08:37 -04:30
Jose Lorenzo Rodriguez
4f131d54f1 Implemented group delete for cache keys in ApcEngine 2012-03-25 19:45:32 -04:30
Jose Lorenzo Rodriguez
ae34c64fa3 Adding test for delete + groups in ApcEngine 2012-03-25 19:22:32 -04:30
Jose Lorenzo Rodriguez
3c9c3ef9ba Implemented group read/write support for the ApcEngine 2012-03-25 19:17:08 -04:30
Jose Lorenzo Rodriguez
58a59fd4a4 Fixing broken test 2012-03-25 18:10:25 -04:30
Kyle Robinson Young
a905954484 Update test suite header version to 2.1 2012-03-25 10:36:30 -07:00
Kyle Robinson Young
b8705a71fb Remove no longer needed empty file 2012-03-24 21:46:32 -07:00
mark_story
49a455a2cb Fix some code standards warnings. 2012-03-24 22:15:08 -04:00
ADmad
c847ec216c Changing assetEqual() to assertEquals() 2012-03-25 04:27:57 +05:30
mark_story
fca8b1dd30 Fix issue where requestAction() would not strip base url. 
requestAction + Controller::referer() don't work well together.
Stripping the base domain, and normalizing the URL gives an application
request which works much better.  This keeps RequestHandler more
transparent when overloading redirects.

Fixes #2711
 2012-03-24 18:11:07 -04:00
Thomas Ploch
68e4e0e7ae Revert "Added TestCakeSession::clear() to CakeSessionTest teardown." 
This reverts commit b346ac961c.
 2012-03-24 21:43:25 +01:00
Thomas Ploch
b346ac961c Added TestCakeSession::clear() to CakeSessionTest teardown. 2012-03-24 21:41:19 +01:00
Thomas Ploch
fda065101b Fixed test cases for successful being built on travis. 2012-03-24 21:32:31 +01:00
Jose Lorenzo Rodriguez
16bde9c723 Making sure components in controller test cases always have a fresh reference to the request object, fixes #2705 2012-03-24 14:34:29 -04:30
mark_story
83ceef045d Removing tests that fail on Postgres and Sqlite. 
Fixes #2174
 2012-03-23 21:21:18 -04:00
dogmatic69
7c697eb9be adding an extra check to only type cast if its a int/true/false so you can still use fields etc in the queries 2012-03-23 21:21:18 -04:00
dogmatic69
a5685947b9 Adding failing tests for bool updates switching with the field name 2012-03-23 21:21:08 -04:00
ADmad
4b49a287a6 Show plugin name in error message if a plugin component was requested 2012-03-24 00:22:50 +05:30
Ceeram
817015e6b3 remove unneccesary elseif 2012-03-23 16:37:02 +01:00
Ceeram
d748fc7451 Merge branch '2.1' into 2.2 2012-03-23 16:32:04 +01:00
Ceeram
4a6159c9af session_cache_limiter() removed, it was set to invalid value as well 
Also remove setting P3P header
 2012-03-23 16:31:26 +01:00
José Lorenzo Rodríguez
3a4d173ce2 Merge pull request #577 from shama/patch-assert-order 
Correct parameter order of assertEquals and assertNotEquals
 2012-03-23 06:57:02 -07:00
Kyle Robinson Young
21c4967cc6 App::uses the File Utility as write() uses File 2012-03-22 23:48:57 -07:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
34e1afd8ef Add support for custom console error handling 
Both errors and exceptions can be configured for the console
at the application layer now.

Fixes #2696
 2012-03-22 20:52:49 -04:00
mark_story
3851ad08a6 Fix code standards warnings. 2012-03-21 21:56:53 -04:00
mark_story
69e63b11a4 Change method to only return true/false. 
null/true/false is complicated.  Fix issues with some
of the test fixtures.  imalsonotrequired was actually required
as it's last rule didn't specify allowEmpty = true and had a range
validation rule.
 2012-03-21 21:06:49 -04:00
Thomas Ploch
cabb0d00ac Added support for 'on' validation key in FormHelper. Fixes #2169. 2012-03-21 21:06:49 -04:00
mark_story
20bdf1d7b0 Add escaping to table names. 
SQLite was not quoting table names, so tables with
keywords caused errors.

Fixes #2702
 2012-03-21 21:04:34 -04:00
Ceeram
c9528b8446 Merge branch '2.1' into 2.2 2012-03-21 11:19:08 +01:00
Ceeram
0a94202fb6 fixing test of previous commit 2012-03-21 11:07:51 +01:00
Ceeram
4dfbfe9c8b fix saveAll deep option, when associated data is empty, or has deeper associated model data as first key in array 2012-03-21 10:38:04 +01:00
mark_story
01e035f726 Move logic to afterDelete. 
Because behavior callbacks are fired first, removing data in the
beforeDelete could result in data loss if the model prevents deletion.

Fixes #2699
 2012-03-20 22:36:48 -04:00
Mark Story
3abb7d966b Merge pull request #569 from tPl0ch/2.2-datasource-close 
Adding basic implementation of DataSource::close().
 2012-03-20 18:06:00 -07:00
Mark Story
57babc87b0 Merge pull request #570 from dogmatic69/2111 
Add regex option to String::highlight()

Fixes #2111
 2012-03-20 17:39:54 -07:00
Kyle Robinson Young
db9c3e5bf3 Remove unused code and correct doc for modelClass 2012-03-20 14:44:14 -07:00
Ceeram
247f5522c6 add test for saveAll deep 2012-03-20 20:41:41 +01:00
Thomas Ploch
8ad65366dc Fixed ModelWrite test. Removed undefined method calls to assertCount(). 2012-03-20 15:06:26 +01:00
mark_story
714ec60507 Fix a few more standards errors. 2012-03-19 21:58:56 -04:00
mark_story
edd54e4ddf Ignore the remaining errors. 
They are just part of the test to compare objects + arrays.
No need to cause standards errors.
 2012-03-19 21:38:51 -04:00
Ceeram
091ad53b80 ensure boolean values are converted to correct value on update, avoiding issues with posgres boolean type 2012-03-19 13:27:26 +01:00
Ceeram
c38419e33a Fixing test, some 5.2 installs do not have function to read mime 2012-03-19 09:52:09 +01:00
mark_story
94b3839b2e Fix a few more small issues. 2012-03-18 23:25:19 -04:00
mark_story
12efa3eb70 Remove duplication in the I18n test. 2012-03-18 22:29:16 -04:00
mark_story
2bbf38038d Remove duplicated code in testsuite shell. 2012-03-18 21:57:15 -04:00
mark_story
67698248ca Fix some coding standards errors. 2012-03-18 21:48:50 -04:00
mark_story
c58b61c17b Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Model/ModelWriteTest.php
 2012-03-18 21:26:45 -04:00
mark_story
dbb2dd44d7 Fix more coding standards. 2012-03-18 21:20:33 -04:00
Ceeram
4191e2e573 adding test to disprove ticket, closes #2691 2012-03-19 01:27:35 +01:00
mark_story
e33dc98124 Fix more coding style errors. 2012-03-18 18:52:35 -04:00
mark_story
480c1bbb54 Fix coding standards. 2012-03-18 18:06:10 -04:00
mark_story
7798914676 Fix most code standards errors in Case/TestSuite. 2012-03-18 17:31:53 -04:00
mark_story
fc234d82f1 Fix coding standards in Case/Model/Behavior. 2012-03-18 14:31:13 -04:00
mark_story
346e048371 Fix coding standards in Datasource tests. 2012-03-18 13:08:27 -04:00
mark_story
6f8e7f1bc5 Revert "Fix coding standards errors." 
This reverts commit 3362100512.
 2012-03-18 12:29:39 -04:00
mark_story
3362100512 Fix coding standards errors. 2012-03-18 12:20:24 -04:00
Thomas Ploch
b28b25f642 Added 'Fixed whitespace. 2012-03-18 11:12:19 +01:00
Thomas Ploch
7cfcef54ed Added 'Enable Debug Output' link to CakeHtmlReporter. 2012-03-18 11:10:12 +01:00
ADmad
0832e18e9e Adding separate error layout for CakeErrorController as using default layout often caused nested errors. Closes #2682 2012-03-18 14:05:41 +05:30
ADmad
bdddc85946 Making option 'unique' => 'keepExisting' for HABTM association behave consistently with all acceptable data formats. 2012-03-18 13:43:21 +05:30
mark_story
1e403c6a7f Fix more coding standards issues. 2012-03-17 23:53:13 -04:00
mark_story
fab9547ac9 Fix coding standard issues with fixtures. 2012-03-17 23:31:17 -04:00
mark_story
c54ac257f1 Fix getCrumbs() with no crumbs and first link. 
Apply patch from 'Andy Hobbs' to fix issues with breadcrumbs, and
a starting breadcrumb.

Fixes #2689
 2012-03-17 23:23:42 -04:00
mark_story
d0733ceb00 Fix most coding standards in Case/Network 2012-03-16 22:19:01 -04:00
mark_story
544930f882 Skip validation when recovering trees. 
Fixes #2663
 2012-03-16 21:57:20 -04:00
mark_story
8fdd57568b Make method protected. 
API changes should be minimized in bug fix releases.
Fix broken builds.
 2012-03-16 21:46:07 -04:00
mark_story
381e5b10bc Add tests for GH-558 2012-03-16 21:05:06 -04:00
Mark Story
6e4456fbd7 Merge pull request #558 from stefanozoffoli/patch-3 
Prevent blackhole auth error for multi fields.

Fields with .1.0 should not blackhole.
 2012-03-16 18:04:49 -07:00
mark_story
111db16ca6 Restore error handlers. 
When switching error handlers, remember to pop off the stack.
 2012-03-16 20:56:24 -04:00
Mark Story
fd824c1da5 Merge pull request #561 from tPl0ch/2.1-configure-error 
Fixed resetting of ErrorHandlers when custom error handlers are set in core.php
 2012-03-16 17:46:39 -07:00
dogmatic69
d3a44811ce adding test and fix for hightlighting tags, old bug 2111 for 1.3 but its the same issue. This should make more options possible 2012-03-16 21:20:27 +00:00
Thomas Ploch
a06eba7e24 Adding basic implementation of DataSource::close(). 
Since this method will be called in Destructor.
 2012-03-16 21:08:48 +01:00
Norio Suzuki
358b84b577 Add charset() / headerCharset() methods to CakeEmail class 2012-03-16 12:54:30 +00:00
mark_story
f5804cb4ca Fix most coding standards in Test/Case/View 2012-03-15 22:50:05 -04:00
mark_story
6a55749e27 Fix reading multiple keys in a single request. 
Fixes #2676
 2012-03-15 21:45:48 -04:00
mark_story
5713cd3269 Fix the way bash is invoked. 
Using /usr/bin/env is more portable to various *nix flavours.
Fixes #2688
 2012-03-15 20:20:39 -04:00
Thomas Ploch
cadfe15549 Fixed problems with custom Error handlers when inclusion of APP bootstrap is defered. 2012-03-15 16:06:54 +01:00
Rachman Chavik
079ae8265c Set::expand as implemented by jeremyharris 2012-03-15 20:07:49 +07:00
Rachman Chavik
8fdb11121e Merge branch '2.1' into 2.2 2012-03-15 20:07:26 +07:00
mark_story
f1931e43ef Add class_exists() check for view class. 
Check that the view class hasn't already been mapped in the autoloader
before mapping it. This allows developers to map view classes from
plugins.

Fixes #2684
 2012-03-14 20:57:11 -04:00
Ceeram
3e0294a695 Several fixes for testcases. 
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
 2012-03-15 01:31:28 +01:00
Ceeram
9f9c6fdd67 ensure correct order in results as postgres does not always return in same order 2012-03-15 01:31:09 +01:00
mark_story
1254a1068f Fixing issues with unwanted querystring parameters. 
Because the request url was being appended as ?/$1 any nested
named parameters would be added as additional GET params.  This is
yet another case where named parameters are fail.  Modify the built-in
htaccess rules to not use a GET parameter at all, and just read
from REQUEST_URI.

Fixes #2678
 2012-03-14 20:20:55 -04:00
Ceeram
40f4f54b34 Several fixes for testcases. 
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
 2012-03-14 15:08:46 +01:00
mark_story
1efee89169 Fix most coding standards issues in Test/Case/Utility 2012-03-13 22:59:20 -04:00
mark_story
4e94ebe710 Fix doc blocks. 2012-03-13 21:04:56 -04:00
Ceeram
b871095125 ensure correct order in results as postgres does not always return in same order 2012-03-14 01:12:35 +01:00
Ceeram
7145bd6574 fix another failing test on postgres 2012-03-14 00:49:04 +01:00
Ceeram
467b0f1c45 fix failing test for postgres 2012-03-13 22:03:22 +01:00
dogmatic69
2ad0f8b8db setting defaults in the DBO so you do not need to pass every field possible to avoid errors. also adds a test for calling with some missing fields. fixes #1779 2012-03-13 17:40:25 +00:00
Stefano Zoffoli
60b9cd80a0 Prevent blackhole auth error where are present multi fields (part 2) 2012-03-13 17:02:22 +01:00
Rachman Chavik
af575027da fix Set::sort() for issue in previous commit 2012-03-13 12:45:06 +07:00
Rachman Chavik
beb0474d67 tests for regression in Set::sort(), re: #2673 2012-03-13 12:44:11 +07:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
907596b2f5 Fix coding standards in Case/Routing 2012-03-12 21:36:27 -04:00
mark_story
b2d393eeb9 Fix coding standards in Case/Event 2012-03-12 21:22:17 -04:00
mark_story
8b797b2577 Fix coding standards in Case/Error 2012-03-12 21:21:02 -04:00
mark_story
b4a444fb14 Fix coding standards in Case/Core 2012-03-12 21:17:50 -04:00
mark_story
5687d97a98 Merge branch '2.1' into 2.2 2012-03-12 20:31:33 -04:00
Ceeram
a2fb4178fb Testcase added, refs #2672 2012-03-12 20:24:53 -04:00
Mark Story
5033fb60d6 Merge pull request #557 from sime/2.1 
array_merge breaks CakeSchema column type change 

Fixes #2672
 2012-03-12 17:24:44 -07:00
Ceeram
68eeee80d8 Set::sort() now correctly sorts when using {s}.path, fixes #2673 2012-03-12 21:58:24 +01:00
mark_story
a9c8a520b2 Port [c19b233] to 2.1 2012-03-12 12:33:20 -04:00
Simon Males
791cc1a657 array_merge inappropriate for certain column types. e.g. Switching from VARCHAR(45) to DATETIME will carry length, collate and charset properties 2012-03-12 21:30:52 +11:00
mark_story
edb582944c Fix coding standards in Test/Case/Controller 2012-03-11 22:20:25 -04:00
mark_story
75f1a84069 Fix docs about ordering of callbacks. 
Refs #GH-555
 2012-03-11 21:35:11 -04:00
Ceeram
a4952166f7 make acl methods available in permission model 2012-03-11 17:07:42 +01:00
mark_story
8c611b236d Fixing missed cache reads for table schema. 
Because cache keys were different, model schema would not be read from
the cache.  Make keys used consistent.

Fixes #2670
 2012-03-11 10:24:05 -04:00
Ceeram
baf8991a1f updating version.txt 2012-03-11 15:19:32 +01:00
Ceeram
bbfaa9e947 Paginating now work well with custom find methods. 
_findCount() will now pass $query['operation'] = 'count' for more flexibility.
Custom finders can distinguish the operation and return other $query if needed.
 2012-03-11 15:14:50 +01:00
mark_story
4b3d8612e9 Fix typo causing notice errors. 
Fixes #2658
 2012-03-11 08:17:01 -04:00
mark_story
83a29f054e Fix Session.cookieTimeout default behavior. 
When Session.cookieTimeout is undefined, it should
reflect the value set for 'timeout' and not default to 240.

Fixes #2669
 2012-03-11 08:14:54 -04:00
mark_story
72d0105e20 Add plugin. prefix for plugin files. 
This prevents app/plugin bleedthrough.  This is
particularly problematic in controllers, as plugin
controllers were partially accessible from non-plugin
routes.

Fixes #2658
 2012-03-10 23:33:21 -05:00
mark_story
ed1d34accc Fix most coding standards issues in Test/Console 2012-03-10 23:32:02 -05:00
mark_story
fdcb3dc34f Fix coding standards. 2012-03-10 23:12:08 -05:00
mark_story
82d8df9c3e Fix more coding standards. 2012-03-10 22:30:56 -05:00
mark_story
932c9d4e2f Fix coding standards. 2012-03-10 22:29:35 -05:00
mark_story
7d256d0f7b One more time. 2012-03-10 22:00:16 -05:00
mark_story
81b487159b Try again at fixing the build. 2012-03-10 21:40:38 -05:00
mark_story
2d343070fe Try to fix build. 2012-03-10 21:33:40 -05:00
mark_story
69ab443ed6 Fix whitespace for coding standards. 2012-03-10 21:19:04 -05:00
Mark Story
f26d24b445 Merge pull request #552 from tPl0ch/2.1-error-handler-bootstrap 
Move inclusion of APP bootstrap after initialization of ErrorHandler
 2012-03-10 17:59:03 -08:00
ADmad
13b748ad86 Fixed bug where registering new packages would reset extra paths set for other packages. Closes #2666 2012-03-10 04:40:50 +05:30
Thomas Ploch
cc9b445ece Fixed warnings in stack trace element when no stack args are set. 2012-03-09 18:38:16 +01:00
Thomas Ploch
2c55c7c193 Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-error-handler-bootstrap 2012-03-09 18:37:53 +01:00
mark_story
150c9fc6a3 Remove parse_str() its buggy and wrong. 
parse_str() replaces `.` with _ and drops duplicated keys, which is
incorrect.  Replace parse_str with an updated version of parseQuery
from 1.x

Fixes #2629
Fixes #2647
 2012-03-08 21:05:28 -05:00
Mark Story
621b086d9c Merge pull request #549 from zoghal/fix2 
urldecode trailing star
 2012-03-08 17:03:56 -08:00
Thomas Ploch
7a93276ecf Move inclusion of application bootstrap behind ErrorHandler initialization in Configure::bootstrap(). 2012-03-08 16:00:13 +01:00
Mark Story
a4da64cacb Merge pull request #550 from majna/2.1-validation 
Make Validation class more strict when checking values in list.
 2012-03-07 17:34:54 -08:00
mark_story
3a8c49e319 Add check for simple category elements. 
Fixes #2655
 2012-03-07 19:52:06 -05:00
Majna
32f5b6f191 Fix failing test. 2012-03-07 19:27:23 +01:00
Saleh Souzanchi
683607de5e fix test Parse Trailing UTF8 2012-03-07 21:51:09 +03:30
Majna
4543a4cb88 Make Validation class more strict when checking values in list. 
Use in_array() with 'strict' param. Affected rules are Validation::inList() and Validation::multiple().
 2012-03-07 18:52:48 +01:00
Saleh Souzanchi
5e9af65486 testParseTrailingUTF8 2012-03-07 08:50:11 +03:30
Saleh Souzanchi
e741d79f9a urldecode trailing pass 2012-03-07 06:06:59 +03:30
mark_story
17eb0e4f68 Fix duplicate values when merging POST data. 
Fixes #2648
 2012-03-06 20:22:13 -05:00
Kyle Robinson Young
c7963835c7 Correct path in debug() 2012-03-05 14:44:45 -08:00
Thomas Ploch
79cab67be7 Adding missing 'recursive' option to DigestAuthenticate object. 
Used integer casting in _findUser() method for 'recursive' option.
 2012-03-05 11:06:46 +01:00
mark_story
664b0538b8 Fix more coding standards problems. 2012-03-04 22:49:38 -05:00
mark_story
c2f42343a3 Fix most coding standards issues in TestSuite/ 2012-03-04 21:51:50 -05:00
mark_story
9a6ad7e1e2 Fixing most coding standard issues in Model/ 2012-03-04 21:51:50 -05:00
Jose Lorenzo Rodriguez
9b395eb23b Update version number to 2.1.0 2012-03-04 19:36:50 -04:30
mark_story
a6da736149 Fix coding standards errors in Network/ 2012-03-04 11:18:20 -05:00
mark_story
863aaad4e3 Update docs for GH-322 2012-03-04 09:59:40 -05:00
Mark Story
ca25e75852 Merge pull request #322 from ingk/2.1 
FormHelper: Allow a boolean value for the disabled attribute in function radio
 2012-03-04 06:51:02 -08:00
mark_story
50e7f4c995 Merge branch '2.0' into 2.1 2012-03-03 23:20:18 -05:00
mark_story
dde19f97c7 Fix sortDir() to read default params. 
sortDir() also did not reflect the default paging parameters.
This would result in initial links not matching the query used.

Fixes #2640
 2012-03-03 23:19:50 -05:00
mark_story
8f72b696a0 Fix sortKey() not looking at default params. 
sortKey() only looked at the options values, which do not include
default sorting options declared as settings in the helper.

Fixes #2640
 2012-03-03 23:06:45 -05:00
mark_story
4640b8ea23 Fix coding standar errors in Routing/ 2012-03-03 20:28:22 -05:00
mark_story
dc2f6efe13 Fix coding standard errors in Log/ 2012-03-03 20:24:02 -05:00
mark_story
9d1e88ba13 Fix error from previous commit. 2012-03-03 20:22:21 -05:00
mark_story
c5be343b72 Fix most of the coding standards issues in I18n/ 
There are a number of whitespace related issues in Multibyte, and
variable name related ones in I18n that cannot be easily changed.
 2012-03-03 20:15:21 -05:00
mark_story
15e6e9d981 Fix coding standards in Event/ 2012-03-03 19:55:18 -05:00
mark_story
60989ad6c8 Fix coding standard issues in Error/ 2012-03-03 19:46:15 -05:00
mark_story
63c992a85b Fix coding standards in Core/ 2012-03-03 19:37:46 -05:00
mark_story
61aba0f0f8 Fix most coding standard issues in Controller. 2012-03-03 19:27:46 -05:00
mark_story
db8c6b5c78 Fix most of the coding standards issues in Console/ 2012-03-03 18:55:29 -05:00
Ceeram
2a7bee0a5c make sure locale is restored correct in tests 2012-03-04 00:36:21 +01:00
Ceeram
169c99cedf Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-03-03 23:55:20 +01:00
Ceeram
08a4d0bf63 Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds 2012-03-03 23:55:03 +01:00
mark_story
c8b113ac91 Fix coding standards in Configure/ 2012-03-03 17:36:59 -05:00
mark_story
b06e15ce6f Fix coding standards in Config/ 2012-03-03 17:35:47 -05:00
mark_story
04c843b17b Fix coding standards in Cache/ 2012-03-03 17:34:13 -05:00
mark_story
9d325fe46e Fixing most coding standard issues in Utility/ 2012-03-03 17:31:47 -05:00
mark_story
acccdcde1f Fix coding standard issues in View/ 2012-03-03 17:10:12 -05:00
mark_story
0df239de2b Fix some coding standards issues. 2012-03-03 15:59:36 -05:00
mark_story
7d51db9e63 Merge branch '2.0' into 2.1 2012-03-03 12:27:22 -05:00
Takayuki Miwa
1475e87b38 Update PaginatorHelper::beforeRender to merge request->query with url options 2012-03-03 13:46:46 +09:00
Cauan Cabral
a3a2d55c94 Enable UpgradeShell to recognize new line between class name and { 2012-03-02 17:43:02 -04:00
mark_story
0b4f735b4c Update API docs for Set::extract() 
Fixes #2634
 2012-03-02 11:19:17 -05:00
Renan Gonçalves
3412c0cb0f Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer. 2012-03-02 15:59:59 +01:00
Renan Gonçalves
6d3bc7be86 Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer. 2012-03-02 15:55:58 +01:00
Jose Lorenzo Rodriguez
c84e25e5b4 Moving $_minimizedAttributes form HtmlHelper back into Helper, as _parseAttributes is using it 2012-03-01 14:56:56 -04:30
José Lorenzo Rodríguez
96f73d6392 Merge pull request #538 from mcammaert/2.1 
Merging input defaults with passed options to preserve nested keys
 2012-02-29 09:09:11 -08:00
Mark Story
9d017c2b5c Merge pull request #535 from michaelhagedon/2.1 
Fixing _fromArray()
 2012-02-29 08:32:45 -08:00
Manu Cammaert
9c24f81379 Test Case for Formhelper Bug 2012-02-29 11:03:55 +01:00
mark_story
1ddcde7c86 Fix how $uses is handled. 
$uses now defaults to true.  All falsey values turn some features
off, and most truthy values enable them.

Fixes #2590
 2012-02-28 19:35:06 -05:00
Manu Cammaert
cd2dca205c default options are lost in case of eg. validation error 2012-02-28 23:39:16 +01:00
Rob McVey
8e93c4cd34 Fix for Consolce/Task/TestTask::getRealClassName(). Controller names of exactly 10 letters 
being returned incorrectly

Signed-off-by: mark_story <mark@mark-story.com>
 2012-02-28 15:21:59 -05:00
Michael Hagedon
5eb4155236 Fixing case. 2012-02-28 13:20:47 -07:00
Mark Story
6599422a7a Merge pull request #534 from dogmatic69/2622 
Fixes #2622
 2012-02-28 12:11:44 -08:00
Michael Hagedon
ef80045fc5 Fixing _fromArray(). See http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/2624-xml_fromarray-does-not-handle-certain-array-structures-as-expected 2012-02-28 12:41:43 -07:00
dogmatic69
ac06880241 making the name lowercase in the addDetector method so that it will be found in the is() method fixes #2622 with tests. 2012-02-28 16:05:32 +00:00
mark_story
2665178ec9 Merge branch '2.0' into 2.1 2012-02-28 07:04:20 -05:00
Norio Suzuki
757579e1d1 Fixed a testcase, support PostgreSQL 9.1 
Signed-off-by: mark_story <mark@mark-story.com>
 2012-02-28 06:32:31 -05:00
ADmad
12364cac8c Fixed indentation 2012-02-28 02:04:43 +05:30
mark_story
0568746bfd Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/CakeSchema.php
 2012-02-26 12:04:28 -05:00
mark_story
d577d6b84e Change cake.php to allow cake libs at ROOT 
Splice the ROOT path into the include_path for console apps.
This allows users to override the system include_path with a local
version of CakePHP.

Fixes #2613
 2012-02-26 12:03:22 -05:00
mark_story
faeb7b4536 Fix error creating schema files. 
If you removed app/Config/Schema and tried to create
schema files, you'd get an error instead of a file.

Fixes #2618
 2012-02-26 10:25:39 -05:00
mark_story
2a9a103d62 Fix bad xml help generation. 
Fixes #2619
 2012-02-26 10:21:04 -05:00
ADmad
a31be56f42 Wrapping error string in translator function. 2012-02-26 20:34:30 +05:30
mark_story
7665f369fa Merge branch '2.1-type-hinting-corrections' into 2.1 2012-02-25 20:07:18 -05:00
mark_story
e958e6c25f Fix strict and warning errors from type hints. 2012-02-25 20:06:48 -05:00
euromark
973dce916a php5 corrections 2012-02-25 19:46:07 -05:00
euromark
42762fffa9 fix broken test 2012-02-25 19:46:06 -05:00
euromark
45112088a1 type hinting models 2012-02-25 19:46:06 -05:00
euromark
22452f61f8 type hinting controllers and views 2012-02-25 19:46:06 -05:00
euromark
38c3e30a1e visibility attributes 2012-02-25 19:46:06 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Ceeram
677f0708dc create View instance after adding model params for request 2012-02-24 18:16:53 +01:00
José Lorenzo Rodríguez
2840dc74d3 Merge pull request #528 from vantienvnn/2.0 
CakeRequest::here explicitly using & as a query string separator to overcome issue in some badly configured 5.3 servers
 2012-02-24 06:51:12 -08:00
vantienvnn
c0b2d8ad9d Fixed #2615 2012-02-24 21:35:50 +07:00
ADmad
4edb378ef8 Added ability to pass ID as parameter to Model::exists() 2012-02-24 19:42:23 +05:30
Mark Story
fd927207c1 Merge pull request #524 from shama/patch-typos 
Typo fixes in the tests
 2012-02-23 17:11:08 -08:00
mark_story
ed22c17eba Fix path in Testsuite. 2012-02-23 20:09:11 -05:00
Ceeram
8eea263d71 fixing incorrect post data 2012-02-23 20:00:51 -05:00
Ceeram
9d71df475d another attempy to set correc order for expected and result in assert, definitely time for some coffee 2012-02-23 20:00:43 -05:00
Kyle Robinson Young
4176e59e52 Typo fixes in tests 2012-02-23 15:29:53 -08:00
Kyle Robinson Young
ea652394c7 Move DbAcl and IniAcl into Acl subfolder and rename Model/DbAclTest to AclNodeTest 2012-02-23 10:45:32 -08:00
Mark Story
94db313e39 Merge pull request #516 from dogmatic69/tree-behavior-optimization 
Tree behavior optimization

Fixes #2600
 2012-02-23 09:27:41 -08:00
Mark Story
3a391529d2 Merge pull request #520 from dogmatic69/2610 
Closes #2610
 2012-02-23 09:26:11 -08:00
Ceeram
6d3c659260 fixed expected and result order in asserts, also added extra test 2012-02-23 12:24:31 -05:00
Ceeram
836f913a64 testcase for incorrect merge of post data 2012-02-23 12:24:26 -05:00
Mark Story
1ddc8f6489 Merge pull request #519 from shama/patch-vis-convention 
Correct convention with public visibility
 2012-02-23 09:23:13 -08:00
Mark Story
66fd891503 Merge pull request #518 from shama/patch-cake-request-test 
Fix failing tests with CakeRequest when ran in webrunner
 2012-02-23 09:22:23 -08:00
Rachman Chavik
e59bff2729 prevent deletion of views/cache/empty in test runs 2012-02-23 22:20:23 +07:00
dogmatic69
c02912261b setting recursive to -1 2012-02-23 11:36:44 +00:00
dogmatic69
2787052bdd adding a truncate test for a url as explained in #2610 2012-02-23 11:17:58 +00:00
Kyle Robinson Young
c202859523 Correct convention with public visibility 2012-02-23 00:03:31 -08:00
Kyle Robinson Young
86fafd0ae5 Fix failing tests with CakeRequest when ran in webrunner 2012-02-22 23:50:13 -08:00
Rachman Chavik
c6449f649f adding missing ',' 2012-02-23 09:08:17 +07:00
Rachman Chavik
b545d8b201 fix getSchemaName() for Sqlserver. 
Closes #2609.
 2012-02-23 08:25:07 +07:00
dogmatic69
74a84c96f1 optimization of tree behavior as per ticket #2600 2012-02-23 00:56:20 +00:00
Ceeram
55b8f66095 fixing incorrect post data 2012-02-22 22:49:42 +01:00
Ceeram
2e2ee3b096 another attempy to set correc order for expected and result in assert, definitely time for some coffee 2012-02-22 22:31:28 +01:00
Ceeram
d5cdc46661 fixed expected and result order in asserts, also added extra test 2012-02-22 22:25:24 +01:00
Ceeram
44ea3fb122 testcase for incorrect merge of post data 2012-02-22 21:53:51 +01:00
Mark Story
b7302850b5 Merge pull request #467 from tPl0ch/2.1-required-update-create 
Added support for simplified required validation on 'create' or 'update'. Fixes #230.
 2012-02-22 09:43:13 -08:00
José Lorenzo Rodríguez
74d837bef3 Merge pull request #512 from shama/patch-test-fixes 
Fix missing class errors with ComponentCollectionTest and DbAclTest
 2012-02-22 03:48:40 -08:00
Stef van den Ham
98b84ce40b Fixed typo in TestSuiteShell 2012-02-22 09:38:59 +01:00
Mark Story
e5205a8dcc Merge pull request #511 from tigrang/crumb-list-opt 
Moving duplicate logic to a new method
 2012-02-21 19:50:35 -08:00
Mark Story
cee8f2cebb Merge pull request #508 from shama/patch-app-build 
Updates to App::build() uses
 2012-02-21 19:48:21 -08:00
Tigran Gabrielyan
95ba5f45a5 Keeping code dry in HtmlHelper::getCrumbs/getCrumbList 2012-02-21 11:38:13 -08:00
Mark Story
f138c73a77 Merge pull request #483 from tigrang/getCrumbList-enhancement 
Added `startText` feature to HtmlHelper::getCrumbList()
 2012-02-21 18:24:16 -08:00
mark_story
6684b775cd Fix failing tests. 2012-02-21 20:45:44 -05:00
Mark Story
3e79038b06 Merge pull request #505 from shama/patch-htaccess 
Remove extraneous space in .htaccess
 2012-02-21 17:40:58 -08:00
Mark Story
c2d753ffb4 Merge pull request #500 from shama/patch-visibility 
Add missing visibility keywords
 2012-02-21 17:36:36 -08:00
Mark Story
540f6669fd Merge pull request #498 from shama/patch-loadFixtures 
Remove unnecessary loadFixtures() calls
 2012-02-21 17:28:52 -08:00
Mark Story
d7026204d5 Merge pull request #497 from shama/patch-crossSchemaTest 
Cleaning up ModelCrossSchemaHabtm test case
 2012-02-21 17:27:01 -08:00
ceeram
6eb4f39afd Merge pull request #499 from shama/patch-dbAcl-uses 
Use ComponentCollection and AclComponent on DbAclTest to avoid error
 2012-02-21 01:20:52 -08:00
ADmad
007ac45b26 Merge pull request #496 from shama/patch-loadSingle-docblock 
Fix docblock of CakeFixtureManager::loadSingle()
 2012-02-20 22:06:47 -08:00
Mark Story
fe4f0009c9 Merge pull request #495 from shama/patch-cakeplugin-loadall 
Load specific test plugins rather than all to avoid conflicts
 2012-02-20 20:43:41 -08:00
mark_story
89df484fc5 Remove un-necessary Set::merge(). 
Using Set::merge() on an empty array causes issues with out of order
numeric keys. Only merge if necessary.

Fixes #2595
 2012-02-18 22:18:16 -05:00
mark_story
2ddc3873c2 Update the Set::merge() documentation. 2012-02-18 16:01:07 -05:00
mark_story
fce70df6ff Fix failing tests. 
rawurlencode() and urlencode() handle utf8 differently.
 2012-02-18 11:18:03 -05:00
teddy
0ea00c5f07 urldecode $this->url before unsetting it from CakeRequest->query 2012-02-18 11:03:36 -05:00
teddy
e6905b44c3 urldecode custom route element values 2012-02-18 10:59:46 -05:00
mark_story
2f51ef00ed Add failing tests for patches from 'teddyzeenny'. 2012-02-18 10:53:47 -05:00
Kyle Robinson Young
962fe7c571 Fix missing class errors 2012-02-18 06:32:48 -08:00
Kyle Robinson Young
32e7943b00 Fix merge conflict with 62f8dea 2012-02-18 04:39:32 -08:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8 Use App::RESET instead of true with App::build() 2012-02-18 04:04:54 -08:00
Kyle Robinson Young
1312cdaedf Remove extraneous space in .htaccess 2012-02-17 21:32:09 -08:00
mark_story
2097d5a968 Fix duplicate items in HABTM associations. 
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598
 2012-02-17 21:10:14 -05:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Jose Lorenzo Rodriguez
a9c279aab0 Update version number to 2.1.0-RC 2012-02-20 18:10:22 -04:30
Jose Lorenzo Rodriguez
715c848577 Bringing theme code up to date with 2.0, cleaning logic a bit 2012-02-20 17:21:04 -04:30
Jose Lorenzo Rodriguez
6918b70ec3 REmoving usage of deprecated ThemeView 2012-02-20 16:49:16 -04:30
Jose Lorenzo Rodriguez
02fa1ae60b Fixing a few failing test cases 2012-02-20 16:17:59 -04:30
Jose Lorenzo Rodriguez
ea79ba81a4 Adding a simpler solution to the missing view files problem without altering the built paths in App 2012-02-20 15:39:03 -04:30
Jose Lorenzo Rodriguez
cec9d2e615 Revert "Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit." 
This reverts commit 5c792aa831.
 2012-02-20 15:21:03 -04:30
Ceeram
ee54daef35 AclNode now throws exception instead of trigger_error 2012-02-20 15:41:57 +01:00
Mark Story
9e8152f949 Merge pull request #417 from 0x20h/php-acl 
PHP config file based ACL implementation
 2012-02-19 19:34:56 -08:00
Christopher Vrooman
585f1e2c31 Minor changes to two error messages. 2012-02-19 14:47:49 -02:00
mark_story
943d928084 Merge branch '2.0' into 2.1 2012-02-18 22:19:38 -05:00
mark_story
20229eeb43 Merge branch '2.0' into 2.1 2012-02-18 11:22:18 -05:00
mark_story
89b9bb7297 Fix duplicate items in HABTM associations. 
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598
 2012-02-17 21:09:48 -05:00
Mark Story
60df31cfb6 Merge pull request #487 from dogmatic69/2.1 
2.1
 2012-02-17 17:38:03 -08:00
euromark
77624552eb added missing assertText methods to assert cross OS 2012-02-17 23:36:57 +01:00
Majna
0cd9a93e9e Remove unused variables and statements. 2012-02-17 21:10:43 +01:00
Majna
c40d132f81 Fix Folder::tree() when excluding dot files or folders. 
When 'exclude' param is array('.') files/folders are not skipped. Added test.
 2012-02-17 20:46:52 +01:00
dogmatic69
be49b2b942 fixing up the docs for Collection::attached(), was showing behaviors but is for all collections 2012-02-17 13:25:37 +00:00
Majna
1dbafe1d4f Fix docblocks. 2012-02-17 13:51:20 +01:00
Kyle Robinson Young
0c27a26cb8 Use ComponentCollection and AclComponent on DbAclTest to avoid error 2012-02-16 22:57:31 -08:00
Kyle Robinson Young
75882507bc Remove unnecessary loadFixtures() calls 2012-02-16 22:37:18 -08:00
Kyle Robinson Young
95b8675637 Cleaning up ModelCrossSchemaHabtm test case 2012-02-16 22:25:53 -08:00
Kyle Robinson Young
2d43f1873c Fix docblock of CakeFixtureManager::loadSingle() 2012-02-16 21:45:37 -08:00
Kyle Robinson Young
4141a3ab5b Load specific test plugins rather than all to avoid conflicts 2012-02-16 20:03:44 -08:00
Tigran Gabrielyan
af2fd03590 Added startText feature to HtmlHelper::getCrumbList() 2012-02-16 19:17:43 -08:00
mark_story
14228fa469 Fix more tests to use assertTextEquals() 
Refs #2148
 2012-02-16 21:51:56 -05:00
euromark
2afece41a0 email component osFix removal due to new assertTextEquals 2012-02-16 21:34:43 -05:00
mark_story
6412797dfc Add missing static. 2012-02-16 20:58:43 -05:00
Kyle Robinson Young
9fdc17eb1f Fix failing AuthComponent test 2012-02-16 15:58:42 -08:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests. 
Remove unused variables and dead code.
 2012-02-16 19:28:21 +01:00
dogmatic69
3246cf7c1e adding the model alias so that there are no issues when the find has a join on it 2012-02-16 16:22:45 +00:00
ADmad
5c792aa831 Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit. 2012-02-16 18:15:12 +05:30
Mark Story
df0d1d681f Merge pull request #479 from slygoncito/0dace174a79b87a2a196cc2bc94dbb009b705878 
Option 'currentClass' always defaults to 'current'.
 2012-02-15 20:05:50 -08:00
Slygoncito
0dace174a7 Option 'currentClass' always defaults to 'current'. 2012-02-16 00:11:43 -03:00
ADmad
bda05293d7 Fixed failing test cases 2012-02-16 02:22:20 +05:30
ADmad
c7cfd45884 Syncing bake skeleton with app 2012-02-16 01:58:11 +05:30
ADmad
90f4c03627 Moving view files from core to app 2012-02-16 01:58:11 +05:30
mark_story
6fda055a1e Move initialize logic to __construct(). 
Fixes #2582
 2012-02-15 14:15:44 -05:00
ADmad
55f63bbd5b Fixing error message. Closes #2579 2012-02-15 12:41:01 +05:30
mark_story
27367b491a Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
	lib/Cake/View/Helper/TextHelper.php
 2012-02-14 21:55:21 -05:00
Rachman Chavik
89d4b58073 fix indentation and add __construct() docblocks 2012-02-14 23:28:57 +07:00
Rachman Chavik
5eb1979b04 rename protected variable to $_engine 2012-02-14 23:28:57 +07:00
Rachman Chavik
fe479c636c adding tests for engine overrides 2012-02-14 23:28:57 +07:00
AD7six
369d316835 Restructure internals of Extract task 
Use variables which are easily identifiable and an internal storage
structure which prevents duplicates.
 2012-02-14 15:30:09 +01:00
Vinícius Krolow
07adcfe2f7 fixing regex of autoLinks to work with urls that have www 2012-02-14 11:08:37 -02:00
Rachman Chavik
d6fd051fb4 changing methods in CakeTime class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4 changing methods in CakeNumber class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445 changing methods in String class to static 2012-02-14 09:34:36 +07:00
mark_story
25ee90ace4 Fix failing tests. 2012-02-13 21:28:07 -05:00
mark_story
76711c9f71 Add missing rawurlencode() 
When routes fail to match because of unknown named parameters,
values that needed urlencoding were missing it.

Fixes #2572
 2012-02-13 21:16:57 -05:00
mark_story
afecb713ab Make button type nullable. 
Fixes #GH365
 2012-02-13 21:00:57 -05:00
Thomas Ploch
1a07f55d43 Renamed parameter to CakeResponse::cookie() to match cakephp standard naming. 2012-02-13 09:59:45 +01:00
Thomas Ploch
574b5dcd41 Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response 2012-02-13 09:56:39 +01:00
Jose Lorenzo Rodriguez
4cfc033387 Fixing failing test cases 2012-02-13 00:26:10 -04:30
Jose Lorenzo Rodriguez
4f176d4284 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-02-12 21:04:35 -04:30
Ceeram
bc07ba3839 Added option['deep'] to saveAll, to save unlimited levels associated data 
Squashed commit of the following:

commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 22:29:33 2012 +0100

    update docblocks for deep save

commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff1
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:17:34 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 1d32698640fa1a3c1d606eeaf4740637ff8a1991
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:16:57 2012 +0100

    Revert "adding info in docblock about associated model fieldList"

    This reverts commit 7cc10a2b5afc1007c388a6da449781dc351d50cd.

commit 7cc10a2b5afc1007c388a6da449781dc351d50cd
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:05:18 2012 +0100

    adding info in docblock about associated model fieldList

commit db2ad2759f6af460715a8bbee167262bcbb62d77
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 17:51:44 2012 +0100

    add tests for deep saveAll respecting fieldList option

commit 14123fccfc43fac1b4cddeea8350dca8fb9c9821
Merge: cfdf25d 2afb05b
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 16:51:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit cfdf25d4b587c6f1a8cd6ec2bc46dc21fa3c6704
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Feb 7 13:54:59 2012 +0100

    Make saveAllTheThings fully BC, use $options['deep'] = true, to save infinite recursive data

commit 6e8c4380c37a31efc2a37a5ab6438db26d293eb3
Merge: 203c7e1 95aa7e3
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:22:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 203c7e1d9870e282ec7098297d47e49132904401
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:19:25 2012 +0100

    validate all the things as well

commit d920d0000fcab80fc48a29b45dbba147a2eed27c
Merge: d648f6a 4f1be12
Author: Ceeram <c33ram@gmail.com>
Date:   Mon Jan 23 18:22:12 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit d648f6a90419e0fa27ed1d9e9feb51c37fbf0397
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Dec 9 15:11:52 2011 +0100

    making saveAll, saveMany and saveAssociated not limited to only save directly related models
 2012-02-13 01:00:28 +01:00
ADmad
1dd0ff1701 Updating docblock 2012-02-12 22:11:55 +05:30
mark_story
ad09b910ee Remove pointless comparison. 2012-02-12 10:09:25 -05:00
mark_story
2afb05b590 Merge branch '2.0' into 2.1 
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
 2012-02-12 10:06:13 -05:00
mark_story
ab09229d40 Update API docs 
View switching only happens for known mime types.
Refs #2565
 2012-02-11 11:45:06 -05:00
mark_story
4c01ba7224 Add ics mime type. 
Fixes #2565
 2012-02-11 11:39:24 -05:00
mark_story
7e17da0ae8 Fix notice error when reading empty values. 
When reading empty values a notice error would be triggered.
Slicing the first char off and comparing that solves this.

Fixes #2537
 2012-02-11 11:33:04 -05:00
mark_story
6f914174a6 Fix issues with double / & leading/trailing / 
Authorize classes should remove // and leading trailing /
Without this incorrect paths that fail to match nodes can be
generated.  This also allows settings[actionPath] to be
permissive in what it accepts.

Fixes #2563
 2012-02-11 10:29:18 -05:00
mark_story
0207a61e9b Move alias wrapping into _formatAddress() 
Fixes #2502
 2012-02-11 10:16:08 -05:00
ADmad
e1dba6798f Added missing echos 2012-02-11 13:53:46 +05:30
Kyle Robinson Young
730ac10ae4 Add missing options to NumberHelper docblocks 2012-02-10 22:17:58 -08:00
ADmad
83e8d436f8 Fixing docbloc and adding tests for FormHelper::tagIsInvalid(). Refs #2562 2012-02-11 06:09:58 +05:30
Mark Story
6502ab8f39 Merge pull request #473 from majna/2.1-cache-clear 
Fix Cache::clear() calls in tests.
 2012-02-10 15:56:21 -08:00
Ceeram
1f0af2a138 Adding order on created to the find, avoid failing test by incorrect order in postgres 2012-02-10 23:51:41 +01:00
Ceeram
2897c72215 AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel 
Conflicts:

	lib/Cake/Model/AclNode.php
	lib/Cake/Model/Aco.php
	lib/Cake/Model/Aro.php
 2012-02-10 23:38:40 +01:00
Majna
42cbb8cafe Fix Cache::clear() calls in tests. 2012-02-10 20:38:41 +01:00
Ceeram
7e5ef1dc0d avoid failing tests by 1 second diff 2012-02-10 19:53:04 +01:00
mark_story
9c1fa28d60 Its EXECUTE not EXECUCUTE 
Also make the search insensitive as casing bugs are no fun.
 2012-02-10 12:43:07 -05:00
Ceeram
f8fef907c8 avoid failing tests by 1 second off 2012-02-10 18:29:25 +01:00
Ceeram
028ba27522 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-02-10 17:26:16 +01:00
Ceeram
97f48dcdb3 fix failing test, caused by postgres ordering 2012-02-10 17:26:05 +01:00
Rachman Chavik
9b62e7ddab changing test order 
L10nTest defines DEFAULT_LANGUAGE causing CakeTimeTest to fail
 2012-02-10 22:26:00 +07:00
Rachman Chavik
b4f51df491 recreating TimeHelperTest 2012-02-10 22:26:00 +07:00
Rachman Chavik
fbd3f87be6 recreating TextHelperTest 2012-02-10 22:26:00 +07:00
Rachman Chavik
8074959637 moving TimeHelperTest to CakeTimeTest 2012-02-10 22:26:00 +07:00
Rachman Chavik
4574dbc273 fix failing test 2012-02-10 22:26:00 +07:00
Rachman Chavik
59342e0524 moving methods from TextHelperTest to StringTest 2012-02-10 22:26:00 +07:00
Rachman Chavik
ef73fff6be adding NumberHelperTest 2012-02-10 22:25:59 +07:00
Rachman Chavik
cd7a8452a2 renaming NumberHelperTest to CakeNumberTest 2012-02-10 22:25:59 +07:00
Jose Lorenzo Rodriguez
fd17e33e78 Making CakeNumber::addFormat static so it is easier to configure globally for the app 2012-02-10 22:25:59 +07:00
Rachman Chavik
2dc9986fad moving methods from TextHelper to String 2012-02-10 22:25:59 +07:00
Rachman Chavik
6fdaef10c8 moving NumberHelper to CakeNumber 2012-02-10 22:25:59 +07:00
Rachman Chavik
04cdef9126 moving TimeHelper to CakeTime 2012-02-10 22:25:59 +07:00
ADmad
e2b273e891 Renaming option type to tag to avoid potential conflict in future with html attribute. 2012-02-10 19:44:55 +05:30
ADmad
7a42290021 $options param in Helper::assetUrl() now defaults to empty array. 2012-02-10 19:05:15 +05:30
ADmad
be694d8d6b Allowed specifying media path using 'src' attribute 2012-02-10 13:06:55 +05:30
mark_story
0cfec525b2 Allow SqlServer to execute procs correctly. 
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.

Fixes #2558
 2012-02-09 22:27:30 -05:00
mark_story
bea50f5246 Fix whitespace. 2012-02-09 20:00:25 -05:00
Thomas Ploch
059a5f21ed Fixed TODO: Refactored setting of Cookies into CakeResponse. 2012-02-09 14:24:10 +01:00
Mark Story
ae9ff9fbd0 Merge pull request #421 from tigrang/plugin-assets 
Plugin.asset support for HtmlHelper::css , script, and image
 2012-02-08 17:31:44 -08:00
Mark Story
7fb4738506 Merge pull request #468 from majna/2.1-bake-skel 
Fix console option parser for --empty in ProjectTask.
 2012-02-08 17:29:02 -08:00
Yasushi Ichikawa
e8a9d93eb5 Add params option to logQuery() 
Parameters for prepared statements are now part of the
logged query data.
 2012-02-08 20:15:40 -05:00
Tigran Gabrielyan
07899938b5 Changed hard-coded full base url to use FULL_BASE_URL constant 2012-02-07 20:26:16 -08:00
Tigran Gabrielyan
7fe6a4d5ea Added Plugin.asset support for HtmlHelper css(), script(), and image() with tests 2012-02-07 20:20:50 -08:00
ADmad
bf700c826a Made specifying 'extension' optional. Fixed bug where downloaded file did not have extension when 'name' was specified. Fixes #2554 2012-02-08 01:08:04 +05:30
Majna
b61f46b030 Add Console/Templates and webroot/files to bake skel. Update tests. 2012-02-07 18:51:04 +01:00
Majna
454f383951 Fix console option parser for --empty in ProjectTask. 
Command 'cake bake project --empty myapp' ignores argument myapp.
 2012-02-07 18:35:12 +01:00
Thomas Ploch
07b16987a3 Fixed strict checking of 'required' attributes. 2012-02-07 15:31:27 +01:00
Thomas Ploch
4f3b266491 Added support for simplified required validation on 'create' or 'update'. Added testcases for new 'required' attributes and conflicts with the 'on' key. Fixes #230. 2012-02-07 12:15:04 +01:00
mark_story
4949a87b7e Fix issues with duplicate msgid values. 
Msgid values could be duplicated if the same string was used
for singular and pluralized translations.  Re-index how the data is
stored so duplicate singular detection per domain is easier.

Fixes #2538
 2012-02-06 21:25:11 -05:00
Vinícius Krolow
fa5f175244 Improve the extract to know when there is the same string inside one plural 
Fixes #2538
 2012-02-06 20:10:33 -05:00
ADmad
b6f99bc0b9 Refactored Helper::assetUrl() a bit and added test cases. 2012-02-07 03:25:59 +05:30
ADmad
610213dd6c Added test for deleting dependent hasMany associated records. Refs #2553 2012-02-07 01:12:14 +05:30
ADmad
c0690a3eff Added reponse object as property of View class View::$response. Refactored HtmlHelper::media() a bit. 2012-02-06 20:45:00 +05:30
ADmad
c57275636c Replacing HtmlHelper::video() with HtmlHelper::media() which can generate either audio or video element 2012-02-06 18:57:16 +05:30
ADmad
2f7f00daa2 "preload" is not a minimized attribute 2012-02-06 12:37:13 +05:30
Mark Story
87f463f40b Merge pull request #461 from ProLoser/appshell-patch 
Added missing AppShell.php file to core
 2012-02-05 17:20:09 -08:00
Jose Lorenzo Rodriguez
5886b25345 Releasing 2.0.6 2012-02-05 19:33:52 -04:30
ADmad
e0f86d83b7 Merge pull request #464 from scottharwell/2.1-not-in-test-case 
Added test case for fix in e1738c8
 2012-02-05 14:04:32 -08:00
ADmad
22220074f2 Added HtmlHelper::video() for html5 video element generation. Extracted asset url generation code to new function Helper::assetUrl(). 2012-02-06 01:30:38 +05:30
Scott Harwell
dddcdd105e Added test case for fix in e1738c8c 2012-02-05 13:37:54 -05:00
mark_story
f799d1c056 Add absolute path to cake/vendors. 
When the app + cake are on different paths, `VENDORS` is incorrect, and
the built-in repo/vendors directory is not reachable by the default
paths.

Fixes #2545
 2012-02-05 13:07:01 -05:00
mark_story
4bb4040851 Check method existence before calling. 
Datasource does not implemente calculate() or
expression().  Only call them if they exist.

Fixes #2535
 2012-02-05 12:54:20 -05:00
mark_story
f3b990bf0f Correct path display for plugins. 
Fixes #2548
 2012-02-05 12:00:55 -05:00
Mark Story
d56cc43cc5 Merge pull request #462 from tPl0ch/2.0-deprecated 
Added handling of E_USER_DEPRECATED to ErrorHandler and Debugger.
 2012-02-05 06:46:49 -08:00
0x20h
3abfaeecf3 Don't let every role inherit from default role. Filter empty aco paths 2012-02-05 15:30:26 +01:00
ADmad
12bf1348f5 Merge branch '2.0' into 2.1 2012-02-05 17:55:46 +05:30
ADmad
b5c7ca2ee9 Added self closing tag format. 2012-02-05 17:43:23 +05:30
Thomas Ploch
94e5ec0545 Added handling of E_USER_DEPRECATED to ErrorHandler and Debugger. 2012-02-05 12:10:07 +01:00
Dean Sofer
ff91a7978e Added missing AppShell.php file to core 2012-02-05 01:47:56 -08:00
ADmad
6f09f5dfc8 Added missing file extension to mime type mapping for files used with html5 audio/video tags 2012-02-05 05:41:02 +05:30
mark_story
18cb9a2fc8 Fix content type errors. 
'serialize' should be '_serialize'.
 2012-02-04 11:12:45 -05:00
mark_story
07dc558fb1 Sync CSS file with app/webroot. 2012-02-04 11:03:01 -05:00
mark_story
5cf5ee4410 Clarify which cache is using the indicated engine. 2012-02-04 10:42:48 -05:00
mark_story
ace9fefb02 Merge branch '2.0' into 2.1 2012-02-03 21:54:50 -05:00
mark_story
49a48ced89 Don't restrict to BASE_TABLE. 
This allows Views, and custom table types
to be connected to models in SqlServer.

Fixes #2529
 2012-02-03 21:54:26 -05:00
mark_story
437d68c60b Handle the case where viewPath changes. 
Fixes #2537
 2012-02-03 21:29:37 -05:00
Shadow6363
62e671f6b8 Changed MySQL in comment to SQLite. 2012-02-03 21:03:34 -05:00
mark_story
ee083e047e Fix errors with missing sub directories. 
Missing content-type specific errors shouldn't trigger fatal errors.
Instead a html view should be rendered as a last resort.

Fixes #2537
 2012-02-02 21:25:46 -05:00
mark_story
f5d05d9ea9 Fix https + query string requests. 
Using https + query strings would result in port 80 instead of the
default https port.

Fixes #2530
 2012-02-01 21:10:56 -05:00
mark_story
e697c68da5 Uncommented code works better. 2012-02-01 20:24:02 -05:00
mark_story
b03d7ba9b3 Fix reset() missing delivery property. 
Fixes #2533
 2012-02-01 20:20:14 -05:00
mark_story
167a551656 Fix incorrect doc block. 2012-02-01 19:30:56 -05:00
Ceeram
62df929342 adding test for image in subdir and fullbase, closes #2534 2012-02-01 14:37:46 +01:00
Ceeram
c8eae93292 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Network/Http/HttpSocket.php
 2012-02-01 12:11:01 +01:00
Ceeram
cccf663c23 omit equal sign if query component is not a key value pair 2012-02-01 12:04:52 +01:00
mark_story
94778ef673 Add block option to HtmlHelper::scriptBlock() 2012-01-31 22:20:21 -05:00
Stefano Zoffoli
edeca2fd3c Fix for extending plugin's view 
Signed-off-by: mark_story <mark@mark-story.com>
 2012-01-31 21:04:21 -05:00
mark_story
e8d3d7ce38 Fix failing test. 
Paths changed.  The Lib directory shouldn't be in the view paths.
 2012-01-30 22:31:19 -05:00
mark_story
01b45cc246 Add files I forgot in previous commit. 2012-01-30 22:29:52 -05:00
mark_story
6c7a14e482 Adding fallback path to plugin. 
This matches the recent changes for the app dir.
Adding tests for the plugin variant.
 2012-01-30 22:21:00 -05:00
Matthew Lanigan
8ed4876830 Add APP/Package to tested paths in App::load() 2012-01-30 10:31:35 -05:00
Anton
57eec6e6fc added decoding of keys for named parameters 2012-01-30 00:26:56 +02:00
Anton
57bd1ea5f9 added test for check nested url 2012-01-30 00:25:48 +02:00
mark_story
a275555297 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Datasource/CakeSession.php
 2012-01-29 15:38:56 -05:00
mark_story
4dd13ef554 Fix issue where session would always be regenerated. 
Fixes #2519
 2012-01-29 15:37:14 -05:00
mark_story
a4740f02f1 Remove odd inflection. 
This additional inflection isn't needed.  People can type the classname
they want.

Refs #2514
 2012-01-29 13:56:53 -05:00
mark_story
e770c7a72d Split the AclComponent classes up. 
Refs #2514
 2012-01-29 13:54:26 -05:00
mark_story
1600322a54 Splitting ConfigReaderInterface out into a separate file. 
Refs #2514
 2012-01-29 13:30:05 -05:00
mark_story
b9053161f4 Split I18nModel into a separate file. 
Refs #2514
 2012-01-29 13:28:08 -05:00
mark_story
0fb6f88a2e Split Cache + CacheEngine into separate files. 
Refs #2514
 2012-01-29 13:25:06 -05:00
ADmad
ca32ca185a Fixing API docblock 2012-01-29 22:24:26 +05:30
Tigran Gabrielyan
30d6341e7f Fixed bug in CacheHelper where PluginAppController was not being loaded 
Signed-off-by: mark_story <mark@mark-story.com>
 2012-01-28 22:35:42 -05:00
Mark Story
21cf8ad018 Merge pull request #448 from majna/2.1-paging-current 
Add option for 'current' class to PaginationHelper::numbers().
 2012-01-28 10:06:56 -08:00
Majna
d7b06194a4 Add option for 'current' class to PaginationHelper::numbers(). 2012-01-28 18:24:28 +01:00
slimus
7c08e4b0f4 Update lib/Cake/Console/Shell.php 2012-01-28 23:45:44 +07:00
slimus
57e4751a82 fix shell help for incorrect user input 2012-01-28 16:36:59 +07:00
mark_story
752711e963 Fix missing behavior constructor. 2012-01-27 21:10:57 -05:00
mark_story
fb7717c0da Fix wonky tabs. 2012-01-27 20:59:03 -05:00
mark_story
3b9f88030e Add tests for previous commit. 2012-01-27 20:59:03 -05:00
mark_story
9ff0739504 Improving test generation. 
Class construction can be a bit more complicated now.
 2012-01-27 20:59:03 -05:00
mark_story
d904ab00fa Merge branch '2.0' into 2.1 2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8 fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464 2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/View/ThemeView.php
 2012-01-26 21:40:18 +01:00
ADmad
00649cbdde Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44251 and #45748. Closes #2509 2012-01-26 17:56:42 +05:30
mark_story
9089bba84b Fix failing test. 2012-01-25 21:19:16 -05:00
mark_story
5b9d69fcc8 Update image() docs. 2012-01-25 21:14:01 -05:00
Mark Story
7cfd27e7f6 Merge pull request #419 from radig/2.1 
Fix HtmlHelper::link test and extend HtmlHelper::image (issue #2476)
 2012-01-25 18:05:56 -08:00
mark_story
f02a3b0531 Wrap aliases containing , in "" 
Fixes #2502
 2012-01-25 21:03:03 -05:00
AD7six
ecbe337052 Make extending a missing element throw an exception 
A layout extending a missing layout throws a missing-layout exception
A view extendinga missing view throws a missing-view exception
Now, an element extending a missing element throws a logic exception

in addition "absolute" paths can be used such that (using elements as an
example)

$this->extend('foo') - extends View/Elements/foo.ctp
$this->extend('/foo') - extends View/foo.ctp

Closes #2504
 2012-01-25 13:04:45 +01:00
Ceeram
6d69ec3a78 update book link 2012-01-25 10:12:59 +01:00
mark_story
154b001552 Fix tests that fail on windows. 
Refs #2148
 2012-01-24 21:12:26 -05:00
mark_story
bd0104d972 Add methods to CakeTestCase 
Add assertTextEquals, and assertTextNotEquals for doing
platform independant text comparisons.

Refs #2148
 2012-01-24 21:08:56 -05:00
mark_story
29514b08fb Fix re-numbering of values in exportVar() 
Using array_merge resulted in values being re-indexed,
change how arrays are combined to preserve keys.

Fixes #2506
 2012-01-24 20:52:43 -05:00
mark_story
dbece1f157 Add test for saveField() + foreign key. 
Closes #2507
 2012-01-24 20:32:48 -05:00
mark_story
b8e27c7588 Fix indentation. 2012-01-24 20:32:06 -05:00
AD7six
11ed1e6ea5 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-24 13:55:56 +01:00
AD7six
def96c0460 throw an exception if the view you try to extend doesn't exist 
or element, or layout
 2012-01-24 13:54:39 +01:00
Ceeram
95aa7e32c3 include theme in _passedVars array 2012-01-24 10:42:18 +01:00
mark_story
354716cf60 Fix issues with sparse arrays in ThemeView. 
Fixes #2500
 2012-01-23 20:22:06 -05:00
Kyle Robinson Young
f69edb5c80 Remove incorrect parameter in HtmlHelper::script docblock example 
Fixes #76
 2012-01-23 16:01:38 -08:00
Ceeram
4f1be12046 Merge branch '2.1-appshell' into 2.1 2012-01-23 15:29:03 +01:00
Jose Lorenzo Rodriguez
62b203f54c Update version number to 2.1.0-beta 2012-01-22 21:18:22 -04:30
Graham Weldon
64d4387c82 Added default prefix to cache configurations. 2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
9d0a67ddec Avoiding class name conflicts 2012-01-22 16:46:41 -04:30
José Lorenzo Rodríguez
5cc2860c41 Merge pull request #437 from josegonzalez/2.1-theme-view 
2.1 theme view
 2012-01-22 12:52:00 -08:00
Jose Diaz-Gonzalez
c2519e702d Merging ThemeView and View class 
In 2.1, the ThemeView is merely a small wrapper around View with extra paths set. Merging these two classes means there is one less property for developers to set to enable themes in their applications.
 2012-01-22 15:45:26 -05:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a Set encoding in CSS file. 
Signed-off-by: mark_story <mark@mark-story.com>
 2012-01-22 11:34:16 -05:00
Jose Lorenzo Rodriguez
a1daaf5960 Merge branch '2.1-http' into 2.1 2012-01-21 15:51:34 -04:30
Jose Lorenzo Rodriguez
1884cd1f28 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-21 15:49:25 -04:30
Jose Lorenzo Rodriguez
37314a2188 Logging transaction commands in DboSource, fixes #2457 2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52 Preventing datasource creationa and access on models having $useTable = false; 2012-01-21 14:03:11 -04:30
mark_story
70bb839de9 Add validation guess for not null + text types. 
Fixes #2493
 2012-01-21 13:10:30 -05:00
mark_story
bc689151a4 Add note about PHP's include_path. 
Refs #2497
 2012-01-21 10:23:25 -05:00
mark_story
df5d9ac3d1 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
 2012-01-20 20:28:15 -05:00
mark_story
e6f5ebc257 Merge changes from hmic/CakeEmail-2.0 
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.

Fixes #GH433
 2012-01-20 20:17:02 -05:00
Ceeram
d4e2fbf6b8 set correct default validate option, now matches saveAll/saveMany default value, fixes #2492 2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3 Merge changes from 1.3 to 2.0 
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
 2012-01-19 22:50:40 -05:00
mattpotts
1c645152ca added sftp to url() 2012-01-19 22:05:10 -05:00
mark_story
69a69d48a2 Add test for Validation::url() + sftp. 2012-01-19 22:04:10 -05:00
Jose Lorenzo Rodriguez
00a5510b1d Readability changes 2012-01-19 22:26:59 -04:30
Jose Lorenzo Rodriguez
5df2a0957f Not sending the response in beforeRender, better let Dispatcher do its work 2012-01-19 22:26:32 -04:30
mark_story
1693478889 Adding test for #GH424 2012-01-19 21:50:51 -05:00
mark_story
ad304e0b43 Reformat long line. 2012-01-19 21:50:51 -05:00
Mark Story
599d8b885c Merge pull request #424 from stefanozoffoli/patch-2 
Prevent blackhole auth error where are present multi fields
 2012-01-19 18:50:39 -08:00
mark_story
eb101b9eb8 Update Model::saveAssociated() documentation 
Fixes #2492
 2012-01-19 21:10:46 -05:00
wnasich
c95ab282dc Test case and Fix for: Number::currency() issue 
Fixes currency() for custom formats and numbers between -1 and 1.

Fixes #2489

Conflicts:

	lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
	lib/Cake/View/Helper/NumberHelper.php
 2012-01-19 21:07:27 -05:00
ADmad
d61b6dc7d3 Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487 2012-01-20 04:05:40 +05:30
Ceeram
2a9e6771c3 allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769 2012-01-19 23:26:43 +01:00
ADmad
2c239cc851 Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487 2012-01-20 03:31:08 +05:30
Stefano Zoffoli
c3b806ce8c Prevent blackhole auth error where are present multi fields 2012-01-19 17:48:39 +01:00
AD7six
b62d9729a9 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-19 10:51:24 +01:00
AD7six
a5240e23ab Merge branch 'feature/set-nest' into 2.1 
Conflicts:
	lib/Cake/Model/Model.php
 2012-01-19 10:51:09 +01:00
Jose Lorenzo Rodriguez
769a5c24e6 Fixing some failing test cases 2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
979f7a28b5 Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in 
RequestHandlerComponent
 2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
28ee27e2dd Making it possible to cancel the render() process from any beforeRender listener 2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3 Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive 2012-01-19 01:08:45 -04:30
José Lorenzo Rodríguez
6839f0c450 Fixing typo in docblock 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
a7662eba57 fixing doc comment identation 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dffe84cfbc Implementing RequestHandler::checkNotModified() as a helper for HTTP caching 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
8e979cc83e Implementing CakeResponse::notModified() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb Implementing the CakeResponse::etag() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6 Adding CakeResponse::vary() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e Implementing mustRevaidate() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571 Removing Pragma headers, implementing sharedMaxAge in CakeResponse 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
2428e83e3f Adding test case for maxAge() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f Implementing the modified() method in CakeResponse to have an easier way of setting the modification time 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2 Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e Not appending the charset information for content types that are not text/* in CakeResponse 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6 Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130 Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e Adding protocol() method to CakeResponse to be able to change it on the fly 2012-01-19 01:08:43 -04:30
Scott Harwell
e1738c8c4a Added check for NOT in key when array count === 1 to prevent SQL error 2012-01-18 15:04:53 -05:00
0x20h
4532659fed code cleanup, added some tests 2012-01-18 20:59:44 +01:00
AD7six
f1f1ce0db4 allow specifying an explicit root 2012-01-18 13:05:44 +01:00
Cauan Cabral
03bac42366 Change fullPath option to fullBase in HtmlHelper::image for consistency 
Updated test cases for that.
Included doc block about that option.
 2012-01-18 08:32:40 -03:00
mark_story
5e495ad90c Simplify how options are checked. 2012-01-17 21:57:22 -05:00
Mark Story
e080bb27b9 Merge pull request #411 from fitorec/2.0 
Check the logic in the Shell::in($prompt, $options = null, $default = null)
 2012-01-17 18:53:00 -08:00
Mark Story
8608caa8a2 Merge pull request #298 from vitorpc/2.0 
Property 'name' removed of PagesController.
 2012-01-17 18:52:26 -08:00
Cauan Cabral
90426674cb Merge branch 'master' into 2.1 2012-01-17 23:18:54 -03:00
Cauan Cabral
d2315ef35b Fix test for HtmlHelper::link 2012-01-17 23:15:11 -03:00
Cauan Cabral
0c0135ff5e Option to return img src with fullpath address 2012-01-17 22:55:24 -03:00
Majna
d2dd861417 Update doc block for 'keepExisting' HABTM option. 2012-01-17 22:02:30 +01:00
Majna
e947df36a5 Remove unnecessary condition in Model::getID(). 2012-01-17 21:57:40 +01:00
Majna
826374e57c Remove unnecessary param when calling begin, commit and rollback on datasource. 2012-01-17 21:52:22 +01:00
Ceeram
828117583f fix that argument with 0 as value will stop parsing args, tests added 2012-01-17 20:01:40 +01:00
mark_story
c81fe6249d Fix prefix = false in connect() 
Connecting routes with a prefix = false created an un-matchable route.
Ignore falsey prefix values when setting up prefixes.

Fixes #2479
 2012-01-16 21:30:26 -05:00
Scott Harwell
153b9f9ee2 Updated to use camelize rather than classify 2012-01-16 20:52:05 -05:00
Scott Harwell
33dc57e667 Added check for duplicate methods to prevent fatal php error 2012-01-16 14:45:12 -05:00
Renan Gonçalves
3a3d89d6d1 Updating test to reflect last changes made by pull #413. 2012-01-16 16:51:49 +01:00
Bob Fanger
5cb974ee70 Fixes the MethodNotAllowed when deleting a model from an scaffolding view.ctp page 2012-01-16 16:21:06 +01:00
Fitorec
ddbaa66997 Reviewing the logic in the Shell::in($prompt, $options = null, $default = null) 2012-01-15 21:16:45 -06:00
Jose Diaz-Gonzalez
adde2a9af5 Fixed broken Controller::setAction() testcase 2012-01-15 15:16:49 -05:00
Jose Diaz-Gonzalez
ad2472aab0 Testcase for Controller::setAction() 2012-01-15 15:00:30 -05:00
Jose Diaz-Gonzalez
6046b8d013 Properly set the current action on CakeRequest when invoking Controller::setAction() 2012-01-15 14:32:09 -05:00
ADmad
f11389fd10 Merge pull request #404 from tigrang/router-defaultRouteClass-fix 
Router::defaultRouteClass() now returns currently set route class if no param is passed. Also added Router::_validateRouteClass() for route class validation.
 2012-01-15 00:44:43 -08:00
Jose Lorenzo Rodriguez
ef568b1159 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-14 23:31:56 -04:30
Jose Lorenzo Rodriguez
81b41aa561 Optimizing Configure::delete(), you can now delete arbitrarily nested keys 2012-01-14 23:30:31 -04:30
Jose Lorenzo Rodriguez
eab2d8aa66 Optimizing Configure::read(), now it is possible to read arbitrarily nested keys 2012-01-14 23:22:08 -04:30
Tigran Gabrielyan
f5b62eb84c Fixed typo in DocBlock 
Router::defaultRouteClass will return the current routeClass if null is
passed
Router::connect and Router::defaultRouteClass both validate the routeClass
now using Router::_validateRouteClass
 2012-01-14 18:45:51 -08:00
AD7six
67f4fa0f20 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-15 01:03:48 +01:00
AD7six
22f844c48f prevent block="css" when using inline=false css 2012-01-15 01:03:17 +01:00
mark_story
c89c49c310 Enhance HtmlHelper::getCrumbs() $startText param 
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.

Fixes #2475
 2012-01-14 13:14:26 -05:00
Ceeram
7badb1d252 fix magic __isset() 2012-01-14 12:42:10 -05:00
Jose Lorenzo Rodriguez
3a48f64370 Optimizing and simplifying Configure::write(), this also allows arbitrary nesting limit in configure keys 2012-01-14 02:15:31 -04:30
0x20h
c6624faf76 more clear test setup 2012-01-13 23:51:18 +01:00
0x20h
9838338976 docblocks 2012-01-13 23:34:35 +01:00
0x20h
bfaea78504 allow more elaborate regex rules 2012-01-13 23:29:23 +01:00
0x20h
95a41af9db allow multiple roles for a rule to be specified as string or array 2012-01-13 22:02:25 +01:00
0x20h
ef5eead038 use more appropriate array key when passing options to the adapter 2012-01-13 21:55:47 +01:00
0x20h
6ddf6dad36 reverting my mistake 2012-01-13 21:50:03 +01:00
0x20h
153152642c PHP configuration file base Acl implementation 2012-01-13 21:43:48 +01:00
mark_story
b14072aa6f Add Router::defaultRouteClass() 
Apply patch from 'Tigran Gabrielyan'.
Allows you to set the default route class used for all future
routes.

Fixes #2435
 2012-01-12 22:19:55 -05:00
Mark Story
533feea2b1 Merge pull request #403 from rintaun/patch-2 
$action in AclShell::_getParams() should default to '*', not NULL
 2012-01-12 19:08:42 -08:00
Mark Story
b76f8f8832 Merge pull request #260 from tPl0ch/2.1-authenticate 
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate
 2012-01-12 18:53:19 -08:00
mark_story
b6040aec5a Update UpgradeShell for App classes. 
Correctly move AppController and AppModel.
Fixes #2472
 2012-01-12 21:37:34 -05:00
Jose Lorenzo Rodriguez
2c5cb1157f Merge branch '2.1-alltests' into 2.1 2012-01-12 20:13:58 -04:30
Jose Lorenzo Rodriguez
e25867da79 Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP 2012-01-12 20:12:38 -04:30
Jose Lorenzo Rodriguez
205064f11e Merge remote-tracking branch 'origin/2.1' into 2.1 2012-01-12 19:14:50 -04:30
Jose Lorenzo Rodriguez
e6e14a7ff9 Fixing php 5.2 specific problem, closes #2468 2012-01-12 19:13:56 -04:30
Ceeram
eaf6f0e2c1 add missing App::uses() 2012-01-12 18:01:27 +01:00
Ceeram
9c652e6573 add missing tests 2012-01-12 13:06:24 +01:00
Ceeram
9f40e6de79 move AppShell to app/Console/Command directory 2012-01-12 11:55:10 +01:00
AD7six
7414d0f77b rename set::getValue to set::get - and make it public 2012-01-12 09:45:28 +01:00
Matthew Lanigan
0e607bf880 $action in AclShell::_getParams() defaults to '*', not NULL 2012-01-11 21:59:58 -05:00
mark_story
97ce118294 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Utility/ClassRegistry.php
 2012-01-11 20:59:31 -05:00
Jose Lorenzo Rodriguez
1a741b853b Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-11 21:26:12 -04:30
Jose Lorenzo Rodriguez
c53f0e6877 Explicitly casting to string a variable that could in times be either string or integer 2012-01-11 21:25:22 -04:30
mark_story
4d73f4e6a1 Fix boundaries used in multi-part messages. 
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
 2012-01-11 20:44:42 -05:00
Hans-Joachim Michl
29cfdb4b41 Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries. 
Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
 2012-01-11 20:30:49 -05:00
mark_story
0f8e1500de Ensure helpers are loaded in data views. 
Both XmlView and JsonView should load helpers when
they use view files.

Fixes #2465
 2012-01-11 20:21:56 -05:00
Victor Yap
cf8c1cd93b Return length 36 for uuid columns in Postgres.describe() 
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.

Fixes #2467
 2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7 Replace smart quotes with ASCII equivalents. 
Fixes #2466
 2012-01-11 13:38:50 -05:00
mark_story
aeda986745 Add additional empty() for tablePrefix. 
Fixes compatibility issues with plugins that worked correctly in
previous point releases.

Fixes #2462
 2012-01-10 21:01:03 -05:00
mark_story
7877e7f997 Make allow(null) and deny(null) consistent with no args. 
No arguments and a single null should be handled the same.

Fixes #2461
 2012-01-10 20:32:12 -05:00
mark_story
a8bc916104 Move check out of the loop, and allow nulls. 
Refs #2341
 2012-01-10 20:15:59 -05:00
AD7six
941d503726 documentation clarification 2012-01-10 10:52:07 +01:00
AD7six
a62c5350b3 whitespace 2012-01-10 10:51:06 +01:00
AD7six
d5fdf45e51 add a test for what happens when you nest on a field that doesn't exist 2012-01-10 10:49:17 +01:00
AD7six
3b1dd82603 add tests for set nest method 2012-01-10 10:18:59 +01:00
AD7six
d534013570 reduce code repetition 2012-01-10 09:47:51 +01:00
mark_story
d238d8c0bb Fix incorrect __isset(). 
There was a missing $ before name.  Fixes issues
with dynamic properties not being handled correctly.

Fixes #2450
 2012-01-09 21:47:57 -05:00
mark_story
dbea15650b Add iPad to the list of mobile clients. 
Fixes #2452
 2012-01-09 21:33:13 -05:00
AD7six
5608d63541 allow set nest to work with any-d arrays 
not just model-formatted arrays
 2012-01-10 01:24:20 +01:00
AD7six
442d889f99 move the paths used into options 2012-01-10 00:48:36 +01:00
AD7six
7b640b8123 move find threaded logic to the set class 2012-01-10 00:24:38 +01:00
AD7six
b8598c5ca0 Ensure the class has a constructor 
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.

Conflicts:

	lib/Cake/Utility/ClassRegistry.php
 2012-01-09 23:42:09 +01:00
AD7six
336c750b7e Ensure the class has a constructor 
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
 2012-01-09 23:38:32 +01:00
ADmad
0be71a08d6 Adding / updating I18n class test cases. 2012-01-10 01:46:19 +05:30
ADmad
30522d0219 Adding $language parameter to I18n::translate() 2012-01-10 00:51:48 +05:30
ADmad
08825e54b7 Replacing hardcoded default domain with static property I18n::$defaultDomain 2012-01-10 00:51:48 +05:30
ADmad
1f246d61ca Refactoring I18n class to expose public methods to read .po, .mo and locale definition files. 2012-01-10 00:51:47 +05:30
mark_story
1ffde95239 Update version number to 2.1.0-alpha 2012-01-08 22:23:56 -05:00
mark_story
1bc4562f3a Fix failing test in App. 2012-01-08 22:14:32 -05:00
mark_story
0e56d742b8 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/basics.php
 2012-01-08 21:59:18 -05:00
mark_story
f4c27e04bc Fix errors generated when option['order'] is undefined. 
Fixes #2447
 2012-01-08 21:55:51 -05:00
mark_story
3c48552f81 Fix error with more case-sensitive databases. 2012-01-08 21:40:12 -05:00
mark_story
c548b6b88a Fix issue with find(count) and translated conditions. 
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.

Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.

Fixes #2349
 2012-01-08 20:40:25 -05:00
Jose Lorenzo Rodriguez
c029316a62 Merge branch '2.1-hiphop' into 2.1 2012-01-08 20:12:40 -04:30
Jose Lorenzo Rodriguez
850dbb9453 More explicit fetch mode in Mysql datasource 2012-01-08 18:46:42 -04:30
mark_story
9a67a70703 Fix failing test. 2012-01-07 20:24:33 -05:00
mark_story
79564fb7d4 Remove incorrect constant. 2012-01-07 20:10:14 -05:00
mark_story
72b9eb540e Update core cake.php to match other versions. 
This makes the pear package install play nice as well.
 2012-01-07 20:05:11 -05:00
mark_story
da5d4bb816 Revert version number change. 
Add trim to fix cli display.
 2012-01-07 20:05:11 -05:00
mark_story
6361500124 Update version number to 2.1.0-alpha 2012-01-07 20:05:10 -05:00
Jose Lorenzo Rodriguez
8b7f069415 Wrapping highlight_string into a helper function as hphp does not implemnet this function 2012-01-07 19:10:44 -04:30
Jose Lorenzo Rodriguez
44dd25010d Adding a replacement for zend_thread_id() to use within hiphop 2012-01-07 18:41:16 -04:30
Jose Lorenzo Rodriguez
67d18b0c59 Making sure the Validation class exists before checking methods on it 2012-01-07 18:33:24 -04:30
Jose Lorenzo Rodriguez
7b586369e0 Initializing CakeSession class only when required, mixing procedural code with class definitions is not good 2012-01-07 18:31:50 -04:30
Jose Lorenzo Rodriguez
399c293b77 Extracting the CakeSessionHandlerInterface into its own file 2012-01-07 18:20:16 -04:30
Jose Lorenzo Rodriguez
e5c312f4b5 Using an explicit fetch mode in all calls to PDOStatement::fetch, this also reduces the memory usage 2012-01-07 18:06:02 -04:30
Jose Lorenzo Rodriguez
fa99b58622 Ensuring the javascript provider class is loaded before checking method on it 2012-01-07 18:03:22 -04:30
mark_story
beced84d2d Fix illegal offset caused by TranslateBehavior. 
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.

Fixes #2443
 2012-01-07 11:58:35 -05:00
mark_story
87924414fc Update Configure::load() to use Set::merge() 
This fixes some of the awkward behavior that using
array_merge_recursive() could create.

Fixes #2441
 2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
1991430584 Removing test that does not relate anymore to SqlServer datasource 2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d Fixing a few SqlServer failing tests 2012-01-07 02:14:07 -04:30
Jose Lorenzo Rodriguez
abb370fe3f Fixing windows failing test case on the debug function 2012-01-07 01:39:40 -04:30
Jose Lorenzo Rodriguez
ba097d404f Explicitly using a fetch mode in SQLServer, not doing it causes serious memory leaks 2012-01-07 01:04:02 -04:30
Jose Lorenzo Rodriguez
cd562f52ba Fixing a couple failing tests on windows using sqlserver 2012-01-07 00:37:50 -04:30
mark_story
de7921a5d4 Merge branch '2.0' into 2.1 2012-01-06 23:06:37 -05:00
mark_story
9a7e69df7f Add missing else for non SQLServer db's. 2012-01-06 23:06:12 -05:00
mark_story
15c7493e39 Merge branch '2.0' into 2.1 2012-01-06 23:02:16 -05:00
mark_story
f23226b937 Fix failing test on windows 
File permissions do not work the same on windows, skip the test.
 2012-01-06 23:01:59 -05:00
mark_story
d69c3f3db6 Fix failing tests with SQLServer. 2012-01-06 22:53:39 -05:00
mark_story
f22c80e9ec Add skip for test that fails on SQLServer. 
SQLServer doesn't support LIMIT, skip the test as its tested
in Jenkins all the time.
 2012-01-06 22:21:54 -05:00
mark_story
e649a0516e Fix singularization of 'foes' 
Fixes #2424
 2012-01-05 21:22:40 -05:00
Jose Lorenzo Rodriguez
7c0297a92c Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-05 19:58:15 -04:30
Jose Lorenzo Rodriguez
00a0c60733 Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales' 2012-01-05 19:56:01 -04:30
Majna
8ad989cabe Fix dispatching event when event key name is used. 2012-01-05 18:31:00 +01:00
Simon Males
adc6846145 schema update fails with -f flag, although it's supported. 2012-01-05 16:54:02 +11:00
mark_story
95ec741b6c Changing SCRIPT_NAME to PHP_SELF 
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.

Fixes #2437
Fixes #2334
Fixes #2268
 2012-01-04 21:10:29 -05:00
José Lorenzo Rodríguez
f9c8d0cbf9 Merge pull request #394 from majna/2.0-sess-doc 
Remove unused property CakeSession::$security.
 2012-01-04 16:20:24 -08:00
Majna
75b4e7d550 Remove unused property CakeSession::$security. 2012-01-04 22:09:40 +01:00
José Lorenzo Rodríguez
3589eaebcf Merge pull request #393 from majna/2.0-sess-doc 
Fix incorrect doc block in CakeSession.
 2012-01-04 12:49:36 -08:00
Majna
ba02cf7a9a Fix incorrect doc block in CakeSession. 2012-01-04 21:40:14 +01:00
mark_story
9562638610 Merge branch '2.0' into 2.1 2012-01-04 07:39:35 -05:00
mark_story
3e1c567f08 Remove duplicate methods. 
Fix regression where #1345 was re-introduced.
Fixes #2434
 2012-01-03 21:11:45 -05:00
mark_story
c43b099894 Fix null bytea columns. 
Apply patch from 'opiazer'  Fixes #2432
 2012-01-03 20:51:56 -05:00
mark_story
101148c10f Return 0 if there is no result. 
The documented return is an integer.  Stick to that.
Fixes #2430
 2012-01-02 20:18:01 -05:00
mark_story
b4faa00703 Adding error to find(threaded). 
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.

Fixes #2341
 2012-01-02 13:46:35 -05:00
Mark Story
81d7ef46c5 Merge pull request #392 from vesln/resource-map 
Resource map
 2012-01-02 05:23:30 -08:00
Veselin Todorov
3eea2e2073 Adding resourceMap accessor test 2012-01-02 13:53:32 +02:00
Veselin Todorov
8864805277 Adding resourceMap accessor 2012-01-02 13:53:21 +02:00
mark_story
997aa8a37b I'm an idiot. Fix the parse error. 2012-01-01 21:29:13 -05:00
mark_story
83987bee17 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Network/CakeRequest.php
 2012-01-01 21:15:27 -05:00
mark_story
ac408b38e3 Add Windows Phone OS to mobile browser list. 
Fixes #2428
 2012-01-01 12:57:35 -05:00
Kyle Robinson Young
8b9770d34d Fix types in docblocks in App class 2011-12-31 14:51:24 -08:00
mark_story
c3e9a931d6 Should have been association name, not field name. 2011-12-30 20:54:26 -05:00
mark_story
b5f918765e Adding docs + exceptions for name translation. 
Closes #2367
 2011-12-30 20:39:04 -05:00
mark_story
6c902a19b3 Fix issue with rendering elements inside blocks. 
Fixes exceptions being raised when you tried to render
elements inside blocks.  Instead compare the number of open blocks.
This should not change before/after rendering a view.
 2011-12-30 14:56:31 -05:00
mark_story
3478f8a627 Merge branch '2.0' into 2.1 2011-12-30 10:19:51 -05:00
Mark Story
a4e3790196 Merge pull request #387 from shama/patch-text-truncate 
Prevent TextHelper::truncate() from breaking HTML
 2011-12-30 07:15:35 -08:00
mark_story
ed43c685b9 Fix string offset error in PHP 5.4 2011-12-29 22:10:12 -05:00
mark_story
ff29b194ed Fix version config. 2011-12-29 20:12:45 -05:00
mark_story
23178df504 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-12-29 20:03:42 -05:00
tigrang
015f9957be Changed order of controller var merging 
From AppController -> PluginAppController to
PluginAppConroller -> AppController

Fixes #2420

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-29 20:02:00 -05:00
mark_story
9cdf8042bf Fix issue with scripts_for_layout compatibility. 2011-12-29 11:58:05 -05:00
mark_story
5936fa5930 Fix strict errors. 2011-12-29 11:10:25 -05:00
Ceeram
929a40364f adding magic method__isset() for overloaded properties 2011-12-29 16:22:08 +01:00
Rachman Chavik
1d333fd8b7 fullTableName needs to check for empty schemaName 2011-12-29 19:18:37 +07:00
Rachman Chavik
b1aae5b5ab add fullTableName tests with empty schemaName 2011-12-29 19:17:06 +07:00
mark_story
339259c841 Update version to 2.0.5 2011-12-28 22:00:12 -05:00
Jose Lorenzo Rodriguez
a47c8160dd Merge remote-tracking branch 'origin/2.1' into 2.1 2011-12-28 19:29:48 -04:30
Mark Story
83b28c42cf Fix failing tests and missing boundary markers. 
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
 2011-12-27 23:38:21 -05:00
Mark Story
f366a9ff83 Add test for inline attachments. 2011-12-27 22:51:47 -05:00
Mark Story
0e4af546d6 Update sending attachments. 
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now.  Re-built the internals
of message rendering to remove duplication and redundant code paths.

Fixes #2413
Fixes #2320
 2011-12-27 22:51:47 -05:00
Mark Story
53598c722c Pulling out view rendering from boundary setting. 2011-12-27 22:51:47 -05:00
Mark Story
34eedcc017 Add a few regression tests for CakeEmail. 2011-12-27 22:51:47 -05:00
Mark Story
bbef4aa36d Convert assertions to assetContains. 2011-12-27 22:51:47 -05:00
Mark Story
8414d37e48 Add docblock examples for attachments. 2011-12-27 22:51:47 -05:00
Jose Lorenzo Rodriguez
6ac3b10a5e Making beforeDelete trigger first on behaviors and then in model 2011-12-27 22:49:50 -04:30
Mark Story
21ac8492b1 Adding an int cast. 
PHP 5.4 doesn't like floats for string offsets.
 2011-12-27 21:57:33 -05:00
Mark Story
e9813d7a97 Fix errors with illegal string offsets. 
If $_list becomes a string notice errors are triggered when trying
to do offsets in PHP 5.4
 2011-12-27 21:38:14 -05:00
Mark Story
2cc38b5ba7 Fix failing test in PHP5.4 2011-12-27 19:40:51 -05:00
mark_story
0b9b23fe38 Fix caching of paths when a plugin param is used. 
Plugin paths should not be cached as it makes subsequent look-ups
behave incorrectly.
 2011-12-27 19:24:16 -05:00
mark_story
69b1c33f1f Fix extending in loops. 2011-12-27 19:24:16 -05:00
mark_story
70981d05ca Throw an exception when a view extends itself. 2011-12-27 19:24:15 -05:00
mark_story
047e93e285 Clean up internal API's 
- There was some duplication in element() for handing plugins.
- Deprecate options[plugin] for element()
- Add file omitted in previous commit.
 2011-12-27 19:24:15 -05:00
Ceeram
d8cbe8a1f7 Cleaning up 
- Adding docblock
- Adding visibility keyword
- Update assertion methods.
- Split up tests into smaller methods.
 2011-12-27 19:23:52 -05:00
Ceeram
210f8c9e2c adding tests for plugindot syntax in view filenames 2011-12-27 19:22:21 -05:00
Ceeram
a72ccf28e3 accept dot syntax for element,view and layout filename from plugins fixes #2247 2011-12-27 19:22:21 -05:00
Mark Story
7f46ede097 Add more complete api docs for label() 
Fixes #2415
 2011-12-27 10:08:54 -05:00
Jose Lorenzo Rodriguez
33705f24bf returning the correct query in beforeFind in case callbacks return true 2011-12-26 13:38:04 -04:30
Jose Lorenzo Rodriguez
1651257919 Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again 2011-12-26 13:06:48 -04:30
Mark Story
eda916d85b Update tests to use assertContains 2011-12-26 12:03:48 -05:00
Mark Story
0750069126 Remove pointless condition. 2011-12-26 11:56:44 -05:00
mark_story
d8bc13f996 Fix incorrect time handling in deconstruct() 
Apply patch from 'Amit Badkas' to solve issues where invalid times
were treated as valid.
Re-structure tests to use a dataprovider instead of copy + paste.

Fixes #2412
 2011-12-26 10:03:14 -05:00
mark_story
bbad5d86bc Adding louder more informative error to i18n. 
When a plural form is wrong, or the Plural-Forms header is wrong, we should
give a more useful error message than strlen() does.  Also make a dumb guess
at what the correct translation is.

Fixes #2045
 2011-12-25 23:27:01 -05:00
Jose Lorenzo Rodriguez
35ecbfebde Making the CakeEvent -> ObjectCollection bridge more intelligent, adding tests 2011-12-25 23:17:08 -04:30
Jose Lorenzo Rodriguez
7fdc1cc8d4 Migrating the beforeRedirect callback to the CakeEventManager, reorganizing how events are triggered in controller 2011-12-25 22:48:27 -04:30
Jose Lorenzo Rodriguez
ffa12f4d47 Fixing test and implementing return values for events 2011-12-25 21:52:12 -04:30
Jose Lorenzo Rodriguez
078a2dfd72 Migrating View and Helpers events to use the CakeEvenManager 2011-12-25 19:00:19 -04:30
Jose Lorenzo Rodriguez
5d67195bf7 Migrating Controller events to use the CakeEventManager 2011-12-25 14:44:34 -04:30
Jose Lorenzo Rodriguez
0a49bd987c Refactoring subscriber attaching and making it possible to define multiple functions per event 2011-12-25 14:42:25 -04:30
Jose Lorenzo Rodriguez
07d358d2cd Making it possible to access name and subject directly on CakeEvent 2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
32fe854fab Adding test for event stopPropagation 2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
f1acd70bad Implementing a global event manager 2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
bb62f05890 Implementing subscriber detaching 2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
adf95a7ac6 Testing the subscriber object attaching to the manager 2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
bef20e6175 Starting to add subscriber classes support, inverted the parameter order for CakeEventManager::attach() 2011-12-25 14:42:24 -04:30
Jose Lorenzo Rodriguez
e8044cd528 Adding new general purpose event system, thanks to Florian Krämer for the original implementation 2011-12-25 14:42:24 -04:30
Kyle Robinson Young
acca796d10 Fix tag order when closing open tags with TextHelper::truncate() 2011-12-25 09:10:50 -08:00
Kyle Robinson Young
4e7e06fa9f Prevent TextHelper::truncate() from breaking HTML 
Fixes #2397
 2011-12-24 21:25:07 -08:00
mark_story
2c0e030831 Move call to tagIsInvalid to FormHelper 
tagIsInvalid() doesn't exist in Helper, and shouldn't be
called from that class.

Fixes #2411
 2011-12-23 20:41:16 -05:00
ADmad
e4cc18c0e7 Changing test case to make it pass on Sqlite 2011-12-24 01:18:07 +05:30
ADmad
053ebf211e More test case fixing 2011-12-24 01:04:38 +05:30
ADmad
f24c01c1f4 Fixed failing test cases. 2011-12-24 00:59:51 +05:30
Kyle Robinson Young
c8650165bb Add returnPath to test on SmtpTransport 2011-12-22 23:16:43 -08:00
ADmad
ba27c8c201 Added multi-model fieldList support 2011-12-23 02:07:48 +05:30
ADmad
e077cf8535 Fixing failing test case. 2011-12-22 03:37:04 +05:30
ADmad
bcab3d0cb9 Made default value and behavior of param $exceptions for Folder::tree() identical to same param in Folder::read() 2011-12-22 03:29:21 +05:30
ADmad
b84c9a1aaa Removing unused function Folder::_tree(). Added exception handling in Folder::delete(). 2011-12-22 03:22:46 +05:30
ADmad
389072708a Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
 2011-12-22 03:15:04 +05:30
ADmad
7339640ef2 Fixed files inside dot folder showing up even when hiding dot files/folder in Folder::tree(). Closes #2395 2011-12-22 02:55:24 +05:30
euromark
a41539dfa4 Indentation fix (tab instead of spaces) 
Fixes #2398

Conflicts:

	lib/Cake/Test/Case/Console/Command/ShellTest.php

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-20 22:26:43 -05:00
mark_story
c8fd7c090b Make App test cases the default. 
Fixes #2372
 2011-12-19 23:13:46 -05:00
mark_story
c272a8b3ca Update doc blocks. 2011-12-19 22:13:02 -05:00
mark_story
c13e6588f5 Datetime labels should point at the first input. 
Label elements generated for datetime/date/time inputs should point
at the first generated input. Apply + update patch from MrRio.

Fixes #427
 2011-12-19 22:09:46 -05:00
mark_story
866177f37d Fix issue with link generation and no title. 
Fix urlencoded text from being displayed in text of links.

Fixes #2387
 2011-12-19 20:49:01 -05:00
Kyle Robinson Young
5225fe2b5c Ability to set hiddenField value with FormHelper::checkbox 
Fixes #1811
 2011-12-18 23:34:19 -08:00
mark_story
2d68e7da1e Fix failing tests. 
You can't use finfo on files that don't exist.
 2011-12-18 23:26:57 -05:00
mark_story
f959fcefc4 Add File::mime() 
Fixes #1051
 2011-12-18 23:02:05 -05:00
Kyle Robinson Young
c34bf673d5 Remove extra space in HtmlHelper radio tag 2011-12-18 09:40:23 -08:00
Kyle Robinson Young
c93dab69a3 Correct placement of between on FormHelper radio and input 
Fixes #1992
 2011-12-18 08:25:42 -08:00
Fitorec
e7c913acba Fix unreachable code in Model mergeVars 
Squashed commit of the following:

commit c8326460a4
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 18:04:11 2011 -0600

    add a space after the comma in the $merge array

commit 22ad6cdca5
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 03:31:54 2011 -0600

    removing the condition and adding actsAs to the default list of merged keys.

commit afa4dd0dee
Author: Fitorec <chanerec@gmail.com>
Date:   Mon Dec 5 12:10:32 2011 -0600

    Solving the small defect in the array of behaviors(actsAs)

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-18 10:38:17 -05:00
ADmad
1358af783b Added test case for TreeBehavior::recover(). Refs #2392 2011-12-18 15:23:49 +05:30
mark_story
0607437abd Fix various failing tests. 2011-12-17 23:50:41 -05:00
mark_story
e9779e7126 Fix failing test in Debugger test case. 2011-12-17 22:53:21 -05:00
mark_story
3b57704a27 Update doc blocks. 2011-12-17 22:23:37 -05:00
mark_story
0b0a69de1e Update default layouts to use blocks. 2011-12-17 22:23:37 -05:00
mark_story
46bb6c8ad6 Adding tests and functionality for nested blocks. 2011-12-17 22:23:37 -05:00
mark_story
f0f3eb9ba9 Fix a few outstanding issues with blocks. 
- Blocks left open after rendering files should trigger
  an exception.
- Fix strict errors.
- Correct doc blocks.
 2011-12-17 22:23:37 -05:00
mark_story
bcb8444ab1 Make CacheHelper able to handle nocache tags in elements. 
Using afterRenderFile() instead of afterRender() allows
CacheHelper to parse content in elements and extended views.
 2011-12-17 22:23:37 -05:00
mark_story
fb20841d25 Doing some internal re-factoring in CacheHelper. 
cache() should only do one thing.
It shouldn't do more work than is necessary each time its called.
Flatten some of the conditions by extracting methods.
 2011-12-17 22:23:37 -05:00
mark_story
a8f0eb2b49 Making afterViewFile callbacks able to modify the rendered content 
CacheHelper will need this.
 2011-12-17 22:23:36 -05:00
mark_story
dcf8c0fd04 Re-factoring duplicated code out. 2011-12-17 22:23:36 -05:00
mark_story
39b1203e9a Making modParams work with non-array values. 
All but true, false, null will replace the parameter now.
This allows modification of string and object parameters.
 2011-12-17 22:23:36 -05:00
mark_story
c5c2859800 Fixing failing tests. 2011-12-17 22:23:36 -05:00
mark_story
44a8d7907e Deprecating View::$output. 
Replacing it with a magic __get/__set to the content block.
This helps deprecate $content_for_layout as well.
 2011-12-17 22:23:36 -05:00
mark_story
c49e261eba Adding new callbacks into View. 2011-12-17 22:23:36 -05:00
mark_story
3fe79564b5 Adding new callbacks - testing them out. 2011-12-17 22:23:35 -05:00
mark_story
d8c6594ff6 Adding constants and a property to track the current type. 
This helps with resolving parent elements.
 2011-12-17 22:23:35 -05:00
mark_story
9b2fd8f251 Extracting ViewBlock from View. 
View was getting too fat.
 2011-12-17 22:23:35 -05:00
mark_story
e06895ef91 Adding view files for tests. 
Adding test case for elements + extending
Making elements extend each other.
 2011-12-17 22:23:35 -05:00
mark_story
b6919a0268 Starting the extend() feature. 
Adding a simple test case.
Still need to add callbacks around every view fragment rendered.
Without that CacheHelper will not be able to cache extended views
correctly.
 2011-12-17 22:23:35 -05:00
mark_story
b866c00318 Renaming methods so they are shorter and still make sense. 2011-12-17 22:23:35 -05:00
mark_story
82139fe8f6 Updating HtmlHelper to allow custom blocks. 
Adding tests for blocks.
Adding missing tests.
 2011-12-17 22:23:34 -05:00
mark_story
7854f9dd52 Add View::getBlock() 
View::get() had two jobs.  That's almost always a bad thing.
Add a new method instead.
 2011-12-17 22:23:34 -05:00
Mark Story mark@mark-story.com
90f035c54d Updating block appending to work better. 2011-12-17 22:23:34 -05:00
Mark Story
6d425dfbcb Adding Backwards compatibility for $scripts_for_layout. 2011-12-17 22:23:34 -05:00
Mark Story
4606ea39a9 Updating HtmlHelper and its tests to use View::append(). 2011-12-17 22:23:34 -05:00
Mark Story
bd4ee41e24 Deprecating addScript() its replaced by blocks feature. 
Adding View::blocks() for getting the list of blocks.
 2011-12-17 22:23:33 -05:00
Mark Story
9107913c07 Implementing basic features of view 'blocks' 2011-12-17 22:23:33 -05:00
Mark Story
3e2bde523b Adding tests for Blocks in View. 
Blocks should replace scripts_for_layout and content_for_layout
in a future version of CakePHP.
 2011-12-17 22:23:33 -05:00
ADmad
248a2d3f26 Adding missing Model::create() when using Model::save() in a loop. Fixing some code formatting. Fixes #848 2011-12-18 03:55:14 +05:30
mark_story
e05d7d1791 Make dispatcher::cached() use here() 
This allows separate cache files to be created
for different query parameters.

Fixes #2381
 2011-12-17 12:19:34 -05:00
mark_story
a71b0f9867 Adding test for CacheHelper. 
Refs #2381
 2011-12-17 12:09:50 -05:00
mark_story
78325a13b9 Remove un-used variable. 
Fixes #2382
 2011-12-16 23:02:27 -05:00
Kyle Robinson Young
d794084d38 More code standards formatting 2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
mark_story
f1b566b88e Fix failing tests. 
Remove duplicated test.
 2011-12-15 23:45:13 -05:00
mark_story
321caf6db6 Fix incorrect value being stored in Auth.redirect. 
An incorrect value would be stored in Auth.redirect when
a custom route with the `pass` key set.

Fixes #2366
 2011-12-15 22:56:39 -05:00
Mark Story
4ed2185876 Merge pull request #379 from shama/patch-code-formatting 
Patch code formatting
 2011-12-15 05:44:17 -08:00
Kyle Robinson Young
54ed278284 Code formatting 2011-12-14 22:54:03 -08:00
Rachman Chavik
577225b8a6 include schema name when storing in _sequenceMap 2011-12-15 13:49:48 +07:00
Kyle Robinson Young
b3396538b7 Add debug flag to flush output 2011-12-14 22:48:41 -08:00
Ceeram
3f8934634b remove cheating, sort() always returns true 2011-12-15 01:18:11 +01:00
ADmad
01b04314c9 Fixing possible test case failure 2011-12-15 03:20:09 +05:30
ADmad
16d29a8d0e Making Folder::delete() code more PHP5ish 2011-12-15 03:07:17 +05:30
euromark
9d6ea57c30 Fix missing App::uses() added 
Fixes #2374

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-14 08:08:35 -05:00
Mark Story
102b96f25c Merge pull request #377 from shama/2.0 
Fix typo on TranslateBehavior error message
 2011-12-14 05:04:00 -08:00
Rachman Chavik
a8d0447e61 fix fullTableName duplicate prefix, closes #2355 2011-12-14 14:35:20 +07:00
Rachman Chavik
d2eac08e6b fixing previous incomplete fix 2011-12-14 14:34:41 +07:00
Kyle Robinson Young
e6e0027ec7 Fix typo on TranslateBehavior error message 2011-12-13 22:28:55 -08:00
Kyle Robinson Young
060e225b76 Add test for Model::getID(), simplify return and remove dated @see link 2011-12-13 22:19:50 -08:00
Graham Weldon
d83115927d Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-12-14 16:04:40 +11:00
mark_story
cfb6ed4cda Fix failing tests. 2011-12-13 22:11:06 -05:00
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05:00
mark_story
b61e3e0378 Fix lies in Shell::createFile() 
It could lie if the file was not writable.

Fixes #2371
 2011-12-13 21:59:58 -05:00
mark_story
8d1edd72f2 Moving tests and un-skipping them. 
Adding tests for proper field quoting in conditions.
Closes #2369
 2011-12-13 21:26:03 -05:00
mark_story
dd335cb183 Fix error in FixtureTask 
The options are always set, use empty() instead.

Fixes #2373
 2011-12-13 20:40:30 -05:00
Rachman Chavik
6505dd8e29 fixing conflict resolution in 2e8498e1 re: pgsql 2011-12-14 07:50:44 +07:00
Rachman Chavik
d77f9aacde updating multidb tests to use ConnectionManager 2011-12-13 21:10:16 +07:00
Rachman Chavik
a88ca54a8d updating usage of assertEqual -> assertEquals 2011-12-13 21:03:40 +07:00
Kyle Robinson Young
5110b976f8 Update api link to 2.0 on default home page 2011-12-13 04:47:08 -08:00
Kyle Robinson Young
b46c4b3e3f Correcting assertEquals parameter order 2011-12-12 20:35:31 -08:00
mark_story
645ef47878 Fix multiple date formats in Validation::date() 
Fixes #2364
 2011-12-12 20:21:10 -05:00
Kyle Robinson Young
096ff76295 Fix overreaching Inflector when ControllerTestCase autoMocks 2011-12-12 10:29:33 -08:00
Rachman Chavik
8b4e79c795 adding tests for LH 275 
ported to 2.0 branch from cakephp/cakephp#93
 2011-12-12 18:18:02 +07:00
Rachman Chavik
90af608489 keep existing data in unique HABTM closes LH 275 
ported to 2.0 branch from cakephp/cakephp#93
 2011-12-12 18:09:02 +07:00
mark_story
ab5bfdccfd Fix bad merge and failing test. 2011-12-11 23:20:19 -05:00
mark_story
d63d51e3dd Fix failing tests caused by incorrect mocks. 2011-12-11 23:07:01 -05:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
 2011-12-11 22:51:40 -05:00
mark_story
8bb6f8803c Fix infinite loop when minYear/maxYear are not int. 
Refs #2361
 2011-12-11 22:11:14 -05:00
mark_story
205bfb506f Add Shell::$plugin and update getOptionParser() 
Adding a plugin property allows the correct
usage/help information to be generated.

Fixes #2359
 2011-12-10 21:31:21 -05:00
José Lorenzo Rodríguez
47b2f3e70c Merge pull request #371 from shama/patch-caketestsuite 
Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile
 2011-12-10 10:57:08 -08:00
Kyle Robinson Young
17fcd0534f Fix spacing for coding standards 2011-12-10 09:06:59 -08:00
Jose Lorenzo Rodriguez
cf03b33a0d Properly using sort() before asserting values, asserting the result of sort() is cheating :P 2011-12-10 10:38:24 -04:30
Ceeram
1eb55bc201 ensure test pass when files are returned in different order 2011-12-10 14:26:14 +01:00
José Lorenzo Rodríguez
039e041665 Merge pull request #370 from shama/patch-foldertree-test 
Add test case for Folder::tree with hidden files
 2011-12-10 00:45:45 -08:00
Kyle Robinson Young
7fa1984a43 Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile 2011-12-09 23:27:17 -08:00
Kyle Robinson Young
97fbcd1079 Add test case for Folder::tree with hidden files 2011-12-09 21:44:15 -08:00
mark_story
c3f17c24f3 Fix issue with duplicate prefixes. 
Postgres::truncate() was double prefixing
table names.

Fixes #2355
 2011-12-09 21:14:57 -05:00
ADmad
f367249bdb Fixing visibility keyword for constructor 2011-12-09 14:08:20 +05:30
mark_story
b7f6645cec Fix issue with url parsing and /? 
PHP's parse_url fails to parse url's containing
`/?`.  It returns false instead of something useful.

Fixes #2354
 2011-12-08 21:48:40 -05:00
mark_story
bbd6e22e26 Add test for FormHelper::select() + 0 
Closes #2352
 2011-12-08 20:15:54 -05:00
Kyle Robinson Young
c836ba08a3 Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
ADmad
df097796c4 Fixing incorrect setting of default value for 'onDomReady' option in JsHelper::writeBuffer() 2011-12-08 14:03:39 +05:30
Jose Lorenzo Rodriguez
73aeb6ba62 Lazy-loading the $tablePrefix property in models, Fixes #2277 2011-12-08 00:10:22 -04:30
mark_story
64eb38a953 Fix disabled + SecurityComponent 
Disabled inputs should be omitted from the secured fields.
This will enable forms to submit successfully as long as those
inputs stay excluded from the form submission.

Fixes #2333
 2011-12-07 22:30:40 -05:00
mark_story
123a1a21ba Fix issues with stack trace output. 
Traces without files and without classes caused errors in printing
the fancy trace.
 2011-12-07 21:19:57 -05:00
mark_story
bc8ae11fc1 Fix fatal error with abstract/interface classes 
Abstract/Interface classes + ClassRegistry::init() should
raise an exception, not cause fatal errors.

Update CakeSchema to swallow and ignore any exceptions coming from
ClassRegistry.

Fixes #2328
 2011-12-07 20:58:01 -05:00
Kyle Robinson Young
3974ea87d8 Move Route docblocks to make text available in the API 2011-12-07 00:03:11 -08:00
Fitorec
c8326460a4 add a space after the comma in the $merge array 2011-12-06 18:04:11 -06:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
euromark
be770bd9b8 Typo fix in HttpSocket 
`schema` should be `scheme`, this fixes the only use of
schema in HttpSocket.

Fixes #2345

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-06 21:07:12 -05:00
mark_story
495b7f279f Adding test for #2345 2011-12-06 21:06:45 -05:00
mark_story
e7a7e57ba6 Fix bare require() to use App::uses() 
Fixes #2346
 2011-12-06 20:09:05 -05:00
Mark Story
a44c4aa291 Merge pull request #359 from shama/patch-texthelper 
Fix TextHelper excerpt method to work as documented
 2011-12-06 09:37:09 -08:00
mark_story
545694d84b Fix undefined variable error. 2011-12-06 12:35:18 -05:00
euromark
f9d12563a3 Translation fix 
Fixes #2340

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-06 12:33:47 -05:00
mark_story
fc4846d676 Move overflow limits to only take effect after expiration. 2011-12-06 12:23:15 -05:00
Fitorec
22ad6cdca5 removing the condition and adding actsAs to the default list of merged keys. 2011-12-06 03:31:54 -06:00
Kyle Robinson Young
7f22fcdbf5 Fix TextHelper excerpt method to work as documented 
Fixes #2339
 2011-12-05 12:12:09 -08:00
Mark Story
ba81754a1a Merge pull request #352 from shama/patch-cakeschema-test-fix 
CakeSchemaTest: Skip testSchemaReadWithConfigPrefix test if an existing prefix has been set
 2011-12-05 11:46:47 -08:00
Mark Story
a32eabe492 Merge pull request #355 from shama/patch-casing 
Consistently setting setUp() and tearDown() on test cases
 2011-12-05 11:44:15 -08:00
Fitorec
afa4dd0dee Solving the small defect in the array of behaviors(actsAs) 2011-12-05 12:10:32 -06:00
Ceeram
3b8990ffca Fix other failing test by 1 second difference 2011-12-05 17:13:22 +01:00
Ceeram
09a623e07b Fix failing tests by 1 second difference 2011-12-05 17:11:41 +01:00
Ceeram
e4e26a852b Making non-interactive behave same as interactive with odd table names 2011-12-05 17:00:48 +01:00
ADmad
a062135d87 Merge pull request #354 from shama/patch-databasesession-test-fix 
Fix DatabaseSessionTest garbage collection test case
 2011-12-05 06:00:59 -08:00
ADmad
72497147bd Changing default docType to 'html5' 2011-12-05 07:04:00 +05:30
Kyle Robinson Young
5388237099 Consistently setting setUp() and tearDown() on test cases 2011-12-04 13:27:51 -08:00
Kyle Robinson Young
66b3e9a7c9 Fix DatabaseSessionTest garbage collection test case 2011-12-04 13:04:42 -08:00
Kyle Robinson Young
8e70f4ac12 Fix CakeSession testCheckKeyWithSpaces and testUsingPluginHandler test cases 2011-12-04 12:43:27 -08:00
Kyle Robinson Young
42583ff6a5 Skip testSchemaReadWithConfigPrefix test if an existing prefix has already been set 2011-12-04 12:10:01 -08:00
mark_story
1bc3583133 Add usage to HttpSocket::configAuth() 
Fixes #2336
 2011-12-04 13:45:53 -05:00
mark_story
9296f770d5 Adding SecurityComponent::$csrfLimit 
This property allows you to control the number of tokens
that will be kept active.  Its possible to make really large
CSRF collection sizes.  Capping the number of tokens allows developers
to better control session sizes.
 2011-12-03 20:13:17 -05:00
mark_story
e421b3bc8f Adding SecurityComponent::generateToken() 
This method allows end developers to add the csrf tokens
manually, if they aren't added automatically.

Tokens are cheap to generate, simplifying the logic
makes things a bit easier to understand.
 2011-12-03 20:13:03 -05:00
mark_story
71b41ed91c Unskip some tests. 2011-12-03 15:00:06 -05:00
mark_story
457dd73ed0 Move viewVars assignment after callbacks. 
Assigning the controller viewVars after callbacks
allows the controller callbacks to assign additional
viewVars, or manipulate existing ones.

Fixes #2335
 2011-12-03 14:45:21 -05:00
mark_story
0670b96c24 Fix issue with incorrect date handling. 
Fixes #2321
 2011-12-03 14:38:55 -05:00
mark_story
545f4d2811 Fix bad merge. 2011-12-03 13:56:55 -05:00
m
73de68f5f4 Test suite should display current PHPUnit version. 
Fixes #2316
 2011-12-03 13:47:40 -05:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
 2011-12-03 13:45:28 -05:00
mark_story
22352a0227 Fix missing directory in dispatcher with rewrite off. 
When re-writing is disabled, and the deployment directory
contains either 'app' or 'webroot' the computed path was
incorrect.

Fixes #2330
 2011-12-02 23:39:33 -05:00
Mark Story
d4fd1b3743 Merge pull request #348 from petteyg/apptheme 
Make TemplateTask prioritize App templates over Core templates
 2011-12-02 17:28:01 -08:00
Kyle Robinson Young
4174ddff0f Always set ControllerTestCase::testAction result variables 2011-12-02 06:19:15 -08:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00