Commit graph

2689 commits

Author SHA1 Message Date
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