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
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
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
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
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
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
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
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
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
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
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
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
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
Ceeram
68eeee80d8
Set::sort() now correctly sorts when using {s}.path, fixes #2673
2012-03-12 21:58:24 +01:00
mark_story
edb582944c
Fix coding standards in Test/Case/Controller
2012-03-11 22:20:25 -04:00
Ceeram
a4952166f7
make acl methods available in permission model
2012-03-11 17:07:42 +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
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
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
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
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
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
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
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
Ceeram
2a7bee0a5c
make sure locale is restored correct in tests
2012-03-04 00:36:21 +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
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
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
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
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
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
Mark Story
6599422a7a
Merge pull request #534 from dogmatic69/2622
...
Fixes #2622
2012-02-28 12:11:44 -08: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
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
2a9a103d62
Fix bad xml help generation.
...
Fixes #2619
2012-02-26 10:21:04 -05:00
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
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
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
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
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
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
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
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
fce70df6ff
Fix failing tests.
...
rawurlencode() and urlencode() handle utf8 differently.
2012-02-18 11:18:03 -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
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
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
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
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
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
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
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
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
euromark
77624552eb
added missing assertText methods to assert cross OS
2012-02-17 23:36:57 +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
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
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
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
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
ADmad
bda05293d7
Fixed failing test cases
2012-02-16 02:22:20 +05:30
mark_story
6fda055a1e
Move initialize logic to __construct().
...
Fixes #2582
2012-02-15 14:15:44 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
0x20h
3abfaeecf3
Don't let every role inherit from default role. Filter empty aco paths
2012-02-05 15:30:26 +01:00
mark_story
ace9fefb02
Merge branch '2.0' into 2.1
2012-02-03 21:54:50 -05:00
mark_story
437d68c60b
Handle the case where viewPath changes.
...
Fixes #2537
2012-02-03 21:29:37 -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
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
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
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
Anton
57bd1ea5f9
added test for check nested url
2012-01-30 00:25:48 +02:00
mark_story
e770c7a72d
Split the AclComponent classes up.
...
Refs #2514
2012-01-29 13:54:26 -05:00
Majna
d7b06194a4
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 18:24:28 +01: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
mark_story
9089bba84b
Fix failing test.
2012-01-25 21:19:16 -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
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
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
Jose Lorenzo Rodriguez
a1daaf5960
Merge branch '2.1-http' into 2.1
2012-01-21 15:51:34 -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
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
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