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

350 commits

Author SHA1 Message Date
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
mark_story
f09693f6e8 Merge branch 'master' into 2.4 2013-06-29 23:26:26 -04:00
Marc Würth
2609016dfe Changed http links to lighthouse, groups.google and github to https 
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
 2013-06-25 22:58:30 +02:00
mark_story
cd3c54bb9d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-06-10 22:12:10 -04:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +02:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
 2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup 
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
 2013-05-31 00:11:19 +02:00
ADmad
36c592e72e Merge branch 'master' into 2.4 2013-05-26 11:23:53 +05:30
mark_story
82d57fb8b2 Add mocked components to the enable list of components. 
Mocked components should be enabled so they receive callbacks. This
allows more realistic integration tests using testAction(). Stop
disabling the constructor as it causes a number of errors with
components that use components.

Fixes #3842
 2013-05-20 22:22:22 -04:00
mark_story
9cdc3927f2 Tidy up variable names. 
Variables with _ in them are confusing, try to use clearer names.
 2013-05-20 21:52:08 -04:00
mark_story
041c2d289f Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Shell.php
 2013-03-26 20:31:54 -04:00
mark_story
386be52c71 Be compatible with PHPUnit installed with composer. 
Doing a class_exists() check is a simple way to check for PHPUnit being
installed via an autoloader. It also keeps things compatible with
a Vendor dir installation.

Fixes #3721
 2013-03-22 21:01:20 -04:00
Ceeram
99fba8c601 more coding standards fixes, minor rectaoring of testcase 2013-03-18 11:38:50 +01:00
Ceeram
89100f9476 fix coding standards 2013-03-18 11:12:28 +01:00
mark_story
e97b3acebb Merge branch 'master' into 2.4 2013-03-14 20:54:42 -04:00
Mark Story
6d301394f4 Merge pull request #1183 from cincodenada/patch-1 
Fix bug where differing key-ordering in fixtures causes errors.

When a fixtures first and last records differed data should be
inserted correctly.
 2013-03-14 17:52:06 -07:00
Joel Bradshaw
12a142d0ca Remove key-ordering sensitivity in fixtures 
Previously, the field order was effectively taken from the last record in the fixture, but the values were ordered according to the array_unique call above - primarily determined by the first record in the fixture.  If these two orders differed, values were added under the wrong keys.
 2013-03-14 14:17:59 -07:00
pjskeptic
5038e7eb38 Fixed PHPUnit include bug. 
Fixed vendor include path bug.
 2013-03-12 22:02:55 -04:00
mark_story
026df62a1f Merge branch 'master' into 2.4 2013-03-12 09:41:37 -04:00
mark_story
73310f9bfd Fix dropTables being ignore in some cases. 
When autoFixtures = false & dropTables = false, individually loaded
fixtures should not be dropped.

Fixes #3691
 2013-03-12 09:34:20 -04:00
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
mark_story
0ba1aa6d38 Close the session out before erasing all the fixtures. 
Not closing the session before closing fixtures results in fatal errors
when using database sessions.

Fixes #3683
 2013-03-08 20:55:44 -05:00
mark_story
4b13e0a5f2 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-03-04 21:55:29 -05:00
mark_story
e3b870dbf7 Fix notice error for fixtures with imported tables. 
Don't emit an error when a fixture has an imported table with no primary.

Fixes #3659
 2013-03-03 20:59:09 -05:00
mark_story
d1c88ebf8a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-02-24 20:24:26 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
ADmad
13029cc2bc Merge branch 'master' into 2.4 2013-02-09 02:20:16 +05:30
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
46aabbd6ae Testsuite header using Configure for current version 2013-01-29 09:45:42 +01: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
AD7six
a6954a7abc Bark if a fixture file is missing 
A missing fixture file would previously be silently ignored
 2012-06-18 15:28:00 +02:00
mark_story
7ef83b89f5 Merge branch '2.1' into 2.2 
h origin especially if it merges an updated upstream into a topic branch.
 2012-06-17 20:54:59 -04:00
Nick Baker
ae990cc0c6 Code cleanup, break if found, no reason to go through entire vendor list overwriting if found on first try. No reason to create variables we don't need. 2012-06-11 12:40:53 -06:00
Nick Baker
42809512f0 No longer suppress the include path to PHPUnit/Autoload.php as Autoload.php require_once() on two files, if either of them aren't there the shell exits without message. Explanation of issue here: http://www.webtechnick.com/wtn/blogs/view/247/Fixing_PHPUnit_for_CakePHP_2_x_testing_on_Mac_OS_X 2012-06-11 12:22:26 -06:00
mark_story
6725a30fe2 Fix funny warning. 2012-05-23 22:46:18 -04:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
mark_story
ad31caeb0e Merge branch '2.1' into 2.2 2012-05-20 14:53:41 -04:00
Kyle Robinson Young
3f7cbf561b Update PHPUnit install instructions 2012-05-19 22:06:45 -07:00
Jelle Henkens
97ebbc8e23 Fixing coding conventions 2012-05-19 16:08:40 +01:00
AD7six
ef9c5bc004 ClassRegistry::getDataSource doesn't exist 2012-05-04 20:15:04 +02:00
mark_story
7b5e45b965 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/VERSION.txt
 2012-05-03 21:06:35 -04:00
mark_story
004bc5b6e7 Fix overwriting of GET/POST 
ControllerTestCase was overwriting GET and POST and not
restoring them at the end of testAction.

Fixes #2841
 2012-04-30 20:36:19 -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
Juan Basso
333ea29805 Renamed variable name from nested transaction 2012-04-26 20:58:25 -04:00
Juan Basso
12392b6285 Fixed variable name. 2012-04-24 20:03:43 -04:00
Juan Basso
4e480eaca5 Disabling nested transaction for fixtures. 2012-04-24 20:01:22 -04:00
Juan Basso
b95f367bef Disabled nested transactions for fixtures. 2012-04-24 00:34:28 -04:00
mark_story
b6de177ffa Merge branch '2.1' into 2.2 2012-04-23 21:50:36 -04:00
Till Claassen
3f7e2f536f CakeTestSuite::addTestDirectory() ignore non-php 
CakeTestSuite::addTestDirectory() and addTestDirectoryRecursive()
now ignore any files that do not end in .php

This avoids any stray non-php files being parsed, especially
tilde-style backup files that end in .php~

Improves #2031

Signed-off-by: mark_story <mark@mark-story.com>
 2012-04-23 12:15:29 -04:00
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
Ceeram
f0bd7386e2 created, modified and updated fields now use static timestamp in testcases 2012-04-21 17:38:49 +02:00
mark_story
dec67ef259 Add proper charset to web test runner. 
Fixes #2804
 2012-04-18 22:45:55 -04:00
mark_story
8639d5af84 Fix mistakes. 2012-04-15 22:54:13 -04:00
mark_story
72c3059d94 Add missing parent calls. 
Fixes piles of failing tests.
 2012-04-15 22:20:34 -04:00
Jose Lorenzo Rodriguez
f574e9644d Fixed failing test case 2012-04-15 12:51:33 -04:30
mark_story
9fbd57331f Clear configure at the end of each test. 
Fixes #2767
 2012-04-14 23:33:08 -04: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
mark_story
4eea72205b Merge branch '2.1' into 2.2 2012-04-06 21:34:11 -04:00
mark_story
790d9beeb7 Always reconfigure global state. 
Fixes issues wher the test suite with no fixtures could hit
a non test connection.

Fixes #2743
 2012-04-06 20:27:56 -04:00
Kyle Robinson Young
c700fedbf8 Update test suite header version to 2.2 
Conflicts:

	lib/Cake/TestSuite/templates/header.php
 2012-03-27 19:52:58 -04:00
mark_story
ed32e0b39b Update another usage. 2012-03-26 22:32:56 -04:00
Jose Lorenzo Rodriguez
b373309ba9 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/VERSION.txt
 2012-03-25 21:18:58 -04:30
Kyle Robinson Young
a905954484 Update test suite header version to 2.1 2012-03-25 10:36:30 -07:00
Jose Lorenzo Rodriguez
16bde9c723 Making sure components in controller test cases always have a fresh reference to the request object, fixes #2705 2012-03-24 14:34:29 -04:30
Thomas Ploch
b28b25f642 Added 'Fixed whitespace. 2012-03-18 11:12:19 +01:00
Thomas Ploch
7cfcef54ed Added 'Enable Debug Output' link to CakeHtmlReporter. 2012-03-18 11:10:12 +01:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
c2f42343a3 Fix most coding standards issues in TestSuite/ 2012-03-04 21:51:50 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Mark Story
c2d753ffb4 Merge pull request #500 from shama/patch-visibility 
Add missing visibility keywords
 2012-02-21 17:36:36 -08:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
euromark
77624552eb added missing assertText methods to assert cross OS 2012-02-17 23:36:57 +01:00
Kyle Robinson Young
2d43f1873c Fix docblock of CakeFixtureManager::loadSingle() 2012-02-16 21:45:37 -08:00
mark_story
bd0104d972 Add methods to CakeTestCase 
Add assertTextEquals, and assertTextNotEquals for doing
platform independant text comparisons.

Refs #2148
 2012-01-24 21:08:56 -05:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30
mark_story
bc689151a4 Add note about PHP's include_path. 
Refs #2497
 2012-01-21 10:23:25 -05:00
ADmad
bcab3d0cb9 Made default value and behavior of param $exceptions for Folder::tree() identical to same param in Folder::read() 2011-12-22 03:29:21 +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
mark_story
c8fd7c090b Make App test cases the default. 
Fixes #2372
 2011-12-19 23:13:46 -05:00
mark_story
0607437abd Fix various failing tests. 2011-12-17 23:50:41 -05:00
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
Mark Story
4ed2185876 Merge pull request #379 from shama/patch-code-formatting 
Patch code formatting
 2011-12-15 05:44:17 -08:00
Kyle Robinson Young
54ed278284 Code formatting 2011-12-14 22:54:03 -08:00
Kyle Robinson Young
b3396538b7 Add debug flag to flush output 2011-12-14 22:48:41 -08:00
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05:00
Kyle Robinson Young
096ff76295 Fix overreaching Inflector when ControllerTestCase autoMocks 2011-12-12 10:29:33 -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
17fcd0534f Fix spacing for coding standards 2011-12-10 09:06:59 -08:00
Kyle Robinson Young
7fa1984a43 Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile 2011-12-09 23:27:17 -08:00
Kyle Robinson Young
c836ba08a3 Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
m
73de68f5f4 Test suite should display current PHPUnit version. 
Fixes #2316
 2011-12-03 13:47:40 -05: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
4174ddff0f Always set ControllerTestCase::testAction result variables 2011-12-02 06:19:15 -08:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
Rachman Chavik
144b556d1f Adding new property Model::schemaName 
Just like physical table name, the schema name is an important information
that should be available in models.  The property will be populated accordingly
by the model's datasource.
 2011-11-25 22:29:23 +07:00
Ceeram
c12c853f10 moving order for finds from constructor to beforeFind 2011-11-24 22:12:39 +01:00