Commit graph

11682 commits

Author SHA1 Message Date
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
0a6fae00fb Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-05 12:16:58 -04:30
Jose Lorenzo Rodriguez
16ffee0065 More fixes in checking dates in tests 2011-10-05 12:16:00 -04:30
Mark Story
b91c475bc1 Merge pull request #227 from tPl0ch/2.0-gitignore
Added '/lib/Cake/Console/Templates/skel/tmp' to .gitignore.
2011-10-05 09:03:03 -07:00
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
Thomas Ploch
cd7b7c9ced Added '/lib/Cake/Console/Templates/skel/tmp' to .gitignore file to ignore cache files of CLI. 2011-10-05 15:36:49 +02:00
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
a6e4208bdd Fix Controller::paginate and ordering with virtualFields.
Model::isVirtualField() does ensure that model names match the current model.
This creates false positives when doing sorting datasets when an associated
model has a field with the same name as a virtualField.
Fixes #1822. Fixes #1756.
2011-10-04 22:52:28 -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
ceeram
499b5e7268 Merge pull request #223 from Phally/custom-reporter
Custom reporter
2011-10-04 05:39:35 -07:00
Frank de Graaf
69ba1965b8 Changed the order of the include for the custom reporter and added file_exists() to prevent errors. 2011-10-04 09:43:35 +02: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
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
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
f4b2e03295 Errors should be output on stderr. 2011-09-30 21:56:57 -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
Jose Lorenzo Rodriguez
705593908b Fixing some @package declarations 2011-09-30 13:17:12 -04:30
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
mark_story
534291a1a6 Re-adding DISABLE_DEFAULT_ERROR_HANDLING to Configure.
Fixes #2033
2011-09-29 20:36:11 -04:00
mark_story
a3f25ee5e3 Fixing issue with integer columns and NULL values.
Fixes #2037
2011-09-29 20:28:52 -04:00
ADmad
11f38687f7 Fixing doc block 2011-09-29 20:04:06 +05:30
Ceeram
883f579670 fixing duplicate emails being sent with MailTransport fixes #2022 2011-09-29 15:00:48 +02:00