mark_story
|
cffc36e4e0
|
Fix notice error when impossible conditions are created.
Fixes #3084
|
2012-08-01 23:05:56 -04:00 |
|
mark_story
|
ad31caeb0e
|
Merge branch '2.1' into 2.2
|
2012-05-20 14:53:41 -04:00 |
|
Ceeram
|
7dbd6bc3a2
|
make sure model data is moved to alias, even when first key in data is assoc model
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
|
2012-05-19 14:41:16 -04:30 |
|
mark_story
|
a3a2655fd5
|
Fix whitespace errors.
|
2012-05-11 21:38:21 -04:00 |
|
Jose Lorenzo Rodriguez
|
bf0f5ab118
|
Merge remote-tracking branch 'origin/2.1' into 2.2
|
2012-04-29 20:05:39 -04:30 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
mark_story
|
9f9feec222
|
Merge branch '2.2-hash' into 2.2
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
|
2012-04-10 21:32:37 -04:00 |
|
Ceeram
|
2b7fe21ee0
|
remove all Set::extract() from core and tests
|
2012-04-05 01:33:57 +02:00 |
|
ADmad
|
93639a7c43
|
Fixed bug where associated model's afterfind was not triggered in particular case
|
2012-04-04 19:48:37 +05:30 |
|
mark_story
|
19e0d8d946
|
Switch usage to Hash where possible.
|
2012-03-26 22:32:53 -04:00 |
|
Kyle Robinson Young
|
90e7afbdc7
|
Correct parameter order of assertEquals and assertNotEquals
|
2012-03-22 23:37:12 -07:00 |
|
mark_story
|
dbb2dd44d7
|
Fix more coding standards.
|
2012-03-18 21:20:33 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
Ceeram
|
08a4d0bf63
|
Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds
|
2012-03-03 23:55:03 +01:00 |
|
ADmad
|
4edb378ef8
|
Added ability to pass ID as parameter to Model::exists()
|
2012-02-24 19:42:23 +05:30 |
|
Kyle Robinson Young
|
4176e59e52
|
Typo fixes in tests
|
2012-02-23 15:29:53 -08:00 |
|
Majna
|
d41e5621b7
|
Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
|
2012-02-16 19:28:21 +01:00 |
|
Scott Harwell
|
dddcdd105e
|
Added test case for fix in e1738c8c
|
2012-02-05 13:37:54 -05:00 |
|
Ceeram
|
2a9e6771c3
|
allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769
|
2012-01-19 23:26:43 +01:00 |
|
AD7six
|
7b640b8123
|
move find threaded logic to the set class
|
2012-01-10 00:24:38 +01:00 |
|
mark_story
|
b4faa00703
|
Adding error to find(threaded).
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.
Fixes #2341
|
2012-01-02 13:46:35 -05:00 |
|
Jose Lorenzo Rodriguez
|
1651257919
|
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
|
2011-12-26 13:06:48 -04:30 |
|
ADmad
|
389072708a
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
|
2011-12-22 03:15:04 +05:30 |
|
euromark
|
a41539dfa4
|
Indentation fix (tab instead of spaces)
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
|
2011-12-20 22:26:43 -05:00 |
|
mark_story
|
07a2a60468
|
Merge branch '2.0' into 2.1
|
2011-12-13 22:03:40 -05:00 |
|
Kyle Robinson Young
|
b46c4b3e3f
|
Correcting assertEquals parameter order
|
2011-12-12 20:35:31 -08:00 |
|
mark_story
|
2e8498e166
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
|
2011-12-11 22:51:40 -05:00 |
|
Kyle Robinson Young
|
1e1c7a036d
|
Code consistency formatting tweaks
|
2011-12-06 12:52:48 -08:00 |
|
mark_story
|
6d269ce25d
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
|
2011-12-03 13:45:28 -05:00 |
|
Kyle Robinson Young
|
94e119fe67
|
Adhere to code formatting standard
|
2011-11-30 23:21:31 -08:00 |
|
Kyle Robinson Young
|
5876744709
|
Adhering to coding standards
|
2011-11-30 07:44:11 -08:00 |
|
Rachman Chavik
|
1f7c292651
|
fixing broken tests: updating fullTableName() use
At the same time, reversing arguments since phpunit wants 'expected' as
the first parameter.
|
2011-11-25 22:36:44 +07:00 |
|
Ceeram
|
179a5c8559
|
remove order, which was required with setting default order on CakeTestModel
|
2011-11-24 22:20:29 +01:00 |
|
Ceeram
|
05940ae1ec
|
adding default order on id to CakeTestModel, to ensure correct order. Postgres can return results in any order it considers appropriate if none specified
|
2011-11-22 21:50:17 +01:00 |
|
m
|
2957a33b23
|
assertEqual to assertEquals in core test files
Signed-off-by: mark_story <mark@mark-story.com>
|
2011-11-19 09:25:03 -05:00 |
|
Kyle Robinson Young
|
98f03dc6df
|
Replacing test case compatibility functions
|
2011-11-16 21:07:08 -05:00 |
|
Ceeram
|
e5c8a446d6
|
Add sorting on joined model virtual field, fixes #2250
|
2011-11-17 00:18:12 +01:00 |
|
ADmad
|
1244656595
|
Prevent unneeded afterFind callback triggering on associated models. Fixes #2057
|
2011-10-26 19:36:32 +05:30 |
|
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 |
|
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 |
|
mark_story
|
d9db8c8124
|
Fixing failing test on postgres build.
|
2011-10-01 09:08:18 -04:00 |
|
ADmad
|
33030a4502
|
Fixing my previous attempt in ef4826e to make Model::_findCount() behave nicely with 'group' option. Refs #1677, #573
|
2011-09-28 02:58:48 +05:30 |
|
Jelle Henkens
|
7ba2f90b2a
|
Refactoring expectError() calls to PHPUnit annotations
|
2011-09-13 19:56:37 +01:00 |
|
Jose Lorenzo Rodriguez
|
12c73806f4
|
Skipping tests on Sqlite that involve creating a duplicate connection/ It is not possible to open multiple connections to it
|
2011-09-03 21:07:40 -04:30 |
|
Jose Lorenzo Rodriguez
|
7003edeb8f
|
Adding missing expectedException annotations
|
2011-09-03 17:05:09 -04:30 |
|
mark_story
|
2c21fc90fb
|
Fixing failing tests and issues with Sqlite.
|
2011-09-03 22:07:45 +01:00 |
|
mark_story
|
2ceea79862
|
Fixing errors and failing tests with SQLite.
Seems that MySQL is extremely permissive with NOT NULL fields.
SQLite is more strict it seems.
|
2011-09-03 18:37:29 +01:00 |
|
Juan Basso
|
620a65b2fc
|
Merge branch '2.0' into 2.0-api-doc
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
|
2011-08-14 21:12:05 -04:00 |
|
ADmad
|
ef4826eb70
|
Making Model::find('count') behave nicely when 'group' key is specified in options. Closes #1677
|
2011-08-14 07:37:23 +05:30 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -04:00 |
|