Commit graph

471 commits

Author SHA1 Message Date
AD7six
43ae7af17d prevent missing-index notices
when baking with a schemaless db
2011-11-20 15:44:44 +01:00
AD7six
f0fa6c7875 code standards 2011-11-20 01:17:07 +01:00
AD7six
8e38f666b7 allow baking models with missing tables - even for rdbms
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
2011-11-20 01:11:33 +01:00
AD7six
ac8e1e8304 allow creating models without the table existing
particularly useful/appropriate for schemaless datasources
2011-11-19 23:51:39 +01:00
Gordon Pettey (petteyg)
99e6072fd3 Make App::path('Console') overwrite App::core('Console') for themes 2011-11-18 05:00:45 +00:00
ADmad
90b007ef75 Implemented priority based triggering of callbacks for objects in collection 2011-11-17 12:36:54 +05:30
mark_story
fa0ec44dfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
mark_story
8981f49bd5 Add stricter validation to TestTask.
Empty classnames, and classnames without the correct type suffix
are no longer accepted.  They did the wrong thing anyways.

Fixes #2267
2011-11-16 20:38:31 -05:00
mark_story
542e5c91de Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Graham Weldon
eefdc43214 Fix plugins not being loaded before looking for pluign paths 2011-11-15 17:30:49 +11:00
ADmad
233a63366f Syncing files between app directory and bake skeleton 2011-11-14 02:32:59 +05:30
mark_story
0a0a09920b Updating for PHP5.4
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
mark_story
254357e9c9 Merge branch '2.0' into 2.1 2011-11-11 22:38:11 -05:00
mark_story
99caa98df3 Update message for PHPUnit3.6 2011-11-11 21:28:34 -05:00
Ceeram
767d1afcd8 fixing helptext for AclShell 2011-11-09 21:07:01 +01:00
Mark Story
e8e2bbc4d7 Merge pull request #304 from jamiemill/2.0-upgradefix2
Add exception migration to the upgrade shell.
2011-11-08 06:47:52 -08:00
Renan Gonçalves aka renan.saddam
2a33bc862a Merge pull request #296 from majna/2.0-dbconfig-task
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Majna
57afa1873e Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes. 2011-11-07 01:01:56 +01:00
jamiemill
e16890225c Fixed mistake in UpgradeShell::exceptions()
My fault ;)
2011-11-06 23:19:30 +00:00
jamiemill
c966a35beb Fixed bug in UpgradeShell::findFiles().
$this->_files was reset on each loop through paths, which means, for
example, if you still had the old 'views' directory kicking around
the results from 'View' would be overwritten.
2011-11-06 21:53:20 +00:00
jamiemill
4368b62dfb Added an 'exceptions' method to the UpgradeShell.
This just replaces some of the basic cakeError() calls with
equivalent exceptions.
2011-11-06 21:53:11 +00:00
jamiemill
1d52dc05e1 Fix for UpgradeShell::helpers() not discovering core helpers. 2011-11-06 21:53:03 +00:00
Mark Story
6fd69b022d Merge pull request #303 from shama/patch-1
Remove 5.3 notice from Config/core timezone comment
2011-11-06 13:47:31 -08:00
mark_story
d87f9f060b Make parent method check explicit to Shell.
This makes only methods on Shell inaccessible on the command line.
Parent methods in AppShell or other parent classes can now be called directly.
Fixes #2193
2011-11-06 16:32:51 -05:00
Kyle Robinson Young
b2414a777f Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment 2011-11-06 13:17:07 -08:00
Mark Story
db41a7dd16 Merge pull request #302 from majna/2.0-viewtask-methods
Fix View task generating only 'admin' methods views in non-interactive mode.
2011-11-06 12:59:38 -08:00
mark_story
aae8a89623 Change var -> public in controllertask.
Makes the confirmation message and generated code the same.
Fixes #2216
2011-11-06 11:50:16 -05:00
mark_story
a2b6f18000 Merge branch '2.0' into 2.1 2011-11-06 11:39:01 -05:00
mark_story
cfe38985cf Fix failing tests caused by changes in App::objects() 2011-11-06 11:23:11 -05:00
Majna
d84b66e744 Fix View task generating only 'admin' methods views in non-interactive mode. 2011-11-06 16:14:55 +01:00
ADmad
e1354b2ee6 Merge branch '2.0' into 2.1 2011-11-06 20:39:08 +05:30
jamiemill
13ebd60b26 Removed invalid 'Helper' suffix in UpgradeShell::helpers() 2011-11-06 12:02:19 +00:00
jamiemill
6c9c36bc0e Fixed missing array wrap in UpgradeShell::tests() 2011-11-05 22:18:49 +00:00
Majna
3374406bbf Fix View task missing 'app' param when baking custom action. 2011-11-05 19:54:21 +01:00
Vitor Pacheco
2b5b7694c9 Property 'name' removed of PagesController. 2011-11-05 15:25:41 -02:00
Majna
1b9b90d2e7 Replacing 'driver' with 'datasource'. 2011-11-04 23:07:31 +01:00
Majna
1455c59e0c Fix notice when baking db config: Undefined variable 'driver'. 2011-11-04 22:49:38 +01:00
mark_story
0304bb8796 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Majna
51ccbad170 Fixing ignored '--exclude-plugins' option on Windows for Extract task. 2011-11-03 21:34:32 +01:00
mark_story
98a8f44fa7 Make formatting tag removal smarter.
Instead of removing all tags, only known
formatting tags.

Fixes #2203
2011-11-02 21:50:16 -04:00
Marko Marković
385f6f164f Fixed typos in css 2011-11-01 16:59:11 +01:00
Jose Lorenzo Rodriguez
d49096aab9 Fixing DbConfigTask to produce correct configurations 2011-10-30 18:25:43 -04:30
Majna
14efc4daae Added missing 'write' param for schema dump shell. Fixes #2179. 2011-10-29 00:51:40 +02:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
mark_story
8529d76e6f Removing Xml prolog from default xml layouts.
Both DOMDocument and SimpleXML output the prolog when
saving xml.

Fixes #2171
2011-10-27 20:58:03 -04:00
mark_story
ad524b25ef Merge branch '2.0' into 2.1 2011-10-25 22:29:03 -04:00
m
5a5a542a71 Missing ini_set of include path for test.php
Fixes #2167

Signed-off-by: mark_story <mark@mark-story.com>
2011-10-25 22:26:59 -04:00
mark_story
d92c73d821 Remove reference to XmlHelper.
Refs #2164
2011-10-25 20:16:58 -04:00
mark_story
d6f7669f54 Merge branch '2.0' into 2.1 2011-10-23 21:07:09 -04:00
Majna
a9dbde0cbd Fixing incorrect doc blocks regarding error handler. 2011-10-23 21:55:20 +02:00
James Larking
75daff8df9 Camelize type of test being generated.
This fixes use for:

`cake bake model ModelName`

When classTypes and directories should be CamelCase.
This solves issue whereby model tests are written directly to Cases folder rather than into Cases/Model

Signed-off-by: mark_story <mark@mark-story.com>
2011-10-23 11:13:56 -04:00
mark_story
72006b9369 Fix options in OptionParser for TestTask
Fix the allowed options for type to allow Camelcase versions as well.
2011-10-23 11:10:52 -04:00
mark_story
ab6aab8a1a Merge branch '2.0' into 2.1 2011-10-22 11:03:42 -04:00
Renan Gonçalves
d9e8b3b6a2 Parsing every parameter until there is no more. Good to have alias but with the ability to override the arguments. 2011-10-21 12:20:43 +02:00
AD7six
53bc963315 Merge branch '2.0' into 2.1 2011-10-20 08:57:49 +02:00
mark_story
f5ae9622e6 Add missing argument.
Without this argument calls with two arguments would be
treated as invalid shell commands.
2011-10-19 22:26:51 -04:00
mark_story
7a4aa401d1 Adding backwards compatible plugin syntax.
Thie got lost during 2.0, and it inflecting only the shell name
is kind of bad.
2011-10-19 21:33:03 -04:00
mark_story
bad819773e Update CommandListShell to give better help.
plugins require plugin prefixes now.  Update the help
to suggest how to run plugin shells.

Fixes #2121
2011-10-19 21:26:31 -04:00
Jose Lorenzo Rodriguez
d666d6175a Improving the upgrade shell by adding more renaming rules and making it more robust in case insensitive systems 2011-10-19 16:46:55 -04:30
Rachman Chavik
a60d71d19b removing 'empty' files from nonempty directories 2011-10-19 12:19:28 +07:00
Rachman Chavik
2bb93761cc fixing typos 2011-10-19 12:19:28 +07:00
mark_story
d7155d374b Making apc feature test rely on apc_dec.
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.

Fixes #2105
2011-10-18 20:48:58 -04:00
AD7six
a538c5d220 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
Conflicts:
	lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
2011-10-18 17:46:00 +02:00
AD7six
25ce1cc823 remove inherited logic 2011-10-18 12:28:52 +02:00
AD7six
2e547cad19 revert to original code 2011-10-18 12:24:59 +02:00
AD7six
11a11bf583 add a backwards compatibility shell for the previous syntax 2011-10-18 12:18:50 +02:00
AD7six
868f8d21ad don't duplicate the arguments description 2011-10-18 12:18:01 +02:00
AD7six
f82ae66790 add a couple of tests for detecting the right app file 2011-10-18 11:36:30 +02:00
AD7six
6ab5f1f2a2 make it possible to test for files that don't exist 2011-10-18 11:02:08 +02:00
AD7six
d492c86ddc update main descrition 2011-10-18 10:28:05 +02:00
AD7six
511207494e remove incorrect description text 2011-10-18 10:24:09 +02:00
AD7six
b4228dcaee Merge branch '2.1' into 2.1-simpler-tests 2011-10-18 10:03:32 +02:00
Jose Lorenzo Rodriguez
e47b970811 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-16 15:45:47 -04:30
Jose Lorenzo Rodriguez
b38c0e50a4 Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
Renan Gonçalves
d2a664c2df Fixing @package at in Cake/Console/Templates/skel files. 2011-10-15 20:30:49 +02:00
Renan Gonçalves
507eb2f653 Fixing @package at in Cake/Console/Templates files. 2011-10-15 20:26:48 +02:00
Renan Gonçalves
1cf67b1e55 Little cleanup in exceptions.
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
Jose Lorenzo Rodriguez
670917070e Changing a bunch of links in doc blocks 2011-10-15 10:43:26 -04:30
Jose Lorenzo Rodriguez
f8772dc524 Also changing shell script in skel directory 2011-10-15 10:18:36 -04:30
mark_story
bda8df1b50 Fix issues with bash quoting and directories with spaces. 2011-10-15 09:56:04 -04:00
Jose Lorenzo Rodriguez
36fa2e87b4 Adding symlink support to the cake console executable 2011-10-14 22:15:26 -04:30
mark_story
6bf6d79979 Removing 'cake' domain from core.
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.

Fixes #2103
2011-10-14 21:01:17 -04:00
Heath Nail
9e9b1f0382 Windows newlines for .bat files. 2011-10-14 15:31:09 -04:00
Heath Nail
36162621cf Incresing sync between app and skel directories. 2011-10-14 15:28:38 -04:00
Heath Nail
ce4acda25b Incresing sync between app and skel directories. 2011-10-14 15:06:36 -04:00
mark_story
7f3c5662ba Fix issue where plugin prefixes would be included in generated view.
Fix issue with `cake bake view Plugin.Model` style view creation.
Fixes #2095
2011-10-12 21:09:19 -04:00
mark_story
f65d763551 Removing ?> from AppModel and AppController plugin templates. 2011-10-12 20:42:23 -04:00
evilbloodydemon
8e78308261 Removed unnecessary ClassRegistry::flush() from test template. 2011-10-12 13:37:50 +04:00
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
mark_story
788d38ccef Merge branch '1.3' into 1.3-merge
Conflicts:
	cake/console/cake.php
	cake/console/libs/shell.php
	cake/tests/cases/console/libs/shell.test.php
2011-10-10 09:37:06 -04:00
mark_story
3f778d8936 Fix inconsistency between app and skel directory.
Fixes #2077
2011-10-08 14:40:11 -04:00
mark_story
e07256b6d4 Update the .htaccess files to increase
compatibility with shared hosting servers.
Fixes #2010
2011-10-07 20:59:20 -04:00
ADmad
fa214e8716 Updating old usage Configure::read() to new Configure::read('debug'). Closes #2070 2011-10-06 17:02:15 +05:30
mark_story
2cc9523509 Adding old webkit gradient prefixes.
Fixes #2066
2011-10-05 17:59:39 -04:00
mark_story
0e47c98c91 Moving cache disabling earlier so it takes
effect.
Refs #2063
2011-10-04 23:03:44 -04:00
mark_story
e56a2cdb2b Set debug=2 when bake is run.
This should help with model caches being re-used when they shouldn't.
Fixes #2063
2011-10-04 22:25:18 -04:00
mark_story
cb1ce83a54 Removing duplicate inflection.
Fixes #2058
2011-10-04 20:10:25 -04:00
mark_story
042e817e1b Fix issue where missing command would exit as success. 2011-10-03 23:08:48 -04:00
mark_story
aa7448e3ed Fixing incorrect exit codes on console exceptions.
Uncaught exceptions on the console would result in exit code 0.
This is not helpful in *nix scripting.

- Update the ConsoleErrorHandler to not inherit from the web error handler.
- Make ErrorHandler::_mapErrorCode() public as it isn't overly private.
- Make ConsoleErrorHandler methods instance methods so mocking can be done.
- Add a _stop method to correctly exit.
- Update tests.
2011-10-03 22:48:50 -04:00
Jose Lorenzo Rodriguez
4110ab7952 Fixing error introduced in my last commit 2011-10-03 12:08:08 -04:30
Jose Lorenzo Rodriguez
d08f916179 Grabbing the first available config defined in connection manager as a default for baking. Fixing a couple of failing test cases 2011-10-03 11:54:40 -04:30
mark_story
84f805419d Fixing issue where DbConfigTask would try to rebuild
database configuration.

This could happen when using commands like `Console/cake bake controller`.
Using ConnectionManager ensures that the database config file will be loaded
if its available.
2011-10-02 22:53:45 -04:00
mark_story
aae2b0c257 Fixing issue baking controller tests.
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
2011-10-02 22:53:37 -04:00
mark_story
aa8965d3f3 Merge branch 'merger' into 2.0 2011-10-01 22:38:39 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Graham Weldon
f69fc937cb Fixed missing string append operator for baked homepage to include banner. 2011-10-02 11:58:11 +11:00
mark_story
f4b2e03295 Errors should be output on stderr. 2011-09-30 21:56:57 -04:00
Jose Lorenzo Rodriguez
5a181d8705 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-30 01:56:19 -04:30
Jose Lorenzo Rodriguez
fff42e92ed Adding a few class loading related changes to make the ApiGenerator plugin happy 2011-09-30 01:55:33 -04:30
Ceeram
22029a1199 fixing email.php.default, from should have email as key 2011-09-29 14:59:27 +02:00
mark_story
dffcf048d9 Fix incorrect documentation. 2011-09-24 12:06:44 -04:00
mark_story
8272758eb9 Adding block to home page for PHP version.
Fixes #2010
2011-09-24 10:41:22 -04:00
Renan Gonçalves
0bcb8d0dfa Improving the regex and moving more files around.
- Making the regex case insensitive so it can also matches capital C in class (ie. Class).
- Adding a new protected method to move view files, the directory will be camelized.
2011-09-22 15:03:42 +02:00
Renan Gonçalves
1b2b191212 Updating cake.generic.css to its newest version from app directory. 2011-09-20 20:29:55 +02:00
Gordon Pettey (petteyg)
744558de90 Add validation guess for Postgress inet field 2011-09-20 17:45:35 +00:00
ADmad
7c87e9abc1 For MySQL you can now specify the socket to use using unix_socket key in the config array. Closes #1994 2011-09-16 13:40:04 +05:30
Graham Weldon
9d1e3cbb05 Fix comment for ife() Upgrade. Thanks SkieDr. 2011-09-16 00:38:26 +10:00
Graham Weldon
d8468c1a38 Fixed incorrect ife() conversion. Thanks SkieDr. 2011-09-16 00:34:39 +10:00
Renan Gonçalves
cd6c370dd9 Adding tests method to Upgrade shell, fixing FooTestCase to FooTest.
Also making sure the preg_match matches the right class and not move the file to other directory rather than tests.
The method `tests` need to be run before `locations` to work properly.
2011-09-14 13:33:01 +02:00
ADmad
97a975c6c4 Refactoring Model::invalidFields() a bit. 2011-09-12 05:10:34 +05:30
AD7six
61f8de440d Merge branch '2.0-simpler-test' of github.com:cakephp/cakephp into feature/2.0-simpler-tests
Conflicts:
	lib/Cake/Console/Command/TestShell.php
2011-09-10 17:08:00 +02:00
mark_story
3cb3424b4f Add App::uses to baked controllers.
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
2011-09-09 20:43:04 -04:00
mark_story
7c08c966b0 Adding App::uses() call to model baking.
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
2011-09-09 20:43:04 -04:00
mark_story
3d44489b0c Deprecating the %page% style placeholders in PaginatorHelper.
Updating scaffold and bake templates to not use deprecated placeholders.
2011-09-06 02:37:43 +01:00
Jose Lorenzo Rodriguez
74ba030e7c More postgres tests passing again 2011-09-03 18:34:11 -04:30
Jose Lorenzo Rodriguez
2bca1435ab Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-03 07:05:48 -04:30
Jose Lorenzo Rodriguez
89b1e54071 Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version 2011-09-03 06:50:19 -04:30
mark_story
8c75488979 More changes to the CSS, and updating the bake templates and scaffolds. 2011-09-03 10:06:01 +01:00
mark_story
efbeab6199 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
2011-09-03 00:48:09 +01:00
Renan Gonçalves
bc3828179b Not using Folder if its a git repository. 2011-09-02 00:19:37 +02:00
Renan Gonçalves
65956ab863 Adding __d(...) to the upgrade shell messages. Althought there is no 'real' need for it its good to be aligned to the others shells. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
81c46a76b7 Not running 'git mv ...' if its dry-run. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
265c094f2f Fixing the path to tests on upgrade shell and also fixing the option for git, it needs to be boolean. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
7ae89c3679 Checking if short options exist, fixed an warning caused by not checking it. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
edbe60e965 Overriding the files array, so it will not try to perform actions on files that no longer exists. 2011-09-01 19:31:32 +02:00
Jose Lorenzo Rodriguez
a8b38beb9d Fixing bug in SchemaShell where it would always force a read on all tables 2011-08-30 00:07:57 -04:30
Mark Story
59c6b419e5 Merge branch '1.3' into merger
Conflicts:
	cake/console/libs/bake.php
	cake/libs/configure.php
	cake/libs/controller/components/request_handler.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Utility/Validation.php
2011-08-28 22:08:49 -04:00
Juan Basso
7d0250ff47 Merge branch '2.0-api-doc' into 2.0 2011-08-26 20:22:26 -04:00
mark_story
f060fdafb7 Adding the --debug flag that later versions of PHPUnit support. 2011-08-22 22:29:32 -04:00
ADmad
34d3d6fe9e Fixing doc block related to session configuration. Closes #1927 2011-08-23 04:07:08 +05:30
Juan Basso
689c7ffd45 Fixed some problems caused by the visibility changes. 2011-08-21 01:04:55 -04:00
Juan Basso
61833294f0 Changed the visibility to methods that not affect others classes. 2011-08-20 01:39:30 -04:00
Juan Basso
f5a54d00dd Changed methods and attributes from private to protected. 2011-08-20 00:43:34 -04:00
Juan Basso
40654df5ab Fixing more documentations. 2011-08-18 22:31:00 -04:00
Juan Basso
0575e92833 Added visibility in some methods and attributes. 2011-08-18 22:30:28 -04:00
Juan Basso
16ef234180 Removing trailing spaces. 2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
Majna
826001adc7 Added doc blocks for WincacheEngine. Fixed Memcache doc block. 2011-08-10 16:55:05 +02:00