adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 19:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13337 commits 7 branches 0 tags 44 MiB
Commit graph

341 commits

Author SHA1 Message Date
Kyle Robinson Young
75882507bc Remove unnecessary loadFixtures() calls 2012-02-16 22:37:18 -08:00
Kyle Robinson Young
95b8675637 Cleaning up ModelCrossSchemaHabtm test case 2012-02-16 22:25:53 -08:00
Kyle Robinson Young
4141a3ab5b Load specific test plugins rather than all to avoid conflicts 2012-02-16 20:03:44 -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
Jose Lorenzo Rodriguez
4cfc033387 Fixing failing test cases 2012-02-13 00:26:10 -04:30
Ceeram
bc07ba3839 Added option['deep'] to saveAll, to save unlimited levels associated data 
Squashed commit of the following:

commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 22:29:33 2012 +0100

    update docblocks for deep save

commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff1
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:17:34 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 1d32698640fa1a3c1d606eeaf4740637ff8a1991
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:16:57 2012 +0100

    Revert "adding info in docblock about associated model fieldList"

    This reverts commit 7cc10a2b5afc1007c388a6da449781dc351d50cd.

commit 7cc10a2b5afc1007c388a6da449781dc351d50cd
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:05:18 2012 +0100

    adding info in docblock about associated model fieldList

commit db2ad2759f6af460715a8bbee167262bcbb62d77
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 17:51:44 2012 +0100

    add tests for deep saveAll respecting fieldList option

commit 14123fccfc43fac1b4cddeea8350dca8fb9c9821
Merge: cfdf25d 2afb05b
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 16:51:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit cfdf25d4b587c6f1a8cd6ec2bc46dc21fa3c6704
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Feb 7 13:54:59 2012 +0100

    Make saveAllTheThings fully BC, use $options['deep'] = true, to save infinite recursive data

commit 6e8c4380c37a31efc2a37a5ab6438db26d293eb3
Merge: 203c7e1 95aa7e3
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:22:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 203c7e1d9870e282ec7098297d47e49132904401
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:19:25 2012 +0100

    validate all the things as well

commit d920d0000fcab80fc48a29b45dbba147a2eed27c
Merge: d648f6a 4f1be12
Author: Ceeram <c33ram@gmail.com>
Date:   Mon Jan 23 18:22:12 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit d648f6a90419e0fa27ed1d9e9feb51c37fbf0397
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Dec 9 15:11:52 2011 +0100

    making saveAll, saveMany and saveAssociated not limited to only save directly related models
 2012-02-13 01:00:28 +01:00
mark_story
2afb05b590 Merge branch '2.0' into 2.1 
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
 2012-02-12 10:06:13 -05:00
Mark Story
6502ab8f39 Merge pull request #473 from majna/2.1-cache-clear 
Fix Cache::clear() calls in tests.
 2012-02-10 15:56:21 -08:00
Ceeram
1f0af2a138 Adding order on created to the find, avoid failing test by incorrect order in postgres 2012-02-10 23:51:41 +01:00
Majna
42cbb8cafe Fix Cache::clear() calls in tests. 2012-02-10 20:38:41 +01:00
Ceeram
028ba27522 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-02-10 17:26:16 +01:00
Ceeram
97f48dcdb3 fix failing test, caused by postgres ordering 2012-02-10 17:26:05 +01:00
mark_story
0cfec525b2 Allow SqlServer to execute procs correctly. 
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.

Fixes #2558
 2012-02-09 22:27:30 -05:00
Yasushi Ichikawa
e8a9d93eb5 Add params option to logQuery() 
Parameters for prepared statements are now part of the
logged query data.
 2012-02-08 20:15:40 -05:00
Thomas Ploch
4f3b266491 Added support for simplified required validation on 'create' or 'update'. Added testcases for new 'required' attributes and conflicts with the 'on' key. Fixes #230. 2012-02-07 12:15:04 +01:00
ADmad
610213dd6c Added test for deleting dependent hasMany associated records. Refs #2553 2012-02-07 01:12:14 +05:30
Scott Harwell
dddcdd105e Added test case for fix in e1738c8c 2012-02-05 13:37:54 -05:00
mark_story
d904ab00fa Merge branch '2.0' into 2.1 2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8 fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464 2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/View/ThemeView.php
 2012-01-26 21:40:18 +01:00
mark_story
dbece1f157 Add test for saveField() + foreign key. 
Closes #2507
 2012-01-24 20:32:48 -05:00
mark_story
b8e27c7588 Fix indentation. 2012-01-24 20:32:06 -05:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30
Jose Lorenzo Rodriguez
37314a2188 Logging transaction commands in DboSource, fixes #2457 2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52 Preventing datasource creationa and access on models having $useTable = false; 2012-01-21 14:03:11 -04:30
mark_story
df5d9ac3d1 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
 2012-01-20 20:28:15 -05:00
Ceeram
d4e2fbf6b8 set correct default validate option, now matches saveAll/saveMany default value, fixes #2492 2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3 Merge changes from 1.3 to 2.0 
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
 2012-01-19 22:50:40 -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
0e56d742b8 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/basics.php
 2012-01-08 21:59:18 -05:00
mark_story
c548b6b88a Fix issue with find(count) and translated conditions. 
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.

Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.

Fixes #2349
 2012-01-08 20:40:25 -05:00
mark_story
9a67a70703 Fix failing test. 2012-01-07 20:24:33 -05:00
mark_story
beced84d2d Fix illegal offset caused by TranslateBehavior. 
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.

Fixes #2443
 2012-01-07 11:58:35 -05:00
Jose Lorenzo Rodriguez
1991430584 Removing test that does not relate anymore to SqlServer datasource 2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d Fixing a few SqlServer failing tests 2012-01-07 02:14:07 -04:30
mark_story
9562638610 Merge branch '2.0' into 2.1 2012-01-04 07:39:35 -05:00
mark_story
c43b099894 Fix null bytea columns. 
Apply patch from 'opiazer'  Fixes #2432
 2012-01-03 20:51:56 -05: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
mark_story
83987bee17 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Network/CakeRequest.php
 2012-01-01 21:15:27 -05:00
mark_story
b5f918765e Adding docs + exceptions for name translation. 
Closes #2367
 2011-12-30 20:39:04 -05:00
mark_story
23178df504 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-12-29 20:03:42 -05:00
Rachman Chavik
b1aae5b5ab add fullTableName tests with empty schemaName 2011-12-29 19:17:06 +07:00
Mark Story
2cc38b5ba7 Fix failing test in PHP5.4 2011-12-27 19:40:51 -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
mark_story
d8bc13f996 Fix incorrect time handling in deconstruct() 
Apply patch from 'Amit Badkas' to solve issues where invalid times
were treated as valid.
Re-structure tests to use a dataprovider instead of copy + paste.

Fixes #2412
 2011-12-26 10:03:14 -05:00
ADmad
e4cc18c0e7 Changing test case to make it pass on Sqlite 2011-12-24 01:18:07 +05:30
ADmad
053ebf211e More test case fixing 2011-12-24 01:04:38 +05:30
ADmad
f24c01c1f4 Fixed failing test cases. 2011-12-24 00:59:51 +05:30
ADmad
ba27c8c201 Added multi-model fieldList support 2011-12-23 02:07:48 +05: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
ADmad
1358af783b Added test case for TreeBehavior::recover(). Refs #2392 2011-12-18 15:23:49 +05:30
Kyle Robinson Young
d794084d38 More code standards formatting 2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
Rachman Chavik
a8d0447e61 fix fullTableName duplicate prefix, closes #2355 2011-12-14 14:35:20 +07:00
Kyle Robinson Young
060e225b76 Add test for Model::getID(), simplify return and remove dated @see link 2011-12-13 22:19:50 -08:00
mark_story
cfb6ed4cda Fix failing tests. 2011-12-13 22:11:06 -05:00
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05:00
mark_story
8d1edd72f2 Moving tests and un-skipping them. 
Adding tests for proper field quoting in conditions.
Closes #2369
 2011-12-13 21:26:03 -05:00
Rachman Chavik
d77f9aacde updating multidb tests to use ConnectionManager 2011-12-13 21:10:16 +07:00
Rachman Chavik
a88ca54a8d updating usage of assertEqual -> assertEquals 2011-12-13 21:03:40 +07:00
Kyle Robinson Young
b46c4b3e3f Correcting assertEquals parameter order 2011-12-12 20:35:31 -08:00
Rachman Chavik
8b4e79c795 adding tests for LH 275 
ported to 2.0 branch from cakephp/cakephp#93
 2011-12-12 18:18:02 +07:00
mark_story
d63d51e3dd Fix failing tests caused by incorrect mocks. 2011-12-11 23:07:01 -05: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
Jose Lorenzo Rodriguez
73aeb6ba62 Lazy-loading the $tablePrefix property in models, Fixes #2277 2011-12-08 00:10:22 -04:30
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
Mark Story
ba81754a1a Merge pull request #352 from shama/patch-cakeschema-test-fix 
CakeSchemaTest: Skip testSchemaReadWithConfigPrefix test if an existing prefix has been set
 2011-12-05 11:46:47 -08:00
Mark Story
a32eabe492 Merge pull request #355 from shama/patch-casing 
Consistently setting setUp() and tearDown() on test cases
 2011-12-05 11:44:15 -08:00
ADmad
a062135d87 Merge pull request #354 from shama/patch-databasesession-test-fix 
Fix DatabaseSessionTest garbage collection test case
 2011-12-05 06:00:59 -08:00
Kyle Robinson Young
5388237099 Consistently setting setUp() and tearDown() on test cases 2011-12-04 13:27:51 -08:00
Kyle Robinson Young
66b3e9a7c9 Fix DatabaseSessionTest garbage collection test case 2011-12-04 13:04:42 -08:00
Kyle Robinson Young
8e70f4ac12 Fix CakeSession testCheckKeyWithSpaces and testUsingPluginHandler test cases 2011-12-04 12:43:27 -08:00
Kyle Robinson Young
42583ff6a5 Skip testSchemaReadWithConfigPrefix test if an existing prefix has already been set 2011-12-04 12:10:01 -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
mark_story
49708ec837 Fix cachefiles being generated with " 
Cache files with SQLite should not contain "

Fixes #2323
 2011-11-30 21:56:25 -05:00
Ceeram
b5c4b85601 Fixing cascading delete, when using foreignKey false and setting condition on hasOne. 2011-11-30 20:02:36 +01:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
Rachman Chavik
1677e87512 fixing broken tests: update expected regex pattern 2011-11-25 22:36:44 +07: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
Rachman Chavik
c4cbf1c635 Adding cross schema test 2011-11-25 22:29:23 +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
mark_story
6d6ac10834 Fix failing tests caused by previous commit. 2011-11-20 23:00:58 -05:00
mark_story
21cd3f00ac Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Test/Case/BasicsTest.php
 2011-11-19 20:40:07 -05: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
Ceeram
0f299a1542 use old timestamp variable, to ensure test to pass 2011-11-17 13:09:03 +01:00
Jose Lorenzo Rodriguez
02912b6eeb Correctly getting connection configs in CakeSchemaTest 2011-11-17 01:03:46 -04:30
Rachman Chavik
073d04931a Adding tests for loading multischema fixtures 2011-11-17 11:24:45 +07:00
mark_story
fa0ec44dfd Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
 2011-11-16 21:31:16 -05:00
Kyle Robinson Young
c97dca1570 Test case compatibility assertIsA() to assertInstanceOf() 2011-11-16 21:07:08 -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
Ceeram
3cb5188b2d Fix failing test, moving timestamp define before the save to ensure it cannot be off by a second 2011-11-16 13:16:36 +01:00
Ceeram
025133db32 Fix tests which might fail due to unexpected order on finds 2011-11-16 13:15:14 +01:00
mark_story
fb7d931bef Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
 2011-11-15 23:10:34 -05:00
Ceeram
9fd04307ff adding sort on testresults, to avoid incorrect order returned by MySQL 2011-11-15 17:18:27 +01:00
Ceeram
37a932b6a7 adding testcase for saving habtm associations with no primary model data set 2011-11-15 16:47:25 +01:00
mark_story
87f5b6cf26 Fix more strict errors. 
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
 2011-11-13 20:47:55 -05:00
mark_story
0a0a09920b Updating for PHP5.4 
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
 2011-11-12 21:42:19 -05:00
Ceeram
d8194a5818 Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0 2011-11-12 18:09:58 +01:00
ADmad
e1354b2ee6 Merge branch '2.0' into 2.1 2011-11-06 20:39:08 +05:30
mark_story
d68053c4d4 Fix exception expectations. 
PHPUnit 3.6 does not allow you to expect the generic Exception
class.
 2011-11-04 22:54:08 -04:00
mark_story
13900dc75c Starting to fix issues with PHPUnit 3.6 compatibility. 2011-11-04 22:54:08 -04:00
mark_story
0304bb8796 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
 2011-11-03 22:04:00 -04:00
mark_story
f531e7f24b Fix UUID issue in SQLite 
Only varchar(36) was interpreted as a uuid.  char(36)
should also be treated this way.  Most documentation refers
to this type.  Also char(x) fields should be treated as strings,
not text.

Fixes #2184
 2011-10-31 23:10:48 -04:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
mark_story
43df8d34e7 Use String::tokenize() to split up fields. 
It is slightly more intelligent than explode()
Solves basic problems in Sqlite with virtualFields.

Fixes #2163
 2011-10-26 21:17:20 -04:00
ADmad
1244656595 Prevent unneeded afterFind callback triggering on associated models. Fixes #2057 2011-10-26 19:36:32 +05:30
mark_story
ab6aab8a1a Merge branch '2.0' into 2.1 2011-10-22 11:03:42 -04:00
mark_story
fe9e595913 Fix issue with postgres and virtualFields 
If a virtualField was set to a literal value it would be quoted.
Test added.

Fixes #2085
 2011-10-21 22:17:48 -04:00
Ceeram
2890e6659e Fixing execute() $this->_result was not instance of PDOStatement after queries other then SELECT, lastAffected() now returns correct integer 2011-10-20 14:27:48 +02:00
AD7six
a538c5d220 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 
Conflicts:
	lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
 2011-10-18 17:46:00 +02:00
AD7six
b4228dcaee Merge branch '2.1' into 2.1-simpler-tests 2011-10-18 10:03:32 +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
Majna
8c3f64be52 Fixing doc blocks in Test suite and some visibility keywords. 2011-10-10 23:18:48 +02: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
ade9e4d154 Fixing another postgres failing test 2011-10-05 21:36:36 -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
Jose Lorenzo Rodriguez
0a2553cce5 Making model tests less time dependent 2011-10-03 14:51:07 -04:30
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
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
mark_story
a3f25ee5e3 Fixing issue with integer columns and NULL values. 
Fixes #2037
 2011-09-29 20:28:52 -04:00
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
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
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
mark_story
7e44836837 Fixing failing test. 2011-09-26 21:46:25 -04:00
Yosuke Basuke Suzuki
5612d411f3 Added unittest for saveAll() validation with the data no id assigned. 2011-09-23 22:23:26 +09:00
mark_story
8d43764801 Fix issue with duplicate associations when using string form. 
Fixes #2002
 2011-09-18 12:26:59 -04:00
mark_story
6a4e7558fc Merge branch '1.3' into merger 
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
 2011-09-18 12:09:04 -04:00
mark_story
09e7f1d491 Splitting apart the Scaffold and ScaffoldView tests. 
Fixes #1985
 2011-09-16 22:08:19 -04:00
Renan Gonçalves
4378bb6dc4 Fixed bug in CakeSchema where it determines the field position. 
- Respective tests were added.
- Schema files will now have 'after' => 'previous_field' on it.
 2011-09-16 15:28:28 +02:00