mark_story
e149c411fb
Merge branch '1.3' into merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/shells/tasks/template.php
cake/dispatcher.php
cake/libs/controller/component.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/cache.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/fixtures/datatype_fixture.php
2011-02-05 12:20:09 -05:00
ADmad
88d5db76fd
Removed overriding of recursive to 0 in Model::_findNeighbors() if 'recusive' option is not specified in find options. Closes #860
2011-01-30 04:13:01 +05:30
mark_story
71d8e744f1
Fixing case-sensitivity of AS in fields. Tests added. Fixes #1474
2011-01-26 20:58:16 -05:00
mark_story
ed7f8d1906
Fixing issue where DboPostgres used the wrong type for boolean columns with a default of false or true.
...
Added a test case.
Changing Model::create() so it doesn't wipe out default values === false.
Fixes #1460
2011-01-21 13:31:33 -05:00
mark_story
dca3fecfed
Merge branch '1.3' into merger
...
Conflicts:
cake/console/error.php
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/controller/components/request_handler.php
cake/libs/model/cake_schema.php
cake/libs/router.php
cake/libs/set.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/text.php
cake/libs/view/view.php
cake/tests/cases/libs/set.test.php
2011-01-18 20:04:30 -05:00
Jeremy Harris
be563e1220
Merge remote branch 'upstream/2.0' into 2.0
2011-01-17 20:07:22 -08:00
Jeremy Harris
1f0c57c4ee
Fixed aliasing so it works with plugins in the 'className' key
2011-01-14 17:44:33 -08:00
Jeremy Harris
2b596859cb
Reversed alias and actual class to be more consistent with how Model aliases load and to make migration easier
2011-01-13 18:04:06 -08:00
Juan Basso
d15ed329d9
Changed the trigger_error by exceptions in ConnectionManager.
2011-01-12 23:08:34 -02:00
mark_story
f893e3b63b
Applying patch from 'ryandesign' fixing incorrect datetime formats. Fixes #1441
2011-01-11 20:16:42 -05:00
Jeremy Harris
24d90c17d6
Allowed behaviors to be aliased by setting the 'alias' key
2011-01-09 18:28:12 -08:00
mark_story
443f6d1c5b
Merge branch '1.3' into merger
...
Conflicts:
cake/console/shells/tasks/test.php
cake/libs/cake_log.php
cake/libs/controller/components/email.php
cake/libs/set.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/libs/view/helpers/time.php
cake/libs/view/view.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/shells/tasks/test.test.php
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/db_acl.test.php
cake/tests/cases/libs/set.test.php
2011-01-08 23:49:19 -05:00
mark_story
de6eda964e
Removing silent errors in PDO dbo's when a connection exception is created.
...
Adding the host param for mysql.
Adding a test for mysql missing the host param.
Fixes #1427
2011-01-03 23:34:22 -05:00
mark_story
d3d009588d
Fixing failing tests because of incorrect types.
2011-01-03 23:06:48 -05:00
José Lorenzo Rodríguez
da152e0e82
Changes to make mysql cast boolean vaules to the native php boolean datatype
2011-01-01 22:07:27 -04:30
mark_story
fd3b4b2cd5
Adding Model::hasMethod() and tests.
2010-12-26 17:35:22 -05:00
mark_story
c5fa93b0fb
Removing test that is testing methods covered in ObjectCollection test case.
2010-12-26 17:26:18 -05:00
mark_story
0c4b665ad0
Adding ability for BehaviorCollection::hasMethod() to return the callback.
...
Re-factored BehaviorCollection::dispatchMethod to be simpler and faster.
Changing now BehaviorCollection stores callbacks so they look like normal php callback arrays.
2010-12-26 17:09:20 -05:00
mark_story
769da1a7c8
Adding basic BehaviorCollection::hasMethod implementation. Tests added.
2010-12-26 16:44:50 -05:00
mark_story
ee3017599d
Merge branch '2.0' into 2.0-pagination
...
Conflicts:
cake/libs/controller/components/paginator.php
cake/libs/router.php
2010-12-24 14:43:11 -05:00
mark_story
ef77e60cb0
Removing @subpackage tags, moving contents of @subpackage into @package.
...
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
mark_story
e20ea8ad72
Renaming Dispatcher::__loadRoutes -> Dispatcher::_loadRoutes to match naming conventions.
...
Updating method name usage, as assertType is deprecated as of PHPUnit 3.5.6
2010-12-24 12:54:04 -05:00
mark_story
51e2b16d46
Removing pagination test from Containable test case, it doesn't make sense there.
2010-12-19 17:24:38 -05:00
mark_story
e410509684
Fixing TestTask not being able to find plugin objects when baking test skeletons interactively. Test case added. Fixes #1361
2010-12-13 22:04:55 -05:00
mark_story
bf22af6b7f
Fixing more strict errors and usage errors in BehaviorCollection test.
...
Making modParams only work if the result is an array. This is for compatibility with previous behaviour.
2010-12-12 17:42:40 -05:00
mark_story
48879f8264
Fixing strict errors in translate and acl behaviors.
...
Removing conditional definition of I18nModel. There is no reason for it to exist anymore.
Removing duplicate class definition.
2010-12-12 17:38:49 -05:00
mark_story
df21d19c4c
Making a bunch of properties public so containable can hack around. Need to refactor and fix visibility issues.
...
Fixing failing tests in containable.
2010-12-12 15:48:36 -05:00
mark_story
81e009b816
Fixing additional strict warnings.
2010-12-12 15:02:38 -05:00
mark_story
33b8a35b75
Fixing strict warnings in TreeBehavior and a few other classes.
2010-12-12 14:56:48 -05:00
mark_story
b9f0fc0724
Merge branch '1.3' into merger
...
Conflicts:
cake/dispatcher.php
cake/libs/cake_session.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/set.php
cake/libs/validation.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
mark_story
8031d33d33
Fixing more E_STRICT notices and adding a type check to DboSource::dropSchema().
2010-12-04 14:37:02 -05:00
mark_story
a6c5065e9c
Fixing a few more E_STRICT errors in postgres test/class.
2010-12-04 14:31:11 -05:00
mark_story
7e29859676
Fixing E_STRICT errors in test models.
2010-12-04 14:19:53 -05:00
mark_story
18fb12c95c
Removing & pass by ref operators as they aren't needed any more.
...
Fixing a bunch of E_STRICT errors.
2010-12-04 14:15:32 -05:00
mark_story
64d1f799f8
Adding fixtures that fixed MissingTableExceptions I was getting.
2010-12-04 13:52:38 -05:00
José Lorenzo Rodríguez
e167271568
Making more DboSlite tests pass
2010-12-03 14:41:39 -04:30
José Lorenzo Rodríguez
2e04c5260e
Fixing some tests to make them run on sqlite
2010-12-02 00:19:43 -04:30
José Lorenzo Rodríguez
0d93520e0a
Fixing test case for sqlite
2010-11-29 20:52:32 -04:30
José Lorenzo Rodríguez
130fe603a7
Skipping test incompatiblw with mysql
2010-11-28 23:34:20 -04:30
José Lorenzo Rodríguez
592dda92de
Fixing test to make it pass using DboSqlite
2010-11-28 22:48:34 -04:30
José Lorenzo Rodríguez
0ff01330c4
Making dates deconstruction in model more consistent for different datasources
2010-11-27 00:13:04 -04:30
José Lorenzo Rodríguez
41ee035d28
Starting to bring sqlite dbo up to date
2010-11-26 23:46:34 -04:30
José Lorenzo Rodríguez
b6731dd9ad
Merge remote branch 'origin/2.0' into feature/2.0/pdo
...
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
2010-11-26 20:26:41 -04:30
mark_story
15ca2400bc
Fixing issue in DboSource::name() where special characters in column names would not be correctly quoted.
...
Tests added.
Fixes #1264
2010-11-25 06:52:23 -05:00
mark_story
4c0e69b8fc
Removing constant checks, they aren't used anymore.
2010-11-21 15:13:33 -05:00
mark_story
8aabf3689e
Making BehaviorCollection more consistent with other object collections.
...
Fixing failing tests caused by not being updated when behavior changed.
2010-11-21 14:42:13 -05:00
José Lorenzo Rodríguez
40418de218
Freeing up some memory in dbos after the result set has been completly fetched.
...
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
2010-11-16 23:59:24 -04:30
mark_story
d12c232d8a
Merge branch '1.3' into merger
...
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
José Lorenzo Rodríguez
f2b707ac0b
Merge remote branch 'origin/2.0' into feature/2.0/pdo
...
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
2010-11-16 21:54:42 -04:30
mark_story
76a80c262e
Fixing failing test caused by name() being able to quote things better now.
2010-11-13 12:04:22 -05:00
