Graham Weldon
|
66d856d883
|
Added extra line for referencing license file for copyright
|
2013-02-08 21:22:51 +09:00 |
|
Graham Weldon
|
7b860debe4
|
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
|
2013-02-08 20:59:49 +09:00 |
|
Ceeram
|
16be9d4990
|
remove unused local vars
|
2013-01-23 17:22:06 +01:00 |
|
mark_story
|
9c29fab4a4
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Network/Http/HttpResponse.php
|
2013-01-14 20:24:56 -05:00 |
|
Cauan Cabral
|
099ca310e2
|
Ensure $sources is Array before use
|
2013-01-11 10:14:05 -03:00 |
|
mark_story
|
d0d13acaf4
|
Merge branch 'master' into 2.3
|
2013-01-08 20:15:46 -05:00 |
|
mark_story
|
ac1f64abc9
|
Start and end transactions on the fixtures datasource.
Fixes #3490
|
2013-01-05 14:50:09 -05:00 |
|
mark_story
|
659715664d
|
Check for the methods that will be called.
Check the same methods that are called. Without this diffs are not
printed for failures.
Fixes #3503
|
2013-01-01 14:25:34 -05:00 |
|
Gregory Gaskill
|
b6b40b1196
|
Updating version number in test suite header.
|
2012-12-30 13:50:05 -08:00 |
|
Jose Lorenzo Rodriguez
|
f25f35353d
|
Making getMockForModel actually useful
|
2012-12-23 00:30:27 +01:00 |
|
euromark
|
b811afbc44
|
double spaces to single ones
|
2012-12-22 23:48:15 +01:00 |
|
José Lorenzo Rodríguez
|
a8bd7c6678
|
Merge pull request #961 from dereuromark/2.3-unify-object-collection
2.3 unify object collection
|
2012-12-22 14:24:26 -08:00 |
|
euromark
|
881127ef4d
|
unify new lines at the end of the file
|
2012-12-05 15:00:24 +01:00 |
|
ADmad
|
72d6ca636f
|
Docblock fixes
|
2012-11-29 04:36:29 +05:30 |
|
Ceeram
|
eadc3a75e5
|
fix coding standards
|
2012-11-21 15:39:03 +01:00 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
euromark
|
8acdb129b2
|
unify object load/unload and loaded methods
|
2012-11-16 12:14:28 +01:00 |
|
Ceeram
|
e02eab05d5
|
Remove all todo from core, create tickets for them
|
2012-11-14 14:59:51 +01:00 |
|
Ceeram
|
56225bcca3
|
fix all warnings except TODO warnings
|
2012-11-14 12:56:10 +01:00 |
|
Reuben Helms
|
4d87abfcdc
|
Add CakeTestCase::getMockForModel convenience method
This method provides a convenience to create mocked models that
are still associated with fixtures and the datasource.
|
2012-11-13 13:07:18 +10:00 |
|
mark_story
|
e0aab77dab
|
Merge branch 'master' into 2.3
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
|
2012-11-10 21:33:26 -05:00 |
|
Ceeram
|
aaf2d2ef71
|
fix remaining cs errors
|
2012-11-04 13:56:13 +01:00 |
|
dogmatic69
|
641ba9f3e6
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
|
2012-10-24 19:03:44 +01:00 |
|
mark_story
|
1aea9ac0c9
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
|
2012-10-15 21:46:49 -04:00 |
|
Adam Taylor
|
4090c2e932
|
Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
|
2012-10-15 18:19:37 -06:00 |
|
mark_story
|
2a803ea412
|
Add missing import
Refs GH-877
|
2012-10-14 22:22:46 -04:00 |
|
Graham Weldon
|
41ae19b5bc
|
Removed spaces at the end of lines.
|
2012-10-15 11:44:31 +11:00 |
|
mark_story
|
9a66768aa4
|
Merge branch 'master' into 2.3
|
2012-10-08 13:08:58 -04:00 |
|
mark_story
|
972d5752bf
|
Improve error message.
Fixture datasources must begin with test so you don't accidentally use
a real datasource.
Fixes #3254
|
2012-10-04 20:41:02 -04:00 |
|
dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
mark_story
|
a1838a0c85
|
Implement missing bits for automatic sequence resetting.
Refs #3206
|
2012-09-18 14:12:23 -04:00 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|
dogmatic69
|
cf8fccae96
|
converting $foo == null / $foo == false to !$foo
|
2012-09-14 18:26:30 +01:00 |
|
mark_story
|
728300786b
|
Merge branch 'master' into 2.3
|
2012-08-30 19:43:11 +01:00 |
|
mark_story
|
988a847f49
|
Fix unescaped entities.
|
2012-08-27 14:48:07 -04:00 |
|
mark_story
|
d5333a2ff1
|
Merge branch 'master' into 2.3
|
2012-08-20 16:20:27 -04:00 |
|
mark_story
|
00f3e7e441
|
Fix silent failures.
Fixes #3133
|
2012-08-20 16:19:34 -04:00 |
|
mark_story
|
e59555a66f
|
Merge branch 'master' into 2.3
|
2012-08-03 22:45:56 -04:00 |
|
mark_story
|
4541510e26
|
Fix notice error when a missing action error is hit.
|
2012-07-29 22:37:41 -04:00 |
|
euromark
|
2a553dcfd1
|
unified doctype for browser related layout templates
|
2012-07-24 18:06:39 +02:00 |
|
euromark
|
6557e3bafe
|
only try to get comparison failure for the appropriate object
|
2012-07-21 15:23:54 +02:00 |
|
mark_story
|
3c6b50953b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-07-18 22:12:51 -04:00 |
|
mark_story
|
3b46cd43f1
|
Add logging and error when fixture creation fails.
This helps people find and solve issues faster/easier.
Fixes #3044
|
2012-07-17 22:48:50 -04:00 |
|
euromark
|
3945c0e6a8
|
rtim files
|
2012-07-18 03:55:29 +02:00 |
|
mark_story
|
46f8de72a2
|
Fix web runner showing fails as passes when show_passes is on.
Fixes #3035
|
2012-07-13 22:58:07 -04:00 |
|
Jose Lorenzo Rodriguez
|
ec7ec73b66
|
Merge branch '2.1' into 2.2
|
2012-07-01 17:35:24 -04:30 |
|
mark_story
|
87677e4cdf
|
Fix possible notice errors.
|
2012-06-26 23:31:22 -04:00 |
|
Alberto Leal
|
7d93c57bd3
|
Use the diff style provided by PHPUnit in the webrunner.
Displaying actual vs expected messages when the result is an array or string.
Fixes #GH-699
|
2012-06-26 19:53:49 -04:00 |
|
mark_story
|
503bc06c70
|
Mark fixtures as created if they exist.
Fixes #2905
|
2012-06-24 12:57:54 -04:00 |
|
mark_story
|
81611956f5
|
Update doc blocks.
Add missing @throws
|
2012-06-18 23:29:28 -04:00 |
|