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
mark_story
22352a0227
Fix missing directory in dispatcher with rewrite off.
...
When re-writing is disabled, and the deployment directory
contains either 'app' or 'webroot' the computed path was
incorrect.
Fixes #2330
2011-12-02 23:39:33 -05:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
390db7beba
Fix issue with dots in request URLs.
...
Dots in request url's often resulted in an additional get parameter
being added.
Fixes #2303
2011-11-26 21:24:53 -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
9c5ad71abc
Add CakeRequest::__isset()
...
Fixes #2266
2011-11-16 20:21:07 -05:00
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
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
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
Clément Hallet
ecb88791c8
move 'redirect' to request, and allow to use int values as ttl
2011-11-13 17:45:33 +01:00
mark_story
a7fcb0a61c
Fix more strict errors.
2011-11-12 21:42:20 -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
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
José Lorenzo Rodríguez
497ada8895
Merge pull request #311 from challet/HttpSocket_handle_redirect
...
optionnaly handles redirect before return the response
2011-11-09 09:42:52 -08:00
mark_story
89ced25fad
Making HttpResponse more tolerant of line endings.
2011-11-08 19:23:36 -05:00
Clément Hallet
62ae6d57e9
optionnaly handles redirect before return the response
2011-11-08 18:55:58 +01:00
ADmad
01aa91b3cf
Fixing bug where content length was not set for clients which don't accept compressed response. Closes #2225
2011-11-07 02:04:57 +05:30
ADmad
e1354b2ee6
Merge branch '2.0' into 2.1
2011-11-06 20:39:08 +05:30
Graham Weldon
812e449680
Created a buffer for CakeResponse testing
2011-11-06 08:21:10 +11:00
mark_story
bfd95d0e04
Fixing remaining failing tests in PHPUnit 3.6
2011-11-04 22:54:09 -04:00
Jose Lorenzo Rodriguez
d74b64d475
Merge remote-tracking branch 'origin/2.0' into 2.1
2011-11-04 12:09:31 -04:30
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
Jose Lorenzo Rodriguez
2711178b4b
Fixing Content-Length calculation when there is buffered output that will be sent before the response body. fixes #2208
2011-11-03 21:09:30 -04:30
Yasushi Ichikawa
e53287583e
return byte length instead of number of characters in Content-Length
2011-10-31 18:31:08 +09:00
Juan Basso
fcd96bcc60
Using native methods to query in HttpSocket.
2011-10-29 15:40:41 -04:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
José Lorenzo Rodríguez
8945dcbf57
Adding test case for previous commit
2011-10-27 22:53:20 -05:30
Jose Lorenzo Rodriguez
4a453cc384
Fixes #2175
...
Adding automatic Content-Length header to hint browser of the end of the response when using persistent connections
2011-10-27 22:15:37 -04:30
mark_story
8e69df9013
Revert "Fix RedirectRoute by stopping execution."
...
This reverts commit 841e7aa560
.
Having _stop() on CakeResponse seemed like the wrong place to stop
execution. It can make testing with redirects harder.
Instead RedirectRoute should be stopping execution.
2011-10-22 22:44:21 -04:00
Majna
841e7aa560
Fix RedirectRoute by stopping execution.
...
If CakeResponse sends a Location header, it will stop execution.
This fixes issues with where a body would be sent with redirect headers.
Tests updated.
Fixes #2143
2011-10-22 13:22:28 -04:00
mark_story
ab6aab8a1a
Merge branch '2.0' into 2.1
2011-10-22 11:03:42 -04:00
Graham Weldon
212028cda2
Remove comments, and fix debug transport for email.
2011-10-23 00:23:50 +11:00
Graham Weldon
2844f4a477
Fixed sending BCC with DATA for CakeEmail, as well as 7->8bit conversion tests passing
2011-10-23 00:20:37 +11:00
Graham Weldon
f8697ccb55
Added skip if mbstring not available
2011-10-22 17:52:41 +11:00
Graham Weldon
51dd024a1a
Merge remote-tracking branch 'origin/2.0' into 2.0
2011-10-22 14:55:53 +11:00
Ceeram
4d795a7383
ensure SmtpTransportTest passes, always use localhost as hostname
2011-10-21 15:02:53 +02:00
mark_story
eb17653965
Implement $request->is('requested');
...
Add tests and new detector type for request parameters
Fixes #1995
2011-10-20 21:11:42 -04:00
Norio Suzuki
712822ef83
add some test for ISO-2022-JP charset mails
2011-10-20 00:18:42 +09:00
Graham Weldon
e3898585be
Added test for content transfer encoding for iso-2022-jp. Thanks @suzuki
2011-10-19 15:49:30 +11:00
Graham Weldon
cef441c16b
Added test for ISO-2022-JP to demonstration fail for charset. Thanks @suzuki
2011-10-19 15:32:20 +11:00
Graham Weldon
cdc21e46cb
Changed expectation for CakeEmail to 8bit for transport.
2011-10-19 15:20:09 +11:00
Jose Lorenzo Rodriguez
b38c0e50a4
Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
...
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
Majna
8c3f64be52
Fixing doc blocks in Test suite and some visibility keywords.
2011-10-10 23:18:48 +02:00
mark_story
50a0a51f53
Renaming method to better match what it does.
2011-09-24 21:56:37 -04:00
Jelle Henkens
7ba2f90b2a
Refactoring expectError() calls to PHPUnit annotations
2011-09-13 19:56:37 +01:00
mark_story
d74f442608
Making test case class names match file names.
...
Refs #1985
2011-09-12 23:01:04 -04:00