Commit graph

13962 commits

Author SHA1 Message Date
Ceeram
2da45df4c2 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-19 13:42:44 +01:00
ADmad
59e28fc94f Merge pull request #323 from shama/patch-doc
Updating docblocks with @link on File, Folder and Set utilities
2011-11-18 12:21:37 -08:00
Kyle Robinson Young
708ae873a5 Add @link to Set methods 2011-11-18 11:13:46 -08:00
Kyle Robinson Young
53f7a716ec Add @link to File/Folder properties 2011-11-18 11:05:30 -08:00
Gordon Pettey (petteyg)
99e6072fd3 Make App::path('Console') overwrite App::core('Console') for themes 2011-11-18 05:00:45 +00:00
mark_story
cb49b242ae Fix issue in Router with prefixes.
Prefixes should not be interpreted as named parameters.
Fixes #2269
2011-11-17 20:30:34 -05:00
Christian Hieke
d6b9b48d4a Update test case for disabled radio buttons (allow boolean value) 2011-11-17 16:39:37 +01:00
Christian Hieke
7dfe72708f Allow a boolean value for the disabled attribute in function radio. 2011-11-17 15:59:14 +01:00
Ceeram
0f299a1542 use old timestamp variable, to ensure test to pass 2011-11-17 13:09:03 +01:00
Ceeram
b380b5efb9 Add back missing .sql files, related to pull request 132 on docs repo 2011-11-17 13:00:54 +01:00
ADmad
90b007ef75 Implemented priority based triggering of callbacks for objects in collection 2011-11-17 12:36:54 +05:30
Jose Lorenzo Rodriguez
02912b6eeb Correctly getting connection configs in CakeSchemaTest 2011-11-17 01:03:46 -04:30
Rachman Chavik
aab8e98531 Configure ClassRegistry in test mode
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
2011-11-17 11:31:36 +07:00
Rachman Chavik
408e785d5e Display datasource name in exceptions and error page.
When working with multiple databases, it's helpful to display
the datasource name that is requested by a given model.
2011-11-17 11:24:45 +07:00
Rachman Chavik
073d04931a Adding tests for loading multischema fixtures 2011-11-17 11:24:45 +07:00
Rachman Chavik
a5ac328a71 Adding multidb fixture support
CakeTestFixture now has a $useDbConfig property, that is similar
to Model::useDbConfig.  CakeFixtureManager now uses this property
to decide which connection to use.  CakeTestFixture::$created
records datasources it was created on.
2011-11-17 11:24:45 +07:00
mark_story
92aea9de88 Update comment. 2011-11-16 23:17:48 -05:00
mark_story
2f599e8a2a Removing extra new lines.
Removing extra new lines and duplicated tests.
2011-11-16 21:51:49 -05: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
99793fd654 Test case compatibility skipUnless() to markTestSkipped() 2011-11-16 21:07:09 -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
Mark Story
2c5350bb4b Merge pull request #297 from markomarkovic/73429b357f06cd76f35d81482dd789b1737fe2b9
Fixed inconsistent debug parameters and empty '(line )'
2011-11-16 17:56:05 -08:00
mark_story
8981f49bd5 Add stricter validation to TestTask.
Empty classnames, and classnames without the correct type suffix
are no longer accepted.  They did the wrong thing anyways.

Fixes #2267
2011-11-16 20:38:31 -05:00
mark_story
9c5ad71abc Add CakeRequest::__isset()
Fixes #2266
2011-11-16 20:21:07 -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
Ceeram
ece8b57809 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-16 13:11:14 +01:00
ADmad
8450b8bbc4 Fixing TMP cleanup code in FolderTest 2011-11-16 14:03:18 +05:30
mark_story
542e5c91de Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-15 23:11:07 -05: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
Daniel Pakuschewski
841c0c2295 Dropped support for wildcard in AuthComponent::allow()
Conflicts:

	lib/Cake/Controller/Component/AuthComponent.php
2011-11-15 23:01:04 -05:00
Ceeram
2bb4ed01be Removing _Token from request data.
It is not used outside the component and could possibly affect Model::save().
Fixes #2256

Signed-off-by: mark_story <mark@mark-story.com>
2011-11-15 22:51:04 -05:00
mark_story
6e4493cc14 Fix ambiguous content types in RequestHandler.
Treat xhtml + html as content types that should trigger no
response/extension setting.  They are different but similar in
that they both generally use the same HTML templates.

Fixes #2257
2011-11-15 22:48:54 -05:00
José Lorenzo Rodríguez
55d4fd3be3 Merge pull request #318 from shama/folder-test
Add test cases to include $exceptions with Folder::chmod()
2011-11-15 09:57:48 -08:00
Ceeram
9fd04307ff adding sort on testresults, to avoid incorrect order returned by MySQL 2011-11-15 17:18:27 +01:00
Kyle Robinson Young
1ebaaf4dd1 Update to assertEquals on Folder tests 2011-11-15 08:18:05 -08:00
Ceeram
bc5b6f7cb2 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-11-15 16:47:38 +01:00
Ceeram
37a932b6a7 adding testcase for saving habtm associations with no primary model data set 2011-11-15 16:47:25 +01:00
Renan Gonçalves aka renan.saddam
1db915faec Merge pull request #314 from challet/HttpSocket_handle_redirect
move 'redirect' to request, and allow to use int values as ttl
2011-11-15 03:09:15 -08:00
Renan Gonçalves aka renan.saddam
9d82cd9417 Merge pull request #317 from shama/2.0
Add @link to File and Folder utilities
2011-11-15 02:59:45 -08:00
Ceeram
d302dabb24 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-15 10:12:26 +01:00
Kyle Robinson Young
d725869507 Add test cases to include $exceptions with Folder::chmod() 2011-11-14 23:58:58 -08:00
Kyle Robinson Young
3248e34819 Add @link to File and Folder utilities 2011-11-14 22:40:02 -08:00
Graham Weldon
eefdc43214 Fix plugins not being loaded before looking for pluign paths 2011-11-15 17:30:49 +11:00
ADmad
a821723347 Merge pull request #316 from shama/2.0
Added missing @link to docs for helpers
2011-11-13 23:10:08 -08:00
Kyle Robinson Young
4e8239a2a5 Add missing @link to docs if available to helpers 2011-11-13 22:08:20 -08: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
Jose Lorenzo Rodriguez
de5a4ead25 Releasing 2.0.3 2011-11-13 20:32:23 -04:30