mark_story
7f0f224c56
Fix missing preg_quote around highlight searches.
...
Highlight strings should be literal values not regexp fragments.
Fixes #2111
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2011-10-18 12:19:19 -04:00
mark_story
55064b6573
Applying fix from 'euromark' to fix protocol relative links
...
Fixes #2107
2011-10-17 21:03:25 -04: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
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
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
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
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
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
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
Renan Gonçalves
49f4035412
Fixing bug when trying to Paginate ordering by multiple keys.
2011-10-12 14:51:46 +02:00
mark_story
3b1a11e2d2
Add a test for src and href attributes
...
with TextHelper::autoLinkUrls()
2011-10-10 22:16:10 -04: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
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
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
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
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
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
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
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
3907c2bdf3
Fixing build failure in Postgres.
2011-10-01 22:49:57 -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
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
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
mark_story
4810518c7d
Fix issue where abstract or interface controllers
...
would be constructed by Dispatcher.
Tests added.
Fixes #2048
2011-09-30 22:40:30 -04:00
mark_story
115c656dcc
Update expectation to account for umask()
...
Updating a number of simple assertEqual -> assertEquals.
Fixes #2045
2011-09-30 22:10:16 -04:00
mark_story
af4b0c9c1b
Make DboSource::lastError() fallback to the connection.
...
If there is no argument the connection error should be checked
for an error.
Add a test for most of lastError(). Mocking PDO is a pain.
Fixes #2046
2011-09-30 21:56:39 -04:00