Commit graph

1486 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
7c5352a6c2 Merge branch 'master' into 2.0
Conflicts:
	cake/libs/controller/components/request_handler.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	cake/tests/cases/libs/view/view.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/cake
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/VERSION.txt
2011-10-16 17:56:22 -04:30
Majna
f0d10b4d69 Refactoring PhpReader::read() to check for .php file first. Fixed error when there's a directory with the same name. 2011-10-16 22:21:01 +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
mark_story
6ecbcccf25 Updating links to the book. 2011-10-16 09:36:51 -04:00
Renan Gonçalves
e37703efdd Fixed typo from last commit. 2011-10-16 13:42:50 +02:00
Renan Gonçalves
573a349209 Using plugin name on exception thrown and in templates files. 2011-10-16 13:40:36 +02:00
Renan Gonçalves
229bf8e984 Keeping BC on short syntax for Acl and Tree behavior. 2011-10-16 12:06:41 +02:00
Renan Gonçalves
3a04bb4733 Dropping short syntax support for Behavior configuration.
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
2011-10-15 20:52:41 +02:00
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
282d322523 Fixing @package tag in Cake/View files. 2011-10-15 20:17:44 +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
Florian Krämer
b6d7766e78 Updating the @link's in the doc blocks for the views 2011-10-15 12:46:22 -04:30
Jose Lorenzo Rodriguez
f23d62d411 Fixing more @link annotations 2011-10-15 12:42:23 -04:30
Jose Lorenzo Rodriguez
f9f0eedca1 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-15 12:35:01 -04:30
Jose Lorenzo Rodriguez
d1a530f53b Fixing all @link annotations in model class 2011-10-15 12:34:31 -04:30
Renan Gonçalves
d9815dbd65 Fixing file_get_contents() call on the last commit. 2011-10-15 18:55:42 +02:00
Renan Gonçalves
704a9f454d Moving binary data to external file, it was causing failures on other tests. 2011-10-15 18:51:48 +02:00
Jose Lorenzo Rodriguez
d406889b14 changing @link in containable behavior 2011-10-15 11:47:10 -04:30
Jose Lorenzo Rodriguez
91d0a081fb Fixing more links in doc blocks 2011-10-15 11:38:49 -04:30
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
6d9b709c7a Fix method signatures of database drivers.
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.

Fixes #2100
2011-10-14 21:25:14 -04:00
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
Gonçalo Marrafa
4adc042882 Fix association lazy-loading when used with ContainableBehavior 2011-10-14 17:53:37 -04:30
Yosuke Basuke Suzuki
0b6c93cf82 Refactoring App::build() so it looks more readable 2011-10-14 17:11:45 -04:30
Thomas Ploch
0a70963a74 Removed creation of unneeded file handle object in FileEngine::write(). Added configuration option 'mask' to FileEngine::. Now able to provide a permission mask to create cache files with specific permissions.
Set '0664' as default value for the 'mask' setting in FileEngine::. Adjusted corresponding test cases.
Added new warning if the file could not be opened for writing.
2011-10-14 16:47:18 -04:30
José Lorenzo Rodríguez
36c931592b Merge pull request #247 from sitedyno/2.0-app-skel
Syncing the skel and app directories
2011-10-14 13:34:47 -07: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
Ceeram
981f40758c Fixing incorrect theme paths for plugins, tests updated. Fixes #2099 2011-10-13 15:22:10 +02:00
mark_story
4090b3e8c6 Fix content-type detection to accomodate jQuery.
Add tests for jQuery content type strings.
Refactor tests, add in missing assertions and missing parent calls.
The new behavior is more lenient and allows for a single requested
content type to switch the view type.

Fixes #2088
2011-10-12 23:21:07 -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
3c611eef90 Replacing direct construction with method calls. 2011-10-12 21:00:47 -04:00
mark_story
f65d763551 Removing ?> from AppModel and AppController plugin templates. 2011-10-12 20:42:23 -04:00
Mark Story
648a1f7dec Merge pull request #245 from evilbloodydemon/remove-cr-flush
Removed unnecessary ClassRegistry::flush() from test template.
2011-10-12 09:23:01 -07:00
Renan Gonçalves
49f4035412 Fixing bug when trying to Paginate ordering by multiple keys. 2011-10-12 14:51:46 +02:00
evilbloodydemon
8e78308261 Removed unnecessary ClassRegistry::flush() from test template. 2011-10-12 13:37:50 +04:00
mark_story
b261024111 Make fixtures disable source caching.
Disabling source caching when using fixtures fixes
issues with test suites.  Testsuites could previously have
test order errors caused by differences in cached and un-cached sources listings.
Fixes #1942
2011-10-11 22:10:09 -04:00
mark_story
c4eb19ab91 Adding another import for helpers appended by RequestHandlerComponent.
Fixes #2084.
2011-10-11 12:42:45 -04:00
Dave
db51c0539a Fix TextHelper::autoLinkUrls() from linking iframes
iframe and img elements should not be autolinked.
Fixes #GH-208
2011-10-10 22:16:46 -04:00
mark_story
3b1a11e2d2 Add a test for src and href attributes
with TextHelper::autoLinkUrls()
2011-10-10 22:16:10 -04:00
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
Majna
8c3f64be52 Fixing doc blocks in Test suite and some visibility keywords. 2011-10-10 23:18:48 +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
455787ade9 Fixing undefined variable reference.
Fixes #2078
2011-10-09 22:34:59 -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
Thomas Ploch
d9cd69ac6e Removed unnessecary call to array_merge() in Model::_deleteLinks(). Fixes #2075 . 2011-10-07 15:03:05 +02:00
Jose Lorenzo Rodriguez
c56797a15f Adding destructor in CacheSession handler to avoid a fatal error when closing the session 2011-10-06 23:10:13 -04:30
Jose Lorenzo Rodriguez
a14abd6281 Fixing DatabaseSession handler to correctly close the session before the model object is destroyed by php.
This allows to remove an old hack in ConnectionManager
2011-10-06 23:01:49 -04:30
kaz29
5eb4c5c6da Fixing bug in getEncoding/setEncoding for PostgreSQL.
Fixes #2028

Signed-off-by: mark_story <mark@mark-story.com>
2011-10-06 22:07:08 -04:00
mark_story
924e283012 Making test less specific as this float cast is different
on different installs.
2011-10-06 21:58:11 -04:00
mark_story
d9e51acf0a Fixing failing tests caused by merge with 1.3 2011-10-06 21:23:35 -04:00
mark_story
055224ef68 Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/Model/Datasource/Database/Mysql.php
2011-10-06 21:06:40 -04:00
ADmad
fa214e8716 Updating old usage Configure::read() to new Configure::read('debug'). Closes #2070 2011-10-06 17:02:15 +05:30
Jose Lorenzo Rodriguez
17963e980b Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-05 21:37:11 -04:30
Jose Lorenzo Rodriguez
ade9e4d154 Fixing another postgres failing test 2011-10-05 21:36:36 -04:30
mark_story
a853c0f93a Fix another typo. 2011-10-05 22:03:18 -04:00
mark_story
c11c5c5719 Fix typo in doc block. 2011-10-05 22:02:15 -04:00
mark_story
ea113922bd Removing extra 0 index in request parameters.
When using requestAction with the return parameter, there
would be an extra 0 index element that would create incorrect
routes in the requestedAction.
Fixes #2067
2011-10-05 20:55:17 -04:00
mark_story
2cc9523509 Adding old webkit gradient prefixes.
Fixes #2066
2011-10-05 17:59:39 -04:00
mark_story
d40bd240ac Add missing echo in MissingHelperClass error page.
Fixes #2065
2011-10-05 17:51:19 -04:00
Jose Lorenzo Rodriguez
fca6fefb4a Weakening the assertion in order to make tests pass, actual difference are in the order of 30 bytes 2011-10-05 13:25:54 -04:30
Jose Lorenzo Rodriguez
16ffee0065 More fixes in checking dates in tests 2011-10-05 12:16:00 -04:30
Jose Lorenzo Rodriguez
746062d4a4 Fixing a couple of problem when testing dates in ModelWriteTest 2011-10-05 10:16:38 -04:30
Jose Lorenzo Rodriguez
ecb63d93bc Merge branch 'refactoringAppBuild' of https://github.com/basuke/cakephp into basuke-refactoringAppBuild 2011-10-05 10:03:31 -04:30
Yosuke Basuke Suzuki
fbf4449b9e Refactoring: clean up the foreach loop.
- cleaner code.
- reduce call of array_values and array_unique.
- clear intent of code.
2011-10-05 15:13:19 +09:00
Yosuke Basuke Suzuki
810e2a4ffe Bypass unnecessary foreach loop when $paths is empty to improve speed. 2011-10-05 15:08:30 +09: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
ADmad
dcb704a12b Fixing bug where you couldn't set CakeRequest::$base to empty string using config variable App.base 2011-10-05 00:46:25 +05:30
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
bab131b8fd Releasing 2.0.0-RC3 2011-10-03 18:36:56 -04:30
Jose Lorenzo Rodriguez
0a2553cce5 Making model tests less time dependent 2011-10-03 14:51:07 -04:30
Jose Lorenzo Rodriguez
71c73503c6 Making test case less configuration independent 2011-10-03 12:13:11 -04:30
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
adcb80b5b9 Making the HtmlHelper a default helper for emails. 2011-10-01 22:55:04 -04:00
mark_story
3907c2bdf3 Fixing build failure in Postgres. 2011-10-01 22:49:57 -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
02cf5d3926 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-02 12:10:13 +11: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
ff570d9daf Removing unnecessary ReflectionClass instance.
Refs #2048
2011-10-01 20:43:49 -04:00
Jose Lorenzo Rodriguez
5d19b6ded9 Removing test ins porstgres that wasn't actually testing a thing, and making another postgres test pass 2011-10-01 15:25:17 -04:30
Jose Lorenzo Rodriguez
a94b049c53 Fixing fixtures to make them run with postgresql 2011-10-01 14:41:55 -04:30
Jose Lorenzo Rodriguez
61be5b1d5c Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-01 14:08:56 -04:30
Jose Lorenzo Rodriguez
b8aa000589 Re-implementing Mysql::listDetailedSources() to not use prepared statements, using php <= 5.3.5 + mysqlnd internal driver causes segmentation faults when using a similar query from this method several times. 2011-10-01 14:06:41 -04:30
mark_story
d9db8c8124 Fixing failing test on postgres build. 2011-10-01 09:08:18 -04:00
mark_story
df82aa09e4 Removing test that causes problems in AllTests. 2011-09-30 22:47:47 -04:00
mark_story
0fc6d7a98d Making test more generic so it passes on Jenkins. 2011-09-30 22:44:04 -04:00