Commit graph

11559 commits

Author SHA1 Message Date
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
Ceeram
22029a1199 fixing email.php.default, from should have email as key 2011-09-29 14:59:27 +02:00
José Lorenzo Rodríguez
314948609d Merge pull request #220 from bar/1.3-fix-input-error-complete
Form input elements can now be rendered with 'error' class appended and empty error messages.
2011-09-28 22:17:03 -07:00
Jose Lorenzo Rodriguez
8acd980895 Converting more pattern assertions into simple string contains 2011-09-29 00:42:24 -04:30
Jose Lorenzo Rodriguez
fbdb058441 Converting regular expression assertions to simple string contains, those perform faster and consume less memory 2011-09-29 00:05:15 -04:30
Jose Lorenzo Rodriguez
27ab12dd2a Simplifying assertions in FixtureTask test 2011-09-28 23:39:07 -04:30
Jose Lorenzo Rodriguez
6196e74339 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-28 22:59:00 -04:30
Jose Lorenzo Rodriguez
7b3ceb5a29 Fixing a few failing test cases and attempting to work around php segmentation fault when running the complete test suite 2011-09-28 22:57:50 -04:30
mark_story
dff45740ea Add 'trace' to the data provided to Debugger formats.
Allows custom debugger output formats to display
a stack trace.
2011-09-28 23:26:38 -04:00
mark_story
9e080951b1 Adding additional documentation for CrudAuthorize.
Fixes #2034
2011-09-28 23:25:14 -04:00
mark_story
864cb70645 Moving basic templates to the 'base' key. 2011-09-28 23:25:14 -04:00
Jose Lorenzo Rodriguez
6b7c752478 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-28 21:23:43 -04:30
Jose Lorenzo Rodriguez
df2ef0e4f1 Bringing the SQlserver datasource up to date, fixing a doc block 2011-09-28 21:23:06 -04:30
José Lorenzo Rodríguez
aa6d6a9918 Merge pull request #221 from majna/2.0-doc-comments
Fixed doc block comments.
2011-09-28 14:07:46 -07:00
Majna
681207e327 Fixed doc block comments. 2011-09-28 22:33:46 +02:00
Ber Clausen
ae8dd1c969 Form input elements can now have 'error' class appended with empty error messages.
Allow setting empty error messages inside Model->validate. This
complements Ceeram's commit which allows overriding error messages by
empty strings from Form->input().
2011-09-28 12:14:01 -03:00
Ceeram
9f23f65755 Passing empty string in [\'error\'] behaved like false, now will behave like any other string 2011-09-28 12:14:01 -03:00
Jose Lorenzo Rodriguez
7f2a4e5137 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2011-09-28 10:42:13 -04:30
Jeff Loiselle
932f07ca77 Fixes baking of custom views. Was not setting path correctly or
capturing content
2011-09-28 10:32:00 -04:00
mark_story
d489d490a6 Moving 'joins' key conversion into DboSource::buildJoinStatement()
Having this in Model felt like the wrong layer for it to reside.
This also simplifies a few things internally.
Refs #1517
2011-09-27 22:43:06 -04:00
Ceeram
6afa21cb18 find with joins option now respects prefix set in database configuration, fixes #1517
test to prove validity of ticket #1517
2011-09-27 22:43:06 -04:00
mark_story
08b974d64b Adding the _x and _y fields to the unlocked fields
for image submits.
Fixes #2032
2011-09-27 21:14:36 -04:00
mark_story
6e22f1d0a8 Excluding hidden files from test directory adding.
Fixes #2031
2011-09-27 20:43:47 -04:00