Commit graph

527 commits

Author SHA1 Message Date
mark_story
2f51ef00ed Add failing tests for patches from 'teddyzeenny'. 2012-02-18 10:53:47 -05:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
Thomas Ploch
574b5dcd41 Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response 2012-02-13 09:56:39 +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
0207a61e9b Move alias wrapping into _formatAddress()
Fixes #2502
2012-02-11 10:16:08 -05:00
Ceeram
7e5ef1dc0d avoid failing tests by 1 second diff 2012-02-10 19:53:04 +01:00
Thomas Ploch
059a5f21ed Fixed TODO: Refactored setting of Cookies into CakeResponse. 2012-02-09 14:24:10 +01:00
mark_story
ace9fefb02 Merge branch '2.0' into 2.1 2012-02-03 21:54:50 -05:00
mark_story
f5d05d9ea9 Fix https + query string requests.
Using https + query strings would result in port 80 instead of the
default https port.

Fixes #2530
2012-02-01 21:10:56 -05:00
mark_story
167a551656 Fix incorrect doc block. 2012-02-01 19:30:56 -05:00
Ceeram
c8eae93292 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Network/Http/HttpSocket.php
2012-02-01 12:11:01 +01:00
Ceeram
cccf663c23 omit equal sign if query component is not a key value pair 2012-02-01 12:04:52 +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
f02a3b0531 Wrap aliases containing , in ""
Fixes #2502
2012-01-25 21:03:03 -05:00
Jose Lorenzo Rodriguez
b79e0ad8f3 Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive 2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
8e979cc83e Implementing CakeResponse::notModified() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb Implementing the CakeResponse::etag() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6 Adding CakeResponse::vary() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e Implementing mustRevaidate() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571 Removing Pragma headers, implementing sharedMaxAge in CakeResponse 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
2428e83e3f Adding test case for maxAge() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f Implementing the modified() method in CakeResponse to have an easier way of setting the modification time 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2 Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e Not appending the charset information for content types that are not text/* in CakeResponse 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6 Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130 Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e Adding protocol() method to CakeResponse to be able to change it on the fly 2012-01-19 01:08:43 -04:30
mark_story
97ce118294 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
mark_story
4d73f4e6a1 Fix boundaries used in multi-part messages.
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
2012-01-11 20:44:42 -05:00
mark_story
15c7493e39 Merge branch '2.0' into 2.1 2012-01-06 23:02:16 -05:00
mark_story
95ec741b6c Changing SCRIPT_NAME to PHP_SELF
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.

Fixes #2437
Fixes #2334
Fixes #2268
2012-01-04 21:10:29 -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
ac408b38e3 Add Windows Phone OS to mobile browser list.
Fixes #2428
2012-01-01 12:57:35 -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
Mark Story
83b28c42cf Fix failing tests and missing boundary markers.
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
Mark Story
f366a9ff83 Add test for inline attachments. 2011-12-27 22:51:47 -05:00
Mark Story
0e4af546d6 Update sending attachments.
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now.  Re-built the internals
of message rendering to remove duplication and redundant code paths.

Fixes #2413
Fixes #2320
2011-12-27 22:51:47 -05:00
Mark Story
34eedcc017 Add a few regression tests for CakeEmail. 2011-12-27 22:51:47 -05:00
Mark Story
bbef4aa36d Convert assertions to assetContains. 2011-12-27 22:51:47 -05:00
Mark Story
eda916d85b Update tests to use assertContains 2011-12-26 12:03:48 -05:00
Kyle Robinson Young
c8650165bb Add returnPath to test on SmtpTransport 2011-12-22 23:16:43 -08:00
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
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -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
mark_story
b7f6645cec Fix issue with url parsing and /?
PHP's parse_url fails to parse url's containing
`/?`.  It returns false instead of something useful.

Fixes #2354
2011-12-08 21:48:40 -05:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
mark_story
495b7f279f Adding test for #2345 2011-12-06 21:06:45 -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
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
Mark Story mark@mark-story.com
957a8d5c00 Fixing log files to directories a webserver doesn't always have write access too. 2011-09-01 20:24:39 +01:00
Mark Story mark@mark-story.com
e2f48b4a95 Refactoring how q values are parsed, as content types were
reversed for similar q value types.  This causes issues in
RequestHandlerComponent.
2011-09-01 00:20:54 +01:00
Jose Lorenzo Rodriguez
b9b7516945 Merge remote-tracking branch 'ceeram/2.0-email' into 2.0
Conflicts:
	lib/Cake/Network/Email/AbstractTransport.php
	lib/Cake/Network/Email/CakeEmail.php
	lib/Cake/Network/Email/DebugTransport.php
	lib/Cake/Network/Email/MailTransport.php
	lib/Cake/Network/Email/SmtpTransport.php
2011-08-31 17:39:41 -04:30
Ceeram
0b00fb4fe0 fixing bug in deliver(), and adding more tests 2011-08-29 17:13:41 +02:00
Ceeram
4b093a858c adding more testcases for CakeEmail 2011-08-29 16:02:00 +02:00
Ceeram
c5d0955cd0 adding back blank line 2011-08-29 11:39:08 +02:00
Ceeram
87ffd92c2b Fixing transport test, as transport class now returns as stated in RFC 2822 2011-08-29 11:38:01 +02:00
Ceeram
3be9a8a5e8 debugtransport now also returns in correct format as stated in RFC 2822 2.3, updated tests 2011-08-29 11:21:46 +02:00
Ceeram
2efa3b0377 optmizing CakeEmail, and improving tests, transport class config() now returns configs array if no array is passed 2011-08-29 03:11:30 +02:00
mark_story
1a872e6544 Fixing CakeRequest::accepts() where ;q values on Accept header
were not respected.
Fixes #1940
2011-08-27 11:39:22 -04:00
Jose Lorenzo Rodriguez
f94394f582 Removing routing url from query string in CakeRequest. This happens mostly with nginx setups 2011-08-27 01:29:50 -04:30
Juan Basso
7d0250ff47 Merge branch '2.0-api-doc' into 2.0 2011-08-26 20:22:26 -04:00
mark_story
5955cc6ed7 Adding trimming of Accept headers to CakeRequest.
Fixes #1684
2011-08-25 22:28:02 -04:00
Ceeram
9e0ff5ad88 add Cakelog to send(), transport classes now all return in same format, fixing some typos 2011-08-26 02:31:18 +02:00
Ceeram
4cc5295400 more refactoring of CakeEmail 2011-08-25 16:03:39 +02:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Juan Basso
d220ee5578 Implemented the support to use helpers in CakeEmail. Fixes #1754 2011-06-19 18:43:17 -04:00
Jose Lorenzo Rodriguez
28ba1c9fd9 Removing unneeded line in test case 2011-06-17 18:12:01 -04:30
Jose Lorenzo Rodriguez
6637d2544c Adding a Debug transport class to help users test their apps when sending emails 2011-06-17 17:55:36 -04:30
Juan Basso
cb88b952f4 Supporting template/layout in plugins for CakeEmail. Fixes #1743. 2011-05-31 22:57:08 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Juan Basso
aacb921695 Pattern to use skipIf in tests. 2011-05-30 20:51:36 -04:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
Juan Basso
39320ef352 Renamed the Mssql driver to Sqlserver. 2011-05-22 23:19:13 -04:00
AD7six
0a53242e3e correcting all the inverted assertEqual tests
$expected is the first argument. Now certain test results start to make
sense:

	1) MultibyteTest::testUsingMbStrtolower
	Failed asserting that two strings are equal.
	--- Expected
	+++ Actual
	@@ @@
	-ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ
	+ⴀⴁⴂⴃⴄⴅⴆⴇⴈⴉⴊⴋⴌⴍⴎⴏⴐⴑⴒⴓⴔⴕⴖⴗⴘⴙⴚⴛⴜⴝⴞⴟⴠⴡⴢⴣⴤⴥ
2011-05-17 00:49:00 +02:00
Jose Lorenzo Rodriguez
2a54f0923d More string replacing for new paths 2011-05-13 03:23:53 -04:30
Jose Lorenzo Rodriguez
900dfef2f7 Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30